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 0001/1140] 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 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 0002/1140] 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 0003/1140] 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 0004/1140] 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 0005/1140] 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 0006/1140] 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 0007/1140] 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 0008/1140] 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 0009/1140] 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 0010/1140] 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 0011/1140] 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 0012/1140] 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 0013/1140] 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 0014/1140] 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 0015/1140] 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 0016/1140] 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 0017/1140] 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 0018/1140] 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 0019/1140] 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 0020/1140] 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 0021/1140] 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 0022/1140] 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 0023/1140] 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 0024/1140] 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 0025/1140] 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 0026/1140] 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 0027/1140] 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 0028/1140] 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 0029/1140] 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 0030/1140] 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 0031/1140] 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 0032/1140] 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 0033/1140] 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 0034/1140] 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 0035/1140] 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 0036/1140] 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 0037/1140] 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 0038/1140] 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 0039/1140] 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 0040/1140] 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 0041/1140] 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 0042/1140] 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 0043/1140] 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 0044/1140] 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 0045/1140] 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 0046/1140] 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 0047/1140] 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 0048/1140] 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 0049/1140] 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 0050/1140] [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 0051/1140] 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 0052/1140] 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 0053/1140] 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 0054/1140] 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 0055/1140] 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 0056/1140] 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 0057/1140] 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 0058/1140] 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 0059/1140] 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 0060/1140] 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 0061/1140] 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 0062/1140] 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 0063/1140] 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 0064/1140] 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 0065/1140] 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 0066/1140] 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 0067/1140] 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 0068/1140] 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 0069/1140] 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 0070/1140] 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 0071/1140] 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 0072/1140] 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 0073/1140] 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 0074/1140] 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 0075/1140] 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 0076/1140] 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 0077/1140] 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 0078/1140] [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 0079/1140] 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 0080/1140] 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 0081/1140] 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 0082/1140] 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 0083/1140] 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 0084/1140] 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 0085/1140] 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 0086/1140] 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 0087/1140] 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 0088/1140] 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 0089/1140] 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 0090/1140] 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 0091/1140] 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 0092/1140] 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 0093/1140] 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 0094/1140] 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 0095/1140] 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 0096/1140] 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 0097/1140] 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 0098/1140] 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 0099/1140] 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 0100/1140] 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 0101/1140] 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 0102/1140] 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 0103/1140] 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 0104/1140] 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 0105/1140] 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 0106/1140] 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 0107/1140] 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 0108/1140] 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 0109/1140] 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 0110/1140] 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 0111/1140] 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 0112/1140] 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 0113/1140] 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 0114/1140] 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 0115/1140] 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 0116/1140] 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 0117/1140] 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 0118/1140] 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 0119/1140] 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 0120/1140] 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 0121/1140] 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 0122/1140] 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 0123/1140] 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 0124/1140] 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 0125/1140] 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 0126/1140] 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 0127/1140] 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 0128/1140] 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 0129/1140] 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 0130/1140] 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 0131/1140] 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 0132/1140] 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 0133/1140] 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 0134/1140] 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 0135/1140] 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 0136/1140] 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 0137/1140] 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 0138/1140] 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 0139/1140] 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 0140/1140] 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 0141/1140] 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 0142/1140] 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 0143/1140] 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 0144/1140] 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 0145/1140] 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 0146/1140] 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 0147/1140] 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 0148/1140] 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 0149/1140] 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 0150/1140] [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 0151/1140] 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 0152/1140] 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 0153/1140] 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 0154/1140] 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 0155/1140] 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 0156/1140] 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 0157/1140] 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 0158/1140] 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 0159/1140] 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 0160/1140] 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 0161/1140] 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 0162/1140] 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 0163/1140] 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 0164/1140] 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 0165/1140] 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 0166/1140] 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 0167/1140] 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 0168/1140] 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 0169/1140] 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 0170/1140] 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 0171/1140] 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 0172/1140] 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 0173/1140] 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 0174/1140] 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 0175/1140] 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 0176/1140] 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 0177/1140] 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 0178/1140] 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 0179/1140] 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 0180/1140] 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 0181/1140] 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 0182/1140] 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 0183/1140] 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 0184/1140] 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 0185/1140] 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 0186/1140] 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 0187/1140] 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 0188/1140] 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 0189/1140] 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 0190/1140] 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 0191/1140] 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 0192/1140] [.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 0193/1140] 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 0194/1140] 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 0195/1140] 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 0196/1140] 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 0197/1140] 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 0198/1140] 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 0199/1140] 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 0200/1140] 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 0201/1140] 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 0202/1140] 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 0203/1140] 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 0204/1140] 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 0205/1140] 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 0206/1140] 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 0207/1140] 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 0208/1140] 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 0209/1140] 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 0210/1140] 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 0211/1140] 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 0212/1140] 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 0213/1140] 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 0214/1140] 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 0215/1140] 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 0216/1140] 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 0217/1140] 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 0218/1140] 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 0219/1140] 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 0220/1140] 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 0221/1140] 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 0222/1140] 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 0223/1140] 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 0224/1140] 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 0225/1140] 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 0226/1140] 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 0227/1140] 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 0228/1140] 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 0229/1140] 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 0230/1140] 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 0231/1140] 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 0232/1140] 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 0233/1140] 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 0234/1140] 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 0235/1140] 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 0236/1140] 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 0237/1140] 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 0238/1140] 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 0239/1140] 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 0240/1140] 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 0241/1140] 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 0242/1140] 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 0243/1140] 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 0244/1140] [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 0245/1140] 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 0246/1140] 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 0247/1140] 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 0248/1140] 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 0249/1140] 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 0250/1140] 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 0251/1140] 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 0252/1140] 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 0253/1140] 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 0254/1140] 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 0255/1140] 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 0256/1140] 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 0257/1140] 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 0258/1140] 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 0259/1140] 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 0260/1140] 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 0261/1140] 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 0262/1140] 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 0263/1140] 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 0264/1140] 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 0265/1140] 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 0266/1140] 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 0267/1140] 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 0268/1140] 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 0269/1140] 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 0270/1140] 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 0271/1140] 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 0272/1140] 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 0273/1140] 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 0274/1140] 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 0275/1140] 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 0276/1140] 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 0277/1140] 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 0278/1140] 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 0279/1140] 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 0280/1140] 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 0281/1140] 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 0282/1140] 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 0283/1140] 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 0284/1140] 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 0285/1140] 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 0286/1140] 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 0287/1140] 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 0288/1140] 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 0289/1140] 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 0290/1140] 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 0291/1140] 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 0292/1140] 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 0293/1140] 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 0294/1140] 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 0295/1140] 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 0296/1140] 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 0297/1140] 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 0298/1140] 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 0299/1140] 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 0300/1140] 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 0301/1140] 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 0302/1140] 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 0303/1140] 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 0304/1140] 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 0305/1140] 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 0306/1140] 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 0307/1140] 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 0308/1140] 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 0309/1140] 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 0310/1140] 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 0311/1140] 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 0312/1140] 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 0313/1140] 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 0314/1140] 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 0315/1140] 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 0316/1140] 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 0317/1140] [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 0318/1140] 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 0319/1140] 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 0320/1140] 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 0321/1140] 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 0322/1140] 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 0323/1140] 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 0324/1140] 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 0325/1140] 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 0326/1140] 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 0327/1140] 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 0328/1140] 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 0329/1140] 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 0330/1140] 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 0331/1140] 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 0332/1140] 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 0333/1140] 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 0334/1140] 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 0335/1140] 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 0336/1140] 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 0337/1140] 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 0338/1140] 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 0339/1140] 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 0340/1140] 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 0341/1140] 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 0342/1140] 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 0343/1140] 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 0344/1140] 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 0345/1140] 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 0346/1140] 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 0347/1140] 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 0348/1140] 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 0349/1140] 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 0350/1140] 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 0351/1140] 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 0352/1140] 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 0353/1140] 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 0354/1140] 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 0355/1140] 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 0356/1140] 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 0357/1140] 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 0358/1140] 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 0359/1140] 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 0360/1140] 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 0361/1140] 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 0362/1140] 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 0363/1140] 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 0364/1140] 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 0365/1140] 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 0366/1140] 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 0367/1140] 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 0368/1140] 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 0369/1140] 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 0370/1140] 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 0371/1140] 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 0372/1140] 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 0373/1140] 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 0374/1140] 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 0375/1140] 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 0376/1140] 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 0377/1140] 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 0378/1140] 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 0379/1140] 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 0380/1140] 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 0381/1140] 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 0382/1140] 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 0383/1140] 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 0384/1140] 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 0385/1140] 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 0386/1140] 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 0387/1140] 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 0388/1140] 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 0389/1140] 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 0390/1140] 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 0391/1140] 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 0392/1140] 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 0393/1140] 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 0394/1140] 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 0395/1140] 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 0396/1140] 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 0397/1140] 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 0398/1140] 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 0399/1140] 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 0400/1140] 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 0401/1140] 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 0402/1140] 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 0403/1140] 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 0404/1140] 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
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

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
zcmdqKd3+Pq8aI9>X_7Y6rfX2BZKom#3fQI%w4gv&C`$`%Srin~Hf;lKQ<Ag=6hT?t
z5XB8eMfOcla6u475m!WUS7cSM`*QW_)H^7@?{m%!Z4tcpy?^{Z@8=c2IcH|h^6bw!
zlg^~1yu5@(vN_Dm2ImzPD%Z~HbQNPY`x*QGvmyBfg@b+^5W%D|k1-})GGtUq*{Dw*
z{)S0oKV>Xx*pRX@xs%Fz9A;8g4;;solwIbUbZzr@jK!>Aj7_er_cVU|!jcymE30KJ
zA-C4+sj}a?Vmz+B2lTDQ3ERz<d(r+n9A8vhADTY+k{+8dS0rQ6jrE@Cjpk2B;SvKq
z%-Z0o_x@{jmu`&3;xM<m(H{(*TEH#_y_<1DVQdsLgEA%wxE^g8Jt_L~Uzyqb70$5t
zYWh?g<sYB@xghMNu<kfEGZUR<%mgZdRA3B{1=Ipp0YP9eFcO#y)Bt6G7r0c%QN7%R
za;vFUvZE{oXv`mh)j%vj=jd7#+R(LEfrUUZPz3y-mp`E_0BGKc0MS8xvjLiW6fg-G
z0t^GFz0sG(Ay6L$=mAUy3IXavb;3}+^r38j-ndTfjeb<pc!L3&zb9}pFaR*leTjNC
zZ~~|WXx?Xm2|$ewnzJ032N2yP!<&GW0JWihE`ZJx|8$P%$N+-CRDiCLygCCk9_b|n
z+^5SOC2vRb6AV5KUWk68>1?3+h`#n9`l<k$gX#utL|=Q*`7^Ny=jwqeKqWx-LA+c8
z#ORPwegJF$7;qj?1f&CX!1(};)1=oEQPR9)0kSP>yBHX)qbo|{n?StNJTztlU;#+>
z3xRI|!)9_(Cpivg?9VSyUIIKr2z#5&BcM*a8FohfiB_6}<Z6^u_W{H&p#mTp43O*%
z+=TiJU@mYwa6NDe*bTf65Dl*Y)aD|9_@sGAZ|zI!N5|s;qKV`~^N}vkR+1jbm*N5P
zcakO1O*%iboPNgnp*S7_P)YPqNphod7(o3=PSF7Ay%uN&NG3)}a-rj!^m3M7&VZbK
z0G%g)=mFdSkZ;m4jZHj}yogpBo6b>r?-|Di9qmhxsrJ-oXh(7)8c8<9``OBToF|(x
zWJ5MfV`b~*Whjl<NG16O@w5U60(6dO-2)5;$Zx4E0cbutCOaTH&Q+3}Y5p^>UyO5|
z0iz@x8pq@-G!M6By`=s`pHY&{KL(I*S%B|=pMk}&{kwprsNV{Z4D0~;9m#^mrg<(s
z2YOO}Tw}naz)@f;unD*icnWw1cp9Md+kyYK9oYf-1I0!vjbpNrOJFn8^mCV^G(hzC
z2hxBPfOJNEdjr&OkY3W5bWCGXok{~FACdvlxdu2FA3JdENdP=b<bSUL|1EENzYcxL
zr)L5bvk21x(#hQb>4)Mc9nS}dCXzeVZwAQj)&q3_(M;F;KoFP*v;bsVq*uB|bG7eF
z^BVnW4r<eWUZRKE8)F*tw;!9@7~>P|B;PE6WPYU%vJ;XOfvyoq{?vwacLgv7=%a)5
zR@4q%P$v`vWLFfMGuxpb>Jh*|fP96ZKtFVjV$lxZLV&Ila)AE8ZGZ%ux&!5)u(u@(
z>d{nhhg{SNH0KC_=pw&sPaoBZ2lAcI&vLDO+hMpqv|StOX9Y-4g!XNzem>wl%lR|g
z{U05J&#eIY=>q`G|9{k9Z*S0hwvuE_V-kN<8pl-T>Bl4s(t`nNHvkw8^ab1i^(USD
zCy<Q(4iDq{Vt{m{fcGDPw~ao~{RR3l%}=(K03^37?Wh}|^EU$&BaL$;1L{NePcV2Q
zza-n44UpYXpA?`g5T}FqCYz^q(2dAlhfsFXVaRPLj)#KAQ9wEB)TcdYenSs*z863;
zq%o;Hv+bGu5sjef)NujMm*J;WW&-51RMIigM}9&2p*%<Bc=Y{EKq9#u0WQ>!BhNUF
z5Xa=B+)t@3VDvZ24%d(UhwJ(nd|s-brM)rk|1BluDWZkTK&O}TB|oOT3ACs6^!csl
zIKQpq`SyL!Ri`{|T;uf<I5t4EL6;KrPIFT`k}n-o-ZzeolCKHI;2QX1Jpqi(L3Q#A
zvWv8KCHY$jplf~|WM||LR1%W)d8iGcK*t1>G}mCjxCVRUK2Es;{?6r9ggVVn>yv6A
z6(Bmu2dQr^kOVXX)UFFK5J<o}CkMdZ{m-e4{qY$}Y|1%0p&SDw0@$1XITx6N?R7m$
z>T@j+i!pwueY*LBKR=i3VQ*tUZVh{h@7&SU_z%1JFjGKU!Yq)~%_h2YFkF<<HLSbj
zqIQ-DqcwK&{4Rhv&Mz1-mhEBe)G5;sr>vNxyEIc_(o(uAoiaU(LJ>Wr1*hlDqKni5
zpHVDJubY^S73g&{OJO7QdKh!Ese0YQ5^)zr^tD1h59oCp>%q3_^>8M$5A}KkOJ*nZ
zy4{?Dj-s#3oM9<?J(6__%hc;pF%O0f)9ViAP54r;$Fp+h2=F0=ksKPGEA+a=x^#-s
z>n7&tbctR!vw@wm^m-V(q*JqAx3IpQjJ{UZqtgfac^ezm=})~L&N`h}tk)yh<>yuD
zb-Q)oc}8EEU6OP}KOf0@C5P+vsMP++nR?y9ULVw;*W=mx!C86!#u))$O>Ic&QQ1>*
zrKR^(DrP99-YR9NC)7(RYN+g^<kZzEyiHIEc!S<Rv$v{GNwYW5=m`duk^TmMskf%7
z&J#%Qla`h?fV4lrxJ*}j>z9plybGq_ea3nNL7%@tIZI!o{aMHG1r?7H3V5o#^`5{~
z#b4c#=6r8mvsWqfH-v(sI?flW4fq;rLjHzcO1=jdb3MK~?+jxSg$8U;{EglQCFpMo
zRC<*bZ$&i*P^vxkzPcHTuOZmz3qUZC&rnFL#WO=0;t$pOAfd8Ge?!o(U(|(%;i{C%
zfY%ceecF-K$8K*wZ>ZL*gl05)t38;tDJYujqx4Y<170s5s~v5<poluJhnjkVN(HD;
zN(x6@I%3GE5q*?$4CjZwd=0%lfl!Md;tADyLTwD3p1Vg!K6;W68k;KWe3eR-zux0(
z=%b9GIcn<s6`ndS10~@1R4GAUO@pV#+v^NLDBk)Cf0fT0RI0qxM5*=%Ft^tjw8rnR
z0(}8bbv34_gm44?Iwd$G81mLrpL$3UIt@V_M6h5u1UY&FRivIOajMc^U*FW=tMr7(
za%#PGjTo!GvCcc4O1cyx8aU?_-cZO3BK$R85E3BifXOOIC*-MvNN}++;0=kPU_~7z
zf(Dg!O<)Gb*5a#z9s&WV9qpPu0Uz%agt-WEVJ|x0uxX{1Y>arX23@`iU!5;BgN|n?
z-sz3rN|+U7Q}3_x1{%oH$N>B`0Z(J?j6U{qf0bv(`$5Gk$nyogN<{$dgABMLAGyjG
z41u^%TR%t?Bf~+-pMrhhx_tVezdF?72@vVt22U^LwDKVa2;1LK1HF3cpe-mm<Tu<%
zOxUM36l&~$*<~#)Eq!3!P)Z+2m`(<9wu+pLTqH<myLMGZ_$s{(L9gB37FBpe(QR3T
zlU{Z^*8w@FQf5#GYG8KMyGm(lfK)i~Wkn;D5^_o2SRcNZ(iSw*AuLj;-j@ux(%<OA
zAQj#^e@icJG&t$0gO)taaCuKf9b6mH04goa8LfCi{p~uJ!ODQI5zGXAb$$GSn#<r)
zcDubR{!=(1qY8?Z!jj^0WkgY4L2+4uVsA%?(pz!$RSLZofhJF21|n%%KfAqm@80?V
zqe=^MM&^zv0J&bJ#t(YPipW0x!k^Lu6Za&2kv^d2dIVSa1njx4id$iow;9|u*26w%
zluCac*z&`1e6Tqlvl;{bDKN5NFFr(5W1~L+Qz2_4sq?5rzT>Ti6^1w|o=S?PFd}lZ
zIz-AQvM}<}(;g+H37Rl^Gxr9ix<hcP4&ZwN?sh&HH6mjzpD(D?!)YqKO0X78A!K0&
zUp)<i1GH>Jm}-E})cP8QW)RPCh$u<If-uPJ{VhSxz-cQXPH@Uk15?oK1yMC2_@Dx}
z@>P=&&`g*SoCJIoO%#ZUU@~}^3{0O&%!OkJyTKoVFW2z^kCXL5GH*B%5y2<xrH2Cu
z2P4mbvj=?5Lg>Uagk6ag0&*%~!F5Ck;-R;yifSFH09}{C{rPOd7BSpuPu0Z>ccdst
zGZ|@Dp)X=!%{sM4t~isBb~JMlv|R^{wf+{EPk<9kEQ8+D$wYV_&B#^2vl3aDE_5+&
zz&ou8iI7_#1+mkLz&YfM)9%~OEvx*XnkMr!HbVMP8ke8HvWbskWXYx=i59Zg#}wJa
z7icGGvI_2z_=c>gxTw6Sq`1ufPGS34@-FzPrVxy2Xsn=@dr39YJuP7LyooGM7uzD$
zP^jJ;=n?FBHU`L$D$z3l>S@72wuSiFR9Q<h0jFf)da{5b`TBuR*bBzsgH7qNMW{pP
zo97Sk^G>P0suE$Y7&>mx1BpuLJ&44i8@8BS@l^Bd21XF}^o3jy*^FxkywK<+d@X=%
zr$?*yW0MFdd>~d(Jb<b@h?2Y?OB=))7#*d}Hb*+Q{AkXRh6kQyPOkbk*QrO`p*5AK
zs)}ph-wW!l^CG*|^ujs@Lasm{3N_J*gL<@}^E|}(>%0fKxr$iYj$9+Up20lyF+-`W
z^)z64R0A^$)O#rY1?V&dNlpTU(oqa#uu6ls1sS>7hnz`POKj#eg=+nQ_5u~m(c*_(
z%uCaFsRo}$cCW9eddOQ@OUsu!r6u4a{b73HZ;dcpsG+6S56NS7qz5hCkUP+X>A4?_
zDkvRUR8|H*P`WF5CB^x=PmJ;g>V14IKuHnt)C&$l0+tjAM?7v*>Oe%Mb)4>z`uzTi
z5FD9A;o){=q^b@C@J@(8BJR#WJb?uw_Imk%Jo4$07-!puKaoZdUF$jq>ZXR%ahvDx
z(;4!NX<-nQ+YI-vhWYwih**fM3QIq%e)`+(={=QVFVeielISo7LQ#N6AV|Om_508d
z39ShlX|o`T_R4ABL5DMK8nM*KYkJneSl+s7XvWp^?|YtApvGvYvqyWO@mzN9oWTu@
za<ZN@ydLCUQV0o!lqr%YRtZ=kw1o<UWGuRPPztqMM)5e0MW>$5^te`~=<=k<N2~JQ
z9^_CgQoPf#nx*K9<kD2{Y3PkjPZeKh(cc|VB!=`LObRwg00Dm^t)0E#x3U)Q(bl{k
z3-KyX$b-?mby)3EYNUQN0fwmXHPF&Z1ac73mcjiXR_~+JjLi{k+M0dd7RUsqPm{x1
z1JF(eOvC>db)H)%=*GMMHB5_a0nV{jpWcWp=?ih64q?d(Uux%oy5|{`RQdzR=?JYn
z=H;D^-69F;IRz~c0`$n-K&uvHPukh&@c?2(E`mTP`%#9V7)?6>+BfjUyumbO&CH&B
zB}46qY&|}nIW@l|7T+ScwQJkahp?D~2kR>cz7hdhP;R|HgqYxMsPYFOH*&NpEH^^5
ziJ{<lrWc{<^h$3dcV|!K)CPYGR!%iS;HP6Ce7YSSXQP=CG;!OG=zv&E;w)AWf1@7A
z#w}#ifk8cZ(J~TDv;`*~7ih_<TQ!1p9T=`}3i7p7`y2^9V4(!X89SP`C6Ne%ypt}%
z_8re$hyDM){^}qJ2#BYea!NJDIke{Lxa+F$B5cwMuL%}GnrQa>u(Gc<Vk{}f2t7uK
zKD~&A(;E}y7nS9W$SE3GP--t9S|IjXWhI5><8n$1l%g_aRB6fBqWpq<<(-@|9KYL3
z8CO(3v}8=Vf)=GY#pPFGx1i({U#Sc)D$ehv6pY8VtE@~ZDOHL_jv7%^fOAE~c_YT;
z7Zndta?!82gm!Zyi^?%*c?s{T4^>oveuWBX$s3B1b8?GD6qR4uODQZWFQzdIF=&o5
zDyOu(C~wS&oKj`fm{R<eRsqJy$FRjk#f7DqrC?+MHjEf3uVmDfrA0%AmiI!Za-8g?
zl$Yk@7mUm)9gbajsZs)#OBLP(oA+Xjp%jdz&SgV$MvPEMAg9MrhL()TN9)`IP@jWs
zr6324bNS&8SI)?sA;f_(E;Z9RXp;a*YDhtGL21s2UP{@hg1jQCKy*c=1$iJ4Eg^0&
zkFyvFtBbON(PMA|?Tjg)gP{eSbkLlG|MSQ`1johTkj5!5DTNGlQpOdP74%YaN{h-!
z35BI4BQZEs0T~gGV<18_g`Ej{NiB4auJO(HX@fv3>a7bdzaVD>283M{|Fx}gALGm&
zer0{|GX30TjkuxJr?Iwi5SC>1lYCWIVB<N7?#w90{SLYdQq$1H?+s86t@BogE~DU&
ztWq1QuPdrnip1TSpce_Cx+ws|$9fM*0gjIx#Iq)?RItV)p9t3an`qO)S2{I5tj)09
zJg5`}J)TOeURrRolI1Z!Yh*K6fcaPr!}k(Q!F}yY))S?RrLlC@7qtqsP*^GRvMQ8A
znFsB9p;p8i(6$e1Ijj!<ly>6;`H`0e(JR23dEY*)gx3O?(}OG2W+W(R0BH0Y)`U?!
zXrGQz)A+vuEFbsiN3gMMz+ZYBeS4qL``oh#F52c9%c%>3d!j=5FXugT{QsT~ALrSF
znL^;w19^J!{RweA73ch{8lUHub3R(vaS1A{kW(DOc<s-Q11BNqk@VRBd4_l^(p5fY
zAuT8@7d0Qo@j|O-a-!f0X~n~(LAK%LwIIf6!l;#egcf{OfL4+jSxhzB*Yh#SPH5&J
zdiu~_Sd6frp*TY})`Hg5ZV37ltv=m`%Fu^Kq`5lw>?jdI9a&-}Z%5YHexCO7Xp>SO
zX2-vC@k?}&Y(k)ncqWbnuT7w*{pcNOA=@wHR8Vh{8qsxjxseu#FOoc2zZjKj<Y7V<
z3MeduwO<MhVWaR#GnDJpkz7cIB;no|BLI3^xU|T6hzF9z*);H1zI(ur&#e#ge_;uY
z(0c`FCM_x8&d=?YC?LwloaUnjZTx8IL0QN3OKpf_KhBX<$jfSQ&Vx@cj~{<Wfr2*m
zTrO4UM{$H^r&5eUR!8y>e3SG$Qd)zne)JIXBVVh=Kfy&Mu8`#tZ4|YFpf`wPn$ei2
zp0}a1)R(TcmvDOxhj5+rPWq_g{r_qQG-EyfHK8TZKqDG4hb*rS)RR3^t417o+4R%L
zMlb3i<j|(`3Y-aX>VzcxT(-iR1E+0AXp-bewnOw1*Q6ifi=r{vC7o}hO2neS*AR_R
ziLsh=&5#Euut*<2rlSD<32ztUHS=>md>S*6yvgI+OIO5~j`}7#sV&*Kh+~G&R_pTe
z!CEM;5r-6C#C58XG|8(gajwm7NW)}N0dPT7Q%s{?6ah$%M0q3Tn*ll6;e*r~yeOSH
z9TXSaq(>4a3#s6}$Qp=N;S23)CLNGX3CR&Pf1OX*sGynjLU~fyN|0-`h|_CuPqM4V
zC=^wxwU9bd=ixr~SI-yLAS|2wfIOF^MAQo35|N2=$C=rvJ%@cD8?wDd)}LL5e=Yo9
zA5KM;9*g?uHf^*F>TOBxB9j?egm@G7-<5U6ydyvhMPSMYULL#iK+l<Lm9{lXDO#O<
zb<&IXE(b+|b0a4xtn4qc6D>rvGv=mI$!~?N7<NUyi$EnsY$HpyjoguXiu`9=Y0xT%
zEX$y*<Ge-$CaF+1HL?&%&JS7Bs79m_bdv^!FOiRkEboC$QallUNmfI>C~M`g(Yzjl
zPV6|}UY9}0o^nki&XQ)x0_#vx#I1p@MV6wBYKOMOzxEOtg*96-pQQw4Icg&ytvr6V
z44(@6on0adG8?TuY28@}y2+!OKyiTEDCs+m_2cvQM$6u3P%sLsrvh*`604jMs0ry3
z_mmHWe2jIL;X(gdf3zkR98+F2{7m?V@Men9v~m@BLd54fSWH_iB<rELMY?N5lo#>C
zpoMfyd6Tq7G8XYs#5u!5D8o_4nu5L*$%5Ph3@Vy%mEsny3EFJ5t#8{}$;dmj%AxDj
zgQAs)(6sI`)}<m688$}NNztMSrQo^}y@b!6nWNg<rl3&J-i*E^31NfPnA@u#ow;(N
zYqYBLLWV>mt#D|5vSad>N^Z#pe?&j6qbZJ2PNbYdnS#bA|225<@%&0sB-zpxF(&Ot
zNDd7+OL>N7po~oV6Fwu>XX2_@OOoHxOu{l~4$>fbCQ)NpS4W?w8Qaq=WFsgxR+=O`
zk}qXd;q`PzWGf$f8<D`^N$@CiLOxr8o@9q&E+Jtf!V_ggBk7SSZlhFW0BWt^Dse0F
zGFdUnl&%Y&XpLk<Z;_D<NwjfB6q96))q$`ap$8gC#8MxRQj`sar5l<SmQ8j@`WDh5
zuE<6xmQ``f7wbbhqS3^;zmtWK*Ja?1)=Cs71#fLSrWQoqUvp|l>m`YhEXYgSc%r#U
zGRAI~<R~ndq-;bDL$-#t4cY!DiS)r3f0eVCo#;7Re<4Twl_6|WM4tecoRF+RiI6W*
z-*IQsKIa*dY4ZY-fY>V;k)xxfx2KoJp2p(_)!Jg8h(2fY2+@u*7+FAjN=WW!%hDtP
zKSn268=TSljaJjbc4;+Z@Ih@WF>V_zZShff4(Z3RTAGvmqRqaE=eE5E?R3wj0TC<O
zawOf&C`2wS2Fd}-k7dlRT!6D;SMry2iIRlTNg~yNSOtr?VbDcZN0uleI7JB3BuRpL
zb<}EmPgc%)|7R%1A<v+>dSDdFdH<aTgoja15OW4llI)E;973`p>I5++#c;z;giehZ
z-adASXx{$*LmP(_XDBid$K(Ya*DdY6qocmt_8(k7kbWtbSbOhn(?_xJ<8$i4u&Va{
zPIo{kPj`&iq!WX4qK;PXG^Y_;MLs=ql}p(`tSt<C6?!pfFTn_6Z$}i=VYIP)RDIuY
zPPz^IF;*X9U16*bgf+EE;jgP@k^9A68?l}dk&Zr%oz9sV>3^|5gHO88M&q{S!2ga<
zLqBJWk-|FZiV=xv^+U6W97&!=Rz@wzs>R-|hMzMs3Ed$PD<aC;dJ83ik3p+8v9>T`
zhKOmjiXlJqqMbpXka&Bo(A@xv3T@Ku*ycZIo>M6#PQFI-h`UFW{VAFSxNjQkKe9v7
z+E_`pNkK%wzq1ArlW1>2^tPZRs%gbX>#c^<vDVOL4wn^4A#hF$H6%mQCu^qrN8~T0
z5gJ`^Lu*KJPULB^cc=R;#(DBGl7Mmdg?yw1eQ0$j{7>kzeSRbVrD#jEi&ZCO5VCo3
z@2KNSt7Akyx12cl?e<KxQ!2%Nr3hJoc9fJ46xJQc<MsTGc>?zYi7L9=+IC;S*eQ~Z
zDB=qp3Mq)Y6k>JMw%!(2By56qbmD%Tp+T_<>c~Ic+oLE%7GYQg>6+w0@yf_PhV`CX
z0;D@JlUM`Mv9aEr!8L1)Nmqmp4GP=VeBzoB4@5uW{cLfE+L9%S3_*Te$454LpShx@
zZ1>mowxEjIQhe*^hkws4Mf{4>`!<7nLsHck%h)*>k`-1)yihbDi=#UywA)VS`M4NV
zh@FYBUSq6t(;-$x<l%--2@Yr!;)iCY`NR&5cHAT*qT|dMMAD?zwDUPL?+7pY4{;jv
z(HKUqH}-4BdR$nqpo?@>&F_-faZi9&BLDlG|Gm!6r0uVJk8@cXS(vc2|7D*+Qu(``
z27PZpKHJ{wgryjsNt!flLEK9aJ1b$k9lz%jt7LJP&7fNJKHK`*Sf`QoQ?Bf|J0p8A
z_IhHK*U>(WH6PJQcGjEQ7uhw9MKO3fJ}D;|Ygdv5p0njvLf>|f#3?hk-Or+EC+<{;
zHL<WgVVP|*pdA3^ANmycooPn0J(47~_MUZgiaSIt%}Ax7jqFj}+ckEL#(V|`f(p75
zO=~f6*Q$*xk~8V(Y<qCOE?Kd<G3MzgXYtJu$%rB@`6^{vA#ve12InHS(suw9H8S+5
zK^g2ndFTJ)Ct|iX+bac49rwa*kx5@oci3Cd%1V46Ebe=Yy(GnewmeN%LQzNLrL$+i
zjyca*%@{HvFQ9KEXfCm?YFp>!aU1FAA?<fUhW!iQ5M$7HL*ze3j3&u7=(;iXo<_dt
zxIPfpNLFZAh*(v$-7_#Og<1+(8kwA=OnNl9GBi#1Vo2AST-W8WZnAV^Ph#xkI_9na
z#C2P*_Is3eE4R~H>^N?lw*R_o5O?N84mNh`9q)h{9172+Oia3`h(H!Vdw249;!b!Q
zc`3y?x`Rjhp({p~`%l&`Mx72VdSMe}Z^kO9689X5z7}YdJdD;LZBi#&>bMRRdAdzv
z^j*H8qyJXUB09G9JG-Pw7e@Rs+KPJ+|C{#+yK#50n{#WBBt|+R-)Y;42~C`B<wWg8
zl>84nA$?Uq_Dp&ZHbJw{F?m}1JDX$)q;2vJ5e@&FdlW>AA!E8{EoSOyh3A^F{rHA;
zwcjuNzkmPh+%|FMuBQC-uBI5@#u)dx{_eXj(l+@N<z32<4bYB=5r)2+ah1M3AZsGu
zYSTe`PdjtfBUZIWgr<?tyb~)j{h1ulzN-v-uo0lY2sx8>X+-}})aaWj<9n?#)CzHa
z9NN)$PxMz&W%#6TqDpWdrilOjQa)2~k12;=!FB9+$r8umDvelzzoRJU$23MM+R=Ar
zSK<tfO@Ccg%#VhneKE$Pz6ESNpQ8X{(tIW8M{|$le>GBs>!Ka?ATGw>nCe5&Dp#Mc
z7`<p-`fiSPprkcWin0Ws#;k%fgDM(X%tw?7x#WQdL30kqrf)@QtSdR4bg#1<^BQ!L
z<cQK7U=%(}ah1Lq9K$6|S4N>;iq8_vL-M4Ni7KL&?wS@uCZ)U_g6l+q_=Zu)igwMT
zFgLXr0=mjM6*LoZM=eQu<+z@MQK>)CFr1$il#xtG%S21tD3t$cZb1jhf2=+p-LED7
zN8lfgEG*=&bkJYUm7opHN@M4u6tX9&(YKYtu7q@i#@p<VsLsbML@)8(rt|jnlH~uY
zgR|Lyp<Nn_v_tY3!KF|J`4vDTG?F+&{mFXBzVmbmiZO+ClT?kiLWbhr1?g`zv?=5+
z#ygV>;%gk2S)0^_oQXoxKFw&{7irTm%}F#H^pMSxEg7EBCKd8BqJ(B5UDFZGK%PLB
zR05gOHNy+V9EKjp@V>^V)UTs_4R0~p8U6k)LI@cdbJN&uypwg1ECq$6Wg(6KJnor)
zkJ0g7_+P)nuSBd3;=BBg?JmPANc@FXAJl4rL5R1s{;Fq_c>KKr^wQs`P2xL`3Q$Np
zHSyO2#@}}se+xqQ>zc4GrPTrb-2g>+x?4mmD!TW58L!dGpH^>zgL<4R;t{@xk8J$C
z5490HfNG3MYdvwli*zS;3Sw<8_Cb`{MdqNj2i@<a^_sC-qB~A>=aF)ZxGNmwEhv-F
zJw@tC_eJ3KxIare2;v;=8Oi@?&qb@m2L46~yu$+TJYc4aP=+xU-bH_dLoa$00zYp?
z=AiRdsTFM^n2PsHi2saIKRid_WS!V~?0nXlb-~*xE?`M`$3zM!No5z}PU1zZ8}1ig
zjFos#b_xD+uow2TeIQx->s=RiewoaTzozKNvRF3mAq`-cvn$v@Xmv2R<UAga3VEz7
zV#5##N5CH_){cVjmcshW;lX3!qvH`(uVNF}M0Pd12HKwtc~n3mB)@7%jds&hux74<
zrO=A15#RaII-NmQO<13|V2?k8&1BcI>)0%IJ)4d9YTUqXWOLa(HlHnE3)v!e6T6w+
z!fs`^;f-y#vnA{fb|+iP?qYYdd)U3~KDLbAk2i2EXAiQ6*u!`uT?=~z@6U6yRi<lA
z*Rj=jCs=1w4^wxx)|AWEvGtgHBiqC_vq#w$Q##(vHp!I49%GNQZPJ}=J9~mX$(~|Q
zvmNXiwv+8*&$8X@Irco>F7g6<k?mzKv3=}i_6mEIy~bW=Z{TgEZ?XgIE%r7$$lhV^
z;%%qzvk&m*55_)XAG1%`A@(Ud%#N_5>=-+aw}5=cK4)LBf3PsiZ)me0{8}Mh2HsCe
z7RfE;N@Y@|G+ml4-7eiJy@$7#B%1n}t~5Pn+Gg5edd2jb=>yYY(`V)|bGSLu9B1xf
z?q`11yeD~n@-K>0NmeezLwRXRhSFcTTp6h3E7O$O%3@`?vRYZEY*uzEyHhQx@u{6s
zFHG&8+9$O<^_tXWsq0gBrXEfG;=)s1O<iNUrgrV#_0q1pyK3ELciY@;TeqjW?d<k!
zw>{ln>h^NC{oUT`_Hnm=bicg&;O@EICwH&xUfq4_PnO^I{`TE(|NQM2&2;J%cww-^
z6%v!IQeP=gDwnFH8JwFprGJ~wKh4e4rk6Q4ADNDuC9~CR2RGeyZssKati&tlDGKMt
zrDW^eG%6uwj<Q5qrL0vpD9@b1O<C%M)Ft3%d+H~t$KVFUjdGeB_7`qm2R9#e;Ktj1
z3g_nQ-+lx)(y3GCdr$p}_sV?DxzayOsi%@e_0R95t4@tMRZd5LZeu^`4d|#5A1nUY
zbMhZ2zB@5ToIiH!vE|1{9=qkUiJ!F`yZ-n%#*UXCFB8`o`%FGI=UDLAw4>J@t2j2{
zSifWGxc*PQ=Xu9AAH#cZk1aoT&(WWb?mu$g;hztGfB2ijUmyPB@QK664#VCK|8RKk
z;g1gc4p$%c9v*tQ@Nj`KvR)$Y;J;V#@|k(k3235=Da$mOPMK;=&89h2qyJ3Ti#p0h
zrdv&Sn(o25`@}VV9cN6d+m1y|v@mTnZ8mK&J#pq$jDQ}dCrmGz=<UAv&-At^&-Q8B
z@z=9_<joj;o9QXjQ{drF_%HeYm+<g-M1d9X|8?-=E$l1Af}@BIt5_Uf9{ey{gZS_o
z{4N^4|2T8tT|Y7K{_XJDH{tCRhaN#BI*3?w0ABpQ?!^)!(?{HspG1U8U@PIt<j*tl
zexL}%o9hs>W+7f(4-ejmm^Bwsi(=M7L@kP0CPb}U5w~tb%vy{HvI%i(36EUii2Qrl
zFYI6JSN0p?ek<ON^lzrIlk5-nC!zq8B*`S1r7*+;t7MbHr3lF`$x@^gB{`&MDMpHw
z;-q*fL2^o+r1PZnrOr|pDN(vWN@AZ%snUhgMN&7ZhtyNLM7mV!CH0p2NS8@zQaawD
zWM*MfhLnjo(^u*zWl7mme`$bpxpajzP#Po+mU1ZeNrlo7X{b~r4U>jTBczd1u~Z_B
zl1AgrOjdaF7-_t8rF4}vL7FICEnOo`k|s+YsRB`}O7cq8QjIi4nkt2)Cia5VEVUq(
z&A_{mBBhz^NA{DHA}NS*c~Y(9GjBC-WB+77OZid(qF$*qRvKrDGbJEi{zH$JUm$XR
zZVER!O!4M7&2O3CHNR&*Xx?vr!~Bl<fcb6d2J`#o4=7ekv&>KNSpB+mJ&)UOAVa*$
zmPxNkuS;)8`=vLf1JYa4+tNYl9qC<ZuK8(co_U{nhxv8$Yv#RdulX7COVXp#I%$Kn
zN!ltsCT)?{OB<!l(i75?(o@pY(hlhvX}h#j+9f?J?UtUCUXu1o&r5rx7o-=Z$E9uN
zUFMzadGr0!67%!s&E`YW9nznO-IB><iZIztQKo2~H6qEfBYOz@mh^W~(~<dJd?>*6
z0IdL42*A!6>{H-Tlq-Q%0K5{GFYqPGH9F|rS{?By*XbY+rrbwZ0c_CmAj*w8s4d>e
z&G8sYL>!JSC~0oOR{$LomIGUL97Rce2zLXI>mXXU>4-zQT?gJE2JaJi80C{Xh!6NT
z$Neau*6|ujiVK9#fM;|>qui;3c-y6e=BM|55gfp79Z@Ks(-DL6c^$;-9vwvE3p(CH
z`J#?DQSQ}2w7&%G146*dI!ITq=x9dys*Zywi3dUp@VbrzDBsZWHcE<*g!ciOkLG^|
zplbvPps@(k0lG%`2zVEG5BLC}{sfXM9TR2%$P^q2D5(#DZ0chjhfsb3P)X-L)iD$0
zVI4M<M|4D>B;6Ap0FLRn4&`wj*P=Y3V-`x%A7M7|xel`XFLca7`41grn_ud<0VUZV
zVJ`5sjvG;a1AGh21HRL-5aste7NGnA_z_qH{G`K#@}D|xM)|XjTT%X^;}(?v(s3Kg
zUv=D$@;4oeQK~w~zFKvVKmD%b4wV1au>_?CoCNL!{?HMQ@=qOhl&5s;5vrFgI0oO6
z6-YxJG)n0Lq$_$)o|FNk0-1mtxCrPA3<i1tIY2J@no;HfqXFtu3Y6jeQz*-UNkAbm
z8Svmd=9VgeN`S6c0YP9q5CWQjDL^v-8|UYyqXfvGkO!CqyWrPh2Z+=RnSn{L0}j}j
z1ep@dkD-KIc>LRn622gjul$JeE#Pe+1vm)21ArgtUEn>S7J!@yX6g$$6Oe6~1bIs&
z>wltzoF&Lt%Ex--d;#L$)LDS!Vd?@TqRm*8{RE`0D6bSSZ$}AQIUpYs=HP&SOi$~G
zL%Bmo0?L;K$e&EF2#~#-5E}^6wJ1LjFjL!)fKNd4F_eb{$X86zH-UW7L}LNuPp0EK
zU`wVGIvglJ(-99@NID=_vq=Z!YBmF50Ay(f4;+xO*`@=r$&7J1-arW(<#-1rbjbld
znIm;TPiF8>kZwfTT|l}4<;4K((fmFD*>Ze{@>v1074see%4x}SfcY4w4&~3lFQ^BQ
zHo*^e<UBVhPSgQu7RvJkurgo@^oyr-cs@{|Qv$_c1-d1WE#hu0!(CXOPn2ZT0gBCv
zB7hYIQ&I&et}7P`U<b++@I|0pr=$r`99LXG2F8btE7?GQw0Q~T<pSpWP!1F@KZz2y
zNT8gfGy>Dm7dE1V0MIDGJ`@@YkmjPC10eR0-78Cg<)}l?$|?afY*1M(Ak9MwITFnK
zP_7d&!#0%-0%nrQMgcR;wMoFd7v*LF%7Mx=0%j_A3YcF)xm&;t`J`F|B<L&^IwD95
zP<9fK7NUd<3D~={RLGAYEkfBxK)MNK8BmV%H=~>YT!Z?pD8Vm5dKBdy0up#iy;DE}
zPpL}<B=C_6{iWWG_J|3o_XtQ^P~Iybtw#xc5G2ST6?!E|;5(JB0cJY49e~WFCs2Za
zf<)&a2ZBW9Cjk6W+J*9nfCTxZ9u<%v!_;HIXK3?0%Flr>P=B1^1`covz6$&8Y7#Jm
z&aN>6<R4uX0W-$$3Y#Qg1<JZYegyN2C@&Q-zkm{YA($bnu9|=ucGV4Yb%QOLF;_S6
zNiahf-C)NA^TR0NKLqm%l$e8HUWF2L5X_ID+#_IKi4uGg%&SqpEMR^RC2Wg8Yp!na
zD}wocl=}rF=&~DP5Wx&uyL|+FjQRs8{~=(0j<N2S3z*lS94ug7i!xWh3>)Y^S-=dP
zb*~gK!ydYOfohBi{dS)sU<N(irwW+C|4$YH^C6`7y#f;K>$k6gZ=j<;QGN@22OUW$
ze*}I)Jp$!F1x!&We-XgipJ`~PnZWzYO!{R52a{0$*To!6+Q+0{6F7LxqufmYotn$K
zqd@PD|4DdRF2hFAX}n#r{X0wPf~z%}T@cocH+r|2TF(!=HB!<piZnkS8K!ML>9`>5
zrGM|VT#$Bt^abwwVqZ(bQg2?I>7N*pg=3%G33n4ya1ZfP+%fEnJA?VS2RMq2!yP{Q
zUNwk4@Eq)N@4)(hE!O+A?|KpO@Br4Hhp^833hS&^>|i6XQ|*LZ>BW)@JI#UEQI=x2
zI7Mob=HL#*B5AR7m-K+N68o$z*ke5_y^MX@JJQF}A?dL6x%4CMP%x7f`@v+>C8jh}
zUsJBB*i>%1%5;sX0(UGLOfyXj`2C3oO)E^RaDU)&)6=Hirq@j$nvR&hF#TlGa97D@
zjyI>6yO}RFr{m62u6d++jQMJ_&)j6b&OFzAv-uA5z2*nakC@k(H<=&DZt!{R3Ewck
zja}sl^N;4=%zuQ1g++&T2~)zlhxH0`g=L53h7AoX4!bg}Dr`zvW7y2Fd0{t&EeTr|
zwjyj@*b`wp!}f%|5_TZ${jeipUxa-Z_Dk5mEoO_|5^Fi%l4|K`Nw*BJ<Xc8s##km<
ze3pRaTFYF^Etb124_Ve(wpyOC?6vH-yleTya@_Kj<!8(9R%VT`##uXC6>Cpxnzf&G
zpmm6~*gD2K(OPMpVx4B4Zk=siV7<+Hm-PYbO6vyeW7emw&sq0b_gmk!equdt{mS~I
z^*8GuwlJG)i?emMDYlDkeQa*q<+eQAFxzO`c-tgfwXNP3vR!Mt(RPz<iS1t7L$)=x
z&9?2fowgTjuiM_WeQNu{_Jd6gXW<dyap8&K7lro@?;AcSyfC~Ze0;bkyf)k)K0SPP
z_@eMT!tV=zD12S`W8qJSKNr3){6P4j@Xy144F4_s&j?FIWJG*K=LjX@k_cBsc0_)}
z@QBig2@w?$zKF(%mWb;k=11Hbu{7fTh?NmrB6dc+5b<inTM-{d9EtcU;>U>JBL1+O
z>=E`@dnbF6{UZCNc9%WdKG;6QUThy@pJ=bNPq9z4Pq)vuFS6fmUuIunUuWN9f7<?>
zeV_e+{eAnV_Al)}*nhR3l*8p{xs#kEUnE~DyX0(nuslRAmdD5w<w|*qJWZZ1&z2X+
zi{)kV3VEIUnEb4~SAJbSD1Rg$mH#1sFaJx{B2AGIkuj0yMJ7jfi|iGd5!pX7Cvs?H
zN#xkbt0Su-r$z=MXGG44To}1H^6tpxk*gv%Mm`?7JMxXlcOs8Oei8Xy<iDfLQTC|V
zsPm&zqPj=*j>?Q05S1HM6g4VpT+}sD-l)2$=BQaww?y3;wJd5y)VioGQBOua8?`s;
z^{9hUA4MIF`bX6FQU8k4941GEBgS!_BiYf-(aVwH=<mpJ40V(^#yYNcR5_+P0*)Du
zIgW*n#g4lj%N?s68y$~3b~v7QyzF?>@t)(5<AmdD$4?H`@n^IpIx;#wx=VCwbdTuE
zqWeZ)5uG1BJi0Xc%IL|_HPH>xP0`my&yBu0`i|)Pq92Z48~teX6Vbb(UyOb&`t9fs
zqmM*?5&d2CFVX*wkz&GQqGLM6B*k15b7_n#COc+u%#fJkm@zREV=7~&#7v8s9y2>;
zLCkG2cf~vqvodBw%wsW6$2=FaFJ^ztyD^`{9FO@b=Es=dV*ZE?i<M*JVmrqwu@}eo
ziFL<b9-9|CEOvD4_}EFY)v@)lq1bC<Z;ZVuc1i5Lu@A+riQOE#J$7g83$d@pz7_jH
z?BUqYW5134IrjHB7H5ld#5v<Gi0c}6NnCndR@|Vt!nl!f<#7|@D&l-`jd3k;*T>C|
zyESfU-2HKn#I29p8uwJ(?zorY-iUiA?&G*)abL#$5cg}`$#`?TJw7)6{P>jk?(x0j
zGvf!u=f)SskBT1`e@(nMzAio(KQsP@_(k!z$KMnGVEpR%P4U~}cg4RH|3>`#@t?+j
z7XMBBKjZ(Mz!D-8;uE?gq$c!8xGce)kd-hfAunNMLV3cZ1Ybg9LMUNI!kmQp33n#k
zoA6-5>Vz!`I}-LKyp?b`;Y7mM3EwCDD?xLboRQ9WXR@=KvzIf&+25Jt9OfMD9Pgau
ztajEro1L?q^PIOh?{q%o-0a-peBQawx!?J&^AqRMPMtgT!OM!%(sHv!ks%6~DBO*{
zl6r3qUa~e5?-BGCGzI+pLQZ}T-kgTF5PC$BQxU)mJw5z0$6te2vQ71ff|{r2<%^;q
zr@&K*cc6OkZa5Tq{IgQjD}4dHij&?{T-jF5tMZ3Dm3Sv_sPc3zuhN5wEBR+W|E$vM
zcrSFQ3RHPQ1%fQR43vm0;B?`&xS+A%^f=zrwE{t^R}=+&G%x=g(nd;6TXhH@sfK?J
zIXz0v>DmyyimD#(&mp>N+SP})4N==x9a`ZD)B;5zyrdJax1-M@K{(#6M)Vi)nSA`S
zND%20MbYUweSOMHhYKke@*+R2XqaybRb3hVhP6#MrL8)QOMVLf9Nv!3sqO1Ecw22l
z9p0$rs~o{w*745~?b_6}tB>GvtK**|KwTYB%zHHO&*FA%8`{;2d5;G1>7gI@!#nzF
zy#=tkhME!~2fPoQ#8JWp;pd+vwM`8*o<LK5ou?_}Z+{?!kS+>WNwCg?x5bgw`P-_c
z{6v6%mbN1%(5_y}Neb}KGTt)CKg-(W7;LMSRpM2@colN+blGMKW$i}gWcB4<mfn~9
zoGU$tD=R&>oX-{FpXD%&5HN<D1ztc3;}|2vfY%(7G{$f_H1W?d^m_Rw`WVwe6zvbj
z2+L{G3v$o=%yDfTw6s;n;f;aK-WL8jjx*iDKZQ&)#^FuJc+;ORcqMN!gMVJx)_q1>
z^(x+PCjY$Zw9U>uU8C11208nA*)7Jfbexf!hXQZ#c28@<OZ~`$@k+m{dS3%H8N@r^
z8mf3RS6^PFlSEx<{R%zRK3`f^b|&fHm7eD2MLG%Em7Y#*UFojAc()-u4DTuA$8K@e
zor$BuzIholy#arpss_AFu))hqyvJUYwQvbutHxV)MFnrY=9Qptx+p<t1Fw1MmkoFg
zZ!;B*_{a@S_0XQT50x}BFZsw+<0JD5jZ769nU{QIs)>=Q#z&?KG2+f6k)@^Oq~T5R
z{+6aj&RupEKjOckAWrlXMK(WQ<!`}@Ezz7_<j*e@2$^N~<)`UAW8yT4$Cb|01&R!Q
zwW+bHL7Wy>^SRQ}bA_OD#Ynkg!u(v`GM`d{D?Oi#9^>dm7C$QBT1)GfCXRTK)=xjl
zXGrVE$4u+TXGrVEhfeFqyQlS|R0bp9W2W`v^QH9@cGQngo7S&@H^~x1XNjS+gz;o?
zJ4nkC6J?2svIHvydJ{2UmY6R~%$FtR%M$ZtiTSd`d|6_?Y%yQ9m@iulmM!MX7V~9`
z`LYFL*<zw>F;TXdC|gXFEhfs&!#hdwu4$h?P-#@~Mo)33+Nj_iz~YS0s7x^`(~Jt@
zhG^4dRGN(n-fb%`%`hr6jf&7wMrE)GZyN;>)kXylEzY1tnk$!BN8y^<;dDWIqj5aV
zsPKl6bb4V%PIi-Vw%MqNaY!&}t^$%BM$MXOTn$#@S22tOT%>s6siSvg`aE@bC3`i_
zxm;;|5v&kr@RHIx{+?<&o1RaZ6GZ{0&UA6nBl6(gn0g~`ePd__Uga%@$i#0d;8!E?
zeoc%Y@K-feiVNv!!6u}CdI>OZD58!lo$J??&h_gOG02t973)gRCTc1@b)o}TtSdba
zBE~C_@v96-h4fx%EVqzZ5Cwg~shEKKsVj|}mMe`Lnky}jUI<PvZ5Kr5pkFP8dVOq{
znBK)r&*jR%OQ`F-ys0aleu)BNAtH3rUEGLWE-|)C%;e%ya%FH^c4cr|c4deGGq^3g
zGQ=zy+=#LK;1gsBUNg86yE3>DyE1a={e<`hhk#B+-#UK{NdgNFL6#7k2;{CzmwwqF
z;8!!ne3_X@1T}#sC_|hU6KD40ulk*im&NPsXNp-fg@iL9VMr5c<g~If1$CK%N4Mb7
zEqHVb9z~vT@jT&jxdp3kF{4|s>K3fJ#b9nRsas6y7BY1UnYx8c-GyXjL?*r1z8OVB
zr4R^TBe-0d`TQl1)B+1K<ScpvzRpx%F?U}vcV97gUom%IonbLeU!8AVb-E(OwG2T}
zU%h2v(1)L#!ODu<MMPqk2*Iv?LJs|eX87s_O~kbQghE6>c8MtM5>eVEg04%1U{_x;
zp9t2jzCtP@O1nhNc8Lh?>L=(F!P=FTPVNA$;hpT>5KIR<2JY{MV`gO;C#eCaUqoS7
zmfPq`{k<W`T#O<b2~mmo?Go|ZB?7lAOOPM}w@ZX^mk8W05x89<IJ-n}c4Z5GM2vQc
z`0dK>ODm!}Z(|*z8p$;$U7WzLYlM9GRRVreqy<-wkaCXDRgRErj*xk_PL2>^woqA)
z(0`7wh8$s+A~(5mgm!X-{&VyWf=0wxq9s=hog<_ma<(g1pH@tiBc{z2gNY@8D_4w}
zD}029c?>3K5eonWeLh2;-b75Bn~&As=_r;bsLs>-=|t%B33Btqw0VN0Jbg?d9=^eJ
zx$*=Ld7^usU@T7%$X7)OWkN3bV!nJaU%nVRUvv;_5|>!0xWrn<CDtphJe?LnS-zM(
zUrd`X_{$fR<qJARPH`28`3m&;#3*7l;S$RoSAiI;K!}HDHkYeFNM0<)Tm@pH0=>H+
zqEPfJ6tfoyRtf|wg@W5ceRd&<LP12KXjv%8Efhl+3aSf)1Pk>J`jMEnP#;>KT@YBv
zsdlGvTHI-TOm`Y5$(_cBcBgS7+-ZCUw^)+9(>N{eG){{<jSuZk<MX-G_zZ55;M^j?
zxzqHCIAw0J-gl>qiPFXFBDcEJ#n2+*x<wXti!AIGdDoq;k0Rzv7qh2}8PYko?sU$d
zJ6+J?5)-+^L}H2Hb_xDmqPs|~ZkJ$_?@L^6m*7uiU$;w4>k`w7wCWa#)GgAgTO?Vx
z$h>ZmhutEPx<y)bizMq7Y1N$}h!A<$E%LBi<XU&8AU8vBlp$sp3D}(>7|Re$izMI{
z+18yY)F^VIJ5%r=Qm8vqXfsnxo5}6WEz+?&Q%GK9S$C!wT4YbR$fa(PS=}Pfx-$i3
znL^eg!Ma6)b&CY+7May8a;aNnR=3EyZjo-?BD1<ho^^`^>+UNE6lv7mS4hGwm=?*`
z-B&18Br<nj!HP(uZjqPVB3ZdbQgw@@>J|ytEz+-B<W{#xfNqf^-6CVUMXGf771N4r
z>K2*SEpnt=WK6e6fNqf^-6A=<MQ(MAH0th`gIi>Ep86{MNLoX41>ScqvYfkLE`F8(
zZ>|quJwpN4&4Vg_4^J>H(x|&%0eXqFBR)^>;CMdud1{&(@ydTsO+X(+^v><ePgY?c
zP><zFu!(*e#8XpOO-DI&%c1So0MC|b=~;#NF}`$9hifi(Hh#^lBG`x@WvKFbu(z(l
z4>ZtJ^bTtLB!L%f;WwNbDjTuA4|#|W+?zC(rWN>c6tPGR;YS9V^~E6aINwt98#{QP
zJ*^*UJ%yq0cI%**2Faj&gPS9KJnndDJX5B*^83<{ytR{KUSYd2L<eq|X(BhK@r0R{
z!DAMRew=aK+o?cX9Fu#YAm2ej#*c!$1w{_Ofz#HOj594m#E~@apEx2vL))xAmH2hN
z(}VLPaV5{F7p5VMrWfi_EkgvG3?5$6GBWx#;%AluZNF47u}9^^|M~Y775&E&*-83N
zungbxeTKg`Eydq?R^u<zUo}PIuZR2K@9VdjJ~Dl8`o$cL@7c~X7nrX%FElSVuf<<>
z9uJENyEv?OSpTq!ut3<1u-Rcxg}od0rA4x2So&KASqd$~Emz@Nuv;v5Sk_y9wT4+`
zYmD_g>m+=qwcC2kmTK#6%eKw1&9}W2ZVt~2_l8dkpNVgo9t>X@z5(Aa?GAq-{H5^U
zBN)C}>Jf2SL~cY;#P|qL#2pcvBDO|69r0eo_Ywb!_}zZ7J<C4Go^NlkH`!;|Z?NBE
zf7HI${<ZygS&=W3Gw==2Kz#G#muJYc<cH+7@^<-s`D6K8`A4}G-|)C2M@QC2-W<6$
z^3lkr@%_zrk-tX%85I!~9TgX)MD>ZfJgOjSWK=~|ZPe_jyQ4NlJr%V(YG2e_QSahA
zn%^B!j#NjQBg>KRC~_3zTbXKnA2ZK!E540+$g$4xjN>(Y3v<-*jpGN$za0N|oQjUY
z_b=(u1EY(huZgaW4n(&^&yHRgeS7rM==-BrM6bbjE_<Wji9R0vQ}iGBro|fLh`Au<
zl9;TR!kChn@iCs5DtyDz7}FecExut{8nYti(U>P<cE!9H^IFW?F`vd9i}^05HCBp^
zicP?`D!pPe@tsO;?9kYev8A!&Vk_{S%JkT|v5RBxj(s3@ZS2<AC!KHXUj67}DHA_c
zzqYBpx^1|8U~Yr|n&j2_mUU0PvF63Zm!A!#rBvBgT{HQvD-*l-8n4+k>xZL%OS$KL
zXKuyzeQ&<J;lQqEXHMUkl40{TOspB6=x~1g{A0Tw4XmoWC*|S0maloF%Z{rb9X9M5
z-!;Jpf)C%ATsH^zy}C@;Q~go0nj2O>^S%`iKX~8z4a=`@X}<RQx)d!othVu<^{ZFk
z|JdWJt_w6wn^TkGQ1jkUN2rBr;c#_?mZ#;7&_-y5TH)*32sJO|P?#oFs!3`$HF3Lo
zu_~$3cI^VKyVj*b>!C4p?)LRh>Hzif-alyFw2OLm)B0<df73&~DCLu|9%J8C!_}xg
zZ~yS)^SN5M7EzveNs6P%KF_IUs^`-`yGBK46sUBzt5mpCJ`U3&F8xlms}bLRr$(sZ
z-(I3cX!c7l(ZW+?=O<PzRZX*G*;V$HMZVmw*k#+grE8yDy=v}_tCHWeEt}SG_oT#<
zEBzU0tXkfA@$;Wuo3l5i6t5b!Vn>(9wmtIl%iH|HHOVjSwCwVfY#f-_ZQ!{68SnW%
zt4TR9?e*Z;E|abajTt@u(arVAqsLpuJ$=yoQKJ05^`QFh;$^o#xcK4D_l$X0J7{^&
zswT89wPaayv?B|zT{P>anVlCcU-ZDDWjX4R^M_b-wZn_9yXpExGds_Ha-ez)?HsQ>
zx8{qK)_+}`bn>@LlVn@tjnh2SLU%3=CJ(b+zk2-*I}$<eg-gGGQ61Q&^}4>3ZI4W^
z+&nl@OGv+18=w__pRR_#^~59F*QboM<$JHvGHyuzNcB41qYkRF8ujd3-|l#J+T=AU
z+HBjzX%ibK!cM+_XXmGDQm$BMnJ}}mp)}Do`5+`3{>1xVy|k&mYI({h>n$JG7j4f-
z)ROyMtX-~Maipi(ImO}J|H2Dz>>smx*zoczhYf#m%o{1Mh53UkH*a3GV%_?c%~Pg?
zLJcYMA@!~$58S<F@$$~M&%C>K$+e$qcb)H;o}{H&<lP(AKfAZfHvg)6e`AxcetGcG
zo01n)PivSnH{6kizrlBA+T}${67N{D<jy6FZeOr8MeC(DSr#mvfBW2d^A|3Nyh!V<
z;dt(%g$ugOTe9GeC9?B_-P?EXs(gIJ)X>}+Gg4OV*|%cv-QmyMwB(ujgEP8}+CK4c
z^6k$%YeUOcu2^~hmW?ZCHHD_l@~1eqt>2uRG-X?g+?sb-`(B-^PCKkkQ>UsQ9X{E|
z>UhV#rJ>4R(_)tkiat!c*uFRk3Yc+7Yqn}G&2)*@BW1cx>#3T1s_DsU^C4}9wa1WW
zPu!T&+VjxKp4Jn0y|wFyMA@=<>EfkJy4<l~$-D&%7cH2ZtTk!9EprzvoPW#QTjt$9
ze?eq7mCh_!dOMhwcd99te%9KHEcXN&m(~xouUs*I?h4rH$fRRdS(TEAqT2ODvh%oA
zec<;o7ME3v*M3-V?fjYZXLMfh;DY7zAJAgeAI{ITs-sWNw>TzhNtR>QM}M-+TEBkw
zrmO7DYD6idyk%=cksbWR-FNJbU%R~Kc`EaY@s;Bz?yP!q^{OTJEl+N~a$L)(x#6Fx
zVNPFQ*~&-OE!((t&8$#!;JRwqz|O7DANjn?%f9th)l>ZyRcnKfElgfCzOJ<17cQ&4
zElcJuT)ZH0-hu`57c8E;cy5Y(@TEO_$Eq1cR;@_OwN$7Dw!LAQ))U7q4(E#-?^?Dt
z<?bVv>ze}CO-vj)d((~-b%#3mLv65HW9#d&Xjf<vgVYG^UE39pUHMhAe1$#!Q<q)-
zed9}Zd3cf*cQj5`C#VDDch%M7tPM9zpI((Xc9%`oqSBx*E&M{Q=WwlZVt8+xS~*ee
zIZO@j8m`)GeGX{O7qw1n)brM=2`_y0X1MG;W*uRdKd`>C=DRQVCBLNIR;muPl~j(+
zy7@9(tg)?_>04Wzm^wI1OVPR?&iVGmEz2KWoig55I;BGEJU4l3iA9aP<H%06Q<v6s
zn>JYc(^)X#rEk99{^G}vZ4de$Nzq2ys+y`pmGC^3^|71|Q?mMcYj&z#Zv74nZK|qj
zm|7z{-?Z*kA6$IT;s+K#(0TE-i)SvLvrk)o{(kGfTKie@t;O1kMc3an=cZYm7cIN#
zzD4(pR#%)q(mGmuc+u>e=PbIu^ZZ9gs*hN5tq$kO-2Uo&R_&XUdn_Yb#~jwaw5i{;
zJ_oU@%7E7|(c~+#HAQp0*HewzyL;uvEy<o;mO$N<8>S?VocQdAb5hi2thYUU%LDgx
z(F)Wg=gt@Wy>Cm=0@e@ie0=Bo;Nx30`WbahN^8CQWYDI`Lwv)pXx#9^wB-C6%Ye;q
zO!y_yaj41O`hin(w~ycFBaEMp?OJBa$=m-XoU7%oBpJpuf5C!z3l=Y2GB-sf_m`b}
zw>+|bWlH6Ht>4*lYb{!y?U7*3L*<E@DKAS))-E{MSGA<v^OiGr(t+dOJ@MiPdp9-&
zmZxatw(92UrfU)%mPI!%nzx|K{3Q$Sl%4NAYEkoTjjJ|=UQPV<!$Yc~CKepitfh6$
zfyR`rxi)nOv^inQnvH=JwbZtC<(3sY5<hyXIPH?j<vA1)e_8qd%A7a4zWr43kL7zm
zzSg2zKGiJND`vj<(yKofJ~g~+XmIF*;lC74e)ZxPORrdN(Zc$xVb+fyC@(9%7^+x(
z#8SSr`KgUvwm-OeYw{;^wRvjS#G|k7|HmgqZx36RGA-Nk;*BdjbzLfF_-d0cU#ia2
zx+eB59+r0bfg$^^OOdsyf267xBxy0fCpe7&Yy{+#9w%Sfn6z!frmb7*MJT)SMC;N_
z?FE}GO}3k5>(Cn~)DB40whmG^TGiC!N7dMr2W)Dz`-qmB>}dV^wj_B<(#dcwRepSs
zMU6grK<hfFHT*+aYaXPg$|t8-<xX{W=coI&9axz%WR=Bx-IS(DiFv-gUw^sjl@E8U
z3Dw`5a&Wa}e_+h!+(gY*&<~nP+23Ear8u;C&BxU+S@MI5K+@L1PHogM)ppWs%?|{6
z&Q5-`c+c%mFWb1W^P07HZQs?!F~@#`I?pLP*FL;r&Dxd~jnkT&8>g*kUXvo<YQJMi
zWH)*9sz)A5nY7t5=Z0(N1QO+2cB@l%t695c=jK%l=B!HDZ@VYxUs{<sVt6P!WoTy6
z32j^EP<71#&8%)yqu$h_p0jPd_mSt49Uog&-|wR+st!8&ffldctaTZ(wczCq7TKy@
zD9=7LvAK0=iyW|P+13+(NY2)6pV`#J=e0yEc@nPCx@x^)53K{$Qp<<7lT`Gxsb6as
zX<uvIEV6dRn?-7z%sIL3ky{>opo{7*I+}Ua)uHmK$<MY_uP;j+Gp@luCFP+4%Z3d*
z);^Z_{OZd7DYZ7)x&MuoAAH_rX_oEs*%#07Ci95rPr^_WAQUZ4t;h1~8f1=(v~FG1
zZm6i;w5zqtv<Ayjs~V=d)o{&iacoG6{{zb*XY0B*Pp-4d3n<&F<wvw~b!?_KRx8U=
z%d{~ktd2m^_LKQe^>?kbNVRECYqp{4z5_Og^N3CR8WVl3USv56_Ow#VAkd~QvZY<)
zFC9~{>GNcDL5_BlO^bVF)OXK6{=nmFlj8?Zey6pc&7sN8tkx+<Y$vB^FFNb(j@ixw
zPpw|RHpO%7_i9_;3X4`@Tiq~uWl^Hm*-h)2?4uW{7o^CKRc0q^^WRsO+En}KeX{ck
zyZq^!gAOIi>b#?pte!W+vg61#R?Rv6?k_EBY^D}#TY8xm|Bz);*3(wi`QQy&n0z|9
z*4X9i?COx?$4{7VkS&*6W#>Mtnu&mVh4oTx#e!K2Z&*09^Md6I?_RL12LkF9R!38k
zdhZq(s1qKvWovzreJUm1H{aBLP>-nWdCRgp?_9jJ%RRGiyYaSU?f%`CTjwvhbz!2s
z`|aKGwhf!NZmr*3RoO75re^(=?J4p#Ny+jpM_xIi?l>&TVOpn4)lTX_b<nqJ0xF%p
z(Gs*l+Q42~C#_S8JXm9cRHkWE9R5(dK-JV9A8I{bu|2kI?d$T5H!i$&-mUXfc5C-q
z=G?Y;&fST3-G0wKOH!Wy712bC(mvM0)sHO$z}(5~QCf!OL#tZX`jN$<4&A=~jdk1O
zT3_ED&*B?f7q`Yb<3~-ZZm60CwvK2w*fj6W$i3Bx>J5jr8?D-Vx179MeJ@d7(fs?U
z7n0=Gen+(9t$(<&5=m5(Ef-t0Vr{&o^-|K`A6Fbx8*KmhN`738fBgREpKN*VxvyFz
zHQ||i-rD-ih685x6?tOP+$DD`yfab0JxORmzS*Mocc1+ExSEA@?z|k9d0Eo?wq^Cc
zyC)<L&hht5kv}%CXnn_d@|{-vBU9TrNZo2Zv}?+cyHX&`Hx8>Cj!5#+xkuyPYn>v4
zsTDUQsn?%;Uma|XpWOPVI`gPpkhBd(AgNWyzdvqPt9Ce#xBl$5{=QGU&3P0#-*%Fz
zU0a#3=qb8Ix8AQ++BOwgempr|ix{fDcEIWY-|E#zPF|O#UTu}{YyN%W&vseMeoD1`
zW0$wBhjla{bz?mu$r~P>(ey}4;Pxp?W+Yd(R85$KM7d?nhE1EMt*@<})-ZMIn))p%
zj!s`&)n4jdSlceO^hQ-%YLRgc$9Lg8ozwWafB$~iu0C>HZJ__nvOh_EQ0<%~zowdA
zmDJG(emP*4TYf`|Z2cM^&8-t#q}J`wS8IHW>TdbUm85PwW|jvO4eFnGwddjIrlj<<
zjo<uy%QNyid;Qd!+6`pT81Dj054Zfdq&~6JtmZ+?cdLWdyKS;M|A<7Yk~gkx4){YY
z4byM9?e4iL6Q)>XHO2Ybrz5RuRDWJN9>0ChT~BP<vu&>=w`lt<2d%HF`_XD$>!0qE
zo3znZIn5r2@Yy=KMZR&T`rb|%Ce<RV*=oF+u6k4tLT$R14Uu9so342@kBU;wmX|lL
zY;IlN68B*1hp^bM!J1mX6aW8e-)%;eKlsjmoM=%OHWS~@v6Dm9!IWJ?PxgCXz1=2T
zr}e-(Yt0V`y=yFQS|3)|SmgN0vuIs-Bu_m8J5Eu}N7QbzP5lWQ>z`!jlqC80m?MA0
zSV@LTi#({+{Goj7ym`0IODvo?Y;5`V=^K&!u)w`z(b7BbSiB_iB3W%6q_qyT479aQ
zQNzLV1=1Gvg171aB=gV68jHiQ5Z`pX^-m2U_jv26<0ntyQypn_gsE2hL3oM$sQn~X
zWP`D5G7Ye5yTT5s<^fi@`KRsbv+$v3pp?#X>$OKuc2hrV?RNC!wN`n%x_rBI=t(u@
zNwfO8{F0>3{lKiwm0y<XUuk{eWwWdf&}O#2rwx`DCpl(+()#)*P{qkVkIUG^V+)3T
z&lVWVJoP-g1Ot)P^ABNPU9S%ORC|gfyqr>}bZC!RerNBC2M_Km&o3BVS|E!BzN2;X
zk&~OPa^}gOPpHde)%=-y!)J1rVb9gPh5&asTOFn<ht&E{<u~n5%3s*DuhdBOE7cCk
zIN#EopQ%o)yyey*Q<4zgQsJ29gJ0sGS^ZYlrfXZ~CCSz=)%z^j*2}bI77*!$1fq7B
zTd$Ct)iFoZu`ROnUTdAX^+|MHe!@)TwmvHd0{1^ILx{)a<Ldkqa?3a0Na|*Y<Sp6q
zrFD-w*rMKIm4^)*wtvEe{U~H@fK%-cA@#S)wtZ?grW+0Ga~@BEy5t*@j@zyB{{8!h
z?b<aAg?w_>@zz=DI;#T#OR_m6h6gI}{KKvMslq+{nazFt=}SC-foC)D$j9gWLCuF4
zJ$|za58Fs=1%E79vf_0eETSJCZD+Yj^sw(%JjN^0)3taQ1J6Oc%AbaMO`_*g@yNyj
zi5@(CTcXEKKfr^h68liX0|4w}i5^76GcU*SRH%eke$eyF9*N<pix9)p1N3<C8vf8R
zo~4<^pX9um;W>FcPQa@0kdK6?=JC)xJ>i1~LY6W-XwN1yJnE094;UWVm@d)7$B*&H
zNES1CD9g|Az&+kHLJ!vF;H@eQPyI_6@H75cZY7h@Y^s?}lUS34hZpFX=I#6`=O-*|
zmqd>PzaY^=S$M|d`Y<*x3@<K`Zl7)H#7xmvJcMJq5RV5&n7T$wgUzO)%#^`QMa+~L
zZyLr-BbjLgGYw~^5@sr9rZQ$KWu{TgG>)0dnQ1gLjgd^_nP~zuUByfjnaRUUlbLA}
zGhI!O5Sp%GrYdHtV5aHJw47d$U|PpamCWRgGtIb={UMni#O+tf^pHggW6+OjwItb?
zX)Ti?m}$KY4;bRPL(?v1+R04MFgyW)#|%wxG1CENdXwQ*3#K=i=~)x*-kP2_n_g$8
zy<vF1(DW+3eZlmeWO_$3eZx!#ndvL(|Ksev!=gyK_Te6SrU!f7QE3Nd#-72PvmhqG
zh>4&gs2DLTS&0HO<eYOhU_enpF@PXRQH-F7ihy8PUGuJ?n(e{;P7mnr^FGh-pYQTg
znd++Qs+y`(C*1cz<2|N<FpY;C@lfNDP~#P*(MI4jhD$J92gCbw1R;&LJdF<m4F=Qr
zqJjU4;bKgqgTe=4xQM{DF&uK+jKXj!50`1+Loj?GaQ%4rPz)c8;iEBpJcf_M@Ua*^
zlH>g06L5SQ4>!PYeGH$%!&hPW3=QD_;f6eXHijExxG9Fu;o*xhd=Z8(#qfm~K97f+
zVE6(IU%|tdW4JknFTrp#47cFn));Pu;VUtGHHNRl@C_Kg2E*54xGjd;VEASX-+|%V
zF?=_MZ^H2P7`_q1cVYNW4Bx`TT`+tbhTHS-y%@d+!#yzE4#V9s+zrFMFx*iCcg1jT
z4Bv<0K0MqL!$URjNDVv!!xfr%Jch?$coK#uVt4|_;RiYsFvRd!9-hMkx)HFX@MH`)
zes~5B3?(2V0XGRhz{7KSK*YjNa5N-fx&lcRct=3-!V57Vlmbr`D2sRz2IM{91OhDu
zufTw$1l%W}MFIN@$aui-0$LY-jfdA@khuV;diX62zlq^DF#I-#-^K7d7+#0r_b|L3
z!y9>c1BN$Y_#=+ki9hBjmv}P<1Sk9%hPPvQ3x>C0_)`pT#qifW{1t}3#PAmw{v5-9
z!|*p4{sF_^WB4Z?{tm-GV)$DO|C5LRh2abjM;Ojx_*V@7g5lpVT*c!<mI)0=G{I#)
z!vDtb?--x2!6z}k5aa)X@q1u=O^p95#_x&oMHrvL_*xjh5616{@q1%@F~;wO@wG8N
zjqwLy{C*f;!sE*@et#Z+D8?Vm;}696x)@)M@dsi2VHkf5#vhLHM`Qd^7=J9rpMdd4
z@c4Qde+tH*jPb`|d;^R>72}V``1%-s62_m1@uy+@nLPdsj6WUY8)JMUjBkkXXJh<@
z7~cfrFUI(bF#ZaRzY^nHV!-#|FUR=1G5!*QZ-epIVEnZh-x=fY!T2s1-wNluV*GW#
z^6fDGUW{*#<IP;aL<4Bet{_~WU>_iX#{fvdVF%=<X5ODbW?H1NRpX>axyF5s_dre3
z#SL&vyoNu4Um%zzSS;`soD!4^ZVOs~0Q3pyKl6y4#93i~;R0c*@DELyW`^dUJ@6i~
z9>aS~01{0YsZSb`@njZxNFCO=N4_LKl7Id3>n~CWX?Xt<_RBdSsTlN}2Vo4Gp20n%
zfQC{FVT@0|@_>3W8$uUWzi#@q5P}wWe{K2oPZ3YlOVnSaCt4!fAj%V!h_3YN*UPq7
zFpxfSdzJKh*6U60$-QR+p(D5Vg+3IJF%*4DfmSh9%Uo-RR)|)H)+wzDt!G-_DJd02
z9iYxrwbYxwzx1X1PUyR-ZvYS)PV_D7`w|EY!^K8oEAauKCLrxa+Nb)>>bI!hzJ4$J
zFYce!|8@V*I=ytp=`7N5*D2E}mrxQ{$vMdd$y3P}>0)WHbiefV0CK>n0Tu%`4^Rw9
zq;=?%bQxVvzoY+_kuq)BDp`o^j{Fz-P<g)mg1kz1fbMMFVBJ{V1G*Ont{dnyP%$um
z;OT*7178mOG-%kM8H1J&+C0c@P{g3rK}QEw45}T}Jm}@1PlHs0g@Z>9)*C!~@Z!O>
zgBu3_Hn?L*&mp=)LWUAUb%u@`x?*V9(9EF)LoW}lANt!+)i81xJ#6Z*Rl_z7D<9S{
z?9Fg&c)#J}hA$l+HKNxD*@%fF=8jl3!f8avh{GeQMzoJyKXTv5q>;Bq^%*s8l+~#1
zqasJ`A5}YAGTL@@^ysY7XGXV-F&^VTCU?yFF|Wt`J$A_0`D3?_O&oh_?9H(+#_`4t
z7-v4tZd~@bi{tK&dp%xrylniG@%G~{PoO4@nP5D@YQoM5{u5Fs9G_4z;rT?~#E}!N
zCk9VEKk?P1UXzR_t)65*DR?qI*>7_C<nxo+DLbYFP05~ee#*Tmoq9|4HtGfIW$Kmc
z-PQX;{}+9IeRF*${l=*VQx{BKH`Q*cVrtaXoT(S4)*8$-SZiQ!;A;?JkY#YnpxU6(
z;KQ_j({!f|nl@yb>9n=e9H%L!B~Cjtec1H88GUC&&4`)tVW!s1nKL)d44-*=W|N_t
zVVGgKVXR@gVXol?!!pCGhBpl#7``_AVEE0bhmq81lF<^Q4My9IJdMJQjvC!I)-s-I
z>}y;%yWecR*~YUSW*?h<XZDLZW9O`$lQied+<tTS%}txvXWrs@A@iQipD=&l{LJ}H
z3wkcFUJ$ip`jT@?%9hkFdAQ{5lFv&8OSP9eF7;a)w=`?%k);=wmM^`v^zqUUOOYwh
zw1=s-=@`=~rt?i#n65Y7Zt7v0W_rT(tZ9Ymb<;mg|1uMr^*5VgHrH&4*=jQfGas{P
zvt+Yuv!iAg%xcW;m^GXIZuZR_H}7pe&U~Kv3iHk8Zsxw`!RE)!i_NRd@0z!nzcT+|
z-f1DQ_|-yUF~UO6VvdEmg^k4y3nz<0i@%qxU*^5+_HwJ`fy;}QSFRYo!f3^Y6}2l`
zR{UYv$8wV8I?ElFK9-r5r!A{3>sM;7)LJQ9IeVq|%HOQ4t#(=kT79%$VZF&Z$a=qZ
zlQpwSx@zgFEvxKTDObg>YFZt&X5E^sHGkO5v+=SyU{h@Kc`dP4AEGP;Yj3T6z80;U
zvrf4#aow?X73-<>BiC<VU%p|=hMWx-H}W=$H}2Y4vGLO;eAA>&yEavA`omV&cDJq4
z_L%K;+ut|$+B|CuvBhjl_LinCe{7w#b^TV4t?66qwyL&SY&)>+{I*-$O}FQ7f3~CF
z4znFGJC5#nv~$Exubszs-rLo0*P2~hckS7gva4!$-`%rzhwXm6`-2@}x6ba8U8CJ+
z`(^g$?Y}$Bb#QbDbU5cw?a=Db;V5;S=D5Pq$1%;Z(y_&{(`llUuhUVdYG>Sexbqh0
zH0Sfq_0Df0kM|%KW0!R<(JnPEFZTSp$9hlnp8CCddlUEO?me^j>fXn$qg`jZ&Uf{5
z&2X)Bed{K6o9njTE!6F-+Y9&p?uPCQ;TLXy@EGD@<`L?V?{UlHg(vN4<(coL;kC-^
zjMw*lhWl3SbJ-WY@94hg-cs+`-aEXjeERzY`h4-7;~V39U7@LvD8?vE6}uFN6c3aG
zl&h3`lo`rWWwW2I-xj|>zYM=~evkY*{LTFn{V(}924DfY0kZ;(0+t7C3)mZw6L2-)
zW1vpp{6N3J6M^-Ct%09{h#)#>c#vMu;-HN|&Ow1eX+bA~&Ier$x*gOK^d{&_aGzkk
zV3XiY!G6Ih!H0s+2Hy{6LIfd`LQF$!L+nE0L(YcOggg!9g$@dx7HSge5}FozI<zFT
zC6o#4872)g2wM?m8x|f`6m~7_eYhlCKYVL=V0d=;x$sBfe?;_+7!$E5Vt0gBL~6vT
zh_Z;M5h${E<iN-YktUILk$#bBktZWdBO9aer~y$1QCp+DqoSjZMHNTgkNO;~6>S*p
zAAKzPPW0y(Nz9~}1u=dx0Wk?Nhhqw2%46zcp2z$Zs}nmZc4_Q}*p0Cvv3FycIBDGO
zxWKryxRY^JagA|r<2B+X@kip{Cg>-4Cp=8-k*J&KlIWj!D)DO~O6*9YlU$R^lkO%x
zOD2;yBp*$_m;60NoFY$|o8q6^JJmcjEcIjB(6orOGwHviFGvr}AT#KU(HVLfb264@
zSY_B|IAr)|L}r}MD9vch_#>k;Q<ynH6j6dKOOW*nQqhENK1SwsytZd3_ZiYA(a^_8
z0~w*|E0EUs26<`uhV#qK*5+EIo5koX5MBs9qs-s8a(Vyr8*kpdZgbi=$yler)%Nr}
zDNBtV1)gQeixEfyQRUgDx1YbdcI)Bet0ohtm@hJtiy~T?PB0_I-~bY9Gls2TlLiy0
z$8Un)g=~*W0(3%;{X;m%QZQE7P$>|B<$nfh`&Z!T&xc|ZDSTKXcqBBk5TFNaxKQl~
zXKxb5%fR{BcvZkI>GFvSMPKQ=;BV<c<0w6ZM3&zt>y!SM(7j7G^t;Pw`eht_V;TmN
z7gTK{Xi+eU_)s~!9cSYHnmmg};(2Cd8~JE9jRKg4@g!^ceUcFkw(YPdD7A_AwjCX6
z!{2JRqhY8YfefxA;?0*8U)Wi4wjYw}5y(a5AO<&KDjGn1J!WKSw!>sN_}GWKU3Wvo
z6O>nS^9hoIYY49@c#i+cZV|Vi6CgX`&SPgC>!pZ#^%2cQGp2rJr3*JZ+3%JkU!mS6
z0otYdC|+TE;*6afg$pknDLzsqeNkZqp>{3n1ruRaTRK)wq8Yp+elUqr7g^I0rRZ`g
zS_kub!_AZ(scI0fCL@X*+)%LF{lbH8NbL59J5so7A-Cd;5=v3wK%zc0RbGMmtNMw@
zlA;v1Jh$c|ghTCM_e)4hW)vfXV(P*t2a>w<iL2}W37vtu3uyGs4O~A#ZWZn~-BBQX
zUv3w1bcp#~yp)D-u(_zY@S*$F!o0%Mg|G$#3$;*A@$O4EimAWrR?uwD@IYGK&;JQb
z3aP&f(0t-Ya1u2YB7R|GA-FrWNapE4QiR&i#ug!yqC<sf(RG@6!ws6<==Rqschr|;
zG{kMp27TiDDZcuD5u)9gRWP(0=(HG3W2axOVW)xHVLF;-b{#xj)8W%J^JU<Mm<I9n
z={HOTB9RZ0F>TN!`x%Z3(8}ZFIaQ1}jTSMMZs;(SFTRb)+c+}lun=cGp_{a`pK#Mf
zs~gd*2guZ&_eJ{&k%v|b5KY*#tHJxF{y-4PjRKY+4x?ED^b3*lK*07Sjv><o+JQ9{
zurzTLnS#UEk^8_W6tf|MML4sw1gs|E3%(PQ_^nZ_ZcD3+MMiGVA2T(No7{PyUo^JA
ze2Js|qr~mci7zRQ^@xxlnQrBT0-151$%$K%s-pb58%1_oGh|IiJZr2=W~J&p(VHn8
z<YO^^nuP83r_JkavWNC}ZD&f1)@+_R&$8&clWe-f;n{c0UVH0^qOKtOE2pZFLp3ky
zCYo_Gj{67yq7XAK9XkYugvz;dhX9G0-eROt@cX^TTb{9y@@ezv1+&ghL72Rnzuc+#
zM$O@}t5rwWFIncaYK0tCsHQ{Z!r$*TZB|#_GJ3w@naNQ33V*qCacxa*+12W!8x}8f
zTD@G(InVCh(@Jd(eS(ahP>+~T+H5a0@<c`U^_ZJF(}~b+%B}l$vJ#}<|K7#g%WaYu
z3u;GCFt!|HeQ@JdV;S{&`q~-GS)PQ|Y%)eY+Z#_`sg~WDE}$N<51AVArIW`mmz>$P
zYURcqmOEvZcRdfElvJt$#MJ9qRweiDTseQINDgjMOToI$)^^LJB6I}4`oylUUervY
zwQV@lkJT2p5;hlE8f3#B335gQk$%-hnE^3k#t3#GyII0+`JL5zJwwK|c-n@eVd@sI
zpZt!r&=v{WJOT|I@dWBuuSdG9KI<%D_p&rQ)MmX*gsPg6t~>8Bvk6B|=$DNkr%+!S
zY18O4stl&}-H-+B$weP=bdsI7gG7m~yatpg2EV3{CFvv9r{SG-@Vci2LwB@7SPFzB
z@8)xK^CgJ;S71nixMq9rMnk|6+vf<H1l{*K0WcvMtK|%CV6hz8^9zn0KY7aG__l41
zb~|<+wJVUre(zYp9T5=cUs}Z-n2-(77Z?c9*vkS{1Utuonb#`hWPV8#@8ug5{v3a)
z&6t4DC*m9KRo^Ss{Qbsn*HK>yB8{3M+`>0lqVFPmxI=Iw>(aT$(uRwx=1*T_Gk=wQ
z=z<}}tc66RXl81fwHW;urZ1^BRHG16b%^?-4fT>!Z7<f{oPShSnRl}0h6M5S9<V}P
zllg`YvL-u0adyGwd(vxV8yC!9v))*~envS#)x9aTGMs8^YqVh9=_hvbnY#pIPu`l3
z`bfDmJpUmB(_%z$Cx}4O&wuxD6tlvFU|*>m1vcn`@FAbwPN41RiU4*cy4HdWp70op
z7dSev5TjAAkr2Mme$(Hwy{y)I*zJ;^K)VDe^9lPKv6fXmbQI(rK7XQC+FY`D>f|N!
zCmL-yQLt6MW{F^P{(}u4rCg82kC3Z7?@1dv`xHkvp--(3A0SRo=zV5?UAo$Jhn@T|
zptbmLMgN+w*&t+{RzqNOHESzj$3A9BG*%YYB%Wq^z4h6(+NaN|O{W+vGt*apS@<I!
za%#ulz{WL1PlOPb+_a8e70$Y7wiA(P`bm_AOwd-%n?jM|F)F-;93N@jd%nCK1-37L
zPQ63dVa4Ad`TO6HsBP7~*~jG6yK9F}R@X{C>bF3&>sS40!%a`GxZ*6MzRYo4HCJE4
zir!B^av5XHr{2w3d+}Ob*~R+0%j*}IuU$V!&i=`#zUVEjeDSE})=N3{=Eb$ehLe`8
zgproIA^!)cxQX}RDJq9^Vg^g#covXttB}0}jhhV^l!>f#=t#ga{Q7DP`t@$*fiov$
zuB_HTR)eMN0mz0<h{rF#{;Z|u#>@7bOQ%gSHJdCKDc_(>OA>t&8_?``J{*bRZfJu$
zgq;U~j)4Z?s7C$FMYSIe(7<XM^*l?9ka0BGz>J$qqCrq{a~TQUFhfguXx^JUl{iX4
zbH(k42{axp3PQ6bUyPr^iIwS1W_!t6h)0(ze`~&IV<BU8*hOLNGRZl1w-~TP>JXJW
z>I3*8k>cvNo6B#Y(3_}FwbqH62eqiGl6s1272;E;ViNP@X*UH5yN!X{0RClwdcmEw
z^c^h40K|Vi8G_tYIm_QYW0Qw6<49a&YE+sm4><}}5Pk~;<pFkio1_z0u)L9S>gn)H
z^KKWNI9j@2MwM?!IP6>~eRTaRpaka*M7?1jOoSnhXPsFW^ed}{CO`u(<SE|lQgrK4
z{+-IxM>j1o+G%1f7p0Rt#!GuB3A&?wF)}KF*aTW#3JMXjBhc*1Ki@vHt~J~*zjgRb
z#a+p(Rj=6TGIkx&&R&LZ5cL#(J!oldvU<ZX`A8NNx^VE}qyG6z7A<pFHdrp&Me=H^
zaMZ3CMV=$yXnWDFG#C1Kt38!Qe45j_9-xR8HUe;AUt3g5h^_|6y&6Z46eCIQ<U+h;
z7n~dz6W6W?u&<6ZlhDC4A{9?MdV;7bRjj5X+&erWO0`-01HlF{HhH9=TQ7av4vh|R
z*Eo~=PcKc(5+XhPNcaI+?A}=SST`h4E$N>|AOW)^c7JS6>_MF{*9a$XiE2qxhs8wU
zK-E<L-60-ft~#LyLb3x+3}UAC2Mk*f{k8?Aw89G}lHCLMr~=tLh<>P^+DW7h>SQev
zy#2i5D{Clc?O@eji8)15`1P3aiY`SGM&?@rtAsqNaOMK~Q~W=XpvMl!CLWYs(Z7D)
zvQ<!j_b8kPQo;tXr^NpgAgbpz-gc#Y{oSP-FU=E#`uT+`;ewNs%uyyx{BhL>c9sl~
zEf(#l;tMgG<n9f%YJFRwPr`6ITe(Q6_BmQqPxI<Xn9&ff7}gKvYTqZ&KEQB{Cs=(|
zMzB}#o=|U{&~z}}GFd$)qib2vNbNCX5Y1F-vzr+KvOrI{km~?8o|U0^!6*VPXJ4`#
z*}nyE2s9d<MHASw0$5G8#=fz`!i<b);V~yVEUal(`*Fvd$2_zTM8-b2>(JiEth{3m
zl0Rnm5^(=90qP4-)qMeWS7&%|cU!@ej#hT>EF|xo!^&p~MU2P|A-Dv5QHS_B!LCL~
zFr8pmu}JWoKqFD4K*Y{(1%T~*F%r_EDw@$?8q8@?49R;&;^>G%m-c@{qQ0;Ue_X*)
zD@ZV%<~L|Inla@gt8Hnu2ZT6E?vB@A5IP($bZU_LHi<25j+}RvqX6Nttm3n`q_0a%
zK(K1An*(ST=#Tdl_WFIr*dKjY!^evebaK-HaxVlBMd&cj97D$kk?0o^XNGn30=z_^
zPoDe)okhz;7ieB}HQEJI>kzwb42=Ta5M7FBcit!MF!D6g0DGw+fMkcbb!b1}A#bSn
zbs>3v>{?QQ`X^tnMq&wfGOoDuT4D1o(tb^_E0`X+G-s#r(55aUtwREq*-n}eF}T}1
zxD`#A9P!F++c)i%7b<q0wUpZIc3kZtzdcKp(2A}LA0Do`T$*6HNX9m*KOU&LT$Z$H
zvW&gmiXaJ7pUvg^p!)Qqd99Ub8I0!%lQWqV-J^N++(sKrvl?zlREii_<*(IXPOTTW
z6$#K*;qIe_jt@9<>OBBE45t3c%1pL8+uO-6=nKJ?vJhL?=ACiiR{6r=3x}(vuPcmM
zf)!aWoB*q=?yjmDXJ)f&#cgK<9aHo-2#?s?9$PGBbqxly2JEaCfWN&{n0xAkoYl@2
zk6&{eiN2M${$763)#j)iz#H~^w%VF-n#5^0X694Q%9_+n?O+x#ITuK3)l-t7Qfo;e
zwZoPasqIo;w^>@F0E5*3GNXX`d{davB2QZD6Oz!>MO3WtBq@(A@Z&i08Jxhw+Vuol
z1+eBR1lxyw8{`%28|0=FygxWKFcSp$+y0XX5m#@l_DC>Z8EtpoeQh{Enn*t(H7PYd
zMJGX#;FG8TG?IS*Hw3#3Wuo~gLNJDaMEL%S0G|MbPGE{(T0jbbnEH<)(0n#RAZmj>
zwv4qh>as6+NK<<?$!b49Hyh9m*f9a1FD-(DbmV~(VZ5!PU4Bi7_}dRJO_0S1ZzP<~
zLzv{6u)UzXF;d1=Vaf0rv)Hkcl|l>WEw(cEIXOhp;mynBmO^&y6C*^1%0#S=TSqu7
zMm7YL+Xe{s>l31p7f{T36n%k*Vqil6N=JNzK)*ycJw#(ARl=)>&lbsY8r%t6=QB0(
zO3*}SK4yQ3lsU~lLNtaKSnEm5g)CNJUmG9`5iSkb?#%L`L~omwvCN4Op+hZhEn1Y4
zS&j~gDdX3t?>5R;5R`IzsI!Z$lrlD3cwJvgDaY<GF_u>ol=124!?{IJaN~|ys}!zA
zMBjVxO$*JuOH$vFa{&Fi^SJmW!Fq!ToI|ktIxRSK;GRcf>ic-^OUZSAcP60>@FQAi
z_=T`L*%ylLP@PJ+UZIU$hpymE&e5~Q5)R=lqgW+}@?L+`w$MXvOS68J@ux30MV2tD
z)VG0tS#BeD^81Pnj|r??c5FA5!gdDq<RGM73@DbqHOIHE&6Pha64W|a)v`P(Yi7ur
zfWu_w4b~7%b(LE!OrK8zngnT*x5=V+aaV8T-P7SvSDApiLhc<Y;0QVVeX@8e9ZY_E
zORBFj>K)V1lw>b-9u=#vG=y=pudOOqPv0eg*6Tbk9z@sE=+rl@+ZC7YE%<ip8}%1*
z0fZ6tZJ7G;5XfJ4X*SJ?%viOzrDvzNE*(SKsEe*}A{CAJR}nLVX&6e|cFy7|m2vO8
zUv|5z<L^oo!n_m13J#;$fhvZpfh^yW&q(SUGi*CeeV7D4#glAb)mQbi>1ycC{j#<@
zrDd^zi)v!-j-#zRb#%Lz_wm}d=vvA4QZ4i=T+}6@jZ~A8Nk*FD|0htNYE=FotUjo<
zN_OJ?(Wr;7%xY2B8dGmESY~*DdeZIj*NYE5&=KwBR^iTdoC)f10w2^)_VOT*=r(kh
zNMFh{>>=R@b{9fDRM#<aIgK856{#2E&h=7Q_`fma1*<R<cA!!hge2QIh`Wv{_m^(3
z+%E#&oP!}T?%Z3hszSw#<qrBYd4)!QbFXOocS*JS4KsfhAwKyQHn%>kc6^)DH_FWz
z*>mgdYCMdl+?39${m`3`a!~G|3F^G^GYN8=TYt6arkY_BNyOB<vI}eONf*)|*<NZv
z4zsR@@7|C5?&o!SiwD#9Xd89WP4#y__upmA6z<FKoW<vAspovVs`%c5yQFOu)oF}e
zxY4l2Fm)A7T~EcRd*g;sPr_d9&-`vd&QN`YQZ;yVwOf<>)#YTDfK@1wCpQMFTsf=L
z8$_)_39`0aIgX4VQ5827>N4tj;tLNhbLGrLZaCCsMdvJN&|U0FBi=WyPwjiTad|z1
z)j^Kjxb|@4+6&{Nij*T^Xw*65tLL*WoRn{&S<G_hd>K`2ylC~AFLG3_#})~_;kssf
zx-oUFXpK8(<-cN9ieu?hDi^_i;yB|X5HTyCphZnQG@uR5ZpTqAJb&Bx;N3gp`=du0
z%^fxB;p}%n2wJn{OnJqbg3{8{+pMg&Z&@Q3CAz(BW(3XeK&tYdH@4y^S0QeFOFT}z
zeBr>O=|}t9_-u8skxt!E2X}?=Lf!M?6HZ&w<t=&64XaMiP0)E~FibdfkJ)&3sDvF}
zJMPn7nJA(eZErwXEn0|v>G&J<32A6E+nNdLwMs->zk2Le<O9vf*oc@|2^!YG>Jii@
z#l`JKHzn0)Yu@~JY4e^uS$>nCXr<ZVDN=UaywSsq5AMj>ET26GI(WU02s3vdv(Qcx
z7NezO+*80Py+rQM!6;^XiV^kr+LtP?a~t#J=MH3@E|vUgcw+i-*_8bGhc8Qt&m6jW
z@3f;^j_g*spwQ0j{BY^ODJw^rA6|FSQEuyLztvhY`L09bE?L9wPcHK%=4;&N&$2ml
z&`q|~Qn2>aqfH;B_s}!(#QX_4Rg(N8hc3j++U@K2SW4_X-5nL6lgvPtJk$@ZJqBJ!
z6Ss~lFtp3<Z{Pyl!}b-ogVvD876SKR`M|-WYFQyN4VSB&g<N^o8-U=--Oz|e=3b-L
z?`_EY*{Ww0^E;=zoD+0VaAlSk-+6Fm{leL6cbdo)#wi5#1>t8+OhztVzs$osIz}Pi
zvP7WFIUaaQihg<7hUk`cx27JIQ_QV{$F73&Lt|P4`^$*IOITx>NKyM1y<wN$Mkj7)
zW!(O)0S&ufcZVuR*E`mVAJ7f7ymM40jV3UZxO{irL>W7apq{G6Gzg)}q*5XEw1u4{
zXdxz`se-HNg=IAo)}c!LjyRdV+XW2IU7n71vQY%Qq_PBgm0pWR6K?P_ZZp<*Ksjrm
zAJFpJOgi?3xW1yO@t}Nhu3(jNx5swrlHC=*Jv~-)^Xx&V9Vzm<Ji*PqYtJr}vY5$u
zwil~?NB>Wts(HDgyfeH{=aA+(WCYMUkXzzg==-~CY^wQt0?2RQ;bQ=iviSjPBS<D1
zkWET~fK}dNrke@%*l2%;fMa?nS^(HSW;M9-cX5YX#Mr3s=Na7Dq+WLkj7M-TU+98A
z`4?IXy=tW{GSgecC=lVakn*@nQWsl<D!t33e+jd)WJ3vDZ(w?TeNL4!zjdr#00fv%
zV1J;2Zb-ic>8nrbX9fc(cMCwd^{0RnZ^bl#a_c`M*yHdG2dRxzLH(_IMvGHxz)<;$
z?ulV|TAYzIlfBC7qpO0^1Zb&R0(RVdG;uLI5&mTbZAgHI*R#WK!M}uPJ*jvMS_ATq
zK-;Ja#!DeSo5!(t5?cjcF3w74>4u>EGjeoVNbN_xU#d<|B&dpa;|O-0xz*CGvWDg0
zR<6wg0QnM0IU3F06wW=q`XTJ<!*|iJyU*%DsyspFk8ox<xXT|QaBt{N&X~Kz%4^SV
z*?~oZgU1Tf%A~iB?wu$17N$DbChn9P>TMW3_NL9Vi^VxPx$?nB#jAE7EiNz4xpd^L
zpYLJ$456FrM%OK1R^~RM3!p0Yc!FG-0E&!q#i+-FW^g*nX172*LufpWV<t3m%!Ee1
z$)<`|ug_K7eNbpMZv0j&V0bJckp`)C<UZ2*5{wezR?$=JC#~1se;q1EaRk-mOH(Dz
zB-K;`H-uK(V-#BD_n7*`xG}52l{<%IN0l(ce&^k)cwW&8+T$&zzqs(k@zbYv=WpHO
zuxrQmV|Hic-l{e+8u0cxlFRjoaaJqFP2W&@M+PHY<bzg9a`jw<Kss9#%}$lD_yYsP
z32GBJrWL{V2|zMd&<?K2>x{Pe?6LgQryTM(Z?T7t^T5$V)ooC<irbMr;eaXxP7oES
z03`TIH?*sn$E*X<u?`u-<4dYt)0w`6h;_chv_C|>!DV*<_Q_(_S^Rs-<6=Zhm`$kX
zL$+tV@K{`K5s)dBhh+DKX)g9jTcnmNfJ~`B)2K=1BV6UUeT1)!GuaYgulbbG=r1-=
z49flwWb>FVWOH|o=2E&+{ro2y8q|Ic`7H8zMf-?3q^jC)1*|AF?+tCzK11d~A)xU&
zHx{VBC%S@ApsQ@`j290jxuUn~lhy%B@25ogaT19#J0HQbL*!dheVDkb*_52oc@}g<
z#S_Dlt!1lQ(6q9mmOCZST1=j3?Wyv9j%=S&atr2Di<sR8u<Vg7!1h~**0!((1Z7s2
z;NcpxM@pF$urtj-r(GzgVkWSQuCq(f%tHra5^`kJ_zA$DQiY-~VyJ}%6rkasbNBo2
z%ao~7g;3ec)6IX6bnrHCs*M1DTpfU+7hSH?I(QE)LU-6O6iG2?i9&qs{F$m;`HCYK
zw_cSNpFdh~Oun;Pu*1pO%TY>wS+=A8O&|zi6bAA->OdsNDKT8oICF)~u0@WrTF1==
z=F*W%$Fg(Sc{e7!lh^TA?0N{=9hHB-8d_aDVZ@5qUOSAI%R$=fAs^tw#uQyHmlmGi
z#!?^;qv6nKplC58f1r{Rq6cIZ`R!u~xchBWNMx&BaN=mu8K*<rV&u`6k6+0<xiPE%
z+U?c`lOz@=9nQ!^KPoR^tmn}v%5xrgEJ$^<pf-j4@#9IxdI$L&@jkcyiEti@Mg(|7
znSJ8?+}yl8m&3bu?{T)bKjZ>NuMcY`UQ8k%wiF&7$~*3I2p;aSvp=-w1gBth?125Y
zUm<=%p!MiG3x6S^#ja<+3s5jB5Ti+K0UROtiwZcKvPmtJr>TYVSL6iR5-9K+I#2yi
zUM2Odi&?2jb#UZLFn_zqm9Wcg?x8vENCR}#S>OEHl|M|4Vf5{ZVs<q93iiw^5UsGj
z>s2!a?6G!qOo-MpGX)~ut}(NxnOdAZtq?yW)G;kRxZ0keDa{~dnxBBW^b%(Xh4@2V
z`PI{MlXHR%yVpCKODEVoeCjDjdc@JY0(LDCni>fty^M(LsB9VBPh4R#@j9!d`Lpy|
zvAe@bdHy58DeGmKW>R*FA={IcxX9NM_9lY6M7Vc^udl=_!XwH{wuLKtM6mS1`$NzK
z&Xb@%!!OI!zDe#lo0ig|zdAS%18OV%T4oCXaxJu^vSVl)<^I>qg=FVa4>9HV4|_#O
zUHFH<BBUIDa#++3BH0PL!(9~*F(0_~E_^2c>Hr54^ST26YuiKd50}n&f{7Pr0f!Ad
zO3;AQPtoe9=)w;bHIp4EeunxGey@<&U2yR!uz~t{q#(ZFvrvKfv9w^YFp1@}V&DW#
z1x^r^6EGg+-%0SupA;L?qW=tG!4B;z=-TBA*m*xTuA&0jSD=L#c<ee5x*2Ff&BK~p
z_=|(X96g6nq$$BZ=R%P@W~jLS$gBEC_D>hibs1-3cv%0Qyn^rI3t`BV(!&QbHY~B&
zx7t;XOjK*Qigk~n;ymZECPqi}>*dH%`$w6H1C-_I-;uM96=G;!Ta!}8HDA0;-P}=o
zuQ!yXl^yz7)-4RtwT_QqrJYp^!z7v+-4Q>O+u9$&jt1E%olP@|e~klsZ;ZMInA<(z
zEP(s^2w2KE(BF=8N8ucJ5vI~fG%D$cH>cgdkAqLu<SREc!5y62scO)|?0I6<sF^@B
zI>Szx$&6}Zr!Z&G6hc%@K1(3cEq1688PUY_y!WQ*<$s?KM6$EQP0(HlXX8J*P<PPv
zBGlOt4}x96b+wE9I-BltLZirz`0?bl@6$ngZzk1l=_%YSJ6ZmZ0#wY68?98=0dGLT
zB)Sf4J_YAgSn%CQJcLXlnIDa~59o@z!D47I1kf3<v5&V=d(qzy)dr>=XI~b5Cc)*Z
zwg-V633rT==?5mhF_`$ucu@2{-RGgf2jPc@Z)v!V9}a^b-+kkugm12-CB*RaE4bqP
zaj=X1Du4gLL$83MaEbL3E6Bnd0vlq%l%M_(5z~Ms@Q@bMFdcM#KVW#++y~Xc9|q8c
zBN4T?xVSODwrq6Qy7vrKwo{qtTD$m4Y5LJZ`CStMwf6e;dG&%rg(;V+B$djGZf9h7
z?ku^zXpw-*KeELpV}+E;TyEp#yj8yNw%O9U1%kbsmFuh|E0fnA+$LKv|K^h0cLa`w
zB|g>C7XBpjy0>yF|IM{~FJ4`nH)gc?g7KiW{S)hjO?BozkFo3c)<UO&1RV<Q6&SAC
zB|ZKic!fLX>2f<S4OZn^N767L;dLf;)td8G?Q&`0)@q&VIXFQguA~*B$!=&s33>xA
z%=%)V`;>~YWh2Dpduj0F^r!DMRzFFT|I5GigW?fRRI$baeMf8SMUus3+i%F&I3`fc
zr6R~oI@y(qU}vnCIu!w|D4O{ISv8=ZaK&jgBkhJW&74EtF9+Dk^o4@5)_i$)N{(5x
zA(h}pbxMx2*A7=mul|#gV}o?$ICV;n2g^QRy_|dUw0x~_k>k4cOA$%4QdBNpumy5-
zROQ_|_cKSwy6qNfryXc5=(8F+<E}o2ocHN&8Cq9{Gkgv`6QpX>rNKOSRR?BxE9DEn
zzYuUj?y8kyFcJtb5iWzWFJxUWbGqqa@F@ILPs^1kLG9I2c6#q8si($2HC514%Z))%
zeQI1ncb_I4<#0#I===0hB)Iy)Gr~Fh)4BHgo!(>Nbm7cG?r6n!vg#T(Tm@zp=Y)vr
zoHZ8uL2=)>*wAE<9W9IKn9lR+ddT`4#0?Myr45#JxQglO>sM~dmpZe%`+5R>@wn-p
zQ?-qyBTASBB^>1v?SzQjU9KwI7gooMi#)t?yW);)+<DQ}j1n9O0THm77;gp59#R<}
z;39*7Dzj9h%HB2A-2ddxt9ynr!Rr*o6pL@&U;K#xmZCX3U@jWKV#1>i8}~1T+!>R{
zK>Tsk)1j#U?Sca*P5>PhIFNV5dMle>A*}L7`>nG(?6T$T7U6p54K6FCoNqGwJ{KND
z13FFxlAAlffmqzD-tApZGuIA-7Wy*VG>C+%L2qfUYB{&(K>#Op)rCE;u8ZopU61V8
zN_FLQP6Q(XtXKIWPF!>17kah^$q6PB+y5JAd3Bsq=L>k)>^Kh_w}}_Fpnw*%yM>2(
zKKtB&Gc&t)@U^--jq>~!_8XW7_ARVEL@(P~R8zqjTuCf&u(h#(9m>g-n8I)OfPX3}
zD$)8<Qw>KAwSzn=2Re0*d_6~}_6D<#`o70Gy|ARP^g+J-RQl13{W&(({q44H_O+E7
zSk=7um7@+K`d~zM8YrKm8o{6%IBq063$i2t5mh%xw$fquMr-aw=reiZSMen^ucg)X
zyV+l&<s!IW{#1X>`tUV#^R?mpk?1?OB~Uu&X9V#Mp;l%Nw+Ev-SqQjZ0AF2&I-<mw
zaNE%0J3fZnhTd<v+kuPAHgXFd)p<Z&8Nqs2bp@ava|>?SnWwHE$9av>sBiYwaQ`%L
z-eE?Ugx%ZK2$sF38uqkxCCHp7+_I~5NvqDwV`vAul5>Eo8zaH?YIx4Yf%gKTlu}Kk
z*(pUxqXb;I*O0~m#Q)}|Rb3ri_2|hWL_}6l-}j@NOf$IRH)g`-IraY|p$pZy|NouS
z<wq<Uoq#h0!RW3Fj@<!we-ZgJ@`f_OVw%|z2U@}I&JW@+aMhy57W7NY8+Q(A7z;+>
z0_}Dtr@3YN8@(}XEc`QlTC*yr9W|m@qJ_`KLQ0ufg3}KtJXRkyWZb5Xe;RAIK_Y=q
z75R5=T-rKP#vW@!sX{bu(JfZfa;@w7-7<ivjJnT``XtofEHGO-_lA(u72bk%)=oVF
z7d_Z(ufbk>1om1HyW6PChs+UKp$go_@6cAxo%;o<yn`y^RCl^v$&hU7K4>NO+znL7
z&gL3I5RA`pU_ahhU*z75C3iCQRk`XWLaOvLgz4*mehGo(>*`Bs13Ti!8;J)_?v3zF
z-Sh)0;`U9WDnhLZwC<pvL!?oCc95)zS?-QBo3xN=aqRt#?NlfFgF8QPRegth<VtP*
z8+maPL3MViMx46St?Qs5g8HsLiCuS9cZZYRm=SJ33Fj1R(_&?VcN@6W3&_;Y)*O=R
z#Gud0nua&>D-WTy5)vKtqK(i>=pS2PZ@X4~sH;g%*-H2}svVr7*B8-f!%scy_5ang
zV3E2=pxJG%WB@G4Gq{z~UjbBAeKSRIY8QOVKqlr^<TYGH{uRD$)Q2t=gnIu;?WY$~
zEnRE!R|mVg1j(M5l&x-J29~{nWzns;-%gzdFoZ>ysz^{doVF;WPJ_ZIq;k4-Mj>;&
zNeoFusJs6wjmXbDBSNq~AX1FhLD-n_ti%h*4qE&8!Gn3n_a3sd-wVdz!M%BM)t_VA
z)a=sd5RxG}XvXB<!DMiQGH1C7se{doE|aj9yb*gj<8*<}@%)sMs{r@{&_*TA98l}c
z^E%np^v^cMus&Rf`g@0ySe;?2E0v4x;{Wc0x!2|D=P|=O;vkR}^?llpj$VRqumDbH
z78eky_^-AO^bIvu1f?SZjvg>J;ye<qQ}q!5awKf2cpB+IKkbf)f8lDpVtR;kX)tha
z3LrY}&DH2O-TJ}(XQTa=VCTZo9gUW87zcayr~n<+S0%Ke-oigo-)<O+8jno0<4@I5
zH$Ft&0FnZjm4Pr;h_W+#{~9ujzSKGMr(q_7VXAS}Z`<#{C^!fUGXK6(JP{=1QwYt+
zazg_E^$$aiHD~28GQi~xb3;lnCP%k_gL`~5*Uo}fD!8{Xhq@kZs(`c<(7I!rm<=a(
z((Dl8Bb@xM<QKUff?HkbFgTPSS_A%*(`v!B8qiegVSH9i<!n0;YbQCB74&wV16uvN
zJCu!n7jxb>&a0$Otdze+-VMv{g3O>0^-7$Bm4HAagq1)y>H-8X-rV<=X$7$)nCg9+
z_qOFB64ZC0YykNEV-0|qtOYHENU){r76BN6J2>Mg)im;8H!z1Ya6rqM4cA}STWshi
zHR^yvb_^y<xtDMuEwMXK?;|o)KRVN)5O1@Cyi126?~*)BP0K#-*}pp}(~e_XWQ-2G
z7aFpA+)x&bFM^?PgxF9q>XTjCh%_Y~E_y0op<kqbq=zgxB_KUGiA`V>{q+HF!*~+O
z5h-EmvRGw;SDYV;Q|;})T)4t%#Zd6-fp-wibz_!226VxvHWbzdzR-8zA}ouo$UJ#T
z^U#UpbLA3rPY9BF+JakbPqQ_UDPBf3SE{#L4U~Va%)fu9eCrSy`xoab91fkr)tz*|
z8(oBkaB3AY_^tt#-94JKBDhE$7*%Lm=R63a{k-Qrs$5A<Y<C_2lMiabEng4m2RTWt
zdJeHVsOSk6RJXn8+YvvVT;G}9)vFOa;JUTrtScw*ybkWRBD>^Xad$l%`c@S>1DdEB
zxPMVyuiGP!66(54QE<waGf`@5IL87!^G`o<PW$RQ`iC2s=?<<=WqZNRHHVB~Tu?3C
z&Rapz_g9<YyV<P&0eJce<KUu&9Fk)Lqu{n3<%oW@0zk)xrvT{4;Q$?u0O)|T$hc^M
z{@4Qv+{&mg{~JXG8GOt@&6!5B32u;m=Yt!wM2!<MXr6-v&}gX|D)R0rSqpuCu_f7^
zs`p~*PdK!U3ma0x1lNH+3nQnzVWA>GLp#7G{~S6&m3G0kgaFq9`NMVn6>f}i%~Wak
zebJ0&aziiedO<Uc`zyUbosdimz+Dji@#AcfMPPxWp1<9P)DYsKHB$@ab5AThep^C4
z)$0bXz(MSWuBfA@i#xpm!19%D1lbJi3r3HV+cBN&Px{4sHT|N?ZV&IA1(iAT`*Cs|
z;CjLMdx4A_4+D($EnM6X90xQ)a&tZEAwe`Ns2X)zHY0B?z}TxV<UhK5!ES4&tm&}e
zp1V;6i%D7OOv7<(Z=_-KVY~c^L&K(75<{yk`i2%owGOfw4o9c8E=G8uj`gC9`Q(~i
z0*{>IKIf%fFOR#!^n0L%raeKu8^fM}4*3|~4%#=opZe>4Ty4cu$)EbCXC9L+J79SL
z(h{CJSXouzxF=Uu4QUBCFF!t8I&u!AC9L1kwo`t?r3PYz8*KMlS=r?0JII!;KE1wb
z_ccEqE0c70L0nQwRECsNT_W?iw}bl1kx~Hs^PUsX9Qel>R98-FU*-};K(O<9B}g*}
zcivV^CA*$+>-A#4n-(eqp!d#3ssN}kFx+Db@<fFoi}{;?66<D_<8)-D`a7F2HH7z4
zb=_~ieu+HpbFO>dkq-fFcXpGz7Nhe3^zQf2O<n1^nsW|Cv*fwwqQhe&Vk31<MIKJb
zO-*d=?+f|nc1t$~oPem(Wu)~GFh<)!h^Vu|8Gzr&sFi&zT#;paZl7$~?EhF~^%dFK
zs>NMH!`tCa99VEah!u+ArdoL!qCneu=oGgG9O!AQdJSOPcD6q0c0F+{o+00diveWl
zudWV!6S%jSk*zp0g!!bP*L3y*v=rPjdCh>agme@T5zhp?Xddd*3~u5SWZkNAG(c8t
z3fpHoxG1@9=n??a!i$~ZN_AyS#Q&A%u76jyJ6xUZPMsW2_Mge|o+5Q_y#7LfK5~JM
zIu2$4keHbe%NRm>(qG?_YV?+y+Bf9@zA3kOk~%+D^%d{}ZU7@VKaPZ!;IZNSVT0B3
zb{Z@U*A@xxcOetJ(V&BHP|@hldC<xmT9v9>feWV&q-?j~<(fR_)MWJweZd|F=}TSq
zQ9b_$ngFkIP(xmBSJXqg8fd#~9Nk&O=h|N69sq113LZp01N1|ecMK2^-l}iV#ZNc{
zbdn4*yRrgZ0DF2fC(P|ZNOOI(p$S@b99qpAt>nZxRk}*m_RpBROx(KFPndP?00(+=
zAN8)FJ~AsfebfX(&Fq9Fw#LRwiqHfZW1<H|?CNKRNIO)v(th{GRch6oGlsKeKXZ$L
z3V!kArAMdbPxC68(HIG10-<%a*Gh}a4#sKkupsS7^M1uM>Z6j;1J~8%y)-lfc(d|y
z$*tG>WnDSg)DR2~ej)3EUqEedT8+<;LCw{|nGWk#F6D-BQziocq*^EE?xrCeJmf2<
z9#EH0s3+SE133uJNwv~C84SKLfY?LMVCkv-mF)P=iQ<v;K^mRp+?>VW&;3yWm2pUu
zlbufR9H<rj+#b8vaFCs3P8hRE-8DICnz!1m<ou(i&b@tIk&mv>c2gI|su4olk9A2l
z3_KY1L<_SiIyEXIDnlm<IGs`6EvgOu>j|nDX#hOUfLN+p&*d=;_tpvHG8v}LVAl0F
zCuXQ@Lw!T{h3(S`%M4EoOIys?_MgTf3%i0g@VahH7iX6Pri%?$z3ZABN2u$ob{Xp}
z;s|xz0zfzk=6Ah|PzPCuzJYH#_2<(rJPoVa`56F)EgfrM!MYfE8|QU1+OELN!__m-
zg_#4Pt)*iXICZnYQ*#f@EBlE*m~R`QG!;s3Thi=m7}07_!#jFC0+@drj{LRTn8(D4
zgac;|<pwIcVyAXVTf1VXU9RJK;5uFpzeuw?NcN1e7N5^@IB9n!^s-Jt%#lN9Bt^TA
zZiC-MWHG7Spm;kZ=v(53Zh<D9-r*p=1ODaikNWD5FSMaZ*8$L&oF>k;vS}dXbs5O$
z`3<!57>Kj6*T5B#3Hqgv8!A1^LxM^)5=eAUI@Ug>9~GXuQ4>iIR|9Q^-@Sbo;+|R`
zUpoCpF^$@c9RO{<sQMDc=Z};nRcfM1ciB<I!H}GQgEFLlmj(19qd2NOk|(Jys(Jt6
z>=uU;vXiZXbLN)06Q%6Lxub{KCpaWK%U78^f_{=*<6R?NHOH7dC;Y8lO;_*H6e;S_
zuKK*AD7c=NbRUI%{RF=6!4S1CD=ewVl$#wD?DX~9vsdc0yW-uOys9GyQtVt4<TsBA
zGK1V78A}%~<ihznHB%nQm$3!n2L$>A0h-xFe&-Hxa}Af?QD)IHeWp2AOZVE0CV4%7
zn|<ZmcX<^B=X0$_jdoeN5#q6rn7T$DTJ`KDNcAd(_{znj`A6h?Dh00YF8iFN_Ip$B
z0DM4ryA)|WMZ+W?Ez0K4v|P&$m$7SvuKTumxCb6x&_6jYJ7IsCCfi>)vCOGjcDREU
z=cjC2xx{(-5=%Lf3qNNZI>yDyk#_BqdQ?&G@2+*Q0X!rncfQ==WQPaL`9U#^SWY1&
zlC5i*J!hSI)WtIzWUL>XE51iSy^a-gRWU+#3=<=m*SVsB@g<o4><IC0_e${FBjvlC
ziW8?ZVPak@x69bx><%%Cs%4`Hz%}?^MD7>R(u=$}#)`Y}Ay>qM+kf1U+Z-2+TxM*m
zCtYG)n7aos%M4(cg9G6H?Zpn1vZH`l){_l`WV!vo2Qg93>M{mmv`l#NRLP;M(re|r
z><`M>B|?!uP$%790-F={b9>iK(=5)rgsXX<=$L8{P%71R>WYpRA`LaIvXF<$A>)-9
zGY`m>kWmp2q<_||IZ<&MOhj$BL%<CM5@~iZh1!4{%C-SF6s1FdG<4VJR9fNr!u)^8
zpFGs381c^GKbW8YS@G&^8tI;Uf3El*xL%p*qe(V#7`*eJN*B5&P+o*Y5Qot{ccl^B
z&oDd-8j$(i@YGdb*KVlwyPkgi*!82eX0>V8{jP7U)hepp2tTA>&%2ff|0-)Y)>0UT
zQP>;|9cO+Md!{I|vQkpAvK6VGo(f+N8HEL56FkLUslHj6si~RSzNucGzEF-9YI~*l
zW@STJmT#)ZJ|ACC8O767vWct39;xb1va=K^o}Ru6PZ?_0_TV~BP07ykg)#+{Q5u->
zWkasx%q-|6(>LAI%h%gWMnOIpm5H`js!vu%dK%X`^ucwmsjKTTQS6!aV}Q_)kHSO7
z*lBZv&P<0vd#89o-!SOjy^U3?Cqm~w+^Dml6K>R=GG;-f*b}A#Z_LVsp1pj0;f=bQ
zN)=@Y54yU};^xlPhGDDMBQ=HVfm;t4hOq!+lU74zpX~JXG_Dsf4`1j7Eehwl<|d=A
z?WG>HQUjal39AaPOo8&QRrQpKbeWVc$HJ*roPEXkgR?=Td_gLWK|-VYKS*sL4M!BA
zkn6NI5PH=+5;((<dhHUVS5v|!-JeftFQAnOCzYdti}jFH>cL%!cK<<ZTY!4V?YTEl
zpW8+_x~d#V=RP9+=hA3%A<0ZL2G9aWRsMMbVE>EIj(_opxvefj8wwHe?@fF166{z`
zIs+xT=a1Go#Sms;=5q{as4s`TTU>nX$IgX54%5suJ-X|K+>ZT&R_|1J@*c?6>SKVe
zLc(Dhg}NbL;WM}Q<qhRrqQ=;|qT-WxapcC#m<w~`{muJDiM4>=KwHV|LHHIyXkz>n
zIw3kbL5BEel&U=f(KYg0y%<tqzAqmrP{zhUBFd!b<m4!MDM}GU#zn=)ND>1R6(Pal
z;XyJsZMDEZ46+tW0^&o{0%eG2&3<581)^56j5!ECd$dR#8xtLyAm2l?u7xyvH92w|
zx{|zw<)_o|CZ?iZoD!dq6cZK~9xq=5Z%7UcP4biah4?9h<<`0^a5ok&LeM44vl93Q
z1%&!bl&N8fVKS7qMi3qs8y+JC0#DbhTuE)n-WMMuN0X4ZAUY;8Iz|#7l;9s05*`*R
zV}G$tW}F1$h-8%$`%94^DkL;AR2mQ%5Ev2_8WjSKSZ_gKOnhjZ6b5#!UK|q}85t)>
z>7|0isFbK=n02&IoQ%aP5F`p+bQ^~B!TOsZIXEQAU+Nd?rwo&?hSZ&q1tKU!;ujZ?
zB7;RZ%Pm3)EW&nj3y>_YC?j99SCwZFe};PYarG&*A}E^%j6~x@xT^mOz&pPE$CAyb
z3s?<-s)pD^GBw0DmIuq$5e(YF!H2FSYbZ{Li%E!;qcQtP$ekVviO6|d1&mUN;J?s>
zgei1<baWzoD}@4;GL?h@U2DUyeFj2%f<D1WRSUYuB~uDsLt^#rfwhv%Zg4T~?ykqy
zs1~dQx09LM-<Usa9>%BTZ%nDg+<Dj9P!m+NM$G@}M<q=Vx1rzli7(&BtRzuQ_a_mW
z_mHu4=iP<KY$bq`Sl6yOva1=(>8kw@X@FU-r`5Ygwg+a*hn4vQDp#S$V)Z2Dy4wVd
zzDm;wU0~k`bqfU10Rd}i$le$N*&AaZdm|dVkAzru*L#@lEjY8CvkWZR)xu2xBV+b+
zQI3v2;47Z_7=;5iQP5!{X7P!WSX|EH!a>kup#RVG)R5#|jz+x%@&JMyk@3;7v6A@U
z*r4FR&`^Kb;B5kg3+pSZ>+V*qm@iW$JYpcLEk5Z5i*qUf_mYxFDEu)FxlYZyhd)T&
z2H_K-605<zwYyz?RrTGvO6Ud#F<3pV{~W{!7{sXm7=%oe?$$v*<eg*k@N*q}F_ZUD
zl}9k!JFQY^Wneb_>@n}+V}^j&zi0juvuRv5+aSnhs|X743yBPh3Y3@rOgEdPPB&Zj
zS#W$;&W1ITp#}y+hZ?m0QMSJ%KVP=8T3};izj%&>9R`fq9>7Y6|KZQDddHjVOJskR
zb*IfuQA9%8T)>!JJb&@rMc!E^8D}mtv&0wK9ARqV3_3nGHZC?aJ~UD8TOdF=7ui#U
z_jv&-yU3OiY3BgL)7|g}lY}$ZnO^Gck-AmDX0J!5h%`tXU%DQZ65bmH?8)^goABNC
zudM<kCFTe-SnP9OV1))i@Q(B^78ntQi1*(K`<=Li{qUOy0wj>HKOtC#oZ{%MQ1LvG
zF;7rI9Q<@(82oqOQ@p*P{t?i58Xxh>>br;JG#}zoJm}efoh#(PTnX>;nJd_CSWm>~
zshb`Acwo4olE}CxI7e*#XE!4!Co(p!=TH%90GK9KTT}Z(IBfeSxZZ3=6ny=UfrbUC
zf3v_C^+5mEZx(oQi;h47k`VwN0wca{`<FET1`y_p{P%Fvz`M%Sulh$AN2-Uxx}q_H
zxPXwTe`obC7$`8Cex2B+n@+R2w>WCiNbU{K#P1<}bn3t5je7sXQAF4bh`o0m!z1uM
z)!pZJ7NVtEX#W$cj&VZSV)aqsPAzbaMSuz`Ks{y%sXEw3y-1e+j}sgZ0*yPtAke@_
zL8d0qnYt$@#)erc{^z#h=0`(&=#B01L`XToW)#tg7K(ziG856%e6;d#X5!WK(7b@e
z>@UMUX~m|7r(C@lcI<p+T!wFUbV5jCY+i7DN?uHS#%2Gc%(L;g%M+-4E3E=#9xTqy
zJXHoHEvz?|lNFVfk&)hW5VaptXC4aJQ6|kyj!a09A3vOxlAV;5sFRg=FeO8BU}Kn~
zNEVh5o*15}85|hlAGoSI&Q0QN7w8uvbMklE=jy2$5TFcFNZmX$v*ib3vvP6+vvMS<
z0Aops*%g#63yq5lkCh%s&q+;`?@x=)Op?Tg!yj4r{@|Rz{hAcEn5XM=*6WnxG0m+-
z9#s{R4B<JCr-Rn7aaz1Ba&`1p8Qf=~61XA#JY>H6d_8<TLxMwsLj(Q1gFJ#g{oI4y
zecd&K{lb*~67Q&xC|OiwTrv>OMnX=}Qo}8|@)Y+3cQ1*{-T=42pvWi)@MkVe*%zxB
z92FKFE1`6IV^~^pa$2S$Ege4TLZZ=_*aR7+gz{`6J0mSKCOjrQPVT8xc!tRQ!viAx
zLN)!u1A~;xM1`k>QbG$)g}=8%85@)wDuc>!<?j#PAG$wCQ@!i~`Nf_|QcAZ6<P<Fw
zhv$T*2Bd0+#QP;hNur}8Vq=q&QW8Srf?{P>=lqjAGJ|7uf@6Z>xW!Hih1f<!Y*c1+
z&!HhgsyC!2<Zj_0iGO53jK3@<I65#USTigtG9pSE9Tgc9DNl%wi;;xKL9db%X~#2;
z%A(_=<KtsAV?yE}^LOfz_%s>Rh>eR1kBX8+Mny$N%Jw^eau64sB27w+kB^t9C8Z^0
z#B0XK#6-qPBE!R@!lXf=ArYbBn!fJt3O6a$12e{a0umAf<%vX0bXc@BJv}xqO`aN;
z9-9`c866cJ87qknj|`KAhew7>!vehncgaH)z9Bx+Kq4?WA|^y05)&Nhm!=8dYBUTY
zGBPSs78w&26BC`B5EGS<tQi{}5gjc_4#`l0(SRv2MX1tWPVwQVfM}mYSwu)sC>R3%
zy)nO#+_=o-oYVu+c0R$85wY?F0t|=VSX_KWNUWT~jQe0=2@#12lAQginMp|j{&8G~
zJS<Kb>AP1F9vT`3(}EHWEHEe{MjjIrl`2UMNLFyQ_{RH!y_6ow@rnNO)S!bA`y?SD
zzG1<#AYnk1UtEwZV{g))SZB?{j>#+6OZ=mJ6H}ApQln*&aghmelCy3ldydPfjgUw8
zv{#0SgG3SP4R>mMP*PZ|zh<;=aGXNA&(q&KOdb{<9_AA2>?sS2x8Eo63<(Lelm&)H
z#l%O&M8?YF(xcMSB=KSKVPS#Xtet!}Djn8_W&}t>gG0mQ;ThihBot)N!~#QuxJBXe
zYkp$(i(|v%0%K&buo1Al5m7yd#0E!(g-OETYYc~_gKuzjh&VJNG8)v(P<ae|1zcNW
zEGou7m|JOMEHpf#tEw&*?;(zc-4y{FOeZ`n1pdHR7ZDyMg^HTk*(fphOdcZ)4~d8h
zlShKm85yoA0w#uxmxOSJL^zJBkwA=QBkfP`Z!9>mJVXBfarP!~HRb>Rcvqcsa?2Gt
zjk?ag_AnTR6iId=WZ%hJvPKHo8M`dWPDv;s$=X8p$X2o>t!BxL8HSm8ojdQt{GaFE
zGCtqW_xt!g9{)$wIp_U;zux=y+MbKk7N#z`WE-=3$&T>J;UTkwR>V%!hb&tdw#vAA
z(acWEC)@U#Hz;_ZOMP-~Mr{q-$sjW0$lqf(Z;aR!Vcea}^*&QFKTUt{#i`7AW7J$6
zls132+9j}GYq*rq$y!`vN^p(Y5Gsd|UNXh3mE?NnYsm>MTrTyLWSjrIixlIQB=fk7
zl(<Q9ef9EFaTj@wTQfp%7pZ%WG`P#$luPPKa!boyBrACXZX-26-$ooM6ZetQ|0hh1
z<6E#||2L!>lMwno?L7{`XELnmd(+5#t!ZQ$Jl2>-inKkAZRd66M^7JxTP4$WF<UD?
zBCS?V+lPlx*#TU#WZeHE<g|lY*7JM(@2q8D@8Z4)jSActnV0#>h!@ohRF7nG38ng#
zw?@_r*GAUlgc`S}#C&jdWIkvW*6W#;^>UL`O1M5E6b-_<SKc5iZ)mJ%J&DzSu4Uc3
zsoDpYN+h8YrGxUdgHeS(gDY$B(all?r)(|jj|#9!`(SbsN^dGFz$T#r>(A^w^W&NQ
zsWJGQmHK<ChHTCee=Z95)jZleK&y;B2YWB7lA^f=$>i!=BP3<)TNHVLmdy#JJjgvF
znAb{)hW!Zc=?E>G2`?saE|x+(v}C|J6f=V^LVop<_GV}u{|5Uo`{pL82}H&-$q}{O
zs#Ut6Je@8;+|uZ*#5_Xt(`iWP%ljJHopz5m(@RhJm(n{bpuPE$WBI>~Naf^j5-T4M
zJK1+=&tc{gZ>MfB!e>6As31XY*A88ME_ECDNBPWWtQKB78frB;c+F)#Gf^YF{u!o8
z#fLKpm)OiV;H!s9O7T-IMGTZE5~G`n)<SzER8D}0{UI0UYbk$@C8g$Ks<qslB1UVO
z|6{bmbTrR{z);n6+m#~LgIXvRq5z4^Yscr8?#yeL#NNOb2u;|NBBCYsT?%bV(a3=m
z5vQdI=6>0A<|O`VZlgacJH<3+fR<*ZP(;d?wW8RuS{nbkRunr^TKz?(5G<{(?8tW%
zhMttSjQ~5~jn;HARASOot;rAd1U~}3=Nv}gpu81)-<PH_8QOn4?#F*yz_f1;lAs^y
z<W_J@D!P&0orRXU+K+=R{b(9BUc36OmSPuZ+x{j|mGRPQvj=-~vzh!xWBqunHI14M
z_0D$^#SYV=q?Qh(*ia;^Y)g~hdUFZQZAmA0e17RpCx=O@k)C-t(#e(5pB3$D@{5*e
zN=3Vx{Nl7G=O4AE(Id2~rPHse)Eb^w7U5<$6biy@BR>ot;lF{G5cmoOPMc~e&mxq~
z;+pUkfom77+rQ$}nth(Mqc)A=b<2z8%p%S8S5yXxXwh<!48Oi1Cu1Alt=}LwR^2zB
zL<7|mNWA-ks+Zmw=w^VY4yUGXz+0Zu2L>n323AjC&i7z<G6j~Ag><@z25!^bEu%Du
z3KGC^9rG04b$U^#2kfQ;VvS**Bz#AjzT26X^QI*m!Z(E5UYR~N88~d!nQaSzpV<{7
zrg1}|*mc<Dk{`2f{PHSeV%rvd`oWjY3#~k;%=&vL*-w72_;~=qr3W*qe|(sUuLzYB
z<o9A@KK4PR6yn3N{T{R&fKojGq2xiXc=F-gJZ|tIz2G}8_8~`Ed|UcWYzRDu9=M_?
zzBX(Ko_#p@A;hiqY>7O$<Xo6$W0~B)%v#<pKY=Y-b@)#i>cz$SkJ>$44?R$r*0D~l
z&veKdY;4DL+#5dg88`oY+S1E<>I4fnBYFKW`DOnbMx_f|Ad<sxZ>ieJ#8pd=8Q2!a
zxXCH=u4TE<95zo3nz4P)Y$IeBe{*Lh9Ujsj?&DltnNF2a$p3_Cjyi$y!8V{byYsNO
z|3{>za&MfW_HP9YUHG<zTb9z-N}t*&w*1da%~1>oT8|Ns%afW$83?t5LY^VY+NIwu
zTpJE782s$9)lJiCu0ucIiQKJ&RPiFG%H70*9>R$?ky21I_@P5jSE+!6(>`kV=L|zY
zT{K|gYwiHAV#CekQ>hL|oeEe3{u1dqc+b#_tZxNMTqX~l*<VE8{Sz*(zHdvdc->vC
zCIdpFI3h7oyG|>6JX1W#QLE-I2cj(J<VcZ)deTDvw}+$K?l3A%J>{lTEa5Z1x0XeD
zt$6D9NNGlEE}T~*PUpumWb5Tg_3>1P``YsnKfQ&eh`>B*P1e6sQ{zE_s`e~pRtbi=
zoyF`$=f-dMv1P6K1#E^m6y-(@eEGI3dyQ(MS4$|*M-hLLyPcF24{zCHs(J;4mC&DZ
z9qT`x<T`SsQU`jHK>Ao$thrQ5A22||SY5Hq^iqlW__EZrjy@o~Zn5b==;v^B%Exu=
zgK3@H$Cq-9=_O>V^@>dHg_?`7^O0kVlr}sT>38fqD&XWAh05~I=sos|?PfAq0#{Z4
zb5~XWb20E!msJEC_B^yyA83y%jn+u&$5&LRCJb%sFdNuEL*9G}Ug{kGIM04vBU$XR
zjx2)-SfwQvJ}tr0u}S@=s2&Glokh1_R(iy9fJeNA*(7AcH0lvq<zTZ|C_cDx?ZJaV
zSABd25B2f6KIDNh+h*3>xDzMiV&jj;hD-|znL7ifb)PMe&}fIS2%mBaGwTwxRb5WL
zPfiN^QFU9Xp(!|mgsK2>*Om67B}xTD_@^*hkA%H(h*}GV@c(dS35>ln%2K5Gh0cf;
ztUan%)*+wPzH-m6dF>Uzast6N2^3!my~q3Ynrd_$ac|1#>mBv=T6r)#X7^+JKVPI>
zzn5%u+}$hryx)C&nJ{kFwR_Wzj)C_Q<F8%RJC0xv*jjPmsLPM@(l6i4Od8~qWb7R{
zb<i*v+&bjb%@>*-rLq?UvVG+uu~(4Kw?W2&8FQa`={vP^XH8g>vi8rPC1*WLFnS$N
z@XOWb6&HeU*2KNo!^rk1wZwoi*MIrt(v8!}$Gp8x8o!<vI%J%lb~%j;eeiI$u`E8e
z=$t+&b<o#ej~NVv(v8KMJEhiloa6(=N-y~!dI?|7$S166OfhD)Jf!<2#a(&I$tQ}{
zpqg^~f{xTe1q_lO7mJRWUHFy1PAutlAH1s3wYy&eDBjSZLsJh-+~XYF<;1dt#YY!9
zv&AfrLwrYmeejw&t7qFfW<C$wacbL%%_p24WAb3?%vu(UESQJ4P~Wr>@%?smch<?#
z*!9POC7A>URocq*g{g-0W8-osge;3*9339*+;8OW@Lh|d7C8fCZ7P`8eoGfEUbHCO
z`P$&vL(#DZVx1oZTzuC16qj&oPga%-E14r=AO4El6}T-hz-9FEG4sb7z|;na8uVLA
zO@64i`AuFWw-v`eXo_X}v>W?HV6KfX`Mi4stH4sq5mY}`zNOC~*Yvd{A}IcemB}qZ
z@=MrYj?ZCMJvf@?#$p8TQ5@yCDYgP@*6c#hKVf0GsFae0XXzX(E0vuEtg4zj@^bV+
zIZrLX&Tqk<s_LlI<$kI?d}XNIPo(KeKkg1sY6y(O5sx9h+3#+@Le0GrdQ@V44~pa&
z{7-kU{QNq5SStg|D4}Zt+*4{^G8cfYS#@A_)y-6f$J3i7R8#`f|02mqY3+uC8MGOy
z?pSALXaSv6qm+i1TEE3>Gn`&#NS7h^u)N%G!j~H}q|I76L$wdJZ~Kl3(S}>DQg?v~
zVQm{TdlzP3)|iAa!=SGvGdk-7frRL?cVzFPG<904eXt;-Ul*4yBm4O*FhDc8P%HN^
zXZQCwN*0TTXE5y{12uG&SYu)H%;}o~^nueite<Hl7kp|3z{L5(M!CDVUl~dE^9`&)
zMIO{ZSf7x%;gmipant4mBXh3&-VzvShpuE4xv;<5iBqR<+KjExUD$jqanou2=@T2)
z!wHnTuzq&X2KelYEfG(|9?sqavO?cIA%{=8$fJPhR!_LIG<IH)%e0Vr{h)byS*l}m
z1Iq(d>2jO(J!*L8Dm4&%w|0y0*koJeDm528HgsF(yT<k>l$RHn&zvrPtcq%Y?ngdz
z3=Jy^_FlNV=JC3s4YuwTA6^SZn;u8p-D=yivgkGf^*#FJHd(tUH(70w_6wyO9<RH-
z#+Gdq2CV6}-fe>|y8*wU8-&|iA4imKvSs@Pw@uw525hyJ|G@V!fgHmwP95wrXdDca
z!werk5HDW8c$yrd4J=e(4$<S1Zn&W1(Utqf^`ve4E90VVi(RF!Klfz`|0LtigM$X8
zb497-KEnNl=>s-*v+c`&X!!m;r=~wg^8oP14dg!)`F{+EpZ7n@js3}1sh1@#)qbXT
zeaNB_6DN&W0tdEgnU0IM`Cbp_{p6j~V!!kMgCKFyrEelgYpXQf29j46pPRIA_>iHs
z@9^uoj~dWtAvghFLFL&Kn$7pAPBKZSNrK*MPjQk2Gw<tSt~P1bPzkWL^v+2|eoUHa
ze$&Cq=ZjQz;D6GZT(EDnljwJ+b`o%%uj5(wlR1`NgFR9uYuqWZ>o$|XtgTG`46IpI
z)0!G0@g#}LoZ#5942i$U3?DxiLkHZn--c-6>;suBV|~=!8LFN7*1M&eawDn(Sg&ca
z54>Y4P2t3ZVhdR;)CuLLY#*%u6T3=)DAT>8I)1w)_=eHf%(G+<b+3Bzq@8N^m9dn@
ztR;M1IHo^j=PL`Qa!s6R2G!QkcjSWlOcayj6IFk*Q>M&<KiT-{$wuPXkT%fuWUbY(
zQzvI7B5eA!Ks8K9(~>0fHqoA@iA}V6M}HLzxRcf~<`3vYnZx|$_HrH3G3KU(&~(Ug
z{b0UbpvihkB`>XMC=Hq*>5dmsOtB`mL~aBrSf}IS&yQYF^)1GBn>ep^Q%Csgrv#<`
z0KuZucl}FR=$rTamQ`P8EZM;2Z%)2^PM>^YOzW*iCT_jct{i(SF9+461pvK6xiaZ0
zW<oJPEI#baB^PW%&+fl+xfFI~#BqZ=e|bjqgt0D;nO@$#JzT~{kII|{aZ5PL93yw5
zhgY?Z{vGk$S+Y1A?Iy}WFQ-d5TjjMucX!SREK+Z_?TNL4i7R`@I;%bROUBuvAsID6
z0s(4+EL*x6zG1GD#I@rmG~f;fOg=EallEldlEuf3j+ujT)MV{Es1`qp*#n0-o$NV^
zDq{2abMLs-2cy?S>vg|GKt?W4Ko`7Y-{P#sw%g1^D>~zIH~Ep+UP3Obn622J4;jR<
z^&S++Pix1qo*vYYpFbFmVh&yBXk8JT%AYI&j%yK)*t(z0G{>TVfMonmf0{Ir((Lx!
zp$X%T4C|!5aAtmJig7Bl;@Bh)>dDV)%dw{JWY5oR%fWqi8Aq|jY>oLLu!#BcM_+L3
zckNui3yt3czS>e>h83tS&|0<@9k-SzJ$Rz}Yl{iA_-otR-{*Eay<<#^z}{wmZCfk+
zwZ)kIwXs1qj{cP{-eM|Ty!l&PydjCj#hd@>h$DyL;?0r-O@Yo%R#6Tg%R%V$c-e!B
z)wW-*qCeu`_5hx8+VMk~6L)ax<bz{7X_FEcho3M`X~k__v?yXhCvDWu4eO(fKyF7D
zIL6-wLTFgZnUD+JwbOzQ90)X?{+?TX;K160sGnnDVTK0X(Hq_2ZPON@c(B@l1DW^8
zemnke!|>^Ya3Awz=vgrt`b0>M%~%H;b%G44_|^>HHZV`~w>}l$HvA!-j=-IqK1`6H
zK=d_`Kv~4k5-lsbT?`eZcbK36!ZVWn{SW7j9TU0kv)hcRtFPNOHFuV=<8-dUd9v?K
zMm?Ly_KLajWoduu|0)~ZJ>K{tk^A7!?C&##8JT_W22kL7RdlKF`<JP(jO<xlUTmEU
zuPZe8C4U46vPWV<gAE<<R#$lJccWXkfrGjk>hiQgsUbeTbu-uaS0Nne@N+{$gM-6j
z;tcBBUqbhr10Q4lz%g$w&T=%kkdL#Fnrncwox-|8uHQ|N8rU7ASd@)CyHJ^p%R)1(
zTjQ|&9k48a&fT>8e$K+Tk@$A%-^Cg$V^ekPM_}y3-2LLeYajK@SYNy}gT~<Eg2j(X
z7y}ov_+7vn*9$A2<5}RU@{Sj$tJrmpLuP8_#_aqp%-}E6$w3f-Nr*Zd=~Q6z6O%0-
zVz9bC1d$@a@uCvs!8;B?Oi!^`333-6vWXSIr-_p>$W&nJz%WeA!NvPBU{9ktOm$Ak
z^{s!BYhm$zcSMxy7c2Go#;owm*MFnO$n{TP+mQF0<2OEnOzOJ}@>;eY@he|ZYK)IY
z7m6=f%PF|SqD*i36=C0n%ypT!EhH+;;OZ_16}$3L(c5AVyTpALyCT}~mS<kQ#Hll9
z1_aDXIGr4ykd%}#6TFs#yQPa6)X!{lAJ|gedyaI|9t8Q$AbdOSdcrmR^=mT+#Hpj_
z^`y3`ZS-y1jA=317|M=X;@vShitoV>DZ(L@wsLUA-GXfepf0PuK~m}bERPp))ZGd_
z)`rZd0hl80IQk+A8*7drk2cvtS%43CJJprL-&ej9Sk>S2-gTWoRXLW*vMkwD0~uMX
z=CO_Q;peb{V#Y69wnuD>h;)uv74hAc)fr#cW@+poVq@HVwLfkD`TeI4)Vv-|+L-mf
zoH^+DDU-g2k(lE@oul_g?$~ZzdY-lk{_{CsVf*UEkzx8VGXn+<N|>5zr1&jx1f4SF
zZSt8Zd-)w(w(s7xd+pjChBLyJmCLq<=>r!m3@|R5Gx@0N9O2vX;^DZcy$6lK$GPRp
zmabW>4_mbB5F8!}{N|{QySBJoopECH@SuP}LrzW3FigfSbZGP5orm-X_ACnpNO(|J
zF(f?tMB<+4xV^hpuZT4E6qc`Ex@xh$9b09t$ZudAYH)GQ6yqbIdA4oEY(s+!Zv^#a
zccl7qo@|AS3l2?Quw?bJ<%V6WmTwQ$FJAWDiq*zl6Iibc0_%iEMuRw>pnCf?H2Yw}
zL2F8qkBS#|@)xt$X1ko3c68K`=>ek*7x<&Q4<sDgyFA=5rQhaWE{EER2lnjQzkkUd
z=(H_av}n(g18^t6Ms~x{z`l_pV?Hn!p_nFNRdr{RIJU)uX7NK*28z2oiF_wE7z^oh
z8qCp-V&I`)14jq0yfPlCPP^w|xn!GdDt=Xb2GKcUVM8I4bf7s5TrhU3JuoS!Vk4W{
zp1Se@crdj89gBDkkiJSaI7))kX+8;CT0kM|#-A=x4fV3kKS00?vd+U*3Jb;}o6o;~
zhKOGSwMdbwNk0n8H0I5D2^-+@8tZpnp}aH<%#l!0o<^Oxd<2s>*QyxHFvr%SwCZ#r
zzfjo)?2Z($o#24X>b-3Bjx%F6y8`S4D?_GOs06iFpE`&|n43anDo&*h7=|EftRi0r
zkt-bX%T|pQtA_B8rZ&c=pUu7H7fQF)987_j+pL0YWA1Zq^;nwNfuG~cu^sJc4j<sb
zF<%dA!q4o%z2p;eI6%^}34Br!M_z@@nb#f6c#Jt7Dyszm&Ci*tg*2C?9-9S%LEhl-
zwx=LI5CnU9Py;@wGYFn|%Fzb(<ZucEyA?9{ID&#z{ZKg=Ozv)!y+|uJ^<Jc{_&6p^
zW2&n<V>kUng9d7K8?S5Vn-|m+Ix`a}Lwqx-tXsC>*pbATQ+sUP`GqSNt_)uuzH`xz
zg*$B9@u!v~h8_#H?bdfv+h#5;&$i3;H3WyuS}<dYZ85($a!=%*9eY;pS+#eSZ3#bp
z_pIpPSlisYXG_XmSeVn}V|kZu8B+a@b?xTTYgV_hgA8MD%+7t}qC0464D00&^hnGW
z$bQ$myUFDp6Kl`w-*bH16}A-U#sY=5QN1qA&FVP4c5=&izGT15wy(hKmo@gC((=Xh
z+HqMAFO==HWz$M&nozd<;rO`zFA{4{DQ|q2+3&(V1HR|M&}CNRZ;&S-QhNZGHyVc~
zZ-IQec3>-U^vb0vG^-8w1&p#K)mI|(epE>7kg6*SVxd0*2wk>f4HPQ?p#u|Ln>G;e
zB5L|c6!n4AMPlHZ>WR#8>}jeVDUD{W*w$|_dZ~Bsp*Xd$TJ7Ic4H$(NvVGt~Hlvvx
zISg{$OY^A4cy$-q4*oJOMgC7Pwpslvw`oMAG@Nx}JIX6Yd24~XWlvJ)u)aN<T7lY0
zUiTbl4@?*BPl6JN>C#c4-;}C2{+_@w$Nwq9Af@r*ULX{+<r~ZvJFtMjr@3f8{(Ny4
zcrKahi%cAo4DPolua<vvE0tWYK4V!EZY@7{c-ROPeK{dDIr{9Dam=-L0c2;+-27{o
zC*AC>9X%!~cBt_@RMTgvHPf045Q9~tiTFZb#>=P<$c{jLcD}AC2kO&3n{)J^UYFan
zX3fSmowVavQ!sQLV^Y8&3b~vXc(uEB-1x*pBcYGkmecJvxtrGw%ssg631ZDHQ@Z(4
zEnd>Z^IA-p=9bCZ{NLDli0meO5vT~5<qWAxRV;VJoMGAwzgy3+Un43T-Ix2*n|&p)
z;lAoP!EYZt-{n*qguiv4QEh=nXCotq-(aYW?t4^gArhw&k^MykAtrt04Z#WGn3Li!
z2!T3?;y0`P>@StNS`0NSpwpMgu_Q_|^_SE~O)fx!b7k_>>ds51A^jy~22(^DJBI3Y
zhMa}B{X<|{vSMwXvf*cKbt<BFm?e#Ah^O}B7#rMod8+r6#-`dr;c@sx)}}MlGAmo%
zn&N?>xn{s|$E_H7z2T2VXnu!@>CEXceHBZ!(tpkZOoqT}Het;Mvtj<W%>^3fPt68V
z&8D{Sx7Oc0cIH$ZiMReCSt!bv;K@gx;kY|jEdePXIni-JMWo#-==~_woW$?FRwglU
z`sCRY=H8^PwL9`%*gWqbx8Nor&Mkz8i?bG959`1-)qVlzl)=SQbH`^5aV9}%3DD(h
z%;^Yyb(CsdEx&K8GUU`ILW3K{K70N44LSIdHr4h9x!|@*T`u|FaAvkbd2gyUl)jq7
zoPwD+q$Pv_f^g>4`GnM?16hyS&ydI5yu_loUk*8ApED!d-}}dEaM4AOCA&j7gIYfR
zqj_w&h=5Wb>pZeMV0K4Y5n|=_<J5nwhS=Y?mQTwoMR*Jmj=h0AWp*<Tp1jV_QMBD@
zDXwZ?!7<rMvg3B}v{Jo37SlxzGM6OrGINcl#WX+<Rn3hw&O<Fl&3`nxH;o|MvKF`t
z_VRr(;RAeOgC<+to~B?=N8%bD@4#o6h8Yds?HrYMHcuHba-ExOo3XcIEl%bODTSL#
z9l}`zgYTDp(!Z5!a7bbcSp!iHC{hA=1pP-98ywKe0W1_-WB|5E1X^`jFbMVE_C{^*
zy<*|lLhNJA=a6oy+pr74O7&i}$~Ye~IML(1`t>D`a7rp-QT&11+$M9KrvVom#qPwC
z#Y?Qkep*F?^huVi@8yM~vd(+0DUlk8aGZHOiQfFk#v9{btGRUHHZ5DWX{nyAY)>or
zU3@FG`rmp`ZGOQ3j&UAk|7Llmh#lcCfJg})CaupbHlB6e;QVjZVN11Fq!op1CC~1y
zQhLs(bYpmbjt%r6&lfN^D`KPgeYZL4Q^eZxacb^!TW}F<;zl}0Q`9E>N0Vo`2z;6Q
z$YT>d-YAb@c@+htaogFU`K+HYuH2H2_4c4Pd^pP3z=NuRd~^|82k&@=Bt4-;6`Wsd
zc_t)0!@>SFP@2Ftu^VFEldjkJR;_+)i9=b}AzFAEu4D~Ue;fD(PzmG^jzeG_JLQrH
zmdt<9NM`?txwmfQ47$;M(7+xyRe=G$D%RwcTIV^vg`t4?P4<Um<Gho+Q3-dK8?jeP
zBX`vuL5?}_X{j|B;Nn~9V?!G`ya<Txx>J%ox6Jw~xr%b6++T_GfUBMar6bQ4+Q^Yb
zN~GDHN~2Ourb@s%6Wn(tycqm35H6O(LAq3vWe$?FoaAtK1zF0C+!chZ&Ifc5b<fxA
zEue1CsOu;xnYMwS?Ts6@oi{<2^9=r4?4SKdOxdfTp~PBK50M@|V-I;yk-MlQWUo=M
zsr*v}GHJ=MVI}yJIjp3lq+MoaJN)6khzA1go{Kb(<_*iljU4s>G?!{=XdTsRDACt8
zNym<#I5GQpK)~!7K|#l6B!QXM?dD%MHP{B;-fbv-u*te|`A*jG^#1*akLus=%7`rE
zO`AC(v5CiHV~)nhgwB{A8ZyhM*3Kt~dRdBwEPc<3XCEATbg1XqKDUx4-x+!JaX9xl
zryJibJmYHe9lxYWedhNJeKhgjz<}g_=|j8k<GS|9<8$|o918cvDlwbf>|C-|$>q?Q
zM`|N9pp7D($z^AFHqplNphm20)BkFzjnAoT9(8%HiFrZZPpI<=i9PQmvM$V<x(G1$
z>>{$xP|fPhD{gFqNZ#Pedh@j2iMmo}))hVZZ+hA7gyf~BRoswP@vxz;AYhIod#D+x
z5tRO&M9SvjsOnp8_;3-RIc+%jSfJgkjR?VQ8;<1)Z1P_ssS$uosCI+122L+)TgNy-
znLJm?<zFb@iL!_6rg*@=6*Ur*kAVp~J8{a?S<_V}C_uF+0}Ir0D@_cfw7<wTL}l3q
z4h~3cC3%@D+t~uMNDTOGa+b(eD~sLb#cXw{oTUcI^8v;p|AY`F*Mrt6^GoIVgn7EL
zSUsE;i*ksY62jKG%elpZ?jKFt<yNqjZUbVo!8T=!kj*|f<$bB@DQFP@P6+O;>YGEG
zh{Xci7%vI5aTBf~sxl8OwY0Gae1n5gv7jtNpu9{CRF)wyCe%#cToK9&(<G`wu0)HB
zOU`B}`eVv+Q@s>q@$?vZ{cWl&&#Ka2OMfkcU014DD!+GwuV>}G<;nCFEGHG)iq;Th
zTT42t9Mpp}#b+czxu6!~g1HzM)H2>Fu4qO{ghS?<&;<g-l`Y((@ZYdKIQ9NSdpVkm
zjtVIL$7;rMtIFu86KhFEiA5r}4sDh9W#mq+g@Mc+iEfeyM_Y@r_rYHY2Yi+)BGkP!
zJk2*3NX?W^o9l48q7J6RY`2K+Mgf8?1sMEg0amG(oqyDNSQ-p}hAg)_Be5}R5e~#l
z)Dc;GShA)JR1ac6RYM-@3i2LF8d?TdjiuySOb%gpO969K^bTujBl;kc&EYGT^Igh&
zruXvgH=*rnL(wAcY{Zd+vHG~fVFBKa16g+?Yv>LRE_Htw=p8UGY;H*K!L#d(9*elP
z+wV-ctAF??y*z*TWoC2OSdoWkspd+_+hS|*UD2-HT~9qrij9st9JgR%gt2%(SGKC(
zIbXd`&rvPCE{`Cac}8Y4Z^Q^MmzIx4J-B=4Tv?>SeLpvG-P{H9^m9X^lb*djMcs|m
z2=ZWRA~%70TY)wFDL1(U4ww3#P+*-vO;YeyRg3SfE@=yt*5XU$Mh8Ltlt8Ugv=Dm~
zit-J71QDN<`0QgTHKS4-{p1Ktpz%{@O<rPT6XANkTx)dnyO128vfD@#`ANHzXI;==
zyLj>XwQ(1R7#-g!b(xzOH0S8a6GxApIB|4N(6l*of`FVRA#u63GTjnwjHEQ`D>quA
z%^}~+!c6kjB#`fwlFQ_4O$X)v*t31x@oYJJERt^_*w(Ub`-&$38$GrJtMfHlov(AD
z1;omsR06+Vax^)j24H?r7F83$MezhC3-e<qnIE0RW0Z1Ml+PC_=gqs+hGI>WTy7mD
zZxH43Vx^o{ifrEVG#uU`Mz9R-cb;9A2LUT!M`gSn74hh@ViHLWY{;|W;Ast`G!EQ)
z?5G0@HMynKAFdTTL15pM*^@nMYM@$f%6xeNW_o=m8X&wca&HJ(f38Me_S8DsNj@(p
z^PQC-5f&lHJ5>c}N`cHj#px$#w8)#c?u$BQar+p!H5{(5HrM_Pi=sAz3Kn(PsY3s&
zHO~;iq5$S>(Ewv0QTrRU#wKl{Ma*n{6IR^w_+Rc{`|Y>;L%udB^Gf6e0ySjT#o#-`
zBFLRJROQkp?Z0wqu(Pd;si9F`&<+l+n)e>uq)G4VKO5wE?UV%qYe?4az^c=kJ?*xq
z6ljo0BJdCgAY=fnUk7m1pu0FMH#0Z0JJ!a}S|ju{pLD2zBYm=#m&gr8fOw84-FTI=
zB=KbBH5>$L{6IBY52uDmc;{KcUp2GkCF}}WIhM#7vM90^Jh_tV(5tMU`a}JO4kcHx
zWLR@=Lhs}8>QKUGLg3Y_3{g3P|ETrU3J8eDV~-p=8ggXDjF8|tvtxsg!#%T2<#T12
z3jU{wdn&gDO3WU0xJ}7}-y61;dm_K*m1W8zQLZAu%Y0uBzA}1??32J+QExM_({Uup
zmoJNcSJ-4En#|VTy257A77o5N`iQcX06?xj=9uz!M2$34XKUGHTI)9)-VwJj{J%Av
z@cuc+&a9fK04%Z<A>~u)rl{<d_YLr)MQjlV(~xi$p4FcgQ8)(+kp*m_8V85n0k@QW
z%D$`tw15^O8e)gv&SHyb5gJwH7Pgn;#G6vODkv$lNYHeom1k%!!k$ka18W$cmP42r
z%$(-XS3{{*?{Zs!s{X-jvsu$rHp%ui6vHOnqoyCo77Q0PVY-^|F=@s6WZRdTj-g4m
zEdb#-sSj(~fY|~bgMUzdjR42$bd-H{mDRf6(pGmj3;r6Mo@PI@Hr2Z;=Chq(^7O!}
zOb$4Y+5_?{AAA$mzB#LfJ5!sVnIp9~(mtw>sH=t1VF^j6qvO+zv>LCx>-fH&o)`MQ
zHCm`1ewO{zdg@(~_VLvIXN<Qt^ev!$SbHPe=S4etvd?jcO}Rr4cV=&d*Xe8<TFt+`
zkX=wPKHJsER(s(!Eqd0}fUudP@v2TI$^uQzp)9TSA*XyZiQ*i!ti?T;y@Bn_r+x4l
z$ZGwpmX$d+XYCDCAJX7_l~O`<(&_lH(FTSS+G^o#-wU3eeaFK~!Lny}pQ&3us6rP6
zW}UTuHrLThZ3{d19%>QYbI8s>JH6OGfwd>c=F|ob_H7EXFT6$7z0eY4W`#}-m>H95
zu)Mlvk1sHLvfm#@;0{1D#kPb5=)8T9_lxAyj)5Z~EOzr^HC)&==&K0%7t?ch8<gH9
za&IAL$;FZ0E)|L^HQe$Uzt<u?!VOU6FT;(A8=K^9{>`jC$Qo)bSPHD!;8Gg=%={bc
z2BPVKETI>@N&gH>G*sz3z=4b(Sg7quXZ_gBqHO7!CRK)b0&)uhxPOCBd7C<<sTQLl
zq2!Mg5oEtkGA(0+Du1hdO@#Fg(_oZ@OZ3E};unTCxWNI??}qwPifM|<FRIFQRT;mw
zz`|zqoah;ckLr+r2FX(|n;)eoD&N;uofej~`cSZBr-<Idk5Zn>E4ow>_mWK|8TmQM
z&&(_*kkyp}Wv~z|sw?1E%R$N`@keAtS|Z4de^A-koxl+Mk66kh8*sC|E!^x*95`Zx
zvk5UkEA9!EW5Z}-1y4twCPI5=_*rW66a=kQ<_~y4tX^j}c8o3CZ9|jBP}9C-Ti+H!
zhnDwQt*Z=-60l3eYvm6x<pgHifHm#ICXKPxMSsC68ZFibFOykOo6a<RqRJ>5o671v
zW#Apzva2@bJ|qqy@J_%%sWr4^Z%loGZ2zF9*)%ED7U1KPQdv{@#{6JwW>Sg%lg9)N
zo0UwCVCxKL-aTe}g|rC+Tj$P_>)}@xh56JTvv1^{VLNSG3Kv$KU3O+^ceVtKp1U;h
z&+)GY6?Jv~L+Fw1aiv*G^n=<zOnEx?-axhJ|IPY2FUbb+wJ>qVl&FB6_b9NoCqIx4
zWc=B0u6X7AUu>VOYdIH+lIDC{yGNj}|Iksk^@X%^>8CS~`?LCBW!|Ep4-%fll|(z2
z3%!=~T`(XduBi6q{nz*2hW_j+=>jelSL6r`dnY002gu7pTXXEP(w~O#i^0t6;X$qW
zg`FU1JMf&N!$oWhzc-ts<%NKwyiW-b&a(s&9+eVkaOFi>zN6lx`?J<6Jx?>eqaL)K
z@68b1uRV1%6K>%_&MM&oGvUic?6^v}6q*Y^umlD@+f!0HigrUSni7ffEEE=@Jb@lG
z2<(P6MQk>|9|aj#$b9(2KO&!btvKdE3IC%M6}Nfx?&nAg+T*0B(o#7id~g#K;mB{m
z<1K<-0Z8g-!*z+~r>N){53XuEO3=di4&3&Z1GV^~wR|}MdAsTaI}cpJ)ABh}NPnnd
zDSM%~F$anpr#nk(1T)VtCf77Y<rymf{HxXRTs~iMsFl-2W*8NZY2?WV0F&S~)6v<6
z6EU9(z*B2T6S{Jq*l*bOV%lB|t9~TJ=~pfX&?n3I^At6UlxAZ69G=4|O#m`{aRze+
zpZN^#Bg~nm68ykfj>w|iL|~1FA0caGG>z3~CCrXax(0#)&Q^DzV1BVL((S#=(e9V*
zJK&G&0P#q0@z_y7-e{Amun<r|D8TDy>3^Q4Z=k@;aMQ44EMA)b4Oh3rtIuR)>7}CO
z>rn}cumoyLZPfn|tLMS_BTECP$NUS2rk|kt_y2|x`Av)T@cO3yx0avD>9^opnjN<M
zhKyQ=2<AXUsAGLvPKWjp!Y#km@M+qbQ8We$8t-H$sE5<!0*I=ZYdv@N)lwrv8*{)W
z*z;#QYOJRT1#B|kq*r>`N~2t>0Iqb(c05e`O>a>zr-FR5y17UT3s~rvy5&vDx+%3b
zs4C?PE0R;epnMwUHHZ~d(l9HJ)7!j%^~dRLP#)Fq8pPhJO5|`YUq=HAG6>@Zb7PHU
zjm(<u*@c=bP%hWXk43q2p#s(F(JT}pceOX4sru;U@*UAzo(KWoW>zl#tCpS!v!=#{
z*#!guAANzDMvkg1&!#F*M7ggSHFsm)i@ZB|`FWb_7+PsGUsS&3VOP0ro68Xae>QD1
z$gT6BFn&4y#?hyG3eWpLDxSx}`ObrmUYTW-;e{7XE;p-a^Y?^t&hhls(t5?rRnI1P
z(&S3@_*$L-x3Orhv&o(`fv3iQme5ywp!}s0(cI6c0@VEC|4^%E1vk9du>2cT0Nr{t
zYgQh;t<-sEZ%=e(_47{9+o{qtEt*cA{k?UL+H~d$(?T$S|3f(+YWS*RKblfioR_1~
zn94*nC(nEbepaD>p?!q~Dc-4wnaGC#4r>BJrm0BrQ{D@@RP7~cg~`F%gpLu(^P>av
z6m*KN4%dWgY5(pj*7^H6@G6^Be0w9|nRVuMTcndDJtV_JjO&xMS|kZ@(L7CXhcQbr
zGw?JKPv&nr(5Ln})FFr3{{feq<jLCew2TZAEr(i2#RnZLt7G#BLLW3m%->ETGnJ4@
zXs7fO+4~ZDkEfm$-z+gtY7t4%K<`2Wa5ANbs8qpo74^Ai<#)A^r4P+N<}#KRg9p>n
zUHsqvnoH@BMD<Ro{~S<I2NcwSr?zSt>*2W`*b4vi*%AjOqNs-y#g>OszWJ%<Y}L`-
z0ks}cr4%LH1H9Hf?L7=>OH4$@KeY~bB-WYb|L1QVxoGLR_;FC_Us^%8TryRW!5cAs
zY*;EUp~E<_eOELE9}z`q_;C=b{SPg`*U{u@{;YN*0v03SiJ%LX{*p|C*hg3$p&v$z
zrCQTs_03E~HmF3Jc+g_yA21gyXsFTf1#C#uVx<Ybx~KyIIejc<$K+3Hkx(~$38#-}
zm}7Dt*cYpdkvWf%P|Oy~pIGOQg9NlGg-~b9(E1>K1YbE=f^*tIZpx=uT1#>88t$g#
zz0z*e%1umzGU4`Kt%h0zyobMr+I8^}?O$3;#%kaZ?E|z5>7Xtt8&C@9$ahvgK}31p
z++b|6xo#wC*;i$dtG-7K<xg!t4ip?SC#tnnTdN3hRu{jK<WID?qP)Cr4=9>=G&LwL
zmVH6>gG!YeNC;8YBIg3Tl{%9EN2W1qtx;~?G1H%~tS5z-BghaWe84)QwmfFb7nLp5
zn%_}dwfJU|C>>ku4ua^VKA?8q#H-T_y`$E^u@p7<lfDy813`u*z&~ZCrLW*0Q@0KN
z>6K5^8ALO+Y*nZ{o;+nk*e#XxJ7B_L&@5)2Kp&)I%J@=wJh(>Z<(n#bwW=#5Gc9v3
zBY%H$eNZwqam6fG^3?Q%234!_m-eFruj_-ZIkU19IrxKsA0;SHO3{i(ig`zW_8xT3
zu`>c<&DO4@(=U-se!?T#G2U@2hRSKd(Qg9#!#t?fmR47rQY{+nn7PUoqxz$L#elR7
z>^>5h&z&9pF<7zAsQsm8qcl;ArVdgyJDN$IUrH3FHU~mMaRnwp3&GKU0t>@v`8=pB
zNzjLCWr8J>gLz1s`{;|RQM{VfdsNDg9g#noJKCQmfHE>Q*AIwy<_e;2f1qv?Nv#^e
zuY|ukGTNcD;?3hCy7UjNNnIw6nA;aL&~0k2m?W866nq(VLe-k8`2`oVU`(A($OcWn
zo_We`%yq*YLfw|)^F+Dv2Y9gX2l=I6*2<g%JSo1`T6#*IEfsabN(74(st4Tz%PevO
zk{-w(Gm}180?P5qC#Z17JkYkYkd9aT$Ff#D0Q#spTvr#@RHrf%F(8*n==D#Py`ISy
zsncC8k+~0RLU?0|M}L^7o;q;j%>#Ey#q<lq^s5}ZpJ$+D=Chi`=Ha_lEwCS!KeVTL
zIkB|K;>z|=3*uK%5Hvsf`>5LZF)Uop!vL>rA+)ch)ThyEmaar>)IOntkQb|ECgkW(
zOEGo;8mW$*B`U40<|&R5fbyfU{(E)swal&<I))_zOWncZKeU#?jP8z?^W2dS27#pv
zrzJ}}SsEXmhtC+*Xnpe(M!p!6s47Zt=>$~ue;KuE4D*^;^Bk=&ruFFCl5^_VSzpZ7
z^HhjU*ZgGO&OC7*>wuli6Xo%QhBvlc%jO9gin=!`Ii+%r;P%nA;z?)P1n!@@VpE7|
zlZdNJXSu(+qaGENHF#bl=oV|$v%(78)$2;7lI5JBp<bn>F#PFt8wY^SI4_8$>N1DX
z(5a}n=!zs?RIgu$i`Cz-7`-c%T3a@+0UrmwmKFoK$C8|!u~E^-B4sehd^`e4Ng@p_
z!r-f?T|qyHbj+O{^T1N(Uuqhq?qDh*xwpE34fX(Z+CQc8Kc)E1>$U?<Sfr012bGzQ
zC_~C6-A=7#zdAx6uVC*uCc!jzwI~lRW`5WjluvG$Ej;Q*-PDqxaIJBxRQIWmM+A8=
zdE#xLoQQ!efYb_vV%Iw2rX-rn<Nivk62wk~filn?m=J?3Bn7n~twnq|()Ode0~gyo
zg!)2jG|CYz>UONMET7x0470({QYf@uo0r89YV|BFg$SvqIgav4q_`s1Pfl#hqn&Na
z<df9zC5z+D#X_Acn<&xT14`m6?Oh3}(KBk<&`M}o*szwNe*mdfk%PJU(WT-;Y|e6`
zdg4=)3(DY+hv9%xIf<!W*$e1)a}UV=bgW2SLO=JWx@e;lUQ6cIH#s1*9LuW*+U}V0
zsZ36^wB2(NYn8pKlZ@eW46Dp)eE6~-)Ph!Yp;{gfQ5`nEYK_@P3<{Hd(MS9LrM_x=
zBBx?ZMtdy|e$==01;%7w3@Z843(Imfq?ipcuZtbczu8cCz+8N8g)(%#+6ok}j)_E+
z!ep<O9(k)h&pt6oKF}KIBus0QeFyO+i&Y7q#7u2pq}d25l0usx0Aca?DL1YtjuPN~
zZ54hl!QV1+LM%A}7zCSaR(M45Y8YF^QjIH$5D}>esld;BRBVa$$cD<X5yexvG0J0w
z0Oj6QY$Z!ItZ)Y@M6zV~NQ^38!Lv(j6|JOHW0X5$A{nTGR{QsoTnwL(%15aF_}vy{
zMgGX$5_EFndnp0m2l(-_8g%OxuWNrxzV==+x!|)O&l2%-oDw<2fbRkGk4k{>O?_8W
zFg&S09PSWw%B0>G=#*GuY65I~bU+s6Lhyj4DYuyA@>nWNO|D2LbzM*|1i4t3a<MKU
zL`{2AO^WlT`EG%=)RGv-(26)nt<zv<>0(Xu)I(Mmla6&kQtV4ukXSC|I%Y0`;R)qV
zv?Q5e$rIyvHWpg*xy;nWAK8Cwf&-g59n#<kwnC!Zv-F^tJvjF{iCWI{YFR!ufpki@
zgbZ>CRz{mL3dU@5qM^sN^nzs`*Rq4k7I6=X>$C?;Ys9m^+aj9TH=fm(zN-H9jo0;m
z^NrVaHwdx%74Fk?<vFsHqdA)+8*(;ib8MKVZ5aWxu?&Egr1`!L(=g4qZJ7q*^;vX4
zL*5wj5`=6@sOaT)Gw;c*+xhvo2XyH=V4xS|TIF)W6V1l6^6|53q}$2|5keR{=x#vt
zqH1uM|5gKs6QUW&f9;qnJl7%{bC%z}QZs97&a$j6Axn_cfY^L(xk%A;kVR88)HkES
zXX!@o;cpFsGJ?_133{)b;B`O9`z=zvA0Vt#C3yQe-4(f9lP2%CPP-z?`ysr;f37m(
zd@YuFH5TN5pCiim5VKrR_A^AJ5p+XyOYUcVi$;iYKWeVvf5m6A#dkRM8zIsSLFuRJ
z5&lRWAKl3zPfZGW=BN+W;8VO5@3;zU53h(_dN3!qw*UF=J;HX+kD9l|`E5T}Vcy!1
zl?#@1&#CS2pVNKGf|Vg_=Q+Ffd&_T`7ZtL5L67dW&->@*99$Z^^6*;c#&_NchqoMx
zI=K5WzMt=ryZc~N?3TmM%&Vt3WZZ@8*DqeYcKy=0!Gp(+AFRr)sO^2ZEu<0>Jr#f2
zpHuM0g*4xmnVT5>+3Zn=@^Hh~tW|Hwp%AStwYslbbhe}OfKZis48D;AkwlKEei$gI
zCM|&~o7nn78l>j^*htpz!f5cJt-)y&T88)ZZ05o=Wo^tu1_S3!j~CzUHw3UeQKbWN
z7#ay0x^NOmY}8CFOuPP;`mo`D`4$*`J=yTOtdEOp+Tg;B<oMIEhQUHh_keyI3^VCP
zg3xc1ds4Z}bzy33@~jMfB^7Gqgh1XBm?=z)J~ivMz9=m_@5QLhE=!hdSi9JG^w@#Z
znJy29K5f%xXy;zT4op2d+Yqs2$>yc{E+d9}c1`PBbo*5N$!O!SiriE|UxvIJZZ&V;
z1|Uly%>*F$==&Y|jTq4_-0(Pj#N~ea4x@XsD$s-&#R6{+FpCB)Dd5@tSGJR0v7PJ{
zr(-+~X-z|zw~FUllRV+2|F&aCSy(3CyL0WeQGP72VyMVF?pGp(@1<<>H&1~AUI6is
zF=5l{)tgr9dyMTf%;?y0$e9Jl;Ts}fV?GBtnH=)fU2vnx&ocO(<Q@VhMl?_?qB*69
zpiIpc<+}6}&qmWobkayD+*6;isq|~un=_Faa8-ZxkwgO@9K3M$f#b3gdEeiufaADQ
zLXAEdL`arrnCfz8qK~Cqa=AA&qfg%<Bm0ayHZggDVWQMa+e?K+?4Y{4&-+$-oKf;1
zJ!9(wpaq!Te53VL`n8mXe{`-Z%}=MV(n+78p)!D=-H@Zj&I4yp^*5#u;S!RQcc<$M
z(}y?MWn_Qz>*sA;xYUJtyzu}yoWA^5@}joxP-ksuP{!Nz>ybpldRTk#Emw~o*j5j0
z3{Cd;boU21-yb9Xp#4c}>}Zp5YTlH?Mz&e0!Y#kB_Hu>`)i?sNnP^b%+KdQ1oD8SW
z5wbP6bKI5@BVAa{V5l952AyeTk)`oWD@792b+qU%zBEu@pvk6wA{$9gl>dRML|?X|
zpXVK~ejV<xkW!pgH@;*W^J!xN6nR>yibFIrmHcx5)WYA;kEm;ZzI>T)G5cE20$7i(
z-Sd<Yz{&+|0yTW_ec2x49bRcg-Xa+KC8tM?h%&MRJUPR!DRcgf4)DX4O&;3;_G?D1
zd>K9@lsTQCI#`qvFak)C>76K(AHH(xlyCK{{V<-6u}9nop6!Chz-cf7A3pnjr}6dk
zulZHy7aW_n&lX-#;FTgz&b)~2NHrukn|}X2%I%Y%FlSZpggGJGBSQ>*gr$e$S6tNV
z>R&Vs$b&n0FvAYu1jBFmdl+{t^62@v*i|dz4EKdS!Ly>q>j#VkM0O?ac3v6uU^@f0
zHb{1a$z|nAy#dN5)3T{Cyh(Vgf8w>9vc-whkDoi2c>L_y#2FJNOrJ5)sM|+F<mK4A
zR^28&3{1Q16D`xgAjAUkHh^hd`b-<@H_dQpCU-sdmnXl|7&ar~h06eCCI3Cv5~_7G
zKjrq>+h=N?xR8Ev%Ej0V?=F;Ha5QC}fa$bjSF0TU`oYsDVpklR8)bB?V|6fU$AMUv
z6AO<IF@Wc>Fq1kmoD=L)I^Vu<cKq#!XP6BSMEClTy5g78z*Wo=92Z-~@UdGLEm^c;
zX^1i0RlF@YmUWKdkL(Cvy!5;95My`NU6fOADyh8gw;cMEqmd(XtZA_PtH^q@ErkD^
z>>_XAdnnK-Pv#*`>kaa~Il}WYmI~B7X>=M%5?7J@6x?lkA+_S7Y>-`e#D=243<i~g
zWcq|eQ26f6!37rwHm8&}8p*K@>7LR2XBm$H6q)^swxjnBkxtA$8+%+uft1^*kdeY?
z$jIhG?5wGWy6c&vSKCI7p1V;k<F;pFr?Ho_ZePlL{x~Hd?4Yr(5D+{z*iX*}vr(e_
z^<(90UUyC_F9e!B)2!&<oaywTG=?XG_AddysIeOxN)Fn(_|F!TMj*d@xSx=Anzx^a
zIrK10^SY4s;iy^+ZH>P4(49T3r<#d9<lNZ9K0WTSheh=84<1|4L#~7#X7ftR9PzEN
zb7S;|eTJ>ecFx_lBHgt%@JE8hHM^HbuZbE)R<$43<yUN44BRK3jN-I<K&>&9;?Vp*
z%dsNfp&rq?2PS(<A8N^3<-kE&4m8to#G!WTKWjPy=~)i_*@Hi+df0KLYU%;y*P*4J
zsm8$m+^uOTzHt3&KJ{2mLwRSiZ=Ey*-sU=v9qQJ^1$rdVNF|8upGkC2bw1#6hpd13
zF!(*|WMo5FSqsnCt}Qygu3P#SHGjdHzvbzb4cYL2#&;XsKd?7c3T)J7z2iikFz`}J
zNpGb09oc)K!F>N#hIS_2i<iHJJBxgiAM@f_<H?Yo8`<yq;7flvbnZt(iCF`|(!6px
z8nzdVk{@zj{CKote|`v_2f)<pA?M4F!*eG-1J6Bs6!7Wz`-s1eZx8wF=I0DNzu?*3
z9C3H<mID!SoA)~J7_h4+$G&3C#dS;9&R-wC`eyCrPr0)^&Fe0%9=3kZx`XTXI4^z9
zCG+q}u0jKQshG=(!3;lM@hS2zYnBDL;JVjf60hP;;JXS2tc*2-0pl|pqvBqw5g3qK
z8>kV0ILs`F!*x}dVLYE`i5M1?Vz%%Ll;XN7OtCT(SQB+ED8#buQ)_k>Ks^5o3NfO<
z<^AHv*6i>~j8v^W8RuHLo;A)YTCtF)hw@~Y_~`0>93h|o+xIWcrv*^T`o~fyGmf;b
zuIa?LlH#mlso^>1TZ#R(R>iB*&}J3tJqgN{mlNXCue+R?eR$^V+4HB(+&}Nsdc&Hj
zb7rkr1tf@Fa^x=Ru`3z+D+l+bL<;|Yu*HYdQB@5w?*G_V-Dq$3LR(_@BEsIjWQ%<@
zS*i7x2w(e36?ms~v>Ia-V|C7|!0MgGPUE6!q6yN(Yre12s>;|Z!BrMjSym;f%C#!x
zRerU0wQgqJ#k!aERO>M7qt+*^Q>`ysKeqncroK&t%`Th$HYuDF7s9RQBDfvgYwmaM
zFW!-#%m?wy`PKYoK8ycD=qL;m_6lc&bHZP?oNW)=)wb7dVGdGNSJknqOVtilJ5}vn
zbz;@&RfDS@t9rcZ>8cm2rdPdFRnb=0*4Eb3Hqs8&j)K3Zt=a_b1?^?+&vsSp?ComW
zIoY+b>txr{&ezV*ZnE7XyBNFMc8~3z+ZEZB+5K!^&HgKU$-b$5OM4IdPWJxx)9vTj
zFSOrff8IXN{#`XqHA6LzYF^d4RvTR{pxWGOq17U)9j$h@+O=wrsy(TeU#+Oxt7?Di
zG`g>JU+dg--n!npe!7XeU|pzggYKa2v@TtDLw8S?r+c9*(*3TJt81!jt2<VAsot!*
zTlMzUyI1d1-LLwv>Z7aAsJ^87rt15uCst3Zey955>d&i}R4=douDV?P9|z9C&Y`-4
z!J&miM~A)+qZ}qW1USraSmdzIVW-1kha`uK4jB$t9d0^gJLEV#aVT?m>!8%ATEnS^
zbB($+Tx+zf(V<4q8iQ(#t1-F8oEnR3tgEr3#{L>{HR5ZWtdUaVVvUR%*J|9a@w~>X
z8o$*r)wHQ;U-PS)b!#@V;6la%7c#_x3uz~oTs)h0F<{^9t;X1`afjkv(#It9@*6c{
zLZ~5Y0T;9T(1Aq#vAyBp^Ot@XWDFUW$j2nEn=?Oj;q)oN`;RO!_L<L3IFu6fTyH1-
z2hMG?GNvWhhqsR=pEHcU&Q${A-hT51FfRLa0MNH-UqIiglB!mb60>T_tjZ%Ls>fP!
zcI5KYa~flmd$m=ei2e(kXzY*P<YLf$R%2xFU`KT%Ht+dyXbsl9{^Wb3H$P~6K)-(D
zlWrKi`ERdxp_&FeeWmr;<rC+kFWFs6kIp=5EEa~%nH)A2b<zD?PF;<~Y(___86-3x
z)7O*nqao^UL{8_ZIoW3=P8=6!cy@ui6EyNRv(~dN9a(qQpY?shdQnfKo%qMy`%jJ=
zJH>Ou<^~4z(=*+0s!R3B=@L@cx^;ZYm^kCJv)r9o!|pJRp7rm<da=ID=P~O;xNC{8
zFQwi{8<*5~ddRA!3yphVJ<{kp8x2F~Z*GKg`}V}`ir1eyuw?%1;DwU{XYGkzXq+;R
z3p<oD|C-+J|H2pg|AQ_>kvGAn*m0iPZ!C4WGb*8%_vlH3ml$q`ac3hFqfhIP?^(Ri
zIGFWKWS%Z|{}Z}tv1HJRCD6N+R%q>1{4l%X{|ThHT3J}T$mHjtEag{h`~rA!l?uGb
z+l?Hb-d*2w*7&Z*3;glT(R<=B%K8kSGj^6S%TvYbye0e#op_^!E<r_3MOZZ0HPN=0
z?5?Mrx_cuzXv#hdI$e*<W_nhwE5PZhz8O(A#rS0UgYn)j-eV?q^BH>nPB5_PxVG^n
zy-1_CbJyZ}`rl}KZd$umt)v&c-RwE$CHdrf<C>|#vzD)lTUI;c^LmX+qsq*_l|*Nq
z@YGMT6aNphF|z$YP49i7_ms_S|FE@#vVUhMyGQXC9~;N>GuMYLo~yTW)uQfSK;_EK
z%qX#fn%R+;cd};{)vrIxqi?^24j*7LGIH6Kq*J>tXI$PnA~0b2@DVuSHfEXJ&pc~J
z7)v&BXJ5T^VZW2T2$zL_9P2UMZ$|${M)nnNmzINVKXfJ+J#9kN7(Hv)yb<f*ez^D9
zvBpu|xqLq6I2U&6-11aCHG2IHO78O>OuS@dFL1b{YMGCIOE|K6S&V^=WtX^x$5)(7
zccJFYPn;RNeb;;=0BSFB2WLc0z}2bhkZ#S;PO#FxrusF}!$*c)B`V+XqoH$WhlI^q
zuwrx6Doms{{J37+xv3+M^wzU(zRZ{P^xWM(p^vdO%vMYJOOH7J(;30{^)O^5U+P(~
zv~cD<Bm0$wiKI`#QA~5`#JtIe4d6V=+=_E+Q`21NvJ-Qe2ybgvW2YTH6JoG?w1ZrB
zkReh7Uu$00bQ>2!Z{O*oMj0>ra;KA%<8JCpuDh{sb{Z9tUq5H#{BRdG?G39Am6s;J
z!LeB=&2LTy*2u8>V{Ng`uvgS_6Oj3!p|WPEJDdW_zl;Bc#%niJ3XHddkBaG%-Nphr
zy+CvPds+JfVD6nLq=2>Lf4X<|cWU55&ALMvHIeyugOt4)YmnKfypMsk@I)lu?UxBp
zNpc}=2GzvEWK3f<;W5!Lsk7VH@Gx7ST5*_mrel6u48O10Ppm2Z#C^@vIHe=U;&F=<
zXpG#E(}}+Q=gyyMjP~VXlQLs2>2DsNF~B%oh@Kj_eS+S@b7IpLcgK96c`iC3!8kdW
zPC(bGO<ZroOr@GQV0yx(E2*(p&!j8~k2Cfa=7da{Ib5$3eWU{9X|{MD1iR)hOq}h)
zrfTg{HSd6AdoA{wHSNZ&l(lE~`gz@9cjsz1eAI}YD4ZJS114b!T!!keKmoK4t2GWv
z-z_kPp`imWh4Vq(f{KEsZ^1=wjo7wv`$l*--)i58g#snTu#<ykqrn1`Vkf@7eJQW7
zYl6=)<M5a<2Tr;q96y+vniw+wup#X%ml8NCu8+Q5Uw<F3oY^@ujaNf1ESTaFFm1uO
zasKf~=NLx&b7PZk&Atn$#`8k+K7(D&it2Q}9fM(ABZ87DhUnmtAu|Gv=SFjJ$4^9^
z(BDZN<-OC$F7fNbHij>EVRZ|9-;iB?AvOSA*I$`~L9w?PGxXSNup{R3omWp8(*>i%
z@foZP>8M<tyRKMy!&wD8qEzE_-LVt}2r+Y~#SPUn+g@&P^;S2}ld4=#jE+BIWK)DE
zCph^k{E)GaVwZ`Tzm}Z8|Lpv!g_FU?=r2r}KRa}=URNSPB-L)_3}(03aJC0FH|qyb
z52HHW@|o4Raba_UjWk{8GL2L2JV_B|A4v?ktzY&)95*>O1+#Xb5VtouAyc1sc3|@s
zQwDeg1?<IG)u&}mvMQlPC5{VZPZ$71wu6<G<Hg1!ruXVO;V@Yn=uW$jqlJ>Q9E}zx
z#~oXGQGYIVPuh9xZR4lUoEmOCxit91SpDQV^CyNIGkYu0Lyi!#W7AX4ZW}w)!1kG6
zqtnlwi45p#emy082s+;#;sr<@?SPB*A5ahL)~tfhGZm9!&ARVYsE3H}*4Q_qPzxx9
z-J4fwZ+1p)+z@48&{pmt?3ou3HC%6ZSevA^gVPrv9@|waLM`;9&@WwoHeprXux|}^
z4_j&N{zc!g6aNJk{){?oSWmpPu|na?4v4oSQtib4-DeD&WqcwyK8MfHO})7?cBYLF
zoq50<R6&1v!IPAN$jFTwwi~{FLaxHD(3z3r^}1$o2Od<6wSf);sK^(850u)Ohx!)t
zP+x0zc>0VTGxgrRhGEL{*9Ybs!A8FUKPFqxU%sM0eQ7GIzR3tEp=ILOxo7X>oIZZe
zXh%>Untz`L63ps4Qx6u1f$OWKp6U^6Wd`Y0KAW92W!Z_B;<oQPWQ@$?mMsihHd#M%
z#nID7m=o8%&+1Y)q4PA3)oaoFHI&HvCQf)^(8a@F4hEI|iz0Oy>R1G3yuDXD1{dA=
z9iV8RW8*pDM)@!2t{1#G@7J>BxIvvT2F!?#NCmCuK^#n3tf-M}MGe$P^@|<N=e9;h
zY_VX)*qLRH8av+c(Z6;=M#nj-sgS|(9don!Z$lxAUpsbJ@Hsg0&J!0J&%P1qu3(o_
z39M=d8Om(Qj#cCBaLofaJ-{f_&RqH7w6QPWZuaouy(=K-eYEG5BO);6KWG8#^q3X#
zShow&H!+VTJJUuHW;OqDX0;0!SdCJ5s%N0%&sY-gIr`Ltl}0-pR(SQWaz9hWdH&+C
z(tq^)anlWSP-r)a(_!<0V4{M50K=1Nu=r608+H}}$NyK`m4H`KWa~QB8{8rRq8Blc
zMZ}26Fc1PnM0NrKh7e=Gu!J?Bh7c1-9ENc)!($wDFd{0V0wMw;W0-&uFd#Ar$QmFa
zY$6~cAR<JhBNxN_>-3HKzHjDx-&5bcU;TCZRQ0LtbakET>Mn1VAWC6F)3OL}e^Jy_
zwoiTP!{;v5ya<BYxn1!ka|J^bZ?bO1u1OZY&x()qw6WaN!He8YaLUUu+oP8}=?9o<
z!~1Fbo2XbU0XT{2&~K6>)EwV^KD7^fsm5Y&Q$tN-`Ph4L)rw_niXVS7<GHB6Z(OnE
z?SG7Xz45T|gX3evlitlLj#N$ndnL^-n6WfM^^e%<Q<%?es^^N8|9v}uVbb>V;peyS
zUA!<d-A*5$J}5T4-I~GgVb8{8%ij3M@~KNE{5`6$XzB77=jOiLct~beT1xoXWw~!h
zLbnQRxBQvv;Xl0=oiQu0HZZP9;3-@A-z!@4;pgF}(?3oxg5bsZ+xxT%Z<UmopN|oS
z-lue7l-{Rw`n2g7M)}u$yu7R^YS3Hj$9&vmW69g^E{~e9*&3gfJuM4?Z6EsdsvEL#
z@0WXv$4^`s6`1LacsxA^J!ti%89s&GvuER8`merNDjCQLY_*2F2lfPV96Z+BW`$y2
zRIe%151*BF$_bqN);(8cDgW9CTvXfep}a%ew^trY+}5S*z=2)5ZcD7h6`AV(&1zu>
zo(z0sxgYU6m@A#5my~~ly};dMxs&1olN{w1Rbq*D;I{Vhf%;KOZ!j<zvs1j~nHq;@
zgKDjB6WZ>R&B`tB>r-po?jOIh##MNyICNd%fe+TbeE{jJ4%o52Q86yK9T)+?Sw{ny
zX2Qof=5(~wNqm~LFmO<R?KDstD0EBlkn@@K)d}mr^KCYid#-ul-0fDJqx{`FWb_{&
zb=pCCM<EN(*mnd*Sk+VUsS$6Xw0cf2#&m^VBBUQI?2LF~p*pj>a$l2m#rdh)z}l3Z
zws1J=ddS#6WMoIVxlXUgtm``~+~-hItW<31ZYi8MXF=ioTQPkV>OBz$R==ZojSkjw
z`EzsUzMK=Ks?9uiU_Pm5j#L*PQT}M33T*x%$vTJcr*yO29(dn)nXU99H2+Dp50Cxy
zCQs_{&ckkF0Nw%rsuDw@EcHy~<;qKy$}RjLP-q9*nH~|^K5#g=_EG)Ww?tu4%`!ag
z#nLEsb^iXmt7^C2c317zd!Z|QY_Uk?9m;b9`<}vWF}>`jv(>#7-n<&;{?+P!y{f{-
z7h(RY+}RaW=+5?6S5;iE!fN^R`iu4J*1HM#G{hb1!}5)1(XJ2dbxk}3*`|Vf(Df;E
zL-Yo8%76KTJE|UTe#g+u%{QQRj=O!2yS<N-y6M6kl$`RuKaRS<*x>ura#A;_E4CWL
zaZ=Z-fk3nh`17hu@)edoRGd@?Hn_t#r~sC%;bR$4lkV96mvtmCWN2U<x{4lK0!i*b
zr8hosjrTASjV%^7D0lD%ygJs}?Uw8&2a;6rpE8!GH%S>WBIUugBR1>S!D>4@wA3vt
zRR<;?2!qA9X7%a!$Q^{@Mc|Iz@ZC55S@h41dQU+0B36|*!5>JOs@Q$Km^QC<3$U?(
z!YY7j>%~#e4I3J+-{s50mz>{J`S^;7`W(9x8Bawh!hY+IC@eKu_L(yN6rnaO{?y%&
z?>>pQc~+}GmtjF}pFnh(TYsOz3!%mTqH1$LHnBusRFqe3=DT)9HfqACa3xmj9>r>1
z)ep<RD{zCmSLxlz-)o|lA9L^DKqx@~IVk$TsFu1X`=<0eJca82kz#%1<ukVW!U<f$
zWbY+xWTo#Y=<@=8yy4O=;P2!5(I2Y*7y`R$r={$SKnSKrSGge;B<s&uV=qH@hqCw1
z{b1$MCW^2m5AUq1u#rAB1s`ZYp<z4Yw(Z8LKwO}`nvPXKIMbi^RlfUQ`C-bQ67Wq%
zx~aA@o-wPhf1h;yIyBzej=N~UO0*PqsMmEhZiAt2hy&iM*`#<?lfLuK@Lyd$z#W#3
zE)=~$03AW-YWLOEN?>|Wh<b3RNMhTX+i|S_dLtGRK7^3yfIo?N(FxdD3<Rc%5x|k+
zQDCN+1e`2h0KOp>16PQ5fU7a#NaB6`No*1y0e6dIz;ogP@Eh?1@CKQJ$e}QxpTdC=
zbQkb$x(C>qkQOD=gTPdJ7&w$NfD`Bsz^AA{81y_nFARB$yhV^vWE265jbh+hV=Zu}
zaYPuRG0Ig3oA~Hbk(}@|Uy7|_8$xYJdkQiOAXBnTeQvpsMul+@at=X`L>=k6@`){U
zO~_se15!k2=BUY8qABF!cjE@fQK+Z7-P3wUi(Wmur$mdyp2@%={kx|{i_s4Z91txs
z69@E)7J117ABYyyQ*@kJDark##oV9_((S?0qzDO8h6oK(rl=pJER@NMXN!hG$`N5f
zst%@oz0kVi<{;%0e$i;+sGP^dOvc%aFEK7)T*~+^V+rF%#;uHd7!OW-Y~o|$IO7?{
zi;PzpYc!J07|Pg)F_JNcu{ElzwmyG*U!u*m{NK_y(e7a)Tr}ghCJ`O<4?%aJ7j=#a
z8wH`dt>9{W;Yhn4t`f9`NP*U5!cT*r1NQ_UlXx;n*YalIcoy>nt}G#->7o$sC3aFI
ziy^q`#tN$0dE*>#7vfOO*BWnxc^tZ-`4ZPG5Z7<b62_g3yBT*$$VBLe(Dpc4s!^Xy
zaaxYY!4&=IpYm@u6=WjRYz7}a0Co)1$7Ci1=~~_Z949kRm@N>$HRvI5=qcc?nBitL
zT#VVuj5XuUE}(nC^)r*qR2&a8N1GFHoMlcnr^459qs{5&Oy-4~&zf`0dFBFhiMhgD
z#bG4~*RD2hsks@lw}Y2u?t%08<v~9SX&eE4!aQSMfL~=+n>E_EOv`6hTMf)`JlbgL
ztg@O}Ex?cAIN?@n@Z&g-h;Ma5+<2>-muD*hVFSE)kQZ+y<9G;;v#b%i4AxlAUy1do
zxd$%X%0}1;&sll3v^5RqhFb+VhR^iVIGznRH|XZW*ZEik7w0)$ZqV`8Qn-YmTM1rq
zuuim0#N~R(`WbI6_{d9b{a71uyamTv-VVqqgVW*9nkCjjFaHSJV;$o<<$C3OokIMx
zK{+Usb<s?+uE4)$hTFoNY}@eb1>3UfC*KY;lkCO_i?o~DExmN@HaPC!(Od_}i}vl#
za6LR7u={G?#^Xu$)9jIU26ThlO_#-LWM|qr@KI;>6L3#L#<SkB_8sVqJp;Th_AI+l
zx3ja#e#w5#UaWm{j=dcIyY?D$iM<}9^iB3w#NTD_H&@w*%ozK)ecC<`o$z!o#w@Wf
zLG~5<su^t`Lfe$s*UcnHI(3{-v&6X>>4kfBjy7N&)jl4PWkT;u99`E1W~mcnb#huc
zvF2t+>rSZ|>vTbQE2kIQV5!z+JJIRqBw5{@RM3aaEN2+5l@i1o?Mz@D)a{|$e-FwW
z?|6F8#~$CA>`Zm0J2SnuL;2$!)P-4&^as@XRx@V~@;eW_N0C2W_oz>92hWekbsFz1
z;OmEV+*yM7E6|JlX8q7leGht|i|B_sdwr6DF$J{`hGOhMeT;>`B&q2(%x|OnJnC-D
z2gWd`1&7AT1K=buX8`wh<5*?}^T#lvmqMJw+zZAteLK_LbWCxK<9NMe5}*43b7C1E
z@^UCKI-q-*(^2=k)RyJ6<y^%vc4SURrem3oWjaURt$TPcMds_fB2jA&&D5ck&T)=1
zzdg%OVt$-NuT1eAvz;*&bk7@&fN@+uam*Rc^>9DS@5-V5nbVm$_c47BOZz=@5}A|0
z*p@jTF~%~caSh+ik`p<Vv0UnhnctZ??TlRHp_|0GkJ>W72TLpA(2-1MGJibN{h98{
zbcm*9clsFTN-o#$SXyV6)`nwt=9rT>&mFi<9%s4}(^Hu4S+fli+A(J|=P-`tG+{Y$
zT8>euL(T47t^}QyxXkevGv|u&3M7o-w7RggyBU*NE8gO=bb<_&k@<0qIkXO(n>fW|
zv=?+Qj@f}j@8$e=W0|jTTKhP+?Ky98oVT7FKb~Xu=9sbiTyeSvBUw?&XC-oI2iAnv
zEV(^nGGmeKjdXAJw1Q>c&sy4obLD3VZ8+U_EPo73yPxU7jDyS=NO;7!f)w?SWT*@W
zT~9>vc&90N&EWKv(;A#+pjr!z2L4lDfYAl?vSydgU(GJ61b)rBxQ9-&+yp(Y#YjnD
ziGmQLgY<+TUCYbD@#G+HD*Wl}Ld1X{M@5f{Y>|imG*KX)7PC1uwCw+3G}Mu6AUG!S
zw1qhjX}V^Yf$<Ndl`^9L0qyZ|^&u4f67U6#n@qM$1X~djR>VPJu>DXU<(2Xl*d-FR
zsckHQ8mzUlY__uMvX$jyD=UPptlQYiYROhsd$zLfVJqulwz7t@l{K8LtdVSGjbbZn
z3|m>bY-Q!Ml{J&CtY_KEn#Wew0=BZ=VJmArTUmS9$|_?ktDLQ@6Kqpeu}$?Ya;(et
zyk`?3@1J`|D38IGlVF?4vz8QMhlqt(cJi4xLw}?KgzYxUjB?b)VOUepEjS-#+pw&D
zW=pk%T>N1DU=LEEL?dyVXfL{n{-}*nKU!AFY*}TpWi^v6t3_;Ct!K-soGq)1+OncL
z+Oi_(EKAgyd<(R;gXj+38LagUd>={>0xR)$(Mog_J;VbTX^#npXuIoH(OmovEz?sZ
ziia@*_s-FFSh%<Y`hSn;1*<qsj0=WnyR3<b5x+-%dy6D76k~bs9BrpH6?cj@;$D#;
z20`b?2Sc>o7J;j&E!w^hw0gL}HNbh(c3h;mOT>!%L|^eBY=B3CA=<8s5-mkL(M8-3
zJ0l(TxOa}W^P<JwxH7wne&QkM&|?CtCo?C@S&VZS=QA#5T)|k(xSnw{;||9Cj7P?d
z${i<9F`i|-$asbEnnpt~+KlxW!x$SgMvl#zG|_0z*pjggV+Y30j6E3pGA1&nFs3n%
z%*Yuv#>imIW}M16gK;+FJjTV0D;Y}|H!<$WoHQoWC}%vvc!Kc^;|0bl#%jhIji#A3
zWnzx$V{E|Kh_NYSGsYH-tr_DOJ27@+Oqi52Hp?8qn9MkYaRlR7#zz^m8S@yYF%~dB
zojYZ8t~r}=F5`U0MT|=sS27keu4UZFxP@^??v(6YvyAZ|<1xlljAt1yGG1Z4rqL3N
zHe<c1<8mfhVT|F7%@|uU#xizd?7`TNF_|%qQTOo@PGA4OwXc`DY019^_5FzWuJp^$
zK)=vH&&OaE;{Tu0b96et2BYpXN!W}QqgTVaPbJ|n)?viF5;(sG_1p&W4971;Og=)w
zuR+X{LBcObi5^ssi+)@GR`k1_aZgCZePks1@odcbOvk9CP|U;qaJg6|*5Y2hLzH7a
z^fYEeuZZg?1xg~H^x9Dta~n#;+8?Bj2-rnj+UlTR<N109Rr5(N^whqt5$%HEwX(&v
zU^wP!I3C7G>^~dy_1u#_|7kBpno0A5)FQ%+Du=D-yED<o;PH0PH&Q*mf%zUC&&WbK
z$aorVwmyby#GC@={=`Ae8`BKUoyM_l;qpskG9-{OImnYn21XtaVvLeXgK@@?pB)j>
z-h{YGjQtpUF?In;ql;)sC+QSnUref?gH%a}=rA3jqjZcur4#fyU82iWMW^Xox<Y5^
zJGx5e=sbNz7w8N6S}*pci}VeBPuK8v*%`V{KhS6NB_xN5X0)FU&|cbx>pV;}q)%uE
z?WA3_oA%H?s-YX0f+Q)WAx-JXy7U+6lS<Z;A+o+~AR9_Ql}U__jZk_5Sci0(>xl)>
zgX`ev8nl_?)mLNYpta?-V4X5Y?$`1E2M6^btA6B2d6q|@delYo4C+*mIZa~?%7F2>
zEH|FRxU?K2md#=r#fasoh4U!0SK45$(+f10UZj`kWtvB?(0qE8UJH)o2svmDT~EOX
zXe7p|dC>J)n9E)OO)nOum|@=qO+O+|h%?ajDp4(J$Rr;%phgr)&8a1|p$-^@_MpC$
zhzdJN`+=wE0Pr|0DGM#Pjb5i0kYkf7M15L7b3q*xVYHB51XYQ;Uqml~I)pZOgI)%8
z7;Ui_8f>DichZ~m3aF!Kn<X?K)G@TtTl6ZZPtjIO={2Nvg7#q?`#IH!WjMM7D@xL3
zbf1!{Bu4I7F0GsMTWJ8VND~-I-vRHWtH5*80e&Ux0x!^CAn6O~Lk&p!S}LFmn@v)+
z3;}*4>jS@+4S?5VL*Nh65B!YEfL}r<ByE9<p*wLsZbt9qLqDZQ-)%vE!c;6%l2+nQ
zwG8RN{kt|oToN-G(;1;H_;+O-#i->G#=}~E5)GmhdWbnAkb;9TX(Ti$8h^=ST?6CL
zSll;K@zf_&-X-r6EsWL1YK%`Mdh-7qdl>RL5`RC&+~d(3Jc1EvQ^=SkqF72aOSuhF
zh||$JPtYrkx&{auuoOAb)C*`Y9WF7BPi4QCo)?FfvyA~t%OGfUbHwP1o_IKHhY8Tl
zi6X1EjF7hg`m+f7vKacY1p2Tvc>e!hk`X_aq%oHyl1p+Mm!uh&L_bH9NL$ysMD31(
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
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

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

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

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
zcmdqKd0bT0|37}t9cBh+bWFxU1&0}MS3tmh7g>}<K)`(+VOSIx95%HQTQtku(iSVz
zO3fw9G}GMEQo$89Gb^*rHrs4D<NM;<-}80vjG)=O_vih1eE<1buQ~UgdzROE?dP0(
z52=}%sjMNJ!!&GQTw<bqLEeFDjHSmjR`S{4_=LpJ>$W3|9d6AS`)P1mYDQ)7ORqC_
zq$y+liw0+m7?fDu`7q<!M;L1`BsHUR%)}mLdl>V_J)4|W=qOIV5&I!ygXS~V_=P;D
zBind*)g?ST2k4%M4F7|EwJ1Ls_pS2^OJ{r&n3K#HZ^)QFv(Pc4n17IlN9;I2SL7&k
zc5E;mefxjKSg)6gT_vSA-)F;sFX3lrERFFGaK!-{#%31&eq~bQzJD-{=3C^jbGeZn
zeCf^B|DNZ!+pn!sQleb^yTX{Xj<u3nvmR0e3*lN8BBirfeu_m%d4LA2y;Q{VrS5F3
z^Z-lbzp+H=EHg<jGZQ<?T4-We7<U2OtUWieY-u^01Sp_(aX*AV$ofi~SuZJ##cF1<
zKGH(gnVn*Nc_teH=pi*@y{QiSg2nJ<Y^;(JPUUPUAC3N}uw-d8%8dYyv)NE76S&<#
z{$%x<$`g3|rM@RgCKj%-A@6DQJrB4)0-V<&%>;A>Y{vatET1>WwF%>W7-<B{*MuQ`
z7jPQSOT6hqq@ag10Bx<u_~x)4nm)iMhJ`EiA)4IBN;r-8KIAV)nE+<ssmvnjQ749t
z<)16%dq_=K4}LHD>x%m*jI|cbtG)RJzlkz_Y?5XuXpDS?7esHA;}783Db|}$N4+S}
zOn@H;K<ht|f;YquJ_|Gf?U6>He}^(|8as`f#_Sst;ZHc-1r!{CAK~Z&;1^2x0jdDC
zw{Rm_sSm)5aH|Jt{AJ*F6LcGoaoB+0YVd0&c-Wn#X{NHF3IwoLpi?}c9q=yFjJx>@
z(Ox6&;AbSp-VN<!VtnPm{|v_TD(l6!gFYuAHy<GX3pPSC8qWwX6Y?6cA&M+SLe`2|
zfR8TxUn~L;qS=l%h(-j|=R&}2)NKTuCxCzJSSJ9<R;OF?Rlo)-`T)J)2{)HQ1|xX1
z0wGc&a7<Bnl;)F3s_!Qt^VA3N!I$D1ve%9`zxg3j1JdslnIpL)AU=5kJQ&AQZ~hLb
z1)U_Me;}O!=nfbGNB|6=GSYpl3+a&35Am4#yGu%RR%iwJQ273LDe26+pb6QB7^E}?
zl8=8%Nxw+O|1NzC?U0<m#Tp}Rf$@I^`Km$sHB!*z<^`nHNIgh@0F5S)uHgPd+*fJZ
zqJE&NJEXtJJMK-tAYCSXk_><d=#3w<l5QhSks{FcV%P_|&qhjmL3rGm{to%`<q<zf
zrv52~ogiI>eWP@!H;wk%(%!dhs%l$%lTQ2WilW=FFSpXUkR!TZ3_M5<NVoovsbZsG
zC;l$IW!rr=-e=prDeuZAL9Qf4@1PHg9()MBS_Pe8H`@VP^J5t2Fg8{LJ?HPUM86%N
zC+T5F=+H@K(oBPmI*fD_3)3VroAd)~N_wN{)5|OoZM0SV#9Xv_7;@l(&A1;np%Uea
zab1M|df|FD(jwgdx8+`CQPNcCxE*{$%GLY6xR1bnU(J2c*;iR-O+z*g&_mOkjg$7=
zf(T6$Mv$$PO<~zokJ_rA@>f_C-Ba5>kPfmK&8w_E`C`rae}Bade&S~9n?wC}E8bc4
zx5_UpmY>v`hchia-Q)0Y43tz-K9LRMpfF>8N=fAhex2EUxA6(dBiR9Fzj;&o>81{S
zwB@t#a2Y-4H!%(>OEtpyi?{miP7eX}>(9D-uO;-~-+QfLEm)lQ+7G^cy!Tqmg4tB>
zwGR1nz1Mn-bD8(rpBb5Nj1AB`q9dg*1M3I=s@Fzl;jO&a4Z-W4-s?v9tmMPJ*Cys{
z@{{-4%rXNqFb?k50Bscnyz0H?tfkrPy_T5C+}V4rVKL@@-fO>lWwflj+2zgGA%Cs+
zTF=tV?|QHOSzyy9-s=WzVAFQqYXh6rG}n7=WF4D+?!9ivVk}1Qb)(SU7GJ+6R^7eA
zn|}|xr$?;!x(PG%81B6`v-Lg3#kq=Sy7P1MO6?o$F;UUo?Nesj)1BG&A&$~;ds0zW
zq&>Evz^;@ivAdlmPItL8J2JK0=`MDZlq6HlE|F1DQGG}l`uOrAln1^$yK*<u=`P84
z71{4n+*k09YWXF0hrQJ8$aWSw+|%r?oZB&rcNUa8?TN0U(h~J@RDNlmJHIHm)KwI2
z&&+cbI!f&Ky0WI_7uAijeO3n=XLQ7WKiIs|(&FBoJ6BXxM7o{Xd5+S^ELUN@%xuCV
zhtQx0ty*EYS<a#or@>Iyt<u|VbPYEcGV?G(!rz|Z$|<dIxSe)n6sWbc?PW#TPPe@@
z&uPy{O17sKJB!r9-sZ#YK8i+1Mn|fRdFxU$S+3%I@NtT>z*P}$cNAq)rlX+5Wp|W2
z@(UbO3Y_)|5DX+vj2&)wl=e1w$5fK#&M(GbO7aULUGCh@sfo!3gP|4vsfeT{q}UTv
zQ!?$zNpT4&83}enJw)sg_L%PWMCTNDnZrF3q>k!gFhoQ|cpFGdPlz2hC^-S>I_<eG
z;6rSsG5%$I_V(zwgPo{S>av%V<`<R~I7)%E%UzINk)Q3fXFJO=y5d47D2P_FTm=}G
z%k3!5hg=Xt?8R=^RA*LcNx0HPS#hz;U8?k^Jk4@DQ5GWU%*nw61r<jYiCcb_La_n}
zQ&~Q`&O+mbg=IzgrTI=YM$`mOXuX{9aM*L)P9(^65tnk@m?{CyY4-dgdqrM;R-S@Q
ziM`M<6AZDJ<Y7?RDo+Zj5!|3;vBO<j1SQGKFIG9@0$toCkt8UfPhv9I2WFNi1Gpt6
zir^78Xt=DznH>&Nm1TqV;r2pTc76^C0bzz7F%ozFl(JIf5W)pB?NE>cS5Ypd=nMBC
zc9E;pUg9c%=**<d!V(hil1M0&N>q$LzbLB!eNe@snP7uEzg#6c4I0n097TlA6i9FZ
zA>u5Y;>^ybtJ|>vUY%WTwKr83(Oij77rf*JsiAX9Pd@u&r@1Jk*^4a=o3OnTk$N~Q
zB&d519P?Zi5FfXKEDag>x}6112eqYY9*s?5fxUEQv6CdsOLVnew{v<~zT2rtAH>JY
zVlV=E4zSawzI7^X&vpT8>daAG4C<q-LO)klnbL|PkJNn$kruS~wu#1ZlkcuKK#~eY
zBe6)3l#-O0l$w%ZICGmVISWK`AV1U%wN>I&v?M3L07%>#s>)=0ouwKA);rzpOFG<b
z03=9RAd(x{lT8M)5S@~;tURI#MoJQ{N(VZ0mASJp2I?>z!jKP{^4b=a9o}&(I*9R{
zN%y)J)y$=U$MwfRq*D1_QtZs~3bxw0-H}u3HI*=XUVm0n3Tr`h#aO8IR5-ExB1eJG
zY}Rj^=tJfMwu0;dSbZBQN&AakMQ95`S7NWPNPka1>T{S+1HBfqexG-!P9f|L39%zv
zQLIu|IM`j_EQKh9+et~vroa%DmQhBH*IH1%Vq#nc&KgBrRa;sQU7vNmWANa|OnX+I
zqX;C)g_yYu9c2I9lubs`CxEw;fdtlG<gBnei^}uet|Fo?4Kuc^G|%P!>)=ZAb79b+
z|J03>uAtMou#SavUFyurE6UFTM=IR;#6NVe>RU0y7Hp`<bAj?jw~UrokZ;2Y-79*K
zmXJOyDI)`VU~g-WOHGOQ>O`8;U6@~@1RfAi*i$D)2o#E71;bUlO|AnLIoGLp2_mDn
zf7g^!C^C`40X&Lf4OH^phJaED7D%<bGht6q61LZ=G^kiUuO&uqee<Wf5m?uP+YNPD
z(Ji};rr>Y>rdtRE`8J<==Rka26@)BEmJLVcDk|x1FhqB-r#Ru}z3Oor>M%ua#R6em
z`CxxO>cOFvfg^PiMAqJZOLtJ=PML;o`}~^MYoIM>K@K<*)8RkYyz9t(t=;k-^@*nV
zvcLBkihz+%_Bsux1HM;b9mx@xsX9+Y35XCVUk!a>k`Z(%MyZsnSbaNRf`Y0$^V+p+
zyO*A1`AT6CBOLId2vVFgN`1yIudL8f6oK#}TZyx1>6I)os0U(_v4I0{yNccU6wnj`
zNvKC%@j_=QDwZOw$afZGmngvi)uRs3#1vRDgjT8{2NHE2+y!L4b-XykpXI|=m*+bx
zKof{Qbq;BDgF9Uy8m_;v^Y3|rYD)FLnrYQrz|5D}oimC-z5G%|r%MqGL6_<&pjY#J
zm}I%!@aZtEip`6=#SqmAd3_2>zyx?La}h-?@Sda>UV8vC!WV%c6!DRVARAqbTCh$e
z2&(&|L6g_)+ChnAs2ri~Rp~psRvxLrw`$z#mAzeu5X?b?y%7XD@kNG(u2R?pXHmAx
z4Z4w{Wh2}u&BqOym^-xyMQ3C=ixqWtWKAn_RUmT8RSAB}212Ln;c+*d$w3o~>mlt{
zgGuBfg7^>Y0d2aew7G47UgJe!BnDAuoD{o2A*)xaVXO-<;KH&JC6=o1Bf$p*N?_by
zLn74(DwVt>tY7iYIIO;2!j}HOkH2oC1PG+KnoM#vDX|oD-9GD@;)L0x2(JthL7XUe
z<s-7s@!42K@x7+UXQFQfu~2$n2k}W6amles!xGXBnL`rPxmHGMV&<sW^aOiShCMAk
zb!1X}LcIM<YzFSnhTBIaWe!Olk!eSX^w^ZlF_<mbV^hZ1hbE=OhuafIW7?IGVNXrB
zCk;zWPD(&tQc7I%i1?(G!S+F@my$}exnW6}Xf!ibsp@SiDFO8o?Z72&2wILEl$4y5
zIVRkmn3S19Z6>18SbJJ*dS+7Gh~(IGd)kO}Y*Zznjd(Phl9ZB|j$RUmC1ApchT>Aw
z#-t|=9+DZ3N}0&SOg%j|K4DmF`p|H~Fcm{iw<|>=fhF3oCyb=Z8AD=|lkG&1TW#2f
zq$bCs^q>S_AB$<FiVg;@&@bE`A3H2|Fpa?1E*0~RppF7Wslf>;3F)!P;r5KQgt#QS
z0O^v_6XJj%N`l-NJaW+zqKk}#;UkcNa=tFWgCPkD>cBY`|HqMhs3T6n2&tXS)O66m
zi^`~^jD&D|Y<f}#F(ENMbr>24D?lR};|P!tMImP@zQh*Fqi4$G`<6hU6xH?;E<PbP
z84W@%QvO;t@^5DNS%oE?y^(q6Vn?nsvN*4J07A0DN%`6RF!7vJ;hbW(Q{@uxLP%~=
znX)!OKD5A@Q`(t~KfFp_X<<Q9jy=hq=YWSTanfwK%niXuya%TM-wGe3cuk5_5aW?f
zl;pX}XwsoXI=T6X%`n}pu_u){99f87DzKh|1wj`pW;2<a<+EIt$4ardw*e5tqF6MR
z5$$XWp4wSDbFyrtLzn|)!f}<vidYtl#8oUd0}GJWwNawnIavv6xmmeVH<G0)S8nv@
zz!NHye5+S#KbMuE9S3T3LAz1Pe|=ayOF+4itj}NSN7So7Qt1g>dKga;TK?}^xD%uL
zE#CRej<yMB2cQ%<IzSI6D^&2EhCCO`!SCPGDITQ@6bjg}Fiu#OqP_aLqtHVsctCV4
z0yRpNQbg-a<hqo;2!nfZoyDdprS8VR_ITO><y0PG`|AG*H%V4X!OPy*?(NJfl>Z`u
zJIP5Ns8R|ZW+_<Ty(CdjrALl3PNIgdMl03|_>**Gp;Qr`II%%txU00*N$TIzK3u6y
zR8)EBqraVHpzj>uTA}dKiC)zb1-JE0l3xZq2xm90iAz*A16q)bG!=9pJnJ}nC-%g}
zJ7qK)<0UXC{JmShK5U4N#lT3_!6`@!kW-=Pp+mvTSJHteC3r@1S`Ns^y#qR2px|49
zd%|6n;zVffaOJubTr?oRK1WMHdy>Rr<Pv8{w+fKDkedsRr$UO86}lS0E%m?p6iI{L
zrl9piluW@0i6TkhAmwJ@*N(b(rwBG(@H9rTK8e743VJM4_(PV6_#MT1C_P7@WQ1~6
zhd~;2FaaYQ#s;Cs1Ux0a6Ss1KyGkFQw)*(^&-}AvGejLRX%^WiYLPV54$72*Hicg6
zRqCZQ(Ww9uLo_G3u`9o13yF8dC{GeY_ExnV#AC9f#4V~z8kFy~7d{QKqn;a2r=o5a
zo|h;R;KQN}Pm7hh)T(c6b#;lKPH(%am2^V(>A72J%ZG^rZTqYnX&{Z4WZw?#RLfL`
zR2?-vRkfVPkJm^PtjY3|#QW;07^=9Jql`)qvZOf*PDCAFS)z@qOZ3d4(5XVfk*qBB
zZwF0Dld}{__KlA$BUxjT5z-Li3)vynBGt7|obq9!>XX_gc_pGl5$d{?x+MG5mrrM0
zUYgQV(%L%7QYC}>AP$md5;i^#{MDA!$62L~ig6k05l%!qqHh_lRjsF-LbOcxIo`aw
zF{xuzc|tln1vN<yiDy0v7buh=&r5tH{^#OKy;m_M%K0R_2qj30$d-^4`{Dq#WTAqm
zYQ2dTs)r()*Nu!YCdy`^zB&$Hk3|Y5sx2i6uP^C7POI`ma!CAEsY9b8IV4-A(un*o
zJ<G;_zP$fL3suHCV@zbl>&8~cV=6&(pl7%H1)t2Q(n}N}S`h9kAE*}fT|efrqcv56
ziRyRK*2irhZU2cPcc-)3JK=M;`YIhMdZ++yWPRL<bg7i}aapA=VNbLrnNVe?zR&Yf
zrcMip0y7nD^;wSFCA~hr)b@1nFJGZio$XVtPkp(eR>`VT4bo>-JL_XYbicc|%tlS(
z0MT8QUkC6j#;AxpYP-I1P}wYCREJBQee{i<e4Z+`s@&g>rz%D26B^gwaX_^dbsmZ$
z+C=!m6hJ0`{9^_)*jwI;3;z<A*sWfQ<Y0Vce|)3y;YA#)^Ce^<h?7+AuUu6ldSA^r
z(BaM*z!2n-)>B{Y(F*yz|BeHyhLKNDC5e0>(cTv)tCUr(P6^s18}5@6m8U)%Uf*`8
z*4%~iZq!iijBkWwXUH<pJ!!%1aZ7#exSijs)ge2m@CVdSS13kfCOx6H5<v&mN2jQI
z{I`7YNmYG)FHv+O3z*fn*u)dx$O${LGSnw=RE<;AXz%tp8F>T3m~=vo8&tmda8E@G
zG=n3mkr%on+WcF*>-R~%ON}dhvnVw(siQ&$=yAJMRDC~19ppFFISq}9MoGSk@V?U{
z{V($88|N_ebh{6{Er$Htar*dkHyf!+Cq405Vv2sK7oYCC6q`vUh(Z*X(G!w9pC>7U
z45|?kd2MeAdsC$(MQv(q;VVz|)hLGa%!zV7{8Wn9=L$tDw^R4_GXKDN1xuCUq-)fV
zDkbFoRqIO{N3o<2JGHbglB}bGDxLpH8hjR(?5`6Z$By43XcJjS8iP-EecX&yXhq)1
z{a<m8>~XHrw(7;Gb#*jO^rYsgemWO-<awz_HJ@~cC_phPc|X#T3Ou9ePSrn^m-YP{
zMWSSF33ngA)OeR9{Z6@7NAKg^-_uDMeZ4so&6LtHUrB-&pcy6k13POAh*PfPZ}$^;
zEt0S*1m?7g;?q^tdJ>Pw;;TGVsX(}rJtKMbMT0(%t;z(==$y)P9|zSa==Slu&?;FW
zk_ewvPz>+0SH3p?nF54~+LIas(Y-I;ovGmAYm=U+JoI5$7xSsleD*-CM`OR6-J!B1
z`>KZ^JuXmM_SN>yt$k(4+x<1(R<WY8s<zOI&wn>sviMVO&D(sV_thmm^vxW6l%>81
zUv)-B*Com<-GDU%^2aH_LY<kY((7yM@8wR7ipbO4Zf&R)8V~hM{i!oFnsF122#-5$
z5K)s#)5^!4en-`!f3VZ&kJ|A0dNuy6i^o;zRq-NT<#^{?G0MpQ_dfr73B41yzs^1W
zPSQxiR4Mvj<{3nl|1{H}=$v%6zSgOd;?qpxq)!&qwFHW0>dLG9QdfG_C|O-)^I@&l
zR;|h3#q$(xQj0WB-|UR!!8g}aqo>>D(--p*o+M`xNY!~LwM7<c27bvx)sO7*pf@BX
zMJP`cC(m5Bo<-J9U8zuGVpaB3$*iLR%>c;%&~HA<Q(r27iIP;>dDqs-?hv-rBc&>C
zB#+sOzW8R1zW#h8P_dYzv`l`V;@`Sa5uJ%gcbkK|@Pu$v<3(RTx6@gjpAn6yUD8$Z
zv?|3_z447)wXJTi?sV~54Vqj1lXm_udZPALCwu9@iAM7uqUqb_78F^jy8=W<nzNBy
zk`1Wy)5JNFIMpxR-2>k4^L!DVk0zumZv01msc}_ZoEN9a$n9}={h3fCdd^fNhWMwp
zp+*6;7U%QBWT|~?E$ZCU=Pz!L4^(L++4e~Y)uhq-<`6zfp^_>seV&}COnmf>%ExKn
zx>Q$%*MuucldnDBOz!sh@t;OrSF8RUrC#KAi;K6n`=9)fx-zHwVBbt#^#STg$cCyT
zR5h18G4Y<PBS`?w-AUtVbgH(Ima3~8#0m8YSq;*Wf0A~!)ftdBCuD*+p!Q9cb{g8C
zwG)!gY$Zynqq@)T*2RIU4AfDqethuX(pj~Rb-mo3(!>j&{qdDm*C75k?NMXWZnw$J
z-*Zs)-FL=LDktt1IZ=7lO8&!4$Qu=q6c8U&nYdd#M-oDkK-?znP&MwqS)(9ad^Dyt
zYqh7_rSR{1tlz#*y6Vpt{?1>j*5dyU>tBB_6L-#PGH=alQm`B2Tj%;udtJnB(kb%0
zWMPZI9o0to_*IUlwEjxcM7mYSgZi3wXVi0N6ixL=X4H6?<V^MScaDJOT^X2zB?JE?
zSP`0~5&lDPRexVA15t1y@<*W@?LE=ncm{rHCn^<tTuI6vc099VjVV@ng6Ej;k|d78
zQ)&?(`XQxzY6G8;A->OKV~|5_(;j<@ayJy^Q_vpOO<<#yJ`&I-^_Plz)b}vt(q3DF
zw;a`=QH;PnT@Oa7LEipSP>cGd@-zb_t^re|srdEvdOKFsvf3YErqU%2V^DF9MccG1
zN^Ol%@T9fQO!Vu+lXe6N(^vpL8pbtAM;tIBO4E}xT&LqV75xxBsb#{7u%%Vg6woAH
zNeAOOVW93Xs<fh6a~k@l5`%$Prh*0aM5CjUM7>Nrk439gpL!jt<f@nvO^C~cOI<7E
z|EX^k52F7_Z+o;}OXE+*f7G%nA%De#-k(TC8S0hV9)wh-JyDHzD^<BtsiShdPW}k%
zc=ST}(zxq*ULRkg{9k!+HyQA8m)auk5IvF=DrA6u3E&8|q~=h4k{*)pI4=d&HdW~+
zs`|>RG*s6vh=0SuO_lCydv}h4#x+WzSsm3?IunM(ed^J-E>g#1>XUHx;X^V@vgFf*
zI;xPC5hm0V@tW?a2hs$Rq*Tz9p82#;?Zd~%5lUTOt5olH`ueoRSI$?jZs+^27DA<w
zuWxF*ZtNr-L`xMz;<8GOe{MGt5#Rr14?hc*uLOJfx38IZMik^wVx34_<pBo3-ctNk
zh|l=R{`LdDwEI6vnR!eBhW1-M(<(*%H$rH=t_*V!iVo<#0kZJ4-#`%+ttEF>t|;=S
zxq>=^Lgd}~{!KD^R^L!cQfz;c(kH#;;KUWxR_6ve=#BPq)s-;fsyc^IXSC`JiG055
zQz$B-l~9VkeQ^}EMr)Gfebn{h5~T$B7+P(ln(8|dcC6eIcS?{)(W1I4Q-P<{p7Iah
zf8x79Cec|A_~27l>izmLoW2%R@-=WOl&|9+lxe^O3sh>dTdDW<Z<0XPj5Wu%ok94H
zvn8|QYiS!031wkeVr<RYU?H&`Li7%-BffJF$3!<0B&V0VV(^kwSJn-$S@d8%Sue1y
z59<ro_6NHMDk2`I7^+0Yh$i8+qoH8=Fo-{y*Wpl`3<&KA7{O6+L}PH;!8m+VI)P1u
zSWE^vrhp(sz8r;Z`B?m#27(rXFeCue!6ae>1DVSqMl&E1v)Fy?e)a&H%_`X(_8@zR
zJ<J}#_o(yOqijBVj6Kd4uqW6;wumieOW0EOB)(5w&YogVvuD_|Yz2FcJ<ncXE7^-|
z6<f_-VlT5-*c!H$tz)mU^?0pqBiqDYW1HFQ><zYsy~(z+ZR{<!oxRO=u$}B3whQ05
z?qPe`KE9gm#}~NovV-gpdyl=3?_H1JEQ~5v&5q&JjuY%8JH<}38g_=AW#`xj>^%FB
zU0@%vi|k|e3Hy{?VxO_g>~nkv{Ut{D75f@r$$rDWW#6&y*$?b0`;q;`erCV0U)eS0
z=SPQu%m&TrTix00CfD+Ad=SszS$qbs<WKT*`06)U>LDGGs-#af0h+d&4Vpcg10i!m
zezRNbA@(qQn-OL2V()E_w^!QN*k23PhMGeIL&HMbhDL^FhE5D!5xOh%v(T@@q%d7r
z<FJ4*OIT1?NLZ(^Az_oloNcPx9RKr>EZw{bJnU>WXI#g-^EjT#v-wQ)e}dOa&C&m1
z^namV|8qjF+0FLmcDvGljJ?-g`_Bj+7rG>LTj<5m%ijK*p#K)P`p@?E&u`wm`6s>@
z{{vXu`bXcP)4zX1H~zg3aR0w^Z#1}Zy!NLrJYPJaKD+$v<@KMBx%|xK$3MU4^3}_&
zE<bU(^6~?pJ#e|`a_;50%l*_+j9uDrY5S!Y8T;%}Tt9m0kxTANgD%B=%s)P(lz=uu
z`WWxYpXRUgll-cLGg+h%DO|$W+7iC6CaC{UijlfYgX-tp?OJLp^^_8EI*Rg7%0xSW
z`v0UM(h&5!8gfW-{2L_I3~7D|a=ZodxP$!;nf?J%zK#X3CXnonkn;~9KaC;7d-26~
zBX$p@ct2$CBS<aj(<{)ZPoYy6A&sAVrIAC!zEULeU1*vGn(>Vym-jI}tj-J2yZa%1
zbD(<<LN6YI<~^+F-h5~u>7E4bTL}GI1l?N<O?V6Xw^Y$Ue^{{NkXyz%m$-)eL4tK$
z&;5A=Zs11VkT>Ec-k9IRoA3Z`=1sYU2l8gTId8#(crb6ttvrO=xSfacFy4x{=52Ue
z-j28D9oV-#f=BWw9?iQ#E4uR@;7>2!oA=>;c|YDCR@9FV-~)LqG$xM6^8}vA2lF93
ziQmhI@?<`YbeN|@n=<(bK9Y~(qxl#<mXG7(`2=X3j!)(e$hni}@LZn9^Z8UhjTi7j
zUc_Czm`~?!Uc$?H1)swoWGDDT{9*nG&M7dmhI}5ASuO9x!+8o%<)yrg-C+ObX?!@J
z#3%A8JPZ1M&8zLdLi2wiTf!exEXjHPxMEd4g#9|lp5wducD{qZ!}s!id=Gz{@8rAq
zL4Jt8$KU6N`4RpuKgz3kH9y9W^E12#I(d?x;-~q3egHPDDPPHU;^YRhM>u5&Zlt|e
z!VV&}17-urudG%9(#9ZRD!h&KWxy+dX8>!w@Eg*#Uf6(iofphVU-iNYr0cyv?NK=b
z=o#cxg)K-od4WzZc+CqtkZ$(E??`b5lL9M|zTt%*kWzhurvYzzfpFRCg#e`6ywC*c
zTV7a=bh{S_7aAwQ^8o6bfKFE0>4l$>zT<_)NOyUG`rPe>y+~;c1SSC86Ep(AJ}Gby
z(*0hb{ttM8^4|5r$4H4c1RntodEo%k_W<t$$^eJGK)gBPg$krcz3?g0Dlg1HTJ434
zNRN5p6Qp$36v5|!6M$2IOMuf};7Dt{FcT@+M1rpXX94E`UjT?+1T>EGUYLdSLoZm6
zUho3R5si)D8vx-%<Ng{zI1$_jpfM2W0fZAl1Hflqcme5UFFb&h#z1gCfN&z14fxUv
zbC43=1eE~lkKjST6)%vy5KaUS0lxLZBS^pV!ox_v2apWT1zh#Qe55~m;ZdYN0Z4Wp
z1N`Cz3F)t1Sb+4J7ZxJ@%?nQ;CAlY91o*=XOOXEQg~dpP7l^m;g9?z0U-!b3NdM)9
zrATE!Enpeoh8O&i{@V)%q&K|)nc%p@sbEU~T!-r@^%+h+Vgy7RI<bUz0Ym`00=fZE
zj&}zP1W;ZqU=Ye{kj4Rq0|o%n0U5|Yh%^&0$(uJBsRQ}wn@<5`0VppUP~uHXk(L3<
zy#U$ga{!Qa0+MA8dBv$Rj6Vc`eBd-02K&r#%8Uy0kb*`8q~DzCoWwQg#GwcLG@uip
z25<(D0yqme2cZ5zOYWs32Muxh5aVg^<IPo|@klLH;1iJs0fJEmW0HEPz&j&_E)$S^
zNk>#5xsa+<;E*Nh0)X@cvL=130?Co|i3%i-(x)nrtZ4#N;E*3pTNOBDOtV1+vXPoS
zDsafH=70)hXG7)y<^oU9F$8#o{Dy1L&Ta-Y1rF~ag+3F&YcV^<YsWar_Si8-0<r;i
zjFkW$jbVw4VQEXTTlNrK1IRYm?JB_AF?*;AWK-;6Dj;@ecHmDyHq;K;A|P90j{$T+
z`_LnMFF<ePpGF$50-|wd2d@cmq7t*OQGqW(`kD%4??NGG1bit{jFEt3A~aA1oUFw{
zfe!&@5G)k95b)(lBURwQKQsf7iTtOLjsr}@^|MIP9|7Nul==YR1Tz*&eE|3lq|^t1
zLk>f!U9`vdBBizf9J~sBMg{&hQfe2#cOqS(0^fyn8vuFyAW~`zz~4nm&j1`e3cUz`
ztZ>Lz=p_|MzC%A#f#f~(GT=*;flh>e1^61*`*F08qyqWvFr5nI1H&4tKz=){i3;S;
z!va)bO_5qu;4dI;p#tI)78axe`P(qa1p&nuVbDDS^7&yyR3P6QHdzIVO~SGPPLz3-
zu{N-S1mxe^z<v?nBqa9dAr%k@F_{A}2KX@k+Xe+lpZV|Y6d?W9;3@vyJcv2%UH)+#
z;KUHnHopB79m;BV-N>#t<kuTXo<P3~4gF+It*NEo?tkslwrtw9am!{kO{!bwZ3$q%
zp#dDm)EI$R2qxiOFu@*#NpuFL%CuTA6%Kw5g6l;Hq*t)j2(LCHblC;hdITc<0o>yk
zFarV|`XhX9icr~(U=s&sA>hT4a0q6{V~SXa@N_nRj4$R-@#pzVd=rAlT?iUa@elat
z{2TrQzs9d)0;!c6OHDD243j!Youmj%N(NwBk}Rc56Q!wAv2>sGptMk0A+3@&NpDEo
zrQOoI(h2FT^pW(n^ovw0-PC9_2F*PhtH!R0&~(-G(Zp(!H5r;o8mDHOrb6?OX1->T
zW`$;zW~1h9Oizz$PH8^WT+)1{`Bw9bMrdR|$*+N5W4}PZmVRM=?foMBy7=|<8{n7d
zm*F?o&*7KrSLipxZ?@kfevAE{@_W&5jo)U!U494r4*MPRJLC6>-#32O{I2`m)atbN
zXsy~-+K$?2ZEtO?c8GSkcC>bqHb+~iE!EzqeMtM5cB%GR?aSH?+O67M+C$po+H=}Z
zwO6#iXgxYfXVjT>R$V(?XI)R-AYHO9LpNTRrJJfN(aq95sGF}_s(ViNl5V~34c*(i
zy}I{w$8=|OAL%aZzR~@p`$Jc&*XkSU&H5mHsJ@*(Qr}hIM_;CY7)RJdMGfkuCSBAd
z24CLdTUva^OyBU)MJ^qTgQF7YI=?6fXCRc$RLgcNDJv{g4(!Os$JO|ny8z#@XP0G_
z(&H|%y^8a3Toaw?pnTvyLur9N63%xN;4GRPl!}Ro>R#ZQg(D%H31x1V(rj$J10TWT
zK#ABXZXC)I>%DR1;=B534keGuMaRX*IkIqmje3*dPz%H+D4AKxZ(O#k)RBermrCQZ
z^4&OCC8q!%R^Q5W;6wm4kd@^?Z}G}+w)fiYa+GG()k#p1z*#PYST=qfr3nfu3Ab8H
zP!YgkN5I<Yy}9+&sWd#euF2fG%Q*F!+MaTqt6b;asy(ExaNZP$JFo6`@U1dQr8rZ?
znTxNE3-PHW4I1Y@AZG|FB&mqw(|E!^NohS_`Axc2KR+@veQ3Ulw@TAQC5ewpx;KC7
z)VeMyH>OLEB(><h3Js?!ztbQq&Y}W*?VO)AxE><O%F}!6nkZ0<*Dq4<x<H}9(E2&R
zGFiz@QEC<`zbW-fq$p2|l;47S`9%&onij_^<T;D#WkceU(I!p>BZ8zVq)5#xE6R1a
z%L)q|Wu*y4xvu*6scK1;A~7zdf~%y!fiM1V31NJ6dc7{($^*B8k-J`gYF({#rAUeT
zTSuJ?B_pFQqoiK-bfv+JdN~SC-MeID;ZP?WdZn-@dQhfPE)&czx$Qx0DY8b?8%_5Z
z93ulc!6_9)i&CZD2xWjHlm{c|7_~Abql_*`)RU3;E@kzpq>`s=nOb5LOhUP{LjA29
z%_wDf70U0Zy6iDZxluT+3a2&Xm&{bF`EEzl?`Eu0cb4)?2VRsYV~*=J_LeY@scUy;
z-6a+4GAOPvzeu$kIEby=tXp-am%;Rr^5Tq!>=JywUzDv>h>k%L6V)Tpk&~Yv)w5UE
zXeB$QJ7q^lb;F4iP%NA-q1;E4A&rUd)|C>ZYNk>)CYo$*V)r=J*2YGuCA*YXxFWNQ
zTy&&ZOt-i=oLlE~-pYuM=|0QpRtvxaD)~7$Oi8`K;bzK3N&XBa#Q`;HhEk`ftPo=<
zcNQtns2j?0(m8!~)s;f1PN~{;T{XI*PAOHIrVEGL?ZP2FXhdy^@|2PE>Zu@Bci%%P
zS_Yes8riOjBDI)GxL!nznCOIV-a^?p$OOgc19IiTAeE4ce~O77q|h^ZkV?-%Y7>Kc
zswI0UNqnr@pjt9MPJO0k#>cBg2B}4&m9D1XfFbo>;c#?(f_kTRoDfwOod_?cR!qcA
z*O(qrQOb#hb*F8NZ=W?@IYjXPcvzx(3?h4sf-N)lCMpplZe<s+0-21}y7l~+)Iw@0
zMPsdY0>YeEr9IMR=_`#N*0CcsLp3Ry37QhkNzIp<A2b31O0?e;zdXN1eyb3GtXIO1
zlYSSqLE3O_lr|p$#%%5L+E=s(wTHDQwIAym>Fm0Wy1u%Bx<uVjU8ZiFZkleH?s?rB
z-A3J82phi98}yC!f%>-k?)v`vM16)nTVJGi>u2g8&_AnRuYXOyMPH>qsXwFtR)5XE
zfqx7CQ2!485&m8MhxiZoAL~Ea-|1iCKihw<|Kt8I_^<Kb=)cSVJ^w2I6aJt0fA0US
z|BwE11J=OQAfQ2DgP;as4LUdI+h9P0p$$?RjBGHzL3RVzx>c*!uB%v8JiWZ4c>3z{
zwKk(D_&^L7u_88B43`V!f>?RD94p6uAP*M>D-CkD4AD-63)>;lRdf^G4$1B0aM_k2
zca^)@OrqJBKa0Mif0wIrGr3upc5+|2|Cb#_vz3PM(HDeSwAgp{`|tPlm(6n1k^Li4
zzD>tXgAxW8PM;F8DpkAo&Fc00g5Nt>*4j2%zi!OL<&%Ru#*CH?HlyXZ_(|8wYTnnz
zD(lY-zjpB5HCx^aky|}(iFNEe`N84Mr+2(tQTCdxz1~?cX3DT&)1qaImMsZdI&aA%
z^B$c)@8J-6k{qIac;2IP7d*V+;l*?3HEbg$$yV*WWsB!82{!J2(cpP}=_>s9Qj4W!
zODmREh>o?7H{bE1;d+{OkgjcQX=U2HRr6NPTiHTx>8a3;(#avU6?4lUDV<x=qOzvD
zr%W5GGo`+g{?h)Sx87WP_|UeZ>1#vY*{a<$C1ZVJaHqsk{koma{bZ`G%6+_eSkSmh
z(=$eneQirY$k@q75&Zi%VxaAUJZYG)IP{@I2e*+UhEBG=2l{sXWZRU98$%)tMvG{4
z=Gd`KwqdVmM^2lN+avgnGPYh;i?DoCBkmE+>_@`4*m`d2xA}vhBYU=fTJz4-oEJil
zzob1jW6-YF!E)e$*cjRW&yhdo*gh@za6-4B9_bUK`lN0@>Iz9J(GGa^izHzPHbz)Y
zmOoA$ynL<e>jO5}+FP}w-#+F%9c=WR3o{s(TWi<p$Lb$k`OtF@J}-adS=T)NMp}($
zwQiSw`F&5_xBPx_v37NHqosQNwi=sLSNK@PEccj6`{IL*HR6Pb(TR@o3GD@)+*zE~
z3iGOWzPKFp-RK|XULo>Rx*GX{MXV6R^+La?e`az{k}TPbo?a*A-^6pmeL{ANhs38R
zYg_3|meV@1;`#{fKplkb=FCxZSI&E3?h7qsi@2$c*NN2HhqWecTdVPy?q^ZG<oRW5
zmaS{Cta$nKCHMU*S2eHJi2%<sZGz4?v?wdVwpF)b;i~7?5QZCdqQcW#8>f>q<XSmJ
z)N1?d#LU`$T9ZX2iYTpJCx^*VTJcg~{aa&%!L)zV*7rXQI-Ij6Z>q~Z#W>Dj-aEOU
z)x38}mce{ua$o!`>17a27F2sKRr7DpeYsQEc6@nG<GD9bOskd$=&qf3|4$JaBswOD
zfwDuM6ekaqJIayo*?&t4k^3c!sb_RCKTbL?S_g@McSW#hFFNj*gXJc2o5=%XI)s?k
zJ@d-uEkP$n?@CA*Jw7S>m1*lLLyWzxxf`c%4>3km9(9$AmyU|&M~&-VT(x%HjMc@{
zE6R(fud0C7uM}FX=yg!e(dEhRw`OZsJ-=b~JHhX*n=)q9R7Y}l_Nq1IwrNweunxjw
z5r(b5T*x={*d8JDwl%eW7N<2%SL?o!r`_f0Zy9IxjIZsl76R+8S?pG$rRu=`s;ZHD
zh7B7zcG$23qpEEC{R*eAedCR_FK^iNN@;Fx$@FP9(Ebgb=r{a~++@UrvI)~dj7ioJ
zs5`=7^vpd`+fL_c=lNK>ueK=3W6{@!*M6!sRaSexuQoywoYq90QE1+M{p_iISuzVT
zI(KO?dzh0G+$X(C_|3M7Uvvv!TJZeSL84pF&*g@Lhq;D3LJpN=ZWt7tm<R)8yJdiC
zw&z9LjQbYtePQD+{}<Lhy=8BZXIp~aSe{FIXnN%*(MSXZeKFx&RFBMI0~7ZppWXE8
z@|RYHl=Ml>9D1MsC!)V)^0e39-Sft4TX$_L7&*2ecbv`i<dP*zm&|{1{&Jgf)`FAb
zxf9}{lSaYz9~>o~9j}*5<u|p3B1eDFPqyfUMGPciyL42(q%+nwlS9QKxv6LxAQ~Sr
zuRbTYw7fV^Yo6TSYF_=k;lNOXG0kvbhV@Z{QJ!r%wrAV>TZ^~%vl+EdJoeav$ATYv
z<l%?sKQVvde4A)3=V=$ueRBTNCzmc-+_1H1CGxZj7d^3PQP8qSmOT_=vLxtYE8EV@
z4q5ep_V}^q&VLeQeAb%foa`z{Fc_1I_MJZd>cL}2H;#=TT9`2mM){1+*v0UA8?DiD
zzg1@%E9V~+ZJ#h0MH>+*h?(1=V&~r6_u8sC4?i1X)OcnE%9$RcXewH2d+X#Rd6d@E
zQJ;{ny%Ap{9?)ODB6`Xfv_|=Jr{VV+jqy-I?XntiQg8IQujgrvMeZ`!jE5FH^)MP*
z8hBABFZN6k8R8-B0G+%+{zWT(Nq`L!EA&Dq!XT%Uv`dyPTD&Ca$$3lW8WpDzB8tU9
zi|}7s_3o#^`!5#AHe2mO@?6D*5W0`m7-y~8Fz3x+)0G9ErX(6Ji>QEY*Zs^hjB>}y
zDo^LC5!NFo#MBcS<LdHthATi(p1r$b)lZv@{NVL8&Gq{{jV)aa#>W>fT(B^B`IF0*
zEqZ*>V~gNWn=BFf-J)-haR4?u)22CQ-WOu@EK4w2qBE`l+h+UEeRq6&R{m<6yi7mZ
zHMVGUu*q_z>iEUW8Hf57xE{W*%w`;FIB2v?uo@@TT+h)b<Z0zR{h9*D%gHe3z1z!u
zZAQ1@A*-=wIke>m@!HZCmcO?6*%pgtKRtEntRLjpnwvxb-zx$%LTjviUp(^uGxQU1
z__#<uF2d;7C~x%qag;9<moy7Ke`Huqo!1$*d4_3>yyl!I@tnqZa<Rd9FSIS9+W4?|
z>Ii?z^Qq=3@s!2$>5<w`btdpWzx;Y$h4Jl!73(SjK0Rubd;NK_+;~d3PZ_tZe${$h
zL@hUnuTFw!b9QQ<m^bf<N8wDSo~)g!GnIQLR~x^2z3P-LOP4dhVEUxw0oC1ujj|4g
z(o${Y-+QKNjEFgw%i&^~w%>~ec^SlHmG*#crC6mkR$sSP7_X-#7{#NNM^lcALDl6)
zMPRkD#QJ-U@s$N9JjYKMH|ut+H69cf5AwZ7MW3S@G14erDK!}PieY=dI>^N;WW^cH
z*cJ#la@_dc+3$>j>#XLTGV$7zSuI)~=fbbXsNJuF&E6^7aACBpv0CIz@utYsi3S^u
z(+wtm@SNBQVvR7!Cw0bhaiUtRs5T122g1NbA_RxiGB#EypI}(hV+WL7t@oAvDJ*|t
z6%&j8SYv&jc1LNk{}smPb1eMP#_D>kVe0VO5o^$c_O%9CX@wOFqHl6q3f-%05MoUi
zOP*DnHa)QBd6Lr(-DytybLX)`$JvLR_SZh*w6lf<-_Nmy#__HVZS*=gUc{mIZAuue
z!LL<zX0f3B0K+yvt=!}Pg^aciUcf>-$D2FYQosr~7Syp`j-_#0O<%yU^G{3WxL&60
z-A$$)V_G10GAxaAtXxlJ_}dk<y|6{u1YN}NiVoiRq0O;;hSw7CW)apzvA#}A=2&??
z%&-*7fyp!to6cDo$IA({qP$JnGk#0Uc5~Vgc$d?51Xk2%`>{v-@JbPXj$u(5OP*Nn
z#p*AP>*uQ(f0^+$jAOy~CC1k>{wm|IGro@T^|UI_H){BsjK9J8R$7?n+h|Fizs0c7
zjx~6`Q^M*y-^chNS_0=EG5$W|2WW|%AECu{{vP9pv9hkg;r`e^!bUtlrJ+UTk7+rX
zpXdBC<DW8qf$@usf5P}B#=m9!3&uZV{3_$0GybK-zi0dk=if2@3*$d9evR=TIscvU
zpBev^@jtOt&A80?AGGa+H^T7eVDQ&WBus9u)5a6_p|GlrT_{P*qy|jlOwur^5tIBF
z{vd{=<I+7$@@JBfNdZhUF{vSw8Z)U0!^<p^nMoEVwV{nGDUi0Qq-L~nCE1x|#f}x1
zLbw!0uc}F*OlrlXPF!lsrH)LBVp4l9MKGx|lcJdv$?!@H-iDF7NZ8+!dNHXllj51w
zlSu=a)EgUu8mSMH`Y~w`llpThflIMWieu7XNlIo?3X|^TQU=3cmXL-s{A~m&l}qVN
z8cA=)NMo5ahDjrsG>S>%m^6V&lbJN0NiHT$Vp2YnCNliVAj!d`EJ?~`QVx@*F)5Ep
zg$#erK`LNU36qMLRLmqdlggMho&MC2REj^M1R~-cJRJmVEmY`pEUw?gn<+#1b9@Wl
zv$!U;!lJlKdKUA;T1_KmZdjpNi3RHy{Elg}G532_dr{X$H&~aX%=M<}w(CB@%x;l>
zuYVK&ss7J4Xwo3R!Tk+3HaOPc3xmdxV$>M}jOE6MjH`|7jfairjo%ypXec%GZ`ib9
ze#7#Hvm0(})VNVdqliWW8l^Ov)#%YiyBZyCRMY5Jlfl%{lwry>xlNCozA#;DY;J68
z+^KP5<Kc~6jh}4%LgNki(*u@!Z1)u2bLgJS_x#qx*rY>~(M<}Qyw&7jlM?}90X+le
z2W$#BY;IwGz`WSJ$9%#3M^nG10Zl`jCO3Vs=|`54mTb#(%WTUk%Vx`NOSR?4z;=PX
z1Cs+M237`c3Oo>aF7W$iO`8pCHm}*0=7XDm*!+5nb}d%4xDpf-R2j4&=*6IqgRTT!
z4R!`E4&EC4Vaqlx+qHbO<&Ku;t!=G^)*9<I>+c~UA?-t+2-y{KCgfkXINQ^<D%-Di
zi@k?^nB8rEHk5_V4}Br@#n3~cUxfvSbq~8gY)ja&u%E+zZFOI(g{@v}b*$B;)={nd
zwC>k>QtOqix3zx1^~bH{HVxY}Z_}pD;5H-LOl>o}&690bx7plgPn)VX=i6Ls^Ltxu
z+oo+hwoPk0q3!)`A8qSt`>%FQ+I4If+iqIBjqUy0hqMoGKdAlv?H9IR+5YwR``Vvv
z|3mxQ4u%fV9VT~}(&2E23mty!Xz19!W8aR$J1**Yvs05!)=phIjqJ3r)7za+b-EUA
z4(}a4CcHTO?Ql;-NJL!3sEDG7M<ZT}I2vh*>>N2Pa%^O7<Rg*qMSd9hV`oEWd*{BL
zQ#w03FYLUc^Onw4oj>b*HOeo_9@RT4GpamlN!0eJ<553G+oJQLH%A|cJ`?>zOoNz^
znCO_qm{BnWF^|SP6SF0zs!Pi*;a%dojOvozWk#2|U2b-b>pHpX{atr-{k2=eZc*Km
zx=ri0qT7}3_jHfzKE8Wp_ZPY!>S5^7yT_0o6MAgyak<A&J*A$_dUovDzh_F%te)jP
zm-XDy^H|UGJ-_SuXRn66!g_V@b#JedUS+*1dd=+hTCcsm&h>84JGggd?_+(&_o?pN
zvTsP=$NPTL&)9EdzuEoX?cb!oxqrxj-2;vfI5ptI0apjq4s0~A&A{#hlLk&0SUK?V
zfy)PO8n}Dl@qx9mjbq!z_KD4oEs9+ndoflFiXXIM(3LoCT-&&N<KB(?DqbHyKK_yT
z_3>2+jS{9MJd^NCVyncFiSrZpCVn;8JUDi+d+?sYH<LFHi>@`B`Wq0Ei0`Y#qyrVJ
z0u<+K{zR;+v<Umf-$lHL8zvfeK4aVWZr<zZ!^W>oeLj6j3-i^H`rVIipZ)rb;mOTk
z%Rf<bHgjwDr@OY;UN(7WPt2tvBIHn;`4c(l^Y)@eNVQ+zA?L3CeEjSupH&U$*y-Lu
zy=|t91t+gJs<_|qd!VP=N%?2-yiTysv={U;>!lSt66D|X12eP(^yd$1P4e%n%lQvA
znjZpd#3#Drd$ou4_m0tuFDdGk|IjCm(x&N8?AMxRBw9Z^D|VdKh!3tW4Kr-Hv9hC~
z&?=TkTHma_9By6YG>COI8c}e4X$M1(e@9q)SRb^CD9^bL2D#n8W4c(EuPzrItHqnu
z!d8JW>)Vr>-_c`7k)jjb4-3C<uZ_4S_pxCvYfI3H=W6eJ#o8lnh;tyO)~50Dz2zc<
z0y{Chf`5(a?>UV)021Ew#gC%D=+@^CxmjY4t1#at77*J1*6M3s*NS3&{`#$jXM-QE
zwq#6MVfgw`ANd|RaMZvEo9P+r@u7wq&s>d1M}v_cxv|tT#JX6`)oaAtkyg2D?K#U3
zgOC;+oKWrw-YXIxwR)UYW@fHfQF*VmHnKL>a#UyD?dk2%PcVpMwZB<13`ZA;9&%*4
zXn4?*hT@Hn-d^~5wXi1{g;BR6-C7%cefit`>=DgbPnzY3r}q@y1cOO9ZZ#v=UJ<?k
zQRz|h19O%c%(Lf&8*nw&S|q=5uhqPA&W0P~si_C%q+8|3J&Aio#{~xSw<5)pX!-2$
z?n?&>-k7|?X8r}WzJ1o3jfqm>RD=AeC+&dvXdf5Lsx;fsu~>gV&eg4WWBr=_oBS{C
zesk;DpbP1{2J{{`IsJi<edXF+Ppx}-SMd9*vs|O5Pj|R%UDHyX_8^n|gIxBn*ZI#i
znx8$ArN%QULHF<1{gl+SOB_A5#QMEBYVk}xMG^Ea&+>|wDgp%aq?jj*&%`?xF+d)$
zYnMDg#A?l}#X!-2%szR5JP^}H<P8`*PQ=Rn<w0`n{xMn;G)ey90W61Htq3?P0y>^G
zpBBx;2+PyDjpCqI6voMgdh_MYwM#9J8{`?D1hHyCMZl?=n{3(~ye5=5hnb6yTu-x@
zw><x(_3OYFp0t|ILLMhqi^QX1WCefEb4nvR1fD``leHpDS0GQ;dT;!7PgQH>2D(>8
zqE<B4J#|zo-=o_gMrsG^3gwYnIZU^{?nbA3Fhwi$x?(v|D>u|tCR3FQ)fT04n9hZ4
zQ+Wr`DY@EF{!;n%*44=(Ea0<qzn&5P=U%Xy7t9gQbQo_ncbfC1UidwA;grw?i5B+v
z!?%R=+|>V#vq498Z^2?&fwEXO>tOoZy`O4fZZ_xRc)fY(oW6QlGiPXG?;zRm=jb1E
zLOv}xKdwhmkBrG!IoqbLoSB2?tQmYJ?Z--glUQGAHSZr}HQ&rPgqZg$>m(uX`_UBI
zX1?j0MdJxgq(e;GDys|2uZL6x>^iaHgvdCt_k{UvF|X3{@#WV~RoTq5FGOj-(8-NO
zyKN_)IkNbj7D>AK?gz)0PQY~N-sYG0A9(kJpf840MRgvO*?Hu;$wvo<nBQ)fJ~*{)
zkgWSCRx}7P?|bKZN6Ue?bB9lKI^rF+QB{Ro-w4|O=H~Z8rq%vnF~8k2b^pa<yWjcd
zkd4-zwB~)o#|_O-4>r|y%r)>+H5%eBcx#f^ULRk<FQ3+kEIH6}QdjhL6c!O?1c}lg
zM7P)94jG~w(kDr7Ddz>rc}Hc_(LN#GDk9~y=7dt^=*LHeN#q5Iyd=?b$j7Mi`s5$v
zZgOdmJR?eORWv!o)bA$$o&?J>hlx=YTs(mO_Ia$9Q=JdKo&4pnLl>6(wz>2~`)ToG
zS6<QzzeL$j|9sE*JsmfdCjFX!e%|nmp<ND5KJm@QkF|=TaPiJrjfX>7#Q0P4crh_f
zo+ytUEXK;?&+1H>);WgSW)IA^K0v~4rtvNCI5cvg-zlBPdi@e4(ey%+m7hN+E}z$k
zQ!tDpc8RH2dK-`~GUTE1sEJr4Z!5>WC#Q;`SRW6XikWIVVO|HNvy0}h$&qp!+2V$_
z*=;8IB}^x4wq*%(faqCc-XeMi)?81Us575VDjQXv5NzI(C5(F0`~@dH7pu8v{5j2s
zfu2bxYc0CxzdXP9<Nf}>9RKsUXc{Dpy+4veWMhw{UgaTGF73$|cD(a_@YRFE2SoQC
z*)`49cCf5TkmG_(vn!8_O~=II;{l#N=O%st<FySVXey*HM1yZ8o*c9u=Ih{w%}1+(
z@D~@)$o{e+AvU%s<hWbAd-cvEUj?76n$WL*=9r$goT0mP=5K#Fn9(hA;G~#dqqlvY
zZ@afx+j(<UoM;(rx(^CJ{D=qa@)&D09wWTZ@IQ`(dPX^PwSKil+8pt%{)nHvP$#g&
zpf#<jJR+`~5W_IW2R_h<D&W-ZTgXKN5!B|2e9v&aQZw1MP0ZJd1J$xemoDEtJX5=2
z?U5~?1%FpPpmS8ezG0n5y}omTZOUk^<Mq$S3vIAz7D9m!s>H?$e*CmJcTywvqE*wc
zzldgkcK%b=#}6-^l5cxS7}1GEwAku@P%lp$Ek|KzU|f(KaZxsih>-c!mgt1jUw?P<
z)VDt!9UKuoG_jM-)M|D4^`=L-=m!tnFR(`Ugc!J9JR?Sl690E<d!&kQ^k8nmWZChU
z?D99w0~*KP5p$~p&YzodMl3lq<(&DNcn`QVzj{R&z8HNz_EnqtYW3O;hYtr`?eUqc
zm9;&3bWD3K?eO#v^R>9*Q3JZd%3O^S%|pyrJw5&UkKKLZqj&e5J^Sw1eo14;^|zU?
z$=Cg2hP?mdrK+>veODFNv%`?#F*ehz<>lhFL*k=qe*C032c1bkpA+|qFfmDt3lb57
zghB2k2exU8)pG6E?S=l_;a7HS4w)r4vdb;x;B0@P7n?2ZQ)<5Z`q-HtzOIRnju?`F
zJsN0-2oR6Wwu<YPNJFjO?{O&1Ol;;nAp!!hs5JaI-1cRmRUVs9XVpGvDKO-2bZ-es
zE1ry{E+}C`&+sKyPnBqBIi;_)iq0N@_N2acs+_J((xbr4li!?#L-RC;L!%`jx!msw
zYhAr6%Lx<~>DnQBk5%qmYn7v^URUy2n~n$UIB|izmheAoF2MS9f6LjIb)u(8n<wIf
zei?WP1}UUx7g-x}Lif?3_ka3&&&Z+JI+D{KmD7XFzi*bap!p)Dvg((kqYjFtM`u@v
z$f|(7Cw@LFa`p?`5%U`dJgq7%yLT^n>J8g-C$yEhX^)HxmXkt3f@qP11-xLaL$(u*
z`a;$Hv%6)wX1%y+$$}@JSPBWgUz@Bme|X@5p4zH8j?Ke^Wqq71b!=Z9cj?gEukD8*
zym4T{@=b*YgRh+X18oeJTZ)GAD0ws%{yWQVdAf*_1H=d$nwTj{E$O-2PhQ+{>cidJ
zCnxn8KP16s8gAf6JX<xMR|8uaURzKtUOp-wtq%CTMjShyb=>^>?=ajq(!>*bF>v26
z-~W*I{(u*4X3vQ=JNBOmx-#Y)xhL3v*dn(PkBYun#9Et@J|JT(qC)fUJLS(Ta=Lg~
zMC(MWHxgrq79`7hn`t9VVGRPr+RBdB<5-?MQ;l%5_MArTXpG^B8%->71J9XE!*DA_
z$T8NjuneElYB$~1h)>1L6Y@;#;e2zlHbQ55z(5O(X4rt*N=pZ;=^{#hc0wGYDE508
zk`;k-4f5wtTM^IF8gtjhSV;Q~dYD())3D)bYp%6kG`_|vhA%IFEyarQdq&roXIvi^
zcs(seFBjJ?nmc>m?76dB%zbv=vvZ%73q6aPr_zp9v2Lq=$?T=Gm(2Dz?-Ubj?-$cN
z_b*-X<cg&$S~&FP8MVcF(>G6Bg#ap713Ozy_gM+iQ0ofdxt#*;x@dblMcdtu2+eoD
zj`)qD?d1ry<zHU0_Db=F+G^#4JD*wortST1yWbf8x%Pa`dZ-->y6bK$W*>LmZtYnS
zH73nA>BN}aT?yJ*uBi`Y2b*Y(6}Vu5_4mMNt7!)K<egFMtL$iS!h|(C$;A?o?)>#e
z_ZdtNTM=4{Z*l)^rKPoDU5WLeXPrju4&0{`4`bI8n`(V(Uz%I-Ncr6I7LTl+yZVt;
za-8R-=Gf;HQ&IT3LnG1y+gV4KSa*0_8c$l_d7bR=_={oU6Kt8vt>u^HcH(8M&WjZJ
z8+n3!L;HbFbP?}qO^Zsb%4}v`U=Qmv5GTwOY66E?<=Jvz_4UcsT<C$79?^nuR?D{Q
zlZCBXc4CS7mUD&;2(+Bi)q34?UB!{8_yV3?za%@8h3&><*_I6Ra$Wlc0@j~Blg*Po
z_ltj9&g$e5;u>unWXRXFXLSgWW5n}XQ%^bJ0v5KP)I238SUgW&sC`mrdeE?1EYyf`
zBMqhj)|FQA3|YJTJxv3>JJNgFSVtp#TWAfy)M?#0NYO!<-KH15#}0bmo<GS=$Bdkw
zJJp7L39Q<iXWWRZ(VKU^qj$Zw1(T;a)t1qtHtlxV#A5wxFYeh{9sK?7K`_q&<NLzz
z$jz1Yb}TAu#8Z`>4Bmb)&0SYx-nrgjo-vD-sC#@ICYpsTt1h>u8Ti3R4Pry3#cq(_
zSZ&padp(&04W>y}nj5dLF<%w4<$R0VYW~EtAVF`w+TQSxfqy;Ks`)x_vSD>1wkE#|
z`1qUNFBr_fz_Qj_23pPE=GE2?hUU$)(!)=bhckp(c_=rzQDZTe4zrrysy#Ku&;~7F
z0yzb7;vbmyLVdpvtiXh87Gj>s`$kt2g=W(K<~`TrVG6$03BLhn+9!?5o9qhNQ<S-W
zL~zE~vaEc}zV|A7KOgALdoFH0a`A`fdctC#z}~U`;#;RKD7U7E43%pQ<_n$<feD~O
zw$*%LsMYj{buDD8(h_DJuS{#7Fi@u(&tc>=rEUD>RWZOjrFCMmhMwL@xG~W?p*3H<
zHKomTtT0?TNK@M8BL~3;j;%yXDh)4))s>d&t!v-hY?GJhYc^@kJFoWvF)vKeugiCA
z96}rHb_BHjFLe}wwnf#J$T4R{bD=wM<?DU>N-{Uv<c0dF#Z$)J8*GyAUp<cyG#~vs
z&|x({`}8TT`DmfRy#8#0-sIhL;_8-@m|YoemFHKU@Pt4?8bHpADlJ_NLtY(oF2pnv
z0+?tBxQs0<ux^H@bzlv)m#_t4-r3e*k|pBHHcuaos0iGHeQ{;iTW%!(GI!?O`{q`(
zn7eB3^K)0q_lRGb$LYL#U&_W;vFIJx&1&8fWso&$8@)B#0zcGU6ERP}@YM59uWYet
z^ffs~`=L&b6)W*J$m7tdXgQ>E=7aamnb~5_$_JmXTp2Awn!^ZmlONZbIy(rFVH(j%
z9@zye0=!22NxE-%*&y1SML7I9l=rZ{-y-M1?}HBM#XVWCBrXX#y=>d7q5<yBr@w#m
z;75x>4(nyV`2z;Z5kX`0LkcHN2zfMpvF@D>6YjN*)|<D;5g!f|e)BQ)_yKQSYga2%
z=vtGd2G<EX6T0e#u6B}r@muuac@Yt`Pk(&FJMV-ne(zD;gu)#sZF}`1V!(OXZ&8T(
zbejI7`EO>12W9Bx2HRYx9}Y>JmsKL)gZpr2W<T_@OKdp#=*fVq+dP5WU>de~hKdcA
zMOJh1a|ZL4Q|FQ|1;a@T{dZhUco7=;#2^ExYPX68H{P(cGVEDB-{3jAp9|Mvp*gHM
z5_nE`R3vG|THP@@Nqa^omtAkBeQV{0x84a-cF#wR9X8?B>@71x_H4Hly4P*qyk-sd
z&)xa?CB@ThvY|HZ0qaJWbw`!whpK>@bK;2;Kxv=2I?B3shme*YKeF*?i#uN-=|-=a
zI3{kiRlT8oFK^@_IUrb`*aeFP8FJitd7v2nfNfM#x&iah9BasgLd*`QS%+JXXB)&s
zT8@$*#(GqY^_u|(p{bsI48C{CR`KGSPeKx}c;c>ain5wN=x#M%aT(0tiGDXWS>Q$8
zhD+bU?|<>4^$Xax4PKJ;ys;ae^<gU!>*tznFIu-j%%7_Fu(cuCAO_Q_mw9&ejpEi;
z+-@I<8?jcs^VmJ-LUI4wjb5#-1FV<6TWMYMqILRl%>MT?F(%HckluX%oYl40e6JMk
znbQVEFFtHIa(w1i@zC*{H&J@mYVj}6PeA>x1HgUPY9N2#z_qnM`6}%mNR{^Q7mfC>
zv~I%++u=FK&HD$6*F0w}=KXW(zwBT`KE3dO+5Vinyz^kL9QfM}y|3N<Xjg8oFfgK;
z49=ixg@I4f&i*d!?7OkEzi#K5rw(pkUEL!2745iLQwlSKqaEilrwQ14@%uv?3$vfM
z9b2P4?Mi)fK(O4bFTI1+^IW*lKVlo5^vwO*#mk?5;`!i>8%y2bXc1n-{QqeC4!|ak
z?C)L4l57bKScrgxB-05H0)&JX2)(z^d#|<uQ(Z8&aPI|UW5D#@2|a*;m}+8741|zQ
zxDXP;QF0u!&f56<y;;dNDR-B<|EKXj@6OJ=X>Z=VdGltLFRHs5c7&C6rwX1@5`sYl
zPnSpNS!3seWTomY>EY(BAB-0C%DuT^y*2R$a`=*sa8+(m+v1mqI@h|F@U$uMr_p1s
zl{E&U%4JW{glSeuJ9<e2kM1Y0n4c006Mq7-=f_;QegsATLP5an1DHBOf4^|tA(mD+
zgxcuS&XT~}D9?d5`m{6J=(ghs+6d#pF$V^O+YXEfeY@#tNtShSm8!1Q<#oYXv@##b
z>?~hhYb1yV^}lw#b?q%)zM-x>{X*rV03ey%TmD4r3rW57v%sG7?A)O2{45|lj~pF~
ze?{0{de)g!ZOC^e{wAy|p9Wio=Xua>2-{K7PpZW!ID{EX+POk1?47FUZeiGZYb<)!
zF*d}NpP=KQW#Ie}I7di*ud^x81IFAeEzNNVmyz{PSgthQ#OefU4ql(3HQo)=!^^(j
zAsY@9FVv)JcS{SQryePd_=Jrv5D&xl4{DAX(g@Q}pWb}<bC<$5nsx5cwAt-$5AC10
zjhJ-w{H0@u&wX@g>foW%CJ(oJHV9*FdR>?56!d0oz4C88_{5mag2P~sV;uKTcPH)C
zkxiev8?$?ZP?t@eJKEA>{4LBStA6<D&!_hIPg`TZzD;A?yWo@2dwQlJ*rT3}boCYu
zY#}!`%T2Dn@ob6BGdv-mg<W7r3cMcX&HBvo84C3DVGU_oesM#s@%x+k`#!yE&SXt5
z=!`$gZM6}HCVu#t`O5KY&mW$ewrGcK`^TC?qX%wlZIPRIf1~l++kG}ovKzl|KjhIe
zZQnpy?CN9l>>*dWUevcxymOnSflPMDl}xPK=NEs;4LUwyul@Lj^#@OzpS`!c9jx&7
zciDc?eD3(Rn_nFCTe89S(J{@wd4o<gu+)ER<eUArk3HpYpA_OdZMeD3wRxZU*gl!V
zJp9|6dktUw?mMH8ZVt4K7^j)M`_9B?mfP%(>CJt0He59y+Oz#^y6s2b&lU_Y&s?&2
z_A(4wquD~XQoPO9L&?S#nm)UD{>F{>FTVHQ(D%D{KR@&{yXS@?eWA!s-gtIH%}&bW
zOgHvuiVi(1N!8KKF?okhes4(KdQGm%?rc<<dY|Q7W#L!7zAR*^w`SZj{`#dn(NuUq
zQ&d~W3>Qxq+Kk0tA078zyHP&x*<<>rXpO(J%166*lZCG12LuEsr#S3B!!_aScSY{9
zu*%=xW9Ba>Tzh+$-B^5W<Ic-h%}mw)mhACH{r>WMHcz%X>?5|}JhNPWlq=r8z~0Db
zBd@ZWUG#FZhv0La|E7HiJ@id&1E{92WgLPQ<c#l)Ha2;xHeViT!eqL>ZeRAydD8-X
z{a_#pWItbJm-D~nxJ=ijH@oQ5em32?eC+d0_92@!gTf{+8E<Ljf998mTQB}CXSeUP
zEc?}MnokytI?~M|SMK=^bQ|8EbYdFd>QYo2BW;uO?9KBm@Vpx9BfCxKB`wpQl|L8>
z#j<p&SZk8nPtZXplN~lUY^SVY*_sK(?a#9mZT6JE%X5EbbF&X=Ai-f?a2@l4>(s41
zVLS87PvRjA@83ClC8UCYoA+*tOeIZ+(vSt1Sk_H>f%e0D8rJ=$Y}bDHH<&1ne@i2$
zcVlz46IyHJF5Ory?dW=_7|#uQQG&8*X^m0(rPi;*+UTW*tol`U@2Z${qbTd9x+suU
z2bDhg8XAMfjlO|3ZIuCC8jQC;9N+sZ*?={yMs4NBa-%2hST$xS`269A_D07Gx-w5o
z@%XEzH+x)p{=D$&gCDQ7X>-i}&ZL3un_HyeHQwy|)!oVVZ;$4G`@r(xlm2z<_8j=8
z-SZ?&)h=P)$Tg^v2Q;V!(4fBC4P(lf-q4`Fi>cIRd9n%0ngl3tq|0oW>2qDNCngA<
zteWOaUGXgWJxvdtTtfOB3i1#kq*<(^rV#Jgdzub9$y2UYjM<$=-i$!Q5?H@Mm#<xx
zEMQ}?n8dS>S)Pf_kt}48*;BqFcVc%m9ktA_*rJi!4`OZm$ZY{3>&jIyw+ducShLG=
zvul7l&p!I#u<I<ZknIW(PuyUSKUT99m<Npcl(l2M*^&;dhCFezeQ93}^NeDeZt`IB
z()i%GAlv2HV@@=)$dzRGH{@2b>g#uy(H?W%)M?21pPuAj`sL?ylbY7+*+<seJ+tMy
zpA-$f4lPW!`m$WtBxQe6+*!-kvr;*Q{iu<w*NcM(YgvZ;4|xmrhIulPy6^KFk_JlY
zqq4W@X3<y0D@(q*QIsiZw4T=>;d|YNu}}f)a6>I+gqe<PU%7glJ^hv@XyN=Yf6J(t
zL&xpxEUR(5cu(gib#(Hq!NUj4uw5CaVdABAAc#TctE_|kt*-a3(Ko<Oy35{|i~OOz
z><4zy80lU9aL0FcsYJIkZO`eQTb4&{u$|SdTI|1Sf@SddIc@C4rMkIMbH?~BOiv54
zjnp|dY<GN!nMzZ(?GkHy`KLTF=O&wg^_)BGfayBhu4Ue>*L3SYYU!dmwsnIw8@GS3
z=8Wa$&V}#VVZT0SLWYl}<69G&HT!t%{iA0#Y}js>-PW6i&)jqN!kNuEJC8d;cG%z4
zEnYZw;Z&qipKZ-&SM$Xag)9P+U+7|ezFXJv=O1V48&4hD!S4C4HG|K<3)#LK#sioU
z#p#Xn`df_~GW5m+v++L}|3~=^8r|E%CxTL6X~;YJ*7CTk(jHdLE9b_Kta`m0Om&lF
z47O9MYudki$KE}DduGj?@9XQcZQcQUaPdPEtNruenAzS<+j#JxhONeY^eNP^tSK8D
z#73DnbziKD2k{R|l;45wP*&Y)&uXKVpGtM048_`6LqdLzS)@A9l^QqhEB?vEd~|cL
zjOM_)SFT3(fj&a=E)b>VX#eG`yXhu7T<p_Zs*9zFggZl_yt*unHu_5$(A;&=Vm8yO
z1d9<Y8HUQNll&#71fFu7Vr}<2nWcF#Z*-CzOzXc){qiuYZI%|XDp%zypXqib?>f0_
z%kt&xZC7-wmiVulW*IR84cxk2|F5BfC{CTCKgot*>T)taF28L0;wSZ!)TZzEUnX0;
znX!KUiY=aTTnnE;z3hjz2a|ViJ8m)h@rjKwTkhe8sm?e|b+VPI&gq2wqACGgCwaMs
zbVw`5L6<aKD>p8wVq(ptq3N4eY)RizD}CXLh3Sjgo5e$GdT!C5kh&TD+2|Udqr9nl
z_78cb=}RpZw^m{$C0)}2w=noaxLp)(7Y~+ZJxQU~>zzh{9k@}TC;J{MVevU+jNZ8V
zkj3M>%g_?+QVoF1HRAQ}>+kl{lggBp6s5J-v!|H7)Pt`wd10+co-@9X-ry6L$B^V+
z%+oVZOk3*d7wEsB2~Ody;}q!RE#niZFAw%Df<2k1?^tpi^A~nH?CL0|fiH9(n1tOe
zG%k_m)sTb&`6O)E+g+2}LI1h6Kz``Z8uw@UPs*5Jk$pSM1JPN#eTroyzeC5<*X*&&
zy2B>u|0Y@aR*MrKI2P}*7w^z5@tF}i!Q#pGVWFY>Ro3Y$w>pI0XGfUnUf%KR2kd<g
z<c<Hva^=FdJ%{Yv40@Vly5;SWh5rbvU<KW|`E6O%vG>d#({0zLy?^*^i(IQU->-46
z39GeE-_*5V<L94T`!(LQvpFn6F`)g*lKYvjY)iCzzD3rc`I23oPu8IJ%f)uBXOvYQ
z3hUhJFj`KI4%iytb?h>$O~Pn@rjw?aX6V_d8Z$6%4wb%Q)kRn}<E=Upiw3Y$Uu4Bg
z*f)2wuEjb7VPPH$3g`zY_TC*^j~wvZHra0c<kFs_>(<(g2Ln?zBYmg6|DJj9!3Fzm
zSg|0yQ2CL)^rTSqLyp-vX|4X`-yX7R*IBhkBHQy=&Ayc4OglGi+`e`37JT`4;R62+
zOLo}h5P7(BVV#A@M-TwU@{2biz+y6%-vMLpu#-jllj03&k(zA_GkvCI6WB``7wHry
z$S*Z4l3h2kuJUy(vEyRbx$c8&0gR*t=<1Xc<o8RCyk$+s+!@k6>-kesVFI54vBl15
zFT`3>6tuA}(MMw`uh+$YUSz{ziz?hvOPVm#lY+B3d+bB^YbN=Qo!i&aVAS7!2(YtG
z+AS9~@<eUi>V(w^SqU2wHgCdymjv#+R{L~a&I9IQxp*pQ-d;N-<Xz*3WDm5+?{t!@
z$d-ln30nX6H6Lr^mnJM-Y7R&UObWD3Cohcj_RTlzvX<b~S4bOlf(5I2r%gpma-UuB
zq3)Sx_4MOrv(JC(4+iB{$O0d<FEoCks3XBmw=25EFPyr?MH{Uw1{(H`P#4NEawJri
zBd!**i!_%JF_%$Gi>{gqXXxZQOR`uc%|CUaSjBTrXu|Z$WJXg*mx=M(zELx)$9^rV
zy(yxhMy_^~Rnskh%4~~a<nS6hgf*-~SnL@F@`MQGB0Q%-eJ5*0(kp5hX1z|9(Oh?c
zrTlIJU&|Mi#eC!WbCOq$SN1^^dtIch4_-CKTA}fAav5o8QCb~68&~pzxD07cq;}*Z
zlTRyaSvZzVx)f$txRLeYPtc>pt+%4fykP$2w6G7ffLL7nl0*D!8CSkcwH~7A@4b9u
zf^{m)hA4$uB`+pe<?j^I$|###UnobWFFC-2zsVV4b&C9=r&Y1{W~&I{l$Y(m(aJm}
ze?t6H<yObKK>rbI5pI=g7OemiZSt}`!VS{1B#Jc(vFhsw>7{Yb;Pk*4Po)iiN8|(h
z`5$Tw*J~k3hq0Gx_5n?NNtAvZp^xEQ_ykMf6Y5c5uP5f|JsnoO{X9=}#GwbhD}COG
z2Z!X%D*dEp9lAm9yjwa*IvMdJQpsSoRyx?7eCJucm_Mn)4zeyIt%ve8Q?$KWlS<3q
zsnR;=YhAAYL>j7Q&>*#?C~|0ycojzBo#oJ0`kbRV_Yc~KYTubRa%7){dRLamHn)0i
z`mTVL6o_BnVBbK%D*VoL`OMnghwKHtbI$a<uGw}t>+~h_1;>XAkJ|F{N96YHr`b7e
z)VjfzL8AiaPP6yPA3d_5w`Rd)$CzQ}A*)7joo?&Z>)i1CYZ|{pIU$!U1#YkRx&8c?
zYoGu9$+eF4>-Oo~$nNQ&!AgIH53#Im(V?MMNnP>;)b*bAyDQ29#Tlj{8-D1;wv@E0
z4<fstC$gqgYu^-QHqx{4C7C?@#k_Ua1=pEh{^0AR^K!5~RH?>g!t>(KT^gwzp@H=@
zDuYd)h*`;-SJYBA)yRoGr~VEFxN~%mDH*JJMRD1F-n21;7wYAU()?xCHz<1Nvdu@x
zW1}l)@{Qk0)d&;xV;^igbN>Syd#u9_zi%t-?;EY_J8#^?e!$}mY4cBZ`jvMf4Cr<B
zEEv{i^+-{8wK>&*x%gIn>jph6(r8Kriw+QI@hSA0QThz)Io5(|Oc5v@>>17G<cyLK
z5-c4gSvp9xbdYT6AmP&ClrDEuHv#J>WW!#zYXY5JH@%v*q4;A<LYnH80Mb0_0EsVE
z&Hz$XqVdR*9th9}3MQyPSx1nr+!gDlrzj9#@WG4RTi?S!yPGw#_+=TkT2#K>Fb#Aj
zce1&4bMf7#dSx9}*<gXCSoSryx@+4PE58*NWFPQlDj4~ZUU7RNb1yWW!6H&97Lm?4
z7m=jeMYBd*i>sH^Sz_(P*PE6|ovwb&HIZ0zIxYE0Ii~!pegCP&Vpey#E)1+-d{ed&
zr8%rA8h=@jz4r0J&3pITjUf{;Av-OPIfIQZ_a8IE*#g%-m-()JF7I3aekBBakLY+d
z$hZ|2vA(;)m$6ht!>mI|CukGjw-)AsBaVwxIO1g@W1}Qb03lP1i+RvR&WW>*BVFVR
zi1tLrMTy1tdDMqLt<>K~b>?@~%TqZ6CGDk{d-Io{zD1wi)y-P`5-QDLBGdj($qh@X
zu;a%<BPcZQR{l-<f!}RF#Jc)XZO^$=#)8m2+i)7Ey(e5CyP121wFB<s6hHsUo(sF}
z+t+N%TAw}rWX-wLreRlF>pu|3MESKAO<+q>=S#UVs~Ke*KG$#3$c6f4MSV>lDbkj_
zFHq07FL^3sz$4z&y+HD<tfZ`MZrxRU7lmG?A5M%M>*{4Z8;k1`t+b^{S;l&dy>uYP
z5idPyJ@6a89{9L1BBCw}Zyk)YhJ9)*VRBKX3Ci7SAKm=k-b>qW%&Y+eNALgG)=O(F
zX_ecJRkbCSY^G)ViPrmQf?EM`)&YfzF7z<9!HAOmCgWF*1y*Ib(LwkXvTykltBFPb
zCtdYf(E4)>BmyCCZa)<k8lSMk-K--@E>qsV<&mE>*5AaIq7Sb!zdUy9Ds`PXXPMSz
zI515PXrP~HWo|DZ_T}FC$5~d1GV-N^9rD$WEV%$g9L*2NLz#^MYQt$}FoilQdk<rB
z6qZC;bU!_<ib@U1TOI}PNv>FyYkk<eAVpXwz&d9&R@!#nzt&P~{OTDks5X!v>Rh)i
z``j<ySqNjyhq`NS@<S-L9%?;DKrW&l<y>_wWP7ztor_J2Ikag}-d)I&bgbhL+5tIs
z(Re=_tHoMem0SE%*TYBCwQv7?tP9eR&R1G|4m~b>^nvj)o6Bb*-(Z-0JWnrcO7={!
zl1?4^@^MO#Cu|ZQNk3C2Dzc{dF=^E~Dn0t2KXpG=v*d{q5u*!6=PA7Z)hub{3W`x=
z>h(K?w=w&-QwN+~lF7rvf4I}X8nycD;?I>ReApOh6(g>kEmS|Hu7H8`%kB1+){?=x
z{tHG=ps|z(QkI^VTsiz>JL<y4eD!(z2FTq36*j3(FZqGSi(fewo0Q(YI2~xlOz2}a
z7WX~la}g79r@ZsyPwk*3f6BbO!Zddl$vIRZf4;g6p{WyfrRb8h305ptv}kUPF1|&j
zV8g*S6_b*2KpDvGP>d&}*Gk5<)xXOp;w-cbcOjbqNf(5-OmHrsvja7-iXQBcZ}4?=
zHoRn(2@B>Y9kgN|ZS{IkX!K9Q>>Yjw$qN=P5FN?JMT+Ot*Y%~UEdo-{Mc6<VN8MI7
zqTeFQiC3er4`@V^eP6b#7-b(H*1EpzQ5IuYthHz`nb^F3cBVC^q(%dMgIKGSPUhc#
zKRd-L50N7p=v$DKb|3j@Ujwu8ZtOGmIvWhln;b5m*Dz&wrVi?3_PWM1OMj74Zuatx
z%~o3cFN*D_$NK-yqF9nj>ziN(FciJ_A{ovj*}7+8r7~a7y1aa^fnNS+tkvsbq0d?4
zU9uN2eiHZctp@rmeOZeDr4LZTGV@^}tF2fSu$@~*bK4&_7Zd%XgtQZ8`yA`};<w0_
zGXo|%DbNNyEWC&}gqjU4?t?d2s{D@kd|35h1NjQb-J@SNr*%nMW}=El=f^&R0aS0F
zV|4}#N~f`&^c9wq9=K|*_gPj2bwfr$@@%TE5vajQSHl9x;K1|jjY8u?#Wdjy#C+V(
zD!)^Fs)7CiZEfY&L`EVvwhNs5cj<o8+{#{ueSC#vS-p)(*02C5u#{QtFUa6^Ol&_>
zCbriXS*5MTGbzRaBzK)M>a<$wC&!vjr0rX?WuyC%1KA&4GZ%&S_;;K4zbxKVbFgmM
zg1)a~Q}75UjU#>7TP$JML998+r?Yn-cVE9F^Wa%CyAF<pJ=;}>@jctdxyZpW+KGLu
zfbYaEcAo;($#+-6t!y~wGaX7~%oZXcu5PowC>!MKVoq@}4}2YC&ml-L7<w8(EZWS2
z(g1&JcAV9h7ULeVZG3?Lg$DS#<<k?iWm;S7ypnZ@;#%YDM&kTDjENP(NoK11U9W_@
zpp2XqLa{8~mu|gm*GBKeCUq$CH#v9z-_Ww*a*cQN@m8>3>U8OlDPefUZ8~ld4HX*m
znTdD3J|+GW^oMCfEVt2Wah6qA%(S`{%b@=dIcCYWC7-@{%#A_(&KiRRZV$3hAcK$~
z0Tv;P1(<{w105xqZpIUib<vufU7L@eGavBZ>_31065n}i=YL?s>zJwY{lg>OJ&~zr
zTr%hn`ubg_vatU`ReWoLzI@lo3@XBKNV2r+q%mcBXh}#jYgquPDe<BekYp*qLt;Vc
zB|Q)TOVuAsKjg#Ap7pzSm|Ev7`;e>+G)$ZE`E{oIa})bl&ZFQ~^*E2>_HV4}w{`uh
zKT}258pSOT!kp8!v%Xfj$vkVp63Hje3kEWlYgshAJIj1{(#B<vQm%aTm6@MiVQXwX
zIPt8{h45M<dufbeL-aGOcCupNI7p(Po!w+*Bc45X4O-{0H>}f1m<Z(322K|sJGy#j
zf5zUNGht1Ychl!tKU-2%1-gyY!f;CYBwIhyY7E(zt65!C1qzztv3=RFk}9jU13GDp
z!DVTlM80F^S&v<twL}_m)eCk!dnxvDnw6r;;*(PnQY@`8`53)+>VaU}`<=^T9{06Q
z2kWU^KuP+Z#n8sh_>4bxC*C8+QfA3Eh;Z(r*X8CxMrkUQM==4!Jct_s-XQY$Sgr|6
zKzUJ_RS_fG?Mg*ojke0IO751~7a=M;P=G&fKq##$s%$DK9^0D@lMl$I-pnK)z`+fm
zX{h@SKtS;cyT<xoWsP8{WCe!}4>KLw;atNA4O|#J+cGBV;Bose*rE-^b|dBAOunhT
zd+Yx9<VFN)=@iqZ2&*FNJSmJNoj?MH;2)%SUbQMAy=#5FbCn!I&s`tuU@{Om=3qr!
z?Aaqg?m6bbihO`@3<d&NEk7<`xg5wL>Nw3HyOi;!GF<vAUchBM&D{8OI)oi5Y2{j!
zk06QnN#XK1YXtK2h&|v_l3$2nx#A<h-NGSp)}aV+jP2q)D~MIW+}gQZA7MRB+6th_
zC4EIM!j-Zgi{^B<mh5w5P43@eBkd4>`}ZjBuai4;nB1~uhoh{6P4O_6$|LW0VohA;
zUka+bg)0bEI>{iX97q%j5Tl<1seVtX?scHpP{yPXr<@KBSYHo2gg(S1jUf*(<{%6i
zClv7MOgh<!-n+tvfhtrazFj`G@4G|x+xyO4!zm@se06Fwt?lcbPq4Pme96PU>%?A<
zwWVuE&Yexu7mOe@|96?FnXcp(V!pv=R(9i=oC7)EZ?`SB$^|;(Hx2b;biL<~nMiUW
z^hbRA81ZSI%k!Aehp?9AnPfiG^<;-CZRdj0B8cgYtbSH$7MG9)!hizCYbRRh%fbyN
z6%>?YN-(bx`so<lUk$^qab~{G8HlBD1|Co$99O7`>>#OezjZ3p<ja^=HnJ+mMsQW`
z0_g5S*rslZ#gV)THX2CibPK&}D_<U0ht)$md@tYO5&EOFk<a;BdY6hc8zrK*k_VNj
zPKo>$>}8#M>l9U+{3#H)_SV6c4jL~~VMHOnz4fc0Mikk8%zVGb%y$*CNFm8@HvF=>
zLC!<AdP7SC>B^F?7;F|w-)i@zZacAKTew46Ihwm_hGqCjtQ<iB*GC^^Ez_<agL0jj
zp^;yoialmQYkiMiG9TT&?ZA<FTYYBDSTNXbob=wI_s{x5AzxSO$S&dp3Y|Jf>bL?t
zXN=S1y5hll%NOBYTqMV`f!;5?<ThuG8=*;$Fk!4SPWq$KZli0kD=w0rAcp^0aME*f
zdtYF0US!D~mhW}@CVTG&R+er+dvt?^XqkP+#pXl&=FeJ)HG?zVird_TWxUb<`wzCC
zIlXsIOPl9HSetacaP0zHQs8wTJLKwoW_<ob4QUoxn_M`%=VIo^?yThnEi?~JwVPr#
zL~OCKHh6q457vh43Ei`wo1Q#6K7G+H+xDxPLt_TGOiyNJ`egaR@_y)$FSQwqRxDm(
zZZhO2ZA?F(-a{w5drHlr+Mk!djeu8vp@d^hh^f3}4z|_wb<XK?+4g~(H8Yn5EF5a-
z<MYwezwf?qEq9aeqI9yK$&OlZN7h-qd$+@epjww&GdKHU`Jm}joQTs!`x#~%%;VOV
z%o|;e*}8r$d&s&j2x&9El)XRgz;rfcjTNsmu~qFQt+Zkq)jBL+`X21Q$<4<Y_Y%WQ
zxkq>I+-wgzq6rFKxYXa`<G=cjoz>M{ImJ}pu!iO*Lr?ebHgddN&n8dSEex6(urzA(
zkeZn*Hl%OMc9$FJTAo^%W7|^Hz;qyM@{m3Y-tW@S&YJ3&xNiF%o2T>x#+Mqo_h|7K
z@-r8ZnT-~Kjm+`uTZ{Gbm-1GV@rmP2t5lcWH_@7~9j_?EPaHhQc*07{R1<raD?ig>
zrI?Mz4x`*sp*?LRdjU%*F`u=RbgY>gm2G16zP|SCx_#7c&FlTzPHARo-SgmwzIHZG
z+Mr|6%dzrUMebygd&wQKq7a8o7%g!E&tSVeSZa$CpmfJiUfue+<+H-s6A#+ucXgi6
z!?2AshuM`~tm8f&_p$MXqvAH!Umeb^sbh;v7wL^mz=qKm4(HK2qbB(7I2B+Ywn$_A
z)iH4EnaQ7FZEp=nc`Wxx4qKMvg`K2QKSEnFP|seIPxZB)D47LBFM+3IjMekeDm|;t
zQ)kQP0>5{~#AR=1;{A$CaUj);b2yNSc~1@Un>oO2l)XD&82+sdzVA}Jc2Iq+(r?JQ
zm~$N4Vn+g3PAc}ro=HVQIjPQlvAarUb+EF<O1L{XJ!KUZ+A^=O!8|yt!>zwgrP6^+
z#iNS{1km|cT`(G@E?l28=b8mi(h~UqP?(i$`w@ai`79mrUvxgrqd)G<qj$wN;CwB7
z{q@Gjozv*OG+91{V*JyAV!Y^#bG82IK-OP$Zl_;@<-)Qho-04*P0U+<WzChHS9atL
z%v*hB`ISjfY~@YD&6+E_F7E<#<W0hkV*zIZb`{uV=?7ELs<3tIR;^mMJ}fIJC@eJ4
zX2hxfErLwJS)uE)v$C?+hh_x_g~Ffpt`WQ{blrORtqaWxT)HeY$YvDX9rDW2rob$Y
zWc|9ZRY5_aVL>+bU5!9OoV9BGx={Fq!Oy4?I-lu8h_lxLNp|R(py1GuV4Kmcs!-gk
zMsU`$b!*qGCgi|D$lblY16!JcR=Y9?Jj=oYZIWLN%5?S`WIAM3FmNN&RjYO`9^Dei
zmr<_Q0SV<g$R_nnGzFn3NO4^@Fb6LSMT*|;j$&gcyiicDqq0+IWSiGV)+)k4^?_`3
z)(CROXaruie$ATIge5pI6j)fFctTBu;h}?hrX4DwWe{o=Nv?vwQma824vM6#08t)X
zsFw9bb1{#n4akckS6d^;=!@S1Gq{6Y+gH>#Yg_^8(w=QOJ|UOg$x*gc*BGjomxU$i
z!_Wix)@$?tIT)L|hvj;);42sfHnQLv*tR_hySC%P)?(gl?P67k&r?o7&+3>%rvNp_
z>dv6B0eblyQhb>!KFU`=s*$ht*QX)DrJOdsazK;6u%Tg~xJMwkUqEk<KyJUZ)5{5&
zOIW8(`sIVH@*=i#wUzCp%uD~k0Z2Ua7<0<A&kmI3e;}|gV_TB+YpfNrFIjRK>IC^$
zvtWwqIvPy-M@NInacs+4E8Fr)!Ppim8S4~KRyekWN>@}%DI2hsm5#!8_%JAdwa?*Y
z{17|XwxE#5P{<Ea$lEC7=Tt~(&?Y_GhB6Mpj*e2{kVC-6$}U*rbx7e1XP(TrcGolQ
zA&qD1ZE35xOWLZwd)vewG5J(ujUzS1kzvV5&df}*pI~8{#MH#p6mv$@%FvkT`1oj>
z?3kblj|+=)m?P3+*F@T$j=^zzk6<D-Xb0rF!D?v(8`VKy9G$7@sFR{IXV&Yhx0R<O
z9k^}EN?Vzc5}z8MYM%i7nQ^h1%Pq@e9FA!F*v2w4F>DwE#)e}wA(2tB5oX7#xRr4>
zhGgSYQ{z*xkUeCf)m5ljHE=3gT8bSTnk$})hBMUS<7~2KTBZ~Z<yR(73`24M@MyKD
z6dbK)QF3@0HSxu5Q%Y)LVyd0t#H*D_tCBL!=~2lcD{Ku<vtssWSg!m?md8HUWJbqO
zzGEGZIQs-SOcNg+A01;}o)(@3V@lM;3DgDK#YUM1TW9`5igsvVVHfQ<@VvFPJS}P0
zZBuTp475*A2kR58p;6=Xryip&ceAha#1lnF)zYtQR7X0k4F($fpK0FIOLpz7hE%2U
zkfLaiUhh0Ln<;lPrKhE&BhR*3*64`X*a%yLSsH1(?%6C&Y<fBl%S=m6U6C4_5}j_B
zZ8&5tIz1{SA|fg#x>9}FD&sjKHYVB}nHrszx*|DwrS0i{4b)8y_iK{FBWLLu1&K&a
zi%G{I*I@@8qV~f-pk|fairetwvC~vM`Lt3z3L=$a_EAcK<TJ%>I_TxoL=Wt=lOEXY
z($bTlN-43RRETg00Z?5_iHI^$(kU1(ag3KZ#$vY&Qz6TPE!EDKp1^g9<GQ5aVrS^(
zP3#f5$NJ?-V}YtbUGy4T7G#xAN@IH$uVy8@%2HF3Q`2p4>pkxkdF6@Hglp=en(PZx
zbYyI7xV`agjnt~R#{fw!KOc$Ob>Wf@6{w{{u<9xvE1%Ty7GNdPYG{}{L;SX15m}FG
zQl)EZ?3oyc9htJ&0DA~0kJNLlHefxfW43P!pFjVmn_SygJm{J<NC!hd@tNEJWa7l}
zgrg{$BMmU|#<Mr#@swarq^`KNzqtuyJs=BC)-~Q&p?y*#&_1AoR2&fqDnOs3ViHAP
zF7h%-Tl0#yYNa_PeO@8But+DtE!%!gL^d)}DKSMhlR}Coe$pHrzinV2vs?#z%-sR;
zpSiO-A8)>T_9NT4lbQkjd^@x;%RN~G>_+Vg*8r~PU7tI{FWP=S8H{aYgIN0E6L6qr
z9JaSi>S#J#?5E4v(b_uL8opg4`5rC~(k?xrk>U;)$7$D`AV%Vh;&08Erz!TEDg|rT
zOwbg^O_k!bOK}r4Rr1w_`}ftCwJ4(S{(=<hN*2@nFE{EZ$aMm7E`_JkYwl~ecHCq=
z!MryN!0{7#Xg-SJZ$-yKkidZxSe=df`5iPZaP*9JL*5D5dy{qR=bHPk5{{CL)RSqj
zaazp|NXt!c>YwH{#Ae9>TlH*AjR8!P2UW_5gq>E&U0P@YmlY0bWC3a_h|SZ%cjXcC
zVbe9H@1vEky7B)?R$!OIkrvIDssvdZ4tV-X$|c=L6MiIuZZDa4T3IYevX894rtRX!
z|6%84eG}(;b{PpVv5zd^Xq$thFb1&ac|Ye3U_-oEuWQ&vAhUQ^NC6=mu*!LI<)1m!
z!PKI9AMDtYtIL%Ku*yw2lpE+|@dLt?z=jL}E{@2b{Zkri;v<Rpfd*7s9sy|N>enzw
zgB4gga@IiS`D66D?3Jv|UN(GN_R5QEVs}NXT>re`Q?Hz?_*EBA#O*wmowhb~eR6ut
z%G6!aD^~4FS+Vv^ct-Z&71z$D8~2XzI><tzO<S|~=U9xL@pZfn>yp;3UAv}IUE@X^
zOt&RsR*oe*Gci5gzI)rcRqHd>t*o_f<>pmu&6_60g&ncQrN^&~U+EqlnGha1>U`P~
zbBJH$@)(<cxc}0{LGBR|j;JuplA!GM_D!klHf)Vtx51p1nw_yK#V2aLEjBGJKGm{m
z&4#R%_KmBPvop*Xzv5GE@f)KzL~e993VlWIWru_J&)exf{YYT$IrCcG(ZFx(P8j3g
zcShpq<momX<{4{_hz(yJXbW8$8n`SdCORfMHgb7LRA6+_@_^`o&;a-7<#CR1b4XH5
zk}WAQEz@FjypALNPIsEN)xIhqJs{Y;U{S=9$f(35EHY>JUbQsUJvu2aIn`|Rt||zt
zGc#9bhpk?NCvTkRmjYgAbijYTcKzDb*(vcU@oDxTM_5pdEj&IVVR@|k^7zOohht?}
zklE-!jG(aa5VIpSDl^uGz;S6P*~Zw7QSQ9jBldn6lwmP?d*H;r4@~hJVzVN$++$WO
z&qy*SCnuz)W@fBPk4=k8wT(C$o)MTGol+}0B`S?7J0mtTVO2tEQg(8s1~EEgRkzMU
zd}Mr7lsP;xA|>3G5}h2G673$Bl!((elamrt67A_2&&}~^z-r#JdiUBLw&WGbD^{eq
zr^KYCn=`YvuUKtEh}5(s9NB43OiD^jv~8TLiA+h0US-Kxxnji%`|6C<8EaR#uSiKr
zOfx6O$0x;EqGDqbV&mOI0|LU9Sd1P*XJJ`H`pQWAN^J^G`?RcClbW{Lo|U#Hb#<zH
zGEP@bH7Ca>#@XWI6XPv$ks*;j_Smq{m}QnoZDe#pN{l@wB|35WYIn41GBS~vn3QNs
zOi4;fNzP19NlMRjPfbq10j-%aYaN(k2>AM9tRviRbi-Xl^0Jk-gqWyUOdG<h3d>`*
zre$Yt$l8?bw=6m_A=RF)#WbU;khUTrCe>~fI#(0o(i2vun>TFC%Ff7$2u~w~qLAiD
z3|(Z7kByB(vEZW;BBK&g>?tWpS>~*W%rFY&)_G}kup=;Y#maDdR@CN%rRJEJ(70$@
zlrAD^d0Lch?V^l@sq@{p&C47<!5p3xx-u&>Ei2iUn3kBHW<I>+<ig!H<0PD9c_4Ug
zues*1*pS$8+lr`+xYTg><k0A}Fw4@Q@Q^rrTzq`og4p>%wzw5@mYRcNVj_pxB4d+M
zRwSiBj7nRRw0gC9Mcj(GxJW9sf9NE~+;OpMBP_Aev2phJwINH*MmG>vWNZ{w3Z3Qm
zRN81tjZceAv7urUP`wFBmFlNPLw+;Ip&8>*b!fq+F{apr#AL{XvGx=+0mbbsB&CE$
zQ%!dkV&fB(px(lYKvOcPD**&nD?Tm;4o#O3pJYKmcj0i7iQd^$bn!6>NpbeXn55Xm
zcpM0HdnFqq9%gUB68&w+CM!)WkqrjN^uFKl!}go)OFr>0Sa{8S=kkEni-s-qnL0jX
z?_i71QvZ2j_T>vF$*Pc{?yt{oH@&S{ejSI-c(XuT1{-6N$8=*2_a=kXQ|#+=HO+FF
zr{5=*ADP?fJ4fxSXJ}F!$q^3om{zh$?r!r8TP3BhVm(%UuvROtUwbe^SMK4?Jv?k1
z+mu%FNT_7EsxLHLO|Dd_Fu77?mRemZGGQAcKR>@0zTi6_Cz4(g?&C|IR(!>B7QTkL
z8Q-3~CqBnlU>m5$sphL<R3E4=s9UPnsB_de)L*H;Q@_B+eOkG_<2J!<m)ili58b|X
zd+PRF<EE*t8KfDDkMsE9?8N=}7|#Vwp5`;n7n;9oo@riatK-!C(b^cCn7<bv+qt4G
z(EeTfOk0Fc?C5n>b#Lq1>3Zpg=!WZ-=t6XHx)nGvf0ypC?zrxZ?yByA?pJq}yVhOr
zUempydlQ_P-`0JQ`!si7cYpT)oS2{LzS?~QPRu{ye#-q4&ddMS{h9keJ+vNGaZbM7
zqn<}Aj}9JPa8mwgkC`4m9&<ewcr5XV@JRJo=dsJ<u*WHnk324WT=)3m(uJ*i54)_a
z|Fv09{co|y+GdlRl%GQEH0$xi%nVyBT4)C0AC4B!57a-!smj=O&>~1LyEl~Gp9bl%
zX}X2RaHGtm{uQIUC3z-!srI)=|AO$8RfIoTLvXDike2libgV87tE?V2t6Q(pM_$-i
zeh>Kro&4_k9<1iM4_2Q%U_&l{ZyluA1{uccHUv*O+z}g+-ohEha?i&tnX2%}_G3Hk
z9d$is4wl=8+dgO0O|AQWisQy!J9F#l!HfQ*cG~55-H3U^eJ5Ky$5|l=(t+!SrZ|rN
z-t`kVx7h#VO|PB4Xu_)4JrAtic=&+%#_*$E`V5~ue6j6ZkmkVJ-8(+8e7I@$teHWx
z$JrN;)*61l_qpHKaxXT`ZaA=g_ntleyJyby_w)7L?svd$Xb6FG7TTwMv0Ds=+n6P_
zqA+$xZSa=dYL3-<7rR9VMh8a+)CxP_MsmZx4IBrStDFG0`A<)P+d?P6O?l-6ID_fb
zo=uxJ*r)B(EO#soooAUpZ|xC-JdxQnsSz>B(U!>Q=&0!Ah~x;n;g1&BaMC_sVXLsT
z_OlM>Vl%5IJvAjQAw3~ICM~s61B2<KJDNUP|LK~ovnOTYWE=k7h7KG0?VDg9-cggU
z-F`^3VE?gYr!C6Y9li?qc-9HKd{rKbW0dechy6PpftzjebnI?fx;Nt388d4rPcqG%
zo4H|;olVEimu#Q(iKEQ?iw`(s{HFH6M;f1F=a<~DIKMRU)8Z$?3hnuS$2Sya4%h6R
zJal6Zi}SM+%{Dd8?O{KXXY$Prz4fWt`PGTsV?lHG+T_=YPnm{JT(=XN+w;;G&E8>I
zUAvf_pQ1oQIBW@O4ZAe2M{%T1_U!K0w@vWw+_|=4b2MFc=S+Bt>HloE3A6T`JHGdW
zlc#r2pEzQ+?|5vOw90iAn(L@PP}jiLx=owE^}vxG+YTPuHh;>@1q-I)<a0h>u)nRx
zao@1MgnpJ~xDLW$H%#)4(R%FWxYc6-ZTw2dfjBIky_tv49b^pCZybm-x|J<D+8v45
zgS9!_v5~guU=P;x@+~^W!wPkVOKPbPwAGVw&QMFh$uj=qy8!qPhyQqjzx^XOxf_;J
zYq4%{HE`Gj{jV<9gl{*<-?ij!c0<ttI)<Oym*TAWTLzib95HE8$&pc!u`!su)8X)t
z07$l65wQ|ym}3|;lq;td&9q_3WW7OIX(c-uzB+1P|GX-%(XzEt6U|ZiUVj#)lUEnR
zC}=D;!km#N!D>Xnp%kxgunwQqt@FgqtQxVAlCiqNeH!Mg8@pp?=qbygoXoRl?4Fv~
z@Yu*`b5v^d3Il5)8s2l6=;j;G7);;h=H32e)YWdj^THPg*tdLnIrrnW?m1}Ng^h8X
zh1uNt!>&Krl5<Sse0QHaz5BqaV|#ptkD2K+&F*;^%CDAsLxdH!Rmys=p$*ntx{|e~
z;q=CddPDin_+5(@7+PY!SzXK8U&EIk8pySWfh!NTdloLX;`<lv^#)xd%$Fk~pwGaE
zMbI0|=gZbvR>K!KAOlA@tdje<w)_mZCJ*3Seu^t;vFL{F*u&YwjCGmoGd9#JuBY>4
zeRVAL6MS{$ZPuj&>me@(i7}5Itn#C0e#~9g$~X<tvuT6fm@{kaxo$m|{q6SktcQi4
ztZCJycWBe@c2CpY^B>*L^F1(ao!t<=JSH(ZF&d|ohiM#1$)tiy$;?c(8+?`rE}mhT
zbW&$9;k1!#GA_x7ZOL9bZ3L%Kj1RyW_yt;+D&=E2U$N<_HXO$c!U}OC*&lksLd>8W
zvtViym<1^d2z>PbEfu22+4iVg18vT+8~4)w9Gi1@PBwPu82eY)pM$g70}S9_QPI(n
z(aABX;9qwq|0wHZ_bK%|8+zzHr6;Cs+cxgmv2@#Xd&=Q$+gGj#O07A1&Z3DU%rmzy
z+HNyodr*6;A!FJ6OkYd?NwdZ*vKy{UInQdGpK`^JbA0p-iy`s(R#xW;)3{%hHx6Ut
z@eu(!s<o&xKKJpWkJVu2=7ON8OQ&&)=Rus}X~0sOvQk!YnM_$Dvm4|iE9rE5QC3UG
z)v_8#lzQSIel3neHE5Z;LDN@j(5!*}5YvjVq;PZ`w6J0#QBt{3YgnmQ8*XB|7B^ir
zMCxq@*%pw2Zx&SRCRfv?H<W8{(9G(!Uu%$Ou<YyNeYQ}2pJkia!t3%vm}%~oZlP*N
zzy!>I4QMd|UWQxJOdPUi2(ilNVOe^ffB680rgW74=)$moJpqQB*d(dO5%hiX45mw8
z?YVQx{{Eh;qrS6T%iXyXV_0*&C#_g{u|%vZ8R+!aumBu}&zG^hSQ0HZ{m2Fx=*v1s
z&IB(wWJ{WpvUueJcSBgZ)ljxI55|DBHP6te)eu<|FSm9#m~yq3*+oq=e2Zh?8mmFX
z3H+{4`80ZagzRoNJozy9)|ZEeH8MaE-{C`pa+vPjX?nxH6SL?Xq?{e6cjj6QEqn&h
ze!~xvcW*szF)TuT8wG>?svGLNnSsS)U$QpuJN^+3e2oVx8t7ecgCan=f0!%x9~$H^
zw)O)1?h<U~4BiRYDHw)Ra?muIJXxbPz*5i0YM9K)wp8p19inJp>%&YRAKAKlx7~n4
z)CGZmEBy?P%2x?ie1+H@e)z6CU>jjD;7DO2;AEVjk8|naL?IC0kQQ-Z{z||tbbdcR
z*m(r-EI!&P;!OT)fS==g$s)exjI-PEh2avwQW2O%gIE>NDB1w)hz$W>7vBbKBlZC7
zEe-;FUmOcKK}5Rvemu_9hx|PsaFG}Vn1mzw)#3&mc&`?4ggf#JjF<(9V&4k?Rro5v
zO}tehJWllI;i;^2>4m3i#O&U)|1iPRZ}OtKf;ZyhS6a&d8}O;pIzoHFqsy2c-a_wg
zU50rJBf1R%oYt?)7;j<0fI<De1;@bt-Mxk6A%g~Z3)#ac%x-+}(3`&N%JGP(!`Fnm
z&L<VVjb2lz=X_G*tLe3b`pzded>qv*G;ls?P#%lW(D|elstL96*;ECmPVhn-HFiF^
zV^z;4K<UBL^AM^FcA<&$NiUdCs-{A-ss0Q7MLmaAIjq59Z4T>l*qFoS9Jc1LJ%^n+
z?CCpw!CbLFhr>7=$Kf;%{Wx62VF-tj942zOlEdsdlNb1kTRGg#;Xw|Mad?`;Tn?{r
zSis>e4!_{=?i}AazTyuYKH~5f4kZp>5>&ZysOPXMhc!5?%^})>xBdSH>Fj(JF#TWu
z7eULEv;PGW1yeux@1O?MS{>BXT6mY&lPKUj2E3&0#eCek3-03g>VcIfy;lFVY|Bo|
z6>DcDEo*l{i%unar{X#S{-Htt66+k}Z>>UiVW2P!pZc99%*7WyqQNuP2wU-C-&?{L
z_zK8lp%`DNQ$Fh3L~Jc~6$hio`{RpsiAeMP(ig%4T%ypV6km=2d;#A#0N*TqR^d)9
zG%l5${z`~P2=O&)vq|Ymp;_rY;SKaWk%u6x1;AP$=*3N?+2ZEXo8p$zqvBRv+e$}>
z+e-_?9i<WC&eBKXF1+6j3?km(+Z2HK1_j>y3SU;?P7MqtPJboDbA<RATxwhCZD4zh
z4{w+dA2E@Og3@f{y`c1hcmP=Gt^jwxBDV#l2gO6cegxR*si5r1jlbK6RFwDSp`Ro4
z&#3Ey(okTzEq;L14k0zd%dznkBLtOqe`=9>yX&0*ZqQljqtc^*M^UqYL^a->c$-xP
z59y3nn}ik%#0OFG!Ab83--zBKwNPJi99lS{^q`Ok{O{u$jcY9GSS{8ST8Z^>H56I_
zQwZ85vGjpZC{#hX2S{_0&{%vE*IVFVDtrp1y4Vsl=O*+m-6KxIH3iqS(mmjRH9?71
zTp^_w1V`x|;JF~A;{OX=Qt2I}G#n`nM@qxRK6vhj>wVPdXw=zQPAdbE2N9)k!T%j+
zd5+8PG(tVl2TCGb!2gS-CtW2%DXFwma7{yLsqC##_Eso6J{n?^P->y>!1|BSQXQ!+
z1WoCk(g&s4rC*ocEPYnG2Q=Qe^aXtG;Awm5LEOJ6y@%@p+KsL|Xt{f6wg34CTrZG=
zJCqBgSMVxAq7I%v?u}NYr)SQ*P>%R}{_-yaDig5r3;o&oqvwD1E6)+n2i418&I9FN
zNyC}?3!!?c?8?o*O5OF2(gc0uBKV*GN+<C;!}s737wyUa6IBaJ&7=Lx%ddC(-6;(%
z#Rr8-7x5CK-Aln6KqCc0ztWR%2SE`;At&K`6FsxK(oV1D%2`shAk~;F1TdD>{Hx)W
zC(0RO@OI~S@^5RqV)=o&JogF$ie2W%^YAazD~m*Z;(z{?r~E&o`X3Pd=ea<y{u=d#
zPhI`@KTrp8l6$yN@5CzrpWzvfuyPtAPJ$=U0YPWjifIy6xMC=GL@7%9g64UA;J#2X
zj-cnU@Wm_ofooCv#3P8hSAZ_b*VXT+oW#k>XoKGV`=3IOJe;jOw39D^ckz;Pnk|3(
zM|Zs33T;=Q$G@5zq!)n_KH@d=0DVvCCwfRguD)AVKHd(_epI@uG!${Od0eU;a1pfE
z1IQ`(QN5#ADYdEa24`O=O@glzqmws)dlQz5Wi0Ql<-SS?gnXd%cOJ{t7G)glH+YD0
z9#!;H(st#5=M^JSc`Dqeti<I{gu~fJoc|~>D&lz+2SUGs#r3vylTvDqnJAQ~=xfmX
zozk=LtL~yMC4Olhr@VWpXOeVQaOxx;N$xCYw-v{;2jS4;IF@^*dANIqRHy~Fqa6x<
zTRsK1D@XtOKl1iJ_Gh#cBmh?`<!w<`KcEM4<so=oKLRaM$`};@m7Y$Na)G`(SMkSV
z-xI2EPEbpz<)kW}BKe^%sMjl$Ks62u0#teq`8sLHbw@GE@hkO@cSJ?Jzv4YPXO0Oo
zPo+W$5c(Nf?2ZewlD2}=+0OM)x)(0`M|j>wfO|@}<0*p2fLx2vH_^^{H0y@{QM5D3
zxpaSz<X%@l0aby5ls9<C`KIgXH~(vu*EGF(_31ZZ|H`Av^nxTpo16C}=nUQg<^q&3
zPq0yLkkgyUF>3q&&yQ-d^rj2<|L3&!xXQsPlTvol11~2ZVQ@#KE^852&i>2)6~>AG
z62o7L<|-dW!uVD}o<=)zZi=?ehU7+1^u9WtAA#Te$3K^RpirvPa<1OOQ{}yh_p%D9
zS43YiR~7yL;GTFS)nF~sIzcypDJ04zBhSzHT>*GUIqf`B_zQA&)5S}OlS02$1)=o{
z#|4f*{!v=IuU2^dYU{oFR3X@3y`?&*eDiV;?+2&H6UJc9vmW5>i;A2~!OuA<=#t*>
zaAmv>JnIf`QQpQCX`o`xD$;btHuxhxQeLahv|r(o6|q*l$Lv{|&2vvG6<isQc7>#|
z;m>{*^W_SIx+oiATz*I=5B?Z0aaZ=XVp>Y9S7tQjk^kadMZ7#k8q>b!HGU6sXPU!S
zq4boTydsxYsgP9JJz{{vDsOnJQawSg<+w>2Ks`F&-ocx)(a7bC5WnNcE_`_Bl=CQb
z1z!cbGamfW=YbnJafL%VJT0XpN=$wa39~$9!s&YV@6sv@_b2?NJf%M<56`J9t%~Wp
z^7~uA-#znrE)V@DoalEk{tFMv`5#g3e}U@XMnMae(K-coa*MM5;jC|GYq_Xasl!)e
zDoNoDm*9Du(w#DEQ^pD6G`|}Kf8S33Hq*`kzfHd)Zr%rem)3uZ`LBhewyK!+UyJ?M
zLi17Zcl^(VgYym7Lxul;M)MVd{Qg!|nd?t$9jtW;vRq}9ku)=pz$L+f!K;3wX(1^W
zVeqMG`k~$bG?#e&8>yW~Q2;&^T<HeMj+W|{%~&g<5z+=KeMa2nzxdf88Gp^^J}>^d
zhSAB%$~oL$$N*{!HBcs@Q@@}w^*@pWsfJ%oN~upkXI@@?TmDoUi+XZ$DWpd8o$S)-
z)Kic??}g=Ie|z^zT$(H0EKPF8rS`5cr}%Bm-#;U#+e`6%@bVwZR8VmoDSv~!kv3&o
zX>2*yL+Yd}rhG%5R>IP}mSg#SPDqX``~Ahf_`k#@8S=mQp%jn)jqLcRSUJ~wx10{p
zs{bjU8w^^2mH^sU8e#q*7FwBR*<~}yS3*_iJ<zGIK?x2551%{Z9-1@WGE^?-XwGS`
zVoL@7X_5Z?1wMvOyuiHMj1RtJ%?`On?$D#TyN8dW|3L3+53D^4x%1*_(`=k(m}O(w
zZ_z7t$3y*T7+|8+11`%Drr(Y=gp=qKAxI{r5P#UaI1f<55I3McSVqsTe35hqS&fgw
z%6kf<VC1!`w8>5Wj;G~{`RadX4APapGN%776wmFez7?N%>O9ZL*B_Tlr3<8bujOT(
zfOgUFx}cW1BZ#_bIzRYTg3W;ni*R4yx+^>ozk;ptkK$w48~+L;2Cb@+%1c#KWmDBx
zHBq%ty`y?p)m7D7H4y&8aE%eaQcY6LQ2D7Ar~(o1xhfR@AFBdYk*avaN>yd5vQ?W^
zJ8`#Pbp$>q#e1rAcz;QiueyPBD3zKV-webpcagwAF4O5KzRLw7KDj&aLFQGJfagb!
zhj7(IJ{5=0y~EAmE)(xV%dR^V=atI~_-Z1(idTJJZYsM?^$o5jC`Ak8=eO7Q@Oy~5
zQLd+|7pSAn_=>%X|EK$bs#LYR+LQmUjy&yu<=U?rqdKWJtG($zZvnJ|x}mz6x|O;u
z>h~N<5cr4J0@PxKi?^J!^{52}v2-jbMl2mgP=v(>TKp$|-<m@#pu_(??*A*l@5f;`
z4rg&Vl*1+*nmL@o;TVEKBEQ#h*p<T$9HwzNnZq_5_TkW*!(kkD=5RfSG!}}&&-~uR
z@3-;$n*2VL-vb~_IKPL+4LJuV0km-cFz^de_>A8dbN@;Fp0v!OxSzwBrLZqj*}4C6
z?$eEYM3KXH31W?ze5P<%i^H#Y$iDoo<0V-ZJ>>pPIIP3{?+|pWs-~58XP<(t4RphJ
zhMiEwb|@XkV?^SO8huhHc);$d4eTD;!S<&EbR8XqPQrUaXGmXNg>JB9=ppnJdI`OS
zK0;ripU__zfc51;u#s9UED-{*Rvsh-3rk@SwN*F-Tc~rehRTI4)aS5t_)_>v_!<^g
z-wJny?}U58-(dT2U-&_I01GK56mbiwQWRe;YDAsr0V}D>VimC(?4(TMYho?Yf?Wu9
zv5r_zY#=s*#Z*)A4Y37Q<J*Ys#13Ld@jbDN*iGyS`>DQSe{mqJD29l`#1Y~saf~=l
zoG4C$RmC)M2JEPOL_cvZEG!nlnrev{C<comVyNhV#YH5#uohNGutS2qQFGMF5I7Im
zYLKnOW^tEb5ch~jU~@zxOI=tmT@o$}SA;y_Hd>o%_g&P-IANyXBP5FMVqLMm*id{|
zoGeZir;GE&g$NUkOR4Msi<(|1tmn0TszPmF|NmIut^RV2|Lgh|1*Oj2F&0;Xo!uy5
zG%RJtq7KIk6JT{WS(qYBh2_k2VFqe-mM|MN>nr#Pb6}Y<5B7K=!ZIOL2ooHz#|wu&
zUL;O(h!$dmSXd;)3kl!}NkX!aBBTmw!U`cBwl~?rMq#(GUpNeVz4P3%<0kC%UcgH4
zSD{#ViJej^(G3<k?qVg;Q>-d_!8XSxdOO>)F)Toui7myq#dpNEVtcf0XISiX7kh}k
z#6Ds_aez1owtGXx;o?Yfv^Z8A4;wzE^=D)M%p7qZQGvKv3=o6FrQ$L%Ok6HTh*4s+
z7z?^^gPq$u!d_t??k$+dc!S33fyx>PErgcB`=G_4!f@=%IVv0zP76801>s^D1%3i6
z6NL(49|$@YVL$gKaSON_xX21{1N<%M=a7oHeWM$<Z`5-8MsIH4_&R#>V)TBpZ*0%)
z8@q$Pwg@A*ed9<_*+*z2vTq#A?Hk8)`^GuE_s-|`jf=Q_V<@+8j6{EJD5P@x#!PPC
zxP{v{9^&?mC%Jv&MQ-1CncFvh%<UULMQ&;SNOop)sgUEka3X4=K7V%!epldB&JwFY
z3sg=6dX^fLL>5?{;AT4XR0CXfaJ05~-wsZNa<zwF2RJqQ>$^y)Bb<hFIxTozXVgy@
zI1li=uE0ioPYcf11F?F-RRRa>h5O!cmB9)7Ag#V|RlpJZfd}-5GlDY?z+7}7oEJFc
zAovW1s}3$1fII}kslhFSfH@e>0Is<daj8EWc#W&UL$~7oBRB)NXfDEEgEI=(;Z)$L
zU%-cWsv2DNJK(toj%ol;eE>WqaB3WhQ;K%S4^S<t0X3oqP$%lZ$vi}Gd$bm64ZOB8
zU=^_nU^THCpiwjennaVJ0snmsu$EX0(1I~e172)}&6{1c3p%uM9o*Lw>j5?p8vr&E
z8v(wKQC<r^-4yT*@eNqdwGdkXwh~(bwia6p9-xUf;H>S$c7Pqk4uBoSj)3n$63~L9
zcLD4sb_47w_5|!L_C}uj!p_wIF5e$;pg0h4us9fSh&V*346Z*6aD+GlaFjSo@Wco(
z25=ngwmdNsOaz=HPJ&I=6j&!!!Kg3|aF#ersEV<{2hdOS1Dq?)1@ssF0T+l102hgi
z0GEhMglZT!0s(`?V89SD1Ta(#6^s~19Dw0sIBdHjF{03@s}ffz>)N2T2B53<@PqNw
zAI|4Uu5tYoUF~aVPg;R^hjWD5u$QVMye+&1N~i@ZF)yS*RIL13qt&gzuEs@9`A_|*
z{F(gRK<`@QL<d^;Ku!eEs_WMXH_f=y1JcjHVG~%zHFI9g(F<CD?kj`Kc%moKk7OAu
zoRX#*_#0Pn%}@i1dmZ+=<eHZGyutZfOYpeg{-{4&__~XLzN@bAnxsJbRpPJ)U?XR4
zxd(ui^G;Wu)Oh<297#8H(GT{`{6FznTBD(#4UXc7{BqSB)g(DBcdoQ~gjWDrCM#DX
z{=Xe^rA9d`ULwzDGo<iFg-dy^7>@3VPUt71zRE9pcKK23sPI;W|K!`m`OX!F{x`)%
z{!KX-Z1PHOTq#xzMO3O>%^?L5tyC(z1dJ+LwAAmf7Tiw<ny7dYwbMn^?xOfVu0P`S
z({NEqsGdDRo9>`)Y8jFaNR}N1r-zI%8llF(sWA?XMc&52X(2O=M_-u;r^aYD8L_9p
zsk!u^hx{-TZ)d?(f*dg$`SgLS0(rt0{(f*q$Q5(Yqvpc7V@#O`AAdL#<c#I0zi>De
zM#X5P7z6o22MHqq{)vz;43IEZq8DYuRfdeQ5&pa3szTP-k5mrBY4|9rhum=<_xW(u
zxsARW63CAT`2tRaBtmk1F`Ov8gwqfaf``BXx`}RpT2Tw=F1ibDkW<h)kX1YZt730~
z1~Q8mV0E!NU|q2;cyxWSK43$!Az)(>)|g@w5p)1qrWt%%iY);l(||9x72CqUz1SY`
zT@j<B*jen1Sx9%WJ76EN5BO|9u^-?7aRA^TaS-79;`@L@#i2qa$UegXM~Wi>M~kDu
zZO4jZ0U-;4BTp75gWFCOrvgsL&W0-DY;iWYr?2P>I7gfVI8U4hI3GJ6szF*>2%fuG
zT#WkwF+lKw<P-$BR9p(UOk4&SCWe9AE*F;rMu-tY4M<c`fYD+!#+X>hR<u7tCB~pn
zDnE>H{N^q22%6*ltDi!xjX0OA2~0IXhb<7HHG0C^=*!JP-^9yagHwKu(I1JI(JYsK
z%70qhRetoW_)(9=xD4u1BPRl=&h@JV4quzQ`hai2xp8R5K8f1S%MMyKf(o^uBbxWR
ze#A)?`~)jkaJ5kbii4#Kca}0AD{y&p=fXq(8zNQW)_P!3ehOyg-Zfg$>{t0!LhdU5
zTB0A*IHu(3b-b+#X9NAyrTmn(pl~GN(XS>P#ZfNuQGUwEq1?ODcD*bA-x7IMu1fqr
zjS{b;oE0yq01<&Mq6ycfJXZ`y_X6rbz^F?$0Oc3?(M5jLI<0U=R^RkQd2_vY{U_Z3
z`I7`rcfU<VNvS-PGA7fwZ0BREh}L#p0ywmQw)*{L<bE`dt$0xl(?!%y7v;%}5Ngyw
zZD8FCr^dWvAN*91VhMU6pBng*9IXX~8t}gjoXBNl6_<R~T=I3}GOw0PyBaR-YPqzl
z1D_rXnkK&NE=+=}1YSHH_r#0cIp@`Lo@?M51ck%8a}MjlxvB@aY8q&dc2~Izr{HLh
z)j2@oq3&EF)?y~|Iefl^qy1L@1Y~d`v<gLlG8{x;Q2;L>9_qn)s0Zhv9-N1|i+WKH
z-bb9&gL6_3&PhEuCw1qX)I+Qx*1+4EVogA^Xa=k;)&_i2d=s3GWLuR;vaL#dOMDAH
z#49~Guk_%&(u4C#56&w+xMZs4lBt?YrfM#ks<~w9#wAlXE}6P<4yfn6&%k+~f%85C
z=Y0k)b!xfPspV3qj!T_7wBKu7mZ{8pv<}>hW>EFu+;}e&K|u}B<KBnUb3KPUW|u?J
z%ERHRVwO1{6mS&I6SK`@Xt~pHD$F`_Kod0cbi*v|5-8*{oR-hWG|+_P;r<gi73QOb
z2<e=Ya_&pCDS-Njvgk+rQju}_<Nq13phVQql%MinkzvV)p6Q|;A~iULlXUayuPXB9
z#hn(AIJ+B%)LXoqS9Ne1>d)?|p^86}R+Ka?z+bI`BW|rY;&0@L=epb<^Rw50i?9(N
zAX!eq%pZ^s<>%te0@|&d6Vp4Y2l^>_vXs50(ZV%il$V{PuJRwnb;VbFDJN7Wa;~(?
z!@KVE$g6Ty<^M@9W<e<{UINbv<&|i{bt%sk!_mD$Cxo5G1lL8hLl-?$>lkonz<+w8
zyt&@H{u38hxI2}*_A9w@rKpSpN+_aI<*JU+m1w1M*+o2`W*oo2%-l~6ny7eD4J)-w
z)Lw<>tv0aHF1o(Bh*J}<Rq+{$qNfnKRzl=@2a#(WM9y(3Mqgkj{em0kuNux@HJr0*
zIA_&xo~q-z29fI*6wZoWOORc)oU>}Vu0iBl24(lEhHGmT&Z^<s1ngLaQ+TJA>k&lG
zLA6|)AaXvc<vInCb5qiqxkKh8ZmQwjRLi-kmUB~W1-VqqH47r=samdI5IJYnaxH_%
z`Ky-e8br=zm6^XHe`@*sU*w!s%e4R^=dW6>3lKS%)pCsh?W27kS_9Gos5q}xabBz9
zyjI0|t(x;%HRrWzKDT${yjI6&_->rz>i9h0jq_a{pY6MG?yEz8YzP|nKufrzKhZp!
zT2hheX7ZMWJPub0{>pq?hbJ0Kwa&4W^hcF=o2vLIs^KlG=3}WFA4@fSEF~@7NTfw0
zY8Bq%Rk&ufGH>@P(2vdlh0?fMh0k#+^Er+(##VFE18M0+K9@1@xl9#K4^{ar#*<S8
zj*)_^CTxT=@cBz+K66n<;3~fxfvfNlSo6vVOmmsa&T*J#GzRBrO!FFpb4>mf+E%?X
zGV_^^fzNdGe3Y)rX{;)zuBx1_s&cxj!s)6Cr>m-*t}xrde1~+jUYJMFe5Wd>sH&Wn
zs&Xo-%IT*n^tJC`_R(4FjG0JRu`BLrM&k*+Z7<x@SY4G<R8>w(RXG(^<@8gP&ucvS
zyrwdr*LZS@Qf4<EoUSVIIgSUXu1b8S<IZWU5~nd0r!f_$F%=)rt8q$GSD-X?1xiy_
zpft5YX?&d5@Nr(l$9XLu=e2xxL!7A==uZbaR3tRw5ehxIIq8XXkZw*XtD+o5Iz_iv
z+V9UKs7cV7y;>5|gsFKyQS%<6=6yrW^XkU)O8gjt7c_d^HL0)cH*bhk@x#7t;>XH<
z^S2>c_9J}(-*rBa?>e8xcby0GUFWHM*ZFq7>-;p|b$)~II{%UHI)CZJ=Gt}s4s^Kv
zxt}}gLfL!X4E56$HA3kUk5=}ezX82SH}p8g*R>bDIW$h)QEQ5?Yft){$X^fiNX6H+
zH@yXPU_Bv8DZZ{f>Mfy{>jl|L@pbK0Zw1cY8<Ljd>)Nya7WB`3uuoX=b?semjn%il
zkjF+$p6s_srRC6*!x|jgIBdvaa}M9(uoH(pIULC0h-q`@%~4I@a2kg`9Qt#(gu@UH
z!#RxQFqy-Z9IlzMVDePeMh<s#c!a|<9A4q@28Um9_ydPeIsBEN+RbnF%*kp`4y$u$
z=FpqNh8#BIuoZ`GIqbw?cMkjd&710{9?ang4##mgg~M4K&gF0shrt{=<}RMIKpo9t
zB8MwD%;Io8hg&(^&EY`~k8yaK!`yibrp;Af;jn<iTO5AD;av`Y;P4TLzi=pV_>!QT
z+rq{E3*Gb_R^_k;hqXDZ%VA><n{(Kj!}c6@=CCLF3CRr9pZ>4^i|8MO`M-zMm#RS0
zqp|P*{~gVPDZl><B-xhqx&%EqB<YvirT{86tne@5P~4UXko3*}8zf0y<nsJ~3u!Jx
zt6l#ctO1SHJK#3G!I{QDKk6eafQ%RpedY?BOt2ZF{vpitE@934HddC1+C=e^QcvP9
zkXwlQb_yq*cex0~!w7es|9^1)f8_lC(D|QEL!lhI-hc0WzV~n6D{0;pT&e$xc{*<y
zjQC3al(QB@@r3ia0QnU~q$ob-Y0?~ne2^A=DHn<l%0gBy@coMWRp;eYiMPZ8_}y~)
zsZf45jOP<Dj!#956BV9B@tE*2!XD&sH-}p}To0%c*CVG@K&REj6oks==eJ}+clrO?
zID3_bf*=a-SyG883L;q9*jR~;mBGfw!cv=nA&~b-DK>&w*~R>s7~{P$&ygn)pTX};
zj3|VVxi{zT&Yld*o!OaXrKdDR-hr6eV;~D=JApia-2QM~Aa%F@hg^cRei7l1Jx{%!
zSSPcb$%Oj^n1=l}tB!dpbeu}$AvucsR4)IM+U#!VsH>j(8t6qsjnMQ(jJB8dsc9VH
zA**=93q0Qy+FsR$<EF-X=DMvnb+~S6qApM0)k7BQBTEgCQ_g?L`d|k|)(qX`vHAKe
z09F(*Tw{$zRZ6GayZ&2IHSTiy<ZV)zGi+D06uEc@j#!6}XRL@LEE^%MPk4Q6tr45m
z$v_+NnLZWjGtSn!?(nx_eh@9@Mq|f^=e!ty6t>Pp5!bZHL;}rdSwrrUPdQ=abDrJ6
lhFuHG@z62GMiVSkV38@7m_`4yV4Y#t;P(do-MhJ}{Wlv+JeL3f

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 0405/1140] 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 0406/1140] 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 0407/1140] 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 0408/1140] 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 0409/1140] 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 0410/1140] 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 0411/1140] 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 0412/1140] 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 0413/1140] 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 0414/1140] 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 0415/1140] 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 0416/1140] 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 0417/1140] 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 0418/1140] 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 0419/1140] 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 0420/1140] 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 0421/1140] 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 0422/1140] 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 0423/1140] 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 0424/1140] 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 0425/1140] 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 0426/1140] 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 0427/1140] 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 0428/1140] 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 0429/1140] 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 0430/1140] 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 0431/1140] 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 0432/1140] 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 0433/1140] 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
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

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
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
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
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/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 0434/1140] 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 0435/1140] 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 0436/1140] 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 0437/1140] 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 0438/1140] 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 0439/1140] 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 0440/1140] 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 0441/1140] 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 0442/1140] 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 0443/1140] 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 0444/1140] 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 0445/1140] 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 0446/1140] 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 0447/1140] 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 0448/1140] 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 0449/1140] 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 0450/1140] 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 0451/1140] 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 0452/1140] 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 0453/1140] 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 0454/1140] 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 0455/1140] 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 0456/1140] 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 0457/1140] 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 0458/1140] 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 0459/1140] 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 0460/1140] 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 0461/1140] 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 0462/1140] 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 0463/1140] 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 0464/1140] 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 0465/1140] 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 0466/1140] 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 0467/1140] 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 0468/1140] 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 0469/1140] 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 0470/1140] 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 0471/1140] 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 0472/1140] 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 0473/1140] 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 0474/1140] 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 0475/1140] 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 0476/1140] 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 0477/1140] 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 0478/1140] 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 0479/1140] 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 0480/1140] 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 0481/1140] 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 0482/1140] 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 0483/1140] 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 0484/1140] 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 0485/1140] 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 0486/1140] 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 0487/1140] 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 0488/1140] 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 0489/1140] 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 0490/1140] 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 0491/1140] 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 0492/1140] 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 0493/1140] 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 0494/1140] 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 0495/1140] 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 0496/1140] 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 0497/1140] 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 0498/1140] 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 0499/1140] 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 0500/1140] 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 0501/1140] 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 0502/1140] 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 0503/1140] 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 0504/1140] 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 0505/1140] 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 0506/1140] 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 0507/1140] 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 0508/1140] 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 0509/1140] 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 0510/1140] 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 0511/1140] 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 0512/1140] 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 0513/1140] 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 0514/1140] 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 0515/1140] 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 0516/1140] 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 0517/1140] 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 0518/1140] 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 0519/1140] 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 0520/1140] 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 0521/1140] 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 0522/1140] 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 0523/1140] 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 0524/1140] 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 0525/1140] 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 0526/1140] 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 0527/1140] 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 0528/1140] 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 0529/1140] 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 0530/1140] 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 0531/1140] 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 0532/1140] 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 0533/1140] 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 0534/1140] 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 0535/1140] 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 0536/1140] 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 0537/1140] 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 0538/1140] 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 0539/1140] 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 0540/1140] 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 0541/1140] 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 0542/1140] 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 0543/1140] 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 0544/1140] 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 0545/1140] 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 0546/1140] 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 0547/1140] 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 0548/1140] 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 0549/1140] 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 0550/1140] 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 0551/1140] 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 0552/1140] 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 0553/1140] 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 0554/1140] 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 0555/1140] 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 0556/1140] 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 0557/1140] 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 0558/1140] 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 0559/1140] 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 0560/1140] 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 0561/1140] 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 0562/1140] 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 0563/1140] 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 0564/1140] 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 0565/1140] 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 0566/1140] 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 0567/1140] 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 0568/1140] 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 0569/1140] 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 0570/1140] 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 0571/1140] 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 0572/1140] 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 0573/1140] 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 0574/1140] 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 0575/1140] 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 0576/1140] 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 0577/1140] 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 0578/1140] 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 0579/1140] 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 0580/1140] 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 0581/1140] 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 0582/1140] 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 0583/1140] 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 0584/1140] 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 0585/1140] 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 0586/1140] 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 0587/1140] 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 0588/1140] 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 0589/1140] 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 0590/1140] 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 0591/1140] 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 0592/1140] 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 0593/1140] 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 0594/1140] [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 0595/1140] [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 0596/1140] 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 0597/1140] 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 0598/1140] 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 0599/1140] 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 0600/1140] 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 0601/1140] 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 0602/1140] 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 0603/1140] 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 0604/1140] 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 0605/1140] 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 0606/1140] 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 0607/1140] 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 0608/1140] 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 0609/1140] 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 0610/1140] 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 0611/1140] 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 0612/1140] 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 0613/1140] 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 0614/1140] 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 0615/1140] 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 0616/1140] 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 0617/1140] 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 0618/1140] 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 0619/1140] 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 0620/1140] 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 0621/1140] 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 0622/1140] 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 0623/1140] 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 0624/1140] 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 0625/1140] 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 0626/1140] 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 0627/1140] 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 0628/1140] 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 0629/1140] 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 0630/1140] 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 0631/1140] 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 0632/1140] 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 0633/1140] 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 0634/1140] 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 0635/1140] 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 0636/1140] 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 0637/1140] 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 0638/1140] 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 0639/1140] 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 0640/1140] 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 0641/1140] 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 0642/1140] 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 0643/1140] 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 0644/1140] 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 0645/1140] 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 0646/1140] 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 0647/1140] 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 0648/1140] 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 0649/1140] 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 0650/1140] 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 0651/1140] 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 0652/1140] 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 0653/1140] 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 0654/1140] 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 0655/1140] 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 0656/1140] 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 0657/1140] 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 ed96eb256f7519f350abc83b2eb7c712efe992ce Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Thu, 25 Jan 2024 06:36:50 +0100
Subject: [PATCH 0658/1140] Yul fuzzer: Support blobhash(uint) global function

---
 test/tools/ossfuzz/protoToYul.cpp | 9 +++++++++
 test/tools/ossfuzz/yulProto.proto | 1 +
 2 files changed, 10 insertions(+)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 1719dec46c..1ba0d599d4 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -599,6 +599,12 @@ void ProtoConverter::visit(UnaryOp const& _x)
 		return;
 	}
 
+	if (op == UnaryOp::BLOBHASH && !m_evmVersion.hasBlobHash())
+	{
+		m_output << dictionaryToken();
+		return;
+	}
+
 	// The following instructions may lead to change of EVM state and are hence
 	// excluded to avoid false positives.
 	if (
@@ -647,6 +653,9 @@ void ProtoConverter::visit(UnaryOp const& _x)
 	case UnaryOp::BLOCKHASH:
 		m_output << "blockhash";
 		break;
+	case UnaryOp::BLOBHASH:
+		m_output << "blobhash";
+		break;
 	}
 	m_output << "(";
 	if (op == UnaryOp::MLOAD)
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 2c10329de6..cf14b887c1 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -156,6 +156,7 @@ message UnaryOp {
     EXTCODEHASH = 7;
     BALANCE = 8;
     BLOCKHASH = 9;
+    BLOBHASH = 10;
   }
   required UOp op = 1;
   required Expression operand = 2;

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 0659/1140] 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 0660/1140] 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 0661/1140] 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 0662/1140] 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 0663/1140] 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 0664/1140] 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;
 

From 44da00d3ff7be33c5dc87ad1a62b5aba320bec09 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 6 Feb 2024 12:25:25 +0100
Subject: [PATCH 0665/1140] Use MCOPY when copying byte arrays

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/YulUtilFunctions.cpp      | 32 ++++++------
 .../debug_info_in_yul_snippet_escaping/output |  2 +
 .../args                                      |  1 +
 .../input.sol                                 | 10 ++++
 .../output                                    | 51 +++++++++++++++++++
 .../args                                      |  1 +
 .../input.sol                                 |  9 ++++
 .../output                                    | 51 +++++++++++++++++++
 .../yul_string_format_ascii/output.json       |  2 +
 .../yul_string_format_ascii_long/output.json  |  2 +
 .../semanticTests/various/address_code.sol    |  2 +-
 .../sizeLimits/bytecode_too_large.sol         |  4 +-
 13 files changed, 150 insertions(+), 18 deletions(-)
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_returned_from_function/args
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_returned_from_function/input.sol
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
 create mode 100644 test/cmdlineTests/mcopy_string_literal_returned_from_function/args
 create mode 100644 test/cmdlineTests/mcopy_string_literal_returned_from_function/input.sol
 create mode 100644 test/cmdlineTests/mcopy_string_literal_returned_from_function/output

diff --git a/Changelog.md b/Changelog.md
index d20c266d83..3d64b1b80e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
 
 
 Bugfixes:
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 35fea8ac4b..0dabc8a369 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -88,34 +88,36 @@ std::string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cle
 		"_to_memory"s +
 		(_cleanup ? "_with_cleanup"s : ""s);
 
-	return m_functionCollector.createFunction(functionName, [&]() {
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
+		_args = {"src", "dst", "length"};
+
 		if (_fromCalldata)
-		{
 			return Whiskers(R"(
-				function <functionName>(src, dst, length) {
-					calldatacopy(dst, src, length)
-					<?cleanup>mstore(add(dst, length), 0)</cleanup>
-				}
+				calldatacopy(dst, src, length)
+				<?cleanup>mstore(add(dst, length), 0)</cleanup>
 			)")
-			("functionName", functionName)
 			("cleanup", _cleanup)
 			.render();
-		}
 		else
 		{
-			return Whiskers(R"(
-				function <functionName>(src, dst, length) {
+			if (m_evmVersion.hasMcopy())
+				return Whiskers(R"(
+					mcopy(dst, src, length)
+					<?cleanup>mstore(add(dst, length), 0)</cleanup>
+				)")
+				("cleanup", _cleanup)
+				.render();
+			else
+				return Whiskers(R"(
 					let i := 0
 					for { } lt(i, length) { i := add(i, 32) }
 					{
 						mstore(add(dst, i), mload(add(src, i)))
 					}
 					<?cleanup>mstore(add(dst, length), 0)</cleanup>
-				}
-			)")
-			("functionName", functionName)
-			("cleanup", _cleanup)
-			.render();
+				)")
+				("cleanup", _cleanup)
+				.render();
 		}
 	});
 }
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 94dfb86426..4c90d9054d 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -180,12 +180,14 @@ object "D_27" {
             }
 
             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)))
                 }
                 mstore(add(dst, length), 0)
+
             }
 
             function round_up_to_mul_of_32(value) -> result {
diff --git a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/args b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/args
new file mode 100644
index 0000000000..c74711ba8a
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/args
@@ -0,0 +1 @@
+--evm-version cancun --no-cbor-metadata --via-ir --optimize --ir-optimized --debug-info none
diff --git a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/input.sol b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/input.sol
new file mode 100644
index 0000000000..05f24d64e7
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/input.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    function foo() external pure returns (bytes memory)
+    {
+        bytes memory ret = "aaaaa";
+        return ret;
+    }
+}
diff --git a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
new file mode 100644
index 0000000000..2441357d97
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
@@ -0,0 +1,51 @@
+Optimized IR:
+/// @use-src 0:"mcopy_bytes_array_returned_from_function/input.sol"
+object "C_14" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize("C_14_deployed")
+            codecopy(_1, dataoffset("C_14_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:"mcopy_bytes_array_returned_from_function/input.sol"
+    object "C_14_deployed" {
+        code {
+            {
+                let _1 := memoryguard(0x80)
+                if iszero(lt(calldatasize(), 4))
+                {
+                    if eq(0xc2985578, shr(224, calldataload(0)))
+                    {
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _2 := 64
+                        let newFreePtr := add(_1, _2)
+                        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
+                        {
+                            mstore(0, shl(224, 0x4e487b71))
+                            mstore(4, 0x41)
+                            revert(0, 36)
+                        }
+                        mstore(_2, newFreePtr)
+                        mstore(_1, 5)
+                        let _3 := add(_1, 0x20)
+                        mstore(_3, "aaaaa")
+                        let memPos := mload(_2)
+                        mstore(memPos, 0x20)
+                        let length := mload(_1)
+                        mstore(add(memPos, 0x20), length)
+                        mcopy(add(memPos, _2), _3, length)
+                        mstore(add(add(memPos, length), _2), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
+                    }
+                }
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex""
+    }
+}
diff --git a/test/cmdlineTests/mcopy_string_literal_returned_from_function/args b/test/cmdlineTests/mcopy_string_literal_returned_from_function/args
new file mode 100644
index 0000000000..c74711ba8a
--- /dev/null
+++ b/test/cmdlineTests/mcopy_string_literal_returned_from_function/args
@@ -0,0 +1 @@
+--evm-version cancun --no-cbor-metadata --via-ir --optimize --ir-optimized --debug-info none
diff --git a/test/cmdlineTests/mcopy_string_literal_returned_from_function/input.sol b/test/cmdlineTests/mcopy_string_literal_returned_from_function/input.sol
new file mode 100644
index 0000000000..0251c7cec9
--- /dev/null
+++ b/test/cmdlineTests/mcopy_string_literal_returned_from_function/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    function foo() external pure returns (string memory)
+    {
+        return "MCOPY on Cancun vacation.";
+    }
+}
diff --git a/test/cmdlineTests/mcopy_string_literal_returned_from_function/output b/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
new file mode 100644
index 0000000000..02740ec0d6
--- /dev/null
+++ b/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
@@ -0,0 +1,51 @@
+Optimized IR:
+/// @use-src 0:"mcopy_string_literal_returned_from_function/input.sol"
+object "C_10" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize("C_10_deployed")
+            codecopy(_1, dataoffset("C_10_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:"mcopy_string_literal_returned_from_function/input.sol"
+    object "C_10_deployed" {
+        code {
+            {
+                let _1 := memoryguard(0x80)
+                if iszero(lt(calldatasize(), 4))
+                {
+                    if eq(0xc2985578, shr(224, calldataload(0)))
+                    {
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _2 := 64
+                        let newFreePtr := add(_1, _2)
+                        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
+                        {
+                            mstore(0, shl(224, 0x4e487b71))
+                            mstore(4, 0x41)
+                            revert(0, 0x24)
+                        }
+                        mstore(_2, newFreePtr)
+                        mstore(_1, 25)
+                        let _3 := add(_1, 0x20)
+                        mstore(_3, "MCOPY on Cancun vacation.")
+                        let memPos := mload(_2)
+                        mstore(memPos, 0x20)
+                        let length := mload(_1)
+                        mstore(add(memPos, 0x20), length)
+                        mcopy(add(memPos, _2), _3, length)
+                        mstore(add(add(memPos, length), _2), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
+                    }
+                }
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex""
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index aa830d1abe..1a9612c777 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -96,12 +96,14 @@ object \"C_11\" {
             }
 
             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)))
                 }
                 mstore(add(dst, length), 0)
+
             }
 
             function round_up_to_mul_of_32(value) -> result {
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index 348e5a0b57..5adeabfdff 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -96,12 +96,14 @@ object \"C_11\" {
             }
 
             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)))
                 }
                 mstore(add(dst, length), 0)
+
             }
 
             function round_up_to_mul_of_32(value) -> result {
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 80daf116cd..7e48b00ca8 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -8,7 +8,7 @@ contract C {
     }
 
     // To avoid dependency on exact length.
-    function f() public view returns (bool) { return address(this).code.length > 400; }
+    function f() public view returns (bool) { return address(this).code.length > 380; }
     function g() public view returns (uint) { return address(0).code.length; }
     function h() public view returns (uint) { return address(1).code.length; }
 }
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
index 21c48cc433..f22b9755d6 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ====
-// EVMVersion: >=shanghai
+// EVMVersion: >=cancun
 // ----
-// 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.
+// Warning 5574: (21-27154): Contract code size is 27164 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 3122d35a4e8b0d49e20cb71833798d15d6e9ea73 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 14 Feb 2024 14:41:26 +0100
Subject: [PATCH 0666/1140] ABI decode test case

---
 .../mcopy_bytes_array_abi_decode/args         |   1 +
 .../mcopy_bytes_array_abi_decode/err          |   5 +
 .../mcopy_bytes_array_abi_decode/input.sol    |   9 +
 .../mcopy_bytes_array_abi_decode/output       | 230 ++++++++++++++++++
 4 files changed, 245 insertions(+)
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_abi_decode/args
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_abi_decode/err
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_abi_decode/input.sol
 create mode 100644 test/cmdlineTests/mcopy_bytes_array_abi_decode/output

diff --git a/test/cmdlineTests/mcopy_bytes_array_abi_decode/args b/test/cmdlineTests/mcopy_bytes_array_abi_decode/args
new file mode 100644
index 0000000000..4a03d8d932
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_abi_decode/args
@@ -0,0 +1 @@
+--evm-version cancun --no-cbor-metadata --via-ir --ir --debug-info none
diff --git a/test/cmdlineTests/mcopy_bytes_array_abi_decode/err b/test/cmdlineTests/mcopy_bytes_array_abi_decode/err
new file mode 100644
index 0000000000..de32e66295
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_abi_decode/err
@@ -0,0 +1,5 @@
+Warning: Statement has no effect.
+ --> mcopy_bytes_array_abi_decode/input.sol:7:9:
+  |
+7 |         abi.decode("abcd", (bytes));
+  |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/mcopy_bytes_array_abi_decode/input.sol b/test/cmdlineTests/mcopy_bytes_array_abi_decode/input.sol
new file mode 100644
index 0000000000..07d66f800e
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_abi_decode/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    function foo() external pure
+    {
+        abi.decode("abcd", (bytes));
+    }
+}
diff --git a/test/cmdlineTests/mcopy_bytes_array_abi_decode/output b/test/cmdlineTests/mcopy_bytes_array_abi_decode/output
new file mode 100644
index 0000000000..2a24ec834f
--- /dev/null
+++ b/test/cmdlineTests/mcopy_bytes_array_abi_decode/output
@@ -0,0 +1,230 @@
+IR:
+
+/// @use-src 0:"mcopy_bytes_array_abi_decode/input.sol"
+object "C_15" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_15()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset("C_15_deployed"), datasize("C_15_deployed"))
+
+        return(_1, datasize("C_15_deployed"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_15() {
+
+        }
+
+    }
+    /// @use-src 0:"mcopy_bytes_array_abi_decode/input.sol"
+    object "C_15_deployed" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := shift_right_224_unsigned(calldataload(0))
+                switch selector
+
+                case 0xc2985578
+                {
+                    // foo()
+
+                    external_fun_foo_14()
+                }
+
+                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_foo_14() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_foo_14()
+                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 round_up_to_mul_of_32(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+
+            function panic_error_0x41() {
+                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
+                mstore(4, 0x41)
+                revert(0, 0x24)
+            }
+
+            function finalize_allocation(memPtr, size) {
+                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
+                // protect against overflow
+                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
+                mstore(64, newFreePtr)
+            }
+
+            function allocate_memory(size) -> memPtr {
+                memPtr := allocate_unbounded()
+                finalize_allocation(memPtr, size)
+            }
+
+            function array_allocation_size_t_string_memory_ptr(length) -> size {
+                // Make sure we can allocate memory without overflow
+                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
+
+                size := round_up_to_mul_of_32(length)
+
+                // add length slot
+                size := add(size, 0x20)
+
+            }
+
+            function allocate_memory_array_t_string_memory_ptr(length) -> memPtr {
+                let allocSize := array_allocation_size_t_string_memory_ptr(length)
+                memPtr := allocate_memory(allocSize)
+
+                mstore(memPtr, length)
+
+            }
+
+            function store_literal_in_memory_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77(memPtr) {
+
+                mstore(add(memPtr, 0), "abcd")
+
+            }
+
+            function copy_literal_to_memory_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77() -> memPtr {
+                memPtr := allocate_memory_array_t_string_memory_ptr(4)
+                store_literal_in_memory_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77(add(memPtr, 32))
+            }
+
+            function convert_t_stringliteral_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77_to_t_bytes_memory_ptr() -> converted {
+                converted := copy_literal_to_memory_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77()
+            }
+
+            function revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
+                revert(0, 0)
+            }
+
+            function revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() {
+                revert(0, 0)
+            }
+
+            function revert_error_987264b3b1d58a9c7f8255e93e81c77d86d6299019c33110a076957a3e06e2ae() {
+                revert(0, 0)
+            }
+
+            function array_allocation_size_t_bytes_memory_ptr(length) -> size {
+                // Make sure we can allocate memory without overflow
+                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
+
+                size := round_up_to_mul_of_32(length)
+
+                // add length slot
+                size := add(size, 0x20)
+
+            }
+
+            function copy_memory_to_memory_with_cleanup(src, dst, length) {
+
+                mcopy(dst, src, length)
+                mstore(add(dst, length), 0)
+
+            }
+
+            function abi_decode_available_length_t_bytes_memory_ptr_fromMemory(src, length, end) -> array {
+                array := allocate_memory(array_allocation_size_t_bytes_memory_ptr(length))
+                mstore(array, length)
+                let dst := add(array, 0x20)
+                if gt(add(src, length), end) { revert_error_987264b3b1d58a9c7f8255e93e81c77d86d6299019c33110a076957a3e06e2ae() }
+                copy_memory_to_memory_with_cleanup(src, dst, length)
+            }
+
+            // bytes
+            function abi_decode_t_bytes_memory_ptr_fromMemory(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d() }
+                let length := mload(offset)
+                array := abi_decode_available_length_t_bytes_memory_ptr_fromMemory(add(offset, 0x20), length, end)
+            }
+
+            function abi_decode_tuple_t_bytes_memory_ptr_fromMemory(headStart, dataEnd) -> value0 {
+                if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
+
+                {
+
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() }
+
+                    value0 := abi_decode_t_bytes_memory_ptr_fromMemory(add(headStart, offset), dataEnd)
+                }
+
+            }
+
+            function array_length_t_bytes_memory_ptr(value) -> length {
+
+                length := mload(value)
+
+            }
+
+            function fun_foo_14() {
+
+                let _1_mpos := convert_t_stringliteral_48bed44d1bcd124a28c27f343a817e5f5243190d3c52bf347daf876de1dbbf77_to_t_bytes_memory_ptr()
+
+                let expr_11_mpos :=  abi_decode_tuple_t_bytes_memory_ptr_fromMemory(add(_1_mpos, 32), add(add(_1_mpos, 32), array_length_t_bytes_memory_ptr(_1_mpos)))
+
+            }
+
+        }
+
+        data ".metadata" hex""
+    }
+
+}

From 4032b5946cc0ae48baf4a65dd35e9401a3d612eb Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Sat, 10 Feb 2024 01:47:07 +0100
Subject: [PATCH 0667/1140] Add DebugData to AssemblyItem.

---
 libevmasm/Assembly.cpp                        |  2 +-
 libevmasm/AssemblyItem.h                      | 45 ++++++++---
 libevmasm/CommonSubexpressionEliminator.cpp   | 76 ++++++++++---------
 libevmasm/CommonSubexpressionEliminator.h     |  4 +-
 libevmasm/ControlFlowGraph.cpp                |  2 +-
 libevmasm/ExpressionClasses.cpp               |  7 +-
 libevmasm/ExpressionClasses.h                 |  2 +-
 libevmasm/KnownState.cpp                      | 62 +++++++--------
 libevmasm/KnownState.h                        | 16 ++--
 libevmasm/PeepholeOptimiser.cpp               | 14 ++--
 libevmasm/SimplificationRules.cpp             | 12 +--
 libevmasm/SimplificationRules.h               |  4 +-
 liblangutil/CMakeLists.txt                    |  1 +
 liblangutil/DebugData.h                       | 70 +++++++++++++++++
 libyul/AST.h                                  | 72 +++++-------------
 libyul/ASTForward.h                           |  1 -
 libyul/AsmParser.cpp                          | 26 +++----
 libyul/AsmParser.h                            |  8 +-
 libyul/AsmPrinter.cpp                         |  2 +-
 libyul/AsmPrinter.h                           |  4 +-
 libyul/backends/evm/ConstantOptimiser.h       |  6 +-
 libyul/backends/evm/ControlFlowGraph.h        | 22 +++---
 .../backends/evm/ControlFlowGraphBuilder.cpp  |  8 +-
 libyul/backends/evm/ControlFlowGraphBuilder.h |  4 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |  2 +-
 .../backends/evm/OptimizedEVMCodeTransform.h  |  2 +-
 libyul/optimiser/ConditionalSimplifier.cpp    |  2 +-
 libyul/optimiser/ControlFlowSimplifier.cpp    |  4 +-
 libyul/optimiser/ExpressionSplitter.cpp       |  2 +-
 libyul/optimiser/ForLoopConditionIntoBody.cpp |  2 +-
 .../optimiser/ForLoopConditionOutOfBody.cpp   |  2 +-
 libyul/optimiser/SSATransform.cpp             |  4 +-
 libyul/optimiser/SimplificationRules.cpp      |  2 +-
 libyul/optimiser/SimplificationRules.h        |  6 +-
 libyul/optimiser/StackToMemoryMover.cpp       |  4 +-
 test/tools/yulInterpreter/Inspector.cpp       |  4 +-
 test/tools/yulInterpreter/Inspector.h         |  6 +-
 37 files changed, 289 insertions(+), 223 deletions(-)
 create mode 100644 liblangutil/DebugData.h

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index b6e4d0006c..424d3229ca 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -180,7 +180,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 
 	if (c_instructions.count(name))
 	{
-		AssemblyItem item{c_instructions.at(name), location};
+		AssemblyItem item{c_instructions.at(name), langutil::DebugData::create(location)};
 		if (!jumpType.empty())
 		{
 			if (item.instruction() == Instruction::JUMP || item.instruction() == Instruction::JUMPI)
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 93be394733..c2b3603c63 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -24,7 +24,8 @@
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Exceptions.h>
-#include <liblangutil/SourceLocation.h>
+#include <liblangutil/DebugData.h>
+#include <liblangutil/Exceptions.h>
 #include <libsolutil/Common.h>
 #include <libsolutil/Numeric.h>
 #include <libsolutil/Assertions.h>
@@ -64,16 +65,16 @@ class AssemblyItem
 public:
 	enum class JumpType { Ordinary, IntoFunction, OutOfFunction };
 
-	AssemblyItem(u256 _push, langutil::SourceLocation _location = langutil::SourceLocation()):
-		AssemblyItem(Push, std::move(_push), std::move(_location)) { }
-	AssemblyItem(Instruction _i, langutil::SourceLocation _location = langutil::SourceLocation()):
+	AssemblyItem(u256 _push, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create()):
+		AssemblyItem(Push, std::move(_push), std::move(_debugData)) { }
+	AssemblyItem(Instruction _i, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create()):
 		m_type(Operation),
 		m_instruction(_i),
-		m_location(std::move(_location))
+		m_debugData(std::move(_debugData))
 	{}
-	AssemblyItem(AssemblyItemType _type, u256 _data = 0, langutil::SourceLocation _location = langutil::SourceLocation()):
+	AssemblyItem(AssemblyItemType _type, u256 _data = 0, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create()):
 		m_type(_type),
-		m_location(std::move(_location))
+		m_debugData(std::move(_debugData))
 	{
 		if (m_type == Operation)
 			m_instruction = Instruction(uint8_t(_data));
@@ -83,7 +84,8 @@ class AssemblyItem
 	explicit AssemblyItem(bytes _verbatimData, size_t _arguments, size_t _returnVariables):
 		m_type(VerbatimBytecode),
 		m_instruction{},
-		m_verbatimBytecode{{_arguments, _returnVariables, std::move(_verbatimData)}}
+		m_verbatimBytecode{{_arguments, _returnVariables, std::move(_verbatimData)}},
+		m_debugData{langutil::DebugData::create()}
 	{}
 
 	AssemblyItem(AssemblyItem const&) = default;
@@ -170,8 +172,29 @@ class AssemblyItem
 	/// @returns true if the assembly item can be used in a functional context.
 	bool canBeFunctional() const;
 
-	void setLocation(langutil::SourceLocation const& _location) { m_location = _location; }
-	langutil::SourceLocation const& location() const { return m_location; }
+	void setLocation(langutil::SourceLocation const& _location)
+	{
+		solAssert(m_debugData);
+		m_debugData = langutil::DebugData::create(
+			_location,
+			m_debugData->originLocation,
+			m_debugData->astID
+		);
+	}
+
+	langutil::SourceLocation const& location() const
+	{
+		solAssert(m_debugData);
+		return m_debugData->nativeLocation;
+	}
+
+	void setDebugData(langutil::DebugData::ConstPtr _debugData)
+	{
+		solAssert(_debugData);
+		m_debugData = std::move(_debugData);
+	}
+
+	langutil::DebugData::ConstPtr debugData() const { return m_debugData; }
 
 	void setJumpType(JumpType _jumpType) { m_jumpType = _jumpType; }
 	static std::optional<JumpType> parseJumpType(std::string const& _jumpType);
@@ -196,7 +219,7 @@ class AssemblyItem
 	/// If m_type == VerbatimBytecode, this holds number of arguments, number of
 	/// return variables and verbatim bytecode.
 	std::optional<std::tuple<size_t, size_t, bytes>> m_verbatimBytecode;
-	langutil::SourceLocation m_location;
+	langutil::DebugData::ConstPtr m_debugData;
 	JumpType m_jumpType = JumpType::Ordinary;
 	/// Pushed value for operations with data to be determined during assembly stage,
 	/// e.g. PushSubSize, PushTag, PushSub, etc.
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index de1e5a364a..cb4eaebff3 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -29,6 +29,7 @@
 #include <libsolutil/StackTooDeepString.h>
 
 #include <range/v3/view/reverse.hpp>
+#include <utility>
 
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -57,9 +58,9 @@ std::vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
 	if (!m_state.stackElements().empty())
 		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());
+		initialStackContents[height] = m_initialState.stackElement(height, langutil::DebugData::create());
 	for (int height = minHeight; height <= m_state.stackHeight(); ++height)
-		targetStackContents[height] = m_state.stackElement(height, SourceLocation());
+		targetStackContents[height] = m_state.stackElement(height, langutil::DebugData::create());
 
 	AssemblyItems items = CSECodeGenerator(m_state.expressionClasses(), m_storeOperations).generateCode(
 		m_initialState.sequenceNumber(),
@@ -87,23 +88,24 @@ void CommonSubexpressionEliminator::optimizeBreakingItem()
 
 	ExpressionClasses& classes = m_state.expressionClasses();
 	SourceLocation const& itemLocation = m_breakingItem->location();
+	langutil::DebugData::ConstPtr debugData{langutil::DebugData::create(itemLocation)};
 	if (*m_breakingItem == AssemblyItem(Instruction::JUMPI))
 	{
 		AssemblyItem::JumpType jumpType = m_breakingItem->getJumpType();
 
-		Id condition = m_state.stackElement(m_state.stackHeight() - 1, itemLocation);
+		Id condition = m_state.stackElement(m_state.stackHeight() - 1, debugData);
 		if (classes.knownNonZero(condition))
 		{
-			feedItem(AssemblyItem(Instruction::SWAP1, itemLocation), true);
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
+			feedItem(AssemblyItem(Instruction::SWAP1, debugData), true);
+			feedItem(AssemblyItem(Instruction::POP, debugData), true);
 
-			AssemblyItem item(Instruction::JUMP, itemLocation);
+			AssemblyItem item(Instruction::JUMP, debugData);
 			item.setJumpType(jumpType);
 			m_breakingItem = classes.storeItem(item);
 		}
 		else if (classes.knownZero(condition))
 		{
-			AssemblyItem it(Instruction::POP, itemLocation);
+			AssemblyItem it(Instruction::POP, debugData);
 			feedItem(it, true);
 			feedItem(it, true);
 			m_breakingItem = nullptr;
@@ -111,12 +113,12 @@ void CommonSubexpressionEliminator::optimizeBreakingItem()
 	}
 	else if (*m_breakingItem == AssemblyItem(Instruction::RETURN))
 	{
-		Id size = m_state.stackElement(m_state.stackHeight() - 1, itemLocation);
+		Id size = m_state.stackElement(m_state.stackHeight() - 1, debugData);
 		if (classes.knownZero(size))
 		{
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
-			feedItem(AssemblyItem(Instruction::POP, itemLocation), true);
-			AssemblyItem item(Instruction::STOP, itemLocation);
+			feedItem(AssemblyItem(Instruction::POP, debugData), true);
+			feedItem(AssemblyItem(Instruction::POP, debugData), true);
+			AssemblyItem item(Instruction::STOP, debugData);
 			m_breakingItem = classes.storeItem(item);
 		}
 	}
@@ -181,16 +183,16 @@ AssemblyItems CSECodeGenerator::generateCode(
 		assertThrow(!m_classPositions[targetItem.second].empty(), OptimizerException, "");
 		if (m_classPositions[targetItem.second].count(targetItem.first))
 			continue;
-		SourceLocation sourceLocation;
+		langutil::DebugData::ConstPtr debugData;
 		if (m_expressionClasses.representative(targetItem.second).item)
-			sourceLocation = m_expressionClasses.representative(targetItem.second).item->location();
+			debugData = m_expressionClasses.representative(targetItem.second).item->debugData();
 		int position = classElementPosition(targetItem.second);
 		if (position < targetItem.first)
 			// it is already at its target, we need another copy
-			appendDup(position, sourceLocation);
+			appendDup(position, debugData);
 		else
-			appendOrRemoveSwap(position, sourceLocation);
-		appendOrRemoveSwap(targetItem.first, sourceLocation);
+			appendOrRemoveSwap(position, debugData);
+		appendOrRemoveSwap(targetItem.first, debugData);
 	}
 
 	// remove surplus elements
@@ -263,7 +265,7 @@ void CSECodeGenerator::addDependencies(Id _c)
 			case Instruction::KECCAK256:
 			{
 				Id length = expr.arguments.at(1);
-				AssemblyItem offsetInstr(Instruction::SUB, expr.item->location());
+				AssemblyItem offsetInstr(Instruction::SUB, expr.item->debugData());
 				Id offsetToStart = m_expressionClasses.find(offsetInstr, {slot, slotToLoadFrom});
 				u256 const* o = m_expressionClasses.knownConstant(offsetToStart);
 				u256 const* l = m_expressionClasses.knownConstant(length);
@@ -334,7 +336,7 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 	for (Id arg: arguments | ranges::views::reverse)
 		generateClassElement(arg);
 
-	SourceLocation const& itemLocation = expr.item->location();
+	langutil::DebugData::ConstPtr itemDebugData = expr.item->debugData();
 	// The arguments are somewhere on the stack now, so it remains to move them at the correct place.
 	// This is quite difficult as sometimes, the values also have to removed in this process
 	// (if canBeRemoved() returns true) and the two arguments can be equal. For now, this is
@@ -342,42 +344,42 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 	if (arguments.size() == 1)
 	{
 		if (canBeRemoved(arguments[0], _c))
-			appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
+			appendOrRemoveSwap(classElementPosition(arguments[0]), itemDebugData);
 		else
-			appendDup(classElementPosition(arguments[0]), itemLocation);
+			appendDup(classElementPosition(arguments[0]), itemDebugData);
 	}
 	else if (arguments.size() == 2)
 	{
 		if (canBeRemoved(arguments[1], _c))
 		{
-			appendOrRemoveSwap(classElementPosition(arguments[1]), itemLocation);
+			appendOrRemoveSwap(classElementPosition(arguments[1]), itemDebugData);
 			if (arguments[0] == arguments[1])
-				appendDup(m_stackHeight, itemLocation);
+				appendDup(m_stackHeight, itemDebugData);
 			else if (canBeRemoved(arguments[0], _c))
 			{
-				appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
-				appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
+				appendOrRemoveSwap(m_stackHeight - 1, itemDebugData);
+				appendOrRemoveSwap(classElementPosition(arguments[0]), itemDebugData);
 			}
 			else
-				appendDup(classElementPosition(arguments[0]), itemLocation);
+				appendDup(classElementPosition(arguments[0]), itemDebugData);
 		}
 		else
 		{
 			if (arguments[0] == arguments[1])
 			{
-				appendDup(classElementPosition(arguments[0]), itemLocation);
-				appendDup(m_stackHeight, itemLocation);
+				appendDup(classElementPosition(arguments[0]), itemDebugData);
+				appendDup(m_stackHeight, itemDebugData);
 			}
 			else if (canBeRemoved(arguments[0], _c))
 			{
-				appendOrRemoveSwap(classElementPosition(arguments[0]), itemLocation);
-				appendDup(classElementPosition(arguments[1]), itemLocation);
-				appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
+				appendOrRemoveSwap(classElementPosition(arguments[0]), itemDebugData);
+				appendDup(classElementPosition(arguments[1]), itemDebugData);
+				appendOrRemoveSwap(m_stackHeight - 1, itemDebugData);
 			}
 			else
 			{
-				appendDup(classElementPosition(arguments[1]), itemLocation);
-				appendDup(classElementPosition(arguments[0]), itemLocation);
+				appendDup(classElementPosition(arguments[1]), itemDebugData);
+				appendDup(classElementPosition(arguments[0]), itemDebugData);
 			}
 		}
 	}
@@ -398,7 +400,7 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 			!m_generatedItems.empty() &&
 			m_generatedItems.back() == AssemblyItem(Instruction::SWAP1))
 		// this will not append a swap but remove the one that is already there
-		appendOrRemoveSwap(m_stackHeight - 1, itemLocation);
+		appendOrRemoveSwap(m_stackHeight - 1, itemDebugData);
 	for (size_t i = 0; i < arguments.size(); ++i)
 	{
 		m_classPositions[m_stack[m_stackHeight - static_cast<int>(i)]].erase(m_stackHeight - static_cast<int>(i));
@@ -467,18 +469,18 @@ bool CSECodeGenerator::removeStackTopIfPossible()
 	return true;
 }
 
-void CSECodeGenerator::appendDup(int _fromPosition, SourceLocation const& _location)
+void CSECodeGenerator::appendDup(int _fromPosition, langutil::DebugData::ConstPtr _debugData)
 {
 	assertThrow(_fromPosition != c_invalidPosition, OptimizerException, "");
 	int instructionNum = 1 + m_stackHeight - _fromPosition;
 	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
 	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
-	appendItem(AssemblyItem(dupInstruction(static_cast<unsigned>(instructionNum)), _location));
+	appendItem(AssemblyItem(dupInstruction(static_cast<unsigned>(instructionNum)), std::move(_debugData)));
 	m_stack[m_stackHeight] = m_stack[_fromPosition];
 	m_classPositions[m_stack[m_stackHeight]].insert(m_stackHeight);
 }
 
-void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, SourceLocation const& _location)
+void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, langutil::DebugData::ConstPtr _debugData)
 {
 	assertThrow(_fromPosition != c_invalidPosition, OptimizerException, "");
 	if (_fromPosition == m_stackHeight)
@@ -486,7 +488,7 @@ void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, SourceLocation cons
 	int instructionNum = m_stackHeight - _fromPosition;
 	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
 	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
-	appendItem(AssemblyItem(swapInstruction(static_cast<unsigned>(instructionNum)), _location));
+	appendItem(AssemblyItem(swapInstruction(static_cast<unsigned>(instructionNum)), std::move(_debugData)));
 
 	if (m_stack[m_stackHeight] != m_stack[_fromPosition])
 	{
diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index b0810a9a1d..3e963838a4 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -142,10 +142,10 @@ class CSECodeGenerator
 	bool removeStackTopIfPossible();
 
 	/// Appends a dup instruction to m_generatedItems to retrieve the element at the given stack position.
-	void appendDup(int _fromPosition, langutil::SourceLocation const& _location);
+	void appendDup(int _fromPosition,  langutil::DebugData::ConstPtr _debugData);
 	/// Appends a swap instruction to m_generatedItems to retrieve the element at the given stack position.
 	/// @note this might also remove the last item if it exactly the same swap instruction.
-	void appendOrRemoveSwap(int _fromPosition, langutil::SourceLocation const& _location);
+	void appendOrRemoveSwap(int _fromPosition,  langutil::DebugData::ConstPtr _debugData);
 	/// Appends the given assembly item.
 	void appendItem(AssemblyItem const& _item);
 
diff --git a/libevmasm/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
index 9d2927ed9c..5b73fb6d5b 100644
--- a/libevmasm/ControlFlowGraph.cpp
+++ b/libevmasm/ControlFlowGraph.cpp
@@ -275,7 +275,7 @@ void ControlFlowGraph::gatherKnowledge()
 			//@todo in the case of JUMPI, add knowledge about the condition to the state
 			// (for both values of the condition)
 			std::set<u256> tags = state->tagsInExpression(
-				state->stackElement(state->stackHeight(), langutil::SourceLocation{})
+				state->stackElement(state->stackHeight(), langutil::DebugData::create())
 			);
 			state->feedItem(m_items.at(pc++));
 
diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
index dd66eea328..74de0ae3f4 100644
--- a/libevmasm/ExpressionClasses.cpp
+++ b/libevmasm/ExpressionClasses.cpp
@@ -33,6 +33,7 @@
 #include <functional>
 #include <limits>
 #include <tuple>
+#include <utility>
 
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -134,11 +135,11 @@ void ExpressionClasses::forceEqual(
 	m_expressions.insert(exp);
 }
 
-ExpressionClasses::Id ExpressionClasses::newClass(SourceLocation const& _location)
+ExpressionClasses::Id ExpressionClasses::newClass(langutil::DebugData::ConstPtr _debugData)
 {
 	Expression exp;
 	exp.id = static_cast<Id>(m_representatives.size());
-	exp.item = storeItem(AssemblyItem(UndefinedItem, (u256(1) << 255) + exp.id, _location));
+	exp.item = storeItem(AssemblyItem(UndefinedItem, (u256(1) << 255) + exp.id, std::move(_debugData)));
 	m_representatives.push_back(exp);
 	m_expressions.insert(exp);
 	return exp.id;
@@ -226,7 +227,7 @@ ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr)
 			std::cout << "to " << match->action().toString() << std::endl;
 		}
 
-		return rebuildExpression(ExpressionTemplate(match->action(), _expr.item->location()));
+		return rebuildExpression(ExpressionTemplate(match->action(), _expr.item->debugData()));
 	}
 
 	return std::numeric_limits<unsigned>::max();
diff --git a/libevmasm/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
index 8d4159fc7b..510302e4c7 100644
--- a/libevmasm/ExpressionClasses.h
+++ b/libevmasm/ExpressionClasses.h
@@ -92,7 +92,7 @@ class ExpressionClasses
 	void forceEqual(Id _id, AssemblyItem const& _item, Ids const& _arguments, bool _copyItem = true);
 
 	/// @returns the id of a new class which is different to all other classes.
-	Id newClass(langutil::SourceLocation const& _location);
+	Id newClass(langutil::DebugData::ConstPtr _debugData);
 
 	/// @returns true if the values of the given classes are known to be different (on every input).
 	/// @note that this function might still return false for some different inputs.
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index 91f798bf38..3878ae0fdd 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -27,6 +27,7 @@
 #include <libsolutil/Keccak256.h>
 
 #include <functional>
+#include <utility>
 
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -114,7 +115,7 @@ KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool
 		for (size_t i = 0; i < _item.returnValues(); ++i)
 			setStackElement(
 				m_stackHeight - static_cast<int>(i),
-				m_expressionClasses->newClass(_item.location())
+				m_expressionClasses->newClass(_item.debugData())
 			);
 	}
 	else if (_item.type() != Operation)
@@ -137,44 +138,44 @@ KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool
 				m_stackHeight + 1,
 				stackElement(
 					m_stackHeight - static_cast<int>(instruction) + static_cast<int>(Instruction::DUP1),
-					_item.location()
+					_item.debugData()
 				)
 			);
 		else if (SemanticInformation::isSwapInstruction(_item))
 			swapStackElements(
 				m_stackHeight,
 				m_stackHeight - 1 - static_cast<int>(instruction) + static_cast<int>(Instruction::SWAP1),
-				_item.location()
+				_item.debugData()
 			);
 		else if (instruction != Instruction::POP)
 		{
 			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());
+				arguments[i] = stackElement(m_stackHeight - static_cast<int>(i), _item.debugData());
 			switch (_item.instruction())
 			{
 			case Instruction::SSTORE:
-				op = storeInStorage(arguments[0], arguments[1], _item.location());
+				op = storeInStorage(arguments[0], arguments[1], _item.debugData());
 				break;
 			case Instruction::SLOAD:
 				setStackElement(
 					m_stackHeight + static_cast<int>(_item.deposit()),
-					loadFromStorage(arguments[0], _item.location())
+					loadFromStorage(arguments[0], _item.debugData())
 				);
 				break;
 			case Instruction::MSTORE:
-				op = storeInMemory(arguments[0], arguments[1], _item.location());
+				op = storeInMemory(arguments[0], arguments[1], _item.debugData());
 				break;
 			case Instruction::MLOAD:
 				setStackElement(
 					m_stackHeight + static_cast<int>(_item.deposit()),
-					loadFromMemory(arguments[0], _item.location())
+					loadFromMemory(arguments[0], _item.debugData())
 				);
 				break;
 			case Instruction::KECCAK256:
 				setStackElement(
 					m_stackHeight + static_cast<int>(_item.deposit()),
-					applyKeccak256(arguments.at(0), arguments.at(1), _item.location())
+					applyKeccak256(arguments.at(0), arguments.at(1), _item.debugData())
 				);
 				break;
 			default:
@@ -276,18 +277,18 @@ bool KnownState::operator==(KnownState const& _other) const
 	return (thisIt == m_stackElements.cend() && otherIt == _other.m_stackElements.cend());
 }
 
-ExpressionClasses::Id KnownState::stackElement(int _stackHeight, SourceLocation const& _location)
+ExpressionClasses::Id KnownState::stackElement(int _stackHeight, langutil::DebugData::ConstPtr _debugData)
 {
 	if (m_stackElements.count(_stackHeight))
 		return m_stackElements.at(_stackHeight);
 	// Stack element not found (not assigned yet), create new unknown equivalence class.
 	return m_stackElements[_stackHeight] =
-			m_expressionClasses->find(AssemblyItem(UndefinedItem, _stackHeight, _location));
+			m_expressionClasses->find(AssemblyItem(UndefinedItem, _stackHeight, std::move(_debugData)));
 }
 
-KnownState::Id KnownState::relativeStackElement(int _stackOffset, SourceLocation const& _location)
+KnownState::Id KnownState::relativeStackElement(int _stackOffset, langutil::DebugData::ConstPtr _debugData)
 {
-	return stackElement(m_stackHeight + _stackOffset, _location);
+	return stackElement(m_stackHeight + _stackOffset, std::move(_debugData));
 }
 
 void KnownState::clearTagUnions()
@@ -307,13 +308,13 @@ void KnownState::setStackElement(int _stackHeight, Id _class)
 void KnownState::swapStackElements(
 	int _stackHeightA,
 	int _stackHeightB,
-	SourceLocation const& _location
+	langutil::DebugData::ConstPtr _debugData
 )
 {
 	assertThrow(_stackHeightA != _stackHeightB, OptimizerException, "Swap on same stack elements.");
 	// ensure they are created
-	stackElement(_stackHeightA, _location);
-	stackElement(_stackHeightB, _location);
+	stackElement(_stackHeightA, _debugData);
+	stackElement(_stackHeightB, _debugData);
 
 	std::swap(m_stackElements[_stackHeightA], m_stackElements[_stackHeightB]);
 }
@@ -321,7 +322,8 @@ void KnownState::swapStackElements(
 KnownState::StoreOperation KnownState::storeInStorage(
 	Id _slot,
 	Id _value,
-	SourceLocation const& _location)
+	langutil::DebugData::ConstPtr _debugData
+)
 {
 	if (m_storageContent.count(_slot) && m_storageContent[_slot] == _value)
 		// do not execute the storage if we know that the value is already there
@@ -336,7 +338,7 @@ KnownState::StoreOperation KnownState::storeInStorage(
 			storageContents.insert(storageItem);
 	m_storageContent = std::move(storageContents);
 
-	AssemblyItem item(Instruction::SSTORE, _location);
+	AssemblyItem item(Instruction::SSTORE, std::move(_debugData));
 	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
 	StoreOperation operation{StoreOperation::Storage, _slot, m_sequenceNumber, id};
 	m_storageContent[_slot] = _value;
@@ -346,16 +348,16 @@ KnownState::StoreOperation KnownState::storeInStorage(
 	return operation;
 }
 
-ExpressionClasses::Id KnownState::loadFromStorage(Id _slot, SourceLocation const& _location)
+ExpressionClasses::Id KnownState::loadFromStorage(Id _slot, langutil::DebugData::ConstPtr _debugData)
 {
 	if (m_storageContent.count(_slot))
 		return m_storageContent.at(_slot);
 
-	AssemblyItem item(Instruction::SLOAD, _location);
+	AssemblyItem item(Instruction::SLOAD, std::move(_debugData));
 	return m_storageContent[_slot] = m_expressionClasses->find(item, {_slot}, true, m_sequenceNumber);
 }
 
-KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, SourceLocation const& _location)
+KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, langutil::DebugData::ConstPtr _debugData)
 {
 	if (m_memoryContent.count(_slot) && m_memoryContent[_slot] == _value)
 		// do not execute the store if we know that the value is already there
@@ -368,7 +370,7 @@ KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, Source
 			memoryContents.insert(memoryItem);
 	m_memoryContent = std::move(memoryContents);
 
-	AssemblyItem item(Instruction::MSTORE, _location);
+	AssemblyItem item(Instruction::MSTORE, std::move(_debugData));
 	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
 	StoreOperation operation{StoreOperation::Memory, _slot, m_sequenceNumber, id};
 	m_memoryContent[_slot] = _value;
@@ -377,22 +379,22 @@ KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, Source
 	return operation;
 }
 
-ExpressionClasses::Id KnownState::loadFromMemory(Id _slot, SourceLocation const& _location)
+ExpressionClasses::Id KnownState::loadFromMemory(Id _slot, langutil::DebugData::ConstPtr _debugData)
 {
 	if (m_memoryContent.count(_slot))
 		return m_memoryContent.at(_slot);
 
-	AssemblyItem item(Instruction::MLOAD, _location);
+	AssemblyItem item(Instruction::MLOAD, std::move(_debugData));
 	return m_memoryContent[_slot] = m_expressionClasses->find(item, {_slot}, true, m_sequenceNumber);
 }
 
 KnownState::Id KnownState::applyKeccak256(
 	Id _start,
 	Id _length,
-	SourceLocation const& _location
+	langutil::DebugData::ConstPtr _debugData
 )
 {
-	AssemblyItem keccak256Item(Instruction::KECCAK256, _location);
+	AssemblyItem keccak256Item(Instruction::KECCAK256, _debugData);
 	// Special logic if length is a short constant, otherwise we cannot tell.
 	u256 const* l = m_expressionClasses->knownConstant(_length);
 	// unknown or too large length
@@ -403,10 +405,10 @@ KnownState::Id KnownState::applyKeccak256(
 	for (unsigned i = 0; i < length; i += 32)
 	{
 		Id slot = m_expressionClasses->find(
-			AssemblyItem(Instruction::ADD, _location),
+			AssemblyItem(Instruction::ADD, _debugData),
 			{_start, m_expressionClasses->find(u256(i))}
 		);
-		arguments.push_back(loadFromMemory(slot, _location));
+		arguments.push_back(loadFromMemory(slot, _debugData));
 	}
 	if (m_knownKeccak256Hashes.count({arguments, length}))
 		return m_knownKeccak256Hashes.at({arguments, length});
@@ -418,7 +420,7 @@ KnownState::Id KnownState::applyKeccak256(
 		for (Id a: arguments)
 			data += toBigEndian(*m_expressionClasses->knownConstant(a));
 		data.resize(length);
-		v = m_expressionClasses->find(AssemblyItem(u256(util::keccak256(data)), _location));
+		v = m_expressionClasses->find(AssemblyItem(u256(util::keccak256(data)), _debugData));
 	}
 	else
 		v = m_expressionClasses->find(keccak256Item, {_start, _length}, true, m_sequenceNumber);
@@ -443,7 +445,7 @@ KnownState::Id KnownState::tagUnion(std::set<u256> _tags)
 		return m_tagUnions.right.at(_tags);
 	else
 	{
-		Id id = m_expressionClasses->newClass(SourceLocation());
+		Id id = m_expressionClasses->newClass(langutil::DebugData::create());
 		m_tagUnions.right.insert(make_pair(_tags, id));
 		return id;
 	}
diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h
index 9cc22710fa..79426c36f4 100644
--- a/libevmasm/KnownState.h
+++ b/libevmasm/KnownState.h
@@ -134,9 +134,9 @@ class KnownState
 
 	/// 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);
+	Id stackElement(int _stackHeight, langutil::DebugData::ConstPtr _debugData);
 	/// @returns the stackElement relative to the current stack height.
-	Id relativeStackElement(int _stackOffset, langutil::SourceLocation const& _location = {});
+	Id relativeStackElement(int _stackOffset, langutil::DebugData::ConstPtr _debugData = {});
 
 	/// @returns its set of tags if the given expression class is a known tag union; returns a set
 	/// containing the tag if it is a PushTag expression and the empty set otherwise.
@@ -155,22 +155,22 @@ class KnownState
 	/// Assigns a new equivalence class to the next sequence number of the given stack element.
 	void setStackElement(int _stackHeight, Id _class);
 	/// Swaps the given stack elements in their next sequence number.
-	void swapStackElements(int _stackHeightA, int _stackHeightB, langutil::SourceLocation const& _location);
+	void swapStackElements(int _stackHeightA, int _stackHeightB, langutil::DebugData::ConstPtr _debugData);
 
 	/// Increments the sequence number, deletes all storage information that might be overwritten
 	/// and stores the new value at the given slot.
 	/// @returns the store operation, which might be invalid if storage was not modified
-	StoreOperation storeInStorage(Id _slot, Id _value, langutil::SourceLocation const& _location);
+	StoreOperation storeInStorage(Id _slot, Id _value,langutil::DebugData::ConstPtr _debugData);
 	/// Retrieves the current value at the given slot in storage or creates a new special sload class.
-	Id loadFromStorage(Id _slot, langutil::SourceLocation const& _location);
+	Id loadFromStorage(Id _slot, langutil::DebugData::ConstPtr _debugData);
 	/// Increments the sequence number, deletes all memory information that might be overwritten
 	/// and stores the new value at the given slot.
 	/// @returns the store operation, which might be invalid if memory was not modified
-	StoreOperation storeInMemory(Id _slot, Id _value, langutil::SourceLocation const& _location);
+	StoreOperation storeInMemory(Id _slot, Id _value, langutil::DebugData::ConstPtr _debugData);
 	/// Retrieves the current value at the given slot in memory or creates a new special mload class.
-	Id loadFromMemory(Id _slot, langutil::SourceLocation const& _location);
+	Id loadFromMemory(Id _slot, langutil::DebugData::ConstPtr _debugData);
 	/// Finds or creates a new expression that applies the Keccak-256 hash function to the contents in memory.
-	Id applyKeccak256(Id _start, Id _length, langutil::SourceLocation const& _location);
+	Id applyKeccak256(Id _start, Id _length, langutil::DebugData::ConstPtr _debugData);
 
 	/// @returns a new or already used Id representing the given set of tags.
 	Id tagUnion(std::set<u256> _tags);
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index e9231c0a56..257a3727c0 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -119,7 +119,7 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
 			if (instructionInfo(instr, langutil::EVMVersion()).ret == 1 && !instructionInfo(instr, langutil::EVMVersion()).sideEffects)
 			{
 				for (int j = 0; j < instructionInfo(instr, langutil::EVMVersion()).args; j++)
-					*_out = {Instruction::POP, _op.location()};
+					*_out = {Instruction::POP, _op.debugData()};
 				return true;
 			}
 		}
@@ -142,13 +142,13 @@ struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
 				Instruction instr = _op.instruction();
 				if (!instructionInfo(instr, langutil::EVMVersion()).sideEffects)
 				{
-					*_out = {Instruction::STOP, _op.location()};
+					*_out = {Instruction::STOP, _op.debugData()};
 					return true;
 				}
 			}
 			else if (_op.type() == Push)
 			{
-				*_out = {Instruction::STOP, _op.location()};
+				*_out = {Instruction::STOP, _op.debugData()};
 				return true;
 			}
 		}
@@ -208,7 +208,7 @@ struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
 		if (_push1.type() == Push && _push2.type() == Push && _push1.data() == _push2.data())
 		{
 			*_out = _push1;
-			*_out = {Instruction::DUP1, _push2.location()};
+			*_out = {Instruction::DUP1, _push2.debugData()};
 			return true;
 		}
 		else
@@ -334,7 +334,7 @@ struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
 			_jumpi == Instruction::JUMPI
 		)
 		{
-			*_out = AssemblyItem(Instruction::SUB, _eq.location());
+			*_out = AssemblyItem(Instruction::SUB, _eq.debugData());
 			*_out = _pushTag;
 			*_out = _jumpi;
 			return true;
@@ -365,7 +365,7 @@ struct DoubleJump: SimplePeepholeOptimizerMethod<DoubleJump>
 			_pushTag1.data() == _tag1.data()
 		)
 		{
-			*_out = AssemblyItem(Instruction::ISZERO, _jumpi.location());
+			*_out = AssemblyItem(Instruction::ISZERO, _jumpi.debugData());
 			*_out = _pushTag2;
 			*_out = _jumpi;
 			*_out = _tag1;
@@ -393,7 +393,7 @@ struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
 		)
 		{
 			if (_jump == Instruction::JUMPI)
-				*_out = AssemblyItem(Instruction::POP, _jump.location());
+				*_out = AssemblyItem(Instruction::POP, _jump.debugData());
 			*_out = _tag;
 			return true;
 		}
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
index ef2d68c7fd..5085b2c3c8 100644
--- a/libevmasm/SimplificationRules.cpp
+++ b/libevmasm/SimplificationRules.cpp
@@ -126,12 +126,12 @@ bool Pattern::matches(Expression const& _expr, ExpressionClasses const& _classes
 	return true;
 }
 
-AssemblyItem Pattern::toAssemblyItem(SourceLocation const& _location) const
+AssemblyItem Pattern::toAssemblyItem(langutil::DebugData::ConstPtr _debugData) const
 {
 	if (m_type == Operation)
-		return AssemblyItem(m_instruction, _location);
+		return AssemblyItem(m_instruction, std::move(_debugData));
 	else
-		return AssemblyItem(m_type, data(), _location);
+		return AssemblyItem(m_type, data(), std::move(_debugData));
 }
 
 std::string Pattern::toString() const
@@ -199,7 +199,7 @@ u256 const& Pattern::data() const
 	return *m_data;
 }
 
-ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern, SourceLocation const& _location)
+ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern, langutil::DebugData::ConstPtr const& _debugData)
 {
 	if (_pattern.matchGroup())
 	{
@@ -209,10 +209,10 @@ ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern, SourceLocation c
 	else
 	{
 		hasId = false;
-		item = _pattern.toAssemblyItem(_location);
+		item = _pattern.toAssemblyItem(_debugData);
 	}
 	for (auto const& arg: _pattern.arguments())
-		arguments.emplace_back(arg, _location);
+		arguments.emplace_back(arg, _debugData);
 }
 
 std::string ExpressionTemplate::toString() const
diff --git a/libevmasm/SimplificationRules.h b/libevmasm/SimplificationRules.h
index b3f8da3c7f..fadad36084 100644
--- a/libevmasm/SimplificationRules.h
+++ b/libevmasm/SimplificationRules.h
@@ -111,7 +111,7 @@ class Pattern
 	unsigned matchGroup() const { return m_matchGroup; }
 	bool matches(Expression const& _expr, ExpressionClasses const& _classes) const;
 
-	AssemblyItem toAssemblyItem(langutil::SourceLocation const& _location) const;
+	AssemblyItem toAssemblyItem(langutil::DebugData::ConstPtr _debugData) const;
 	std::vector<Pattern> arguments() const { return m_arguments; }
 
 	/// @returns the id of the matched expression if this pattern is part of a match group.
@@ -149,7 +149,7 @@ struct ExpressionTemplate
 {
 	using Expression = ExpressionClasses::Expression;
 	using Id = ExpressionClasses::Id;
-	explicit ExpressionTemplate(Pattern const& _pattern, langutil::SourceLocation const& _location);
+	explicit ExpressionTemplate(Pattern const& _pattern, langutil::DebugData::ConstPtr const& _debugData);
 	std::string toString() const;
 	bool hasId = false;
 	/// Id of the matched expression, if available.
diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt
index 53be57e79d..054d01d918 100644
--- a/liblangutil/CMakeLists.txt
+++ b/liblangutil/CMakeLists.txt
@@ -3,6 +3,7 @@ set(sources
 	Common.h
 	CharStream.cpp
 	CharStream.h
+	DebugData.h
 	DebugInfoSelection.cpp
 	DebugInfoSelection.h
 	ErrorReporter.cpp
diff --git a/liblangutil/DebugData.h b/liblangutil/DebugData.h
new file mode 100644
index 0000000000..70259bd039
--- /dev/null
+++ b/liblangutil/DebugData.h
@@ -0,0 +1,70 @@
+/*
+	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>
+#include <optional>
+#include <memory>
+
+namespace solidity::langutil
+{
+
+struct DebugData
+{
+	typedef typename std::shared_ptr<DebugData const> ConstPtr;
+
+	explicit DebugData(
+		langutil::SourceLocation _nativeLocation = {},
+		langutil::SourceLocation _originLocation = {},
+		std::optional<int64_t> _astID = {}
+	):
+		nativeLocation(std::move(_nativeLocation)),
+		originLocation(std::move(_originLocation)),
+		astID(_astID)
+	{}
+
+	static DebugData::ConstPtr create(
+		langutil::SourceLocation _nativeLocation,
+		langutil::SourceLocation _originLocation = {},
+		std::optional<int64_t> _astID = {}
+	)
+	{
+		return std::make_shared<DebugData>(
+			std::move(_nativeLocation),
+			std::move(_originLocation),
+			_astID
+		);
+	}
+
+	static DebugData::ConstPtr create()
+	{
+		static DebugData::ConstPtr emptyDebugData = create({});
+		return emptyDebugData;
+	}
+
+	/// Location in the Yul code.
+	langutil::SourceLocation nativeLocation;
+	/// Location in the original source that the Yul code was produced from.
+	/// Optional. Only present if the Yul source contains location annotations.
+	langutil::SourceLocation originLocation;
+	/// ID in the (Solidity) source AST.
+	std::optional<int64_t> astID;
+};
+
+} // namespace solidity::langutil
diff --git a/libyul/AST.h b/libyul/AST.h
index 71419d807f..4e3e92de3d 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -26,7 +26,7 @@
 #include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
-#include <liblangutil/SourceLocation.h>
+#include <liblangutil/DebugData.h>
 
 #include <memory>
 #include <optional>
@@ -36,77 +36,43 @@ namespace solidity::yul
 
 using Type = YulString;
 
-struct DebugData
-{
-	explicit DebugData(
-		langutil::SourceLocation _nativeLocation,
-		langutil::SourceLocation _originLocation = {},
-		std::optional<int64_t> _astID = {}
-	):
-		nativeLocation(std::move(_nativeLocation)),
-		originLocation(std::move(_originLocation)),
-		astID(std::move(_astID))
-	{}
-
-	static std::shared_ptr<DebugData const> create(
-		langutil::SourceLocation _nativeLocation = {},
-		langutil::SourceLocation _originLocation = {},
-		std::optional<int64_t> _astID = {}
-	)
-	{
-		return std::make_shared<DebugData const>(
-			std::move(_nativeLocation),
-			std::move(_originLocation),
-			std::move(_astID)
-		);
-	}
-
-	/// Location in the Yul code.
-	langutil::SourceLocation nativeLocation;
-	/// Location in the original source that the Yul code was produced from.
-	/// Optional. Only present if the Yul source contains location annotations.
-	langutil::SourceLocation originLocation;
-	/// ID in the (Solidity) source AST.
-	std::optional<int64_t> astID;
-};
-
-struct TypedName { std::shared_ptr<DebugData const> debugData; YulString name; Type type; };
+struct TypedName { langutil::DebugData::ConstPtr debugData; YulString name; Type type; };
 using TypedNameList = std::vector<TypedName>;
 
 /// Literal number or string (up to 32 bytes)
 enum class LiteralKind { Number, Boolean, String };
-struct Literal { std::shared_ptr<DebugData const> debugData; LiteralKind kind; YulString value; Type type; };
+struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; YulString value; Type type; };
 /// External / internal identifier or label reference
-struct Identifier { std::shared_ptr<DebugData const> debugData; YulString name; };
+struct Identifier { langutil::DebugData::ConstPtr debugData; YulString name; };
 /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
 /// side and requires x to occupy exactly one stack slot.
 ///
 /// Multiple assignment ("x, y := f()"), where the left hand side variables each occupy
 /// a single stack slot and expects a single expression on the right hand returning
 /// the same amount of items as the number of variables.
-struct Assignment { std::shared_ptr<DebugData const> debugData; std::vector<Identifier> variableNames; std::unique_ptr<Expression> value; };
-struct FunctionCall { std::shared_ptr<DebugData const> debugData; Identifier functionName; std::vector<Expression> arguments; };
+struct Assignment { langutil::DebugData::ConstPtr debugData; std::vector<Identifier> variableNames; std::unique_ptr<Expression> value; };
+struct FunctionCall { langutil::DebugData::ConstPtr debugData; Identifier functionName; std::vector<Expression> arguments; };
 /// Statement that contains only a single expression
-struct ExpressionStatement { std::shared_ptr<DebugData const> debugData; Expression expression; };
+struct ExpressionStatement { langutil::DebugData::ConstPtr debugData; Expression expression; };
 /// Block-scope variable declaration ("let x:u256 := mload(20:u256)"), non-hoisted
-struct VariableDeclaration { std::shared_ptr<DebugData const> debugData; TypedNameList variables; std::unique_ptr<Expression> value; };
+struct VariableDeclaration { langutil::DebugData::ConstPtr debugData; TypedNameList variables; std::unique_ptr<Expression> value; };
 /// Block that creates a scope (frees declared stack variables)
-struct Block { std::shared_ptr<DebugData const> debugData; std::vector<Statement> statements; };
+struct Block { langutil::DebugData::ConstPtr debugData; std::vector<Statement> statements; };
 /// Function definition ("function f(a, b) -> (d, e) { ... }")
-struct FunctionDefinition { std::shared_ptr<DebugData const> debugData; YulString name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
+struct FunctionDefinition { langutil::DebugData::ConstPtr debugData; YulString name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
 /// Conditional execution without "else" part.
-struct If { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Expression> condition; Block body; };
+struct If { langutil::DebugData::ConstPtr debugData; std::unique_ptr<Expression> condition; Block body; };
 /// Switch case or default case
-struct Case { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Literal> value; Block body; };
+struct Case { langutil::DebugData::ConstPtr debugData; std::unique_ptr<Literal> value; Block body; };
 /// Switch statement
-struct Switch { std::shared_ptr<DebugData const> debugData; std::unique_ptr<Expression> expression; std::vector<Case> cases; };
-struct ForLoop { std::shared_ptr<DebugData const> debugData; Block pre; std::unique_ptr<Expression> condition; Block post; Block body; };
+struct Switch { langutil::DebugData::ConstPtr debugData; std::unique_ptr<Expression> expression; std::vector<Case> cases; };
+struct ForLoop { langutil::DebugData::ConstPtr debugData; Block pre; std::unique_ptr<Expression> condition; Block post; Block body; };
 /// Break statement (valid within for loop)
-struct Break { std::shared_ptr<DebugData const> debugData; };
+struct Break { langutil::DebugData::ConstPtr debugData; };
 /// Continue statement (valid within for loop)
-struct Continue { std::shared_ptr<DebugData const> debugData; };
+struct Continue { langutil::DebugData::ConstPtr debugData; };
 /// Leave statement (valid within function)
-struct Leave { std::shared_ptr<DebugData const> debugData; };
+struct Leave { langutil::DebugData::ConstPtr debugData; };
 
 /// Extracts the IR source location from a Yul node.
 template <class T> inline langutil::SourceLocation nativeLocationOf(T const& _node)
@@ -133,13 +99,13 @@ template <class... Args> inline langutil::SourceLocation originLocationOf(std::v
 }
 
 /// Extracts the debug data from a Yul node.
-template <class T> inline std::shared_ptr<DebugData const> debugDataOf(T const& _node)
+template <class T> inline langutil::DebugData::ConstPtr debugDataOf(T const& _node)
 {
 	return _node.debugData;
 }
 
 /// Extracts the debug data from a Yul node.
-template <class... Args> inline std::shared_ptr<DebugData const> debugDataOf(std::variant<Args...> const& _node)
+template <class... Args> inline langutil::DebugData::ConstPtr debugDataOf(std::variant<Args...> const& _node)
 {
 	return std::visit([](auto const& _arg) { return debugDataOf(_arg); }, _node);
 }
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
index 0e61c6ca12..a4dc5be3f8 100644
--- a/libyul/ASTForward.h
+++ b/libyul/ASTForward.h
@@ -28,7 +28,6 @@
 namespace solidity::yul
 {
 
-struct DebugData;
 enum class LiteralKind;
 struct Literal;
 struct Label;
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 5d3ec84a4b..3635b096af 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -59,7 +59,7 @@ std::optional<int> toInt(std::string const& _value)
 
 }
 
-std::shared_ptr<DebugData const> Parser::createDebugData() const
+langutil::DebugData::ConstPtr Parser::createDebugData() const
 {
 	switch (m_useSourceLocationFrom)
 	{
@@ -74,7 +74,7 @@ std::shared_ptr<DebugData const> Parser::createDebugData() const
 }
 
 void Parser::updateLocationEndFrom(
-	std::shared_ptr<DebugData const>& _debugData,
+	langutil::DebugData::ConstPtr& _debugData,
 	SourceLocation const& _location
 ) const
 {
@@ -286,7 +286,7 @@ std::optional<std::pair<std::string_view, std::optional<int>>> Parser::parseASTI
 Block Parser::parseBlock()
 {
 	RecursionGuard recursionGuard(*this);
-	Block block = createWithLocation<Block>();
+	Block block = createWithDebugData<Block>();
 	expectToken(Token::LBrace);
 	while (currentToken() != Token::RBrace)
 		block.statements.emplace_back(parseStatement());
@@ -308,7 +308,7 @@ Statement Parser::parseStatement()
 		return parseBlock();
 	case Token::If:
 	{
-		If _if = createWithLocation<If>();
+		If _if = createWithDebugData<If>();
 		advance();
 		_if.condition = std::make_unique<Expression>(parseExpression());
 		_if.body = parseBlock();
@@ -317,7 +317,7 @@ Statement Parser::parseStatement()
 	}
 	case Token::Switch:
 	{
-		Switch _switch = createWithLocation<Switch>();
+		Switch _switch = createWithDebugData<Switch>();
 		advance();
 		_switch.expression = std::make_unique<Expression>(parseExpression());
 		while (currentToken() == Token::Case)
@@ -337,21 +337,21 @@ Statement Parser::parseStatement()
 		return parseForLoop();
 	case Token::Break:
 	{
-		Statement stmt{createWithLocation<Break>()};
+		Statement stmt{createWithDebugData<Break>()};
 		checkBreakContinuePosition("break");
 		advance();
 		return stmt;
 	}
 	case Token::Continue:
 	{
-		Statement stmt{createWithLocation<Continue>()};
+		Statement stmt{createWithDebugData<Continue>()};
 		checkBreakContinuePosition("continue");
 		advance();
 		return stmt;
 	}
 	case Token::Leave:
 	{
-		Statement stmt{createWithLocation<Leave>()};
+		Statement stmt{createWithDebugData<Leave>()};
 		if (!m_insideFunction)
 			m_errorReporter.syntaxError(8149_error, currentLocation(), "Keyword \"leave\" can only be used inside a function.");
 		advance();
@@ -428,7 +428,7 @@ Statement Parser::parseStatement()
 Case Parser::parseCase()
 {
 	RecursionGuard recursionGuard(*this);
-	Case _case = createWithLocation<Case>();
+	Case _case = createWithDebugData<Case>();
 	if (currentToken() == Token::Default)
 		advance();
 	else if (currentToken() == Token::Case)
@@ -452,7 +452,7 @@ ForLoop Parser::parseForLoop()
 
 	ForLoopComponent outerForLoopComponent = m_currentForLoopComponent;
 
-	ForLoop forLoop = createWithLocation<ForLoop>();
+	ForLoop forLoop = createWithDebugData<ForLoop>();
 	expectToken(Token::For);
 	m_currentForLoopComponent = ForLoopComponent::ForLoopPre;
 	forLoop.pre = parseBlock();
@@ -559,7 +559,7 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
 VariableDeclaration Parser::parseVariableDeclaration()
 {
 	RecursionGuard recursionGuard(*this);
-	VariableDeclaration varDecl = createWithLocation<VariableDeclaration>();
+	VariableDeclaration varDecl = createWithDebugData<VariableDeclaration>();
 	expectToken(Token::Let);
 	while (true)
 	{
@@ -595,7 +595,7 @@ FunctionDefinition Parser::parseFunctionDefinition()
 	ForLoopComponent outerForLoopComponent = m_currentForLoopComponent;
 	m_currentForLoopComponent = ForLoopComponent::None;
 
-	FunctionDefinition funDef = createWithLocation<FunctionDefinition>();
+	FunctionDefinition funDef = createWithDebugData<FunctionDefinition>();
 	expectToken(Token::Function);
 	funDef.name = expectAsmIdentifier();
 	expectToken(Token::LParen);
@@ -657,7 +657,7 @@ FunctionCall Parser::parseCall(std::variant<Literal, Identifier>&& _initialOp)
 TypedName Parser::parseTypedName()
 {
 	RecursionGuard recursionGuard(*this);
-	TypedName typedName = createWithLocation<TypedName>();
+	TypedName typedName = createWithDebugData<TypedName>();
 	typedName.name = expectAsmIdentifier();
 	if (currentToken() == Token::Colon)
 	{
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index da4f09ed22..3e0af66acc 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -118,15 +118,15 @@ class Parser: public langutil::ParserBase
 	);
 
 	/// Creates a DebugData object with the correct source location set.
-	std::shared_ptr<DebugData const> createDebugData() const;
+	langutil::DebugData::ConstPtr createDebugData() const;
 
 	void updateLocationEndFrom(
-		std::shared_ptr<DebugData const>& _debugData,
+		langutil::DebugData::ConstPtr& _debugData,
 		langutil::SourceLocation const& _location
 	) const;
 
-	/// Creates an inline assembly node with the current source location.
-	template <class T> T createWithLocation() const
+	/// Creates an inline assembly node with the current debug data.
+	template <class T> T createWithDebugData() const
 	{
 		T r;
 		r.debugData = createDebugData();
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index bee213f8ca..b27af03713 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -305,7 +305,7 @@ std::string AsmPrinter::formatSourceLocation(
 	return sourceLocation + (solidityCodeSnippet.empty() ? "" : "  ") + solidityCodeSnippet;
 }
 
-std::string AsmPrinter::formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement)
+std::string AsmPrinter::formatDebugData(langutil::DebugData::ConstPtr const& _debugData, bool _statement)
 {
 	if (!_debugData || m_debugInfoSelection.none())
 		return "";
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 7c67c14acf..d3f80b9a09 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -30,7 +30,7 @@
 
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/SourceLocation.h>
+#include <liblangutil/DebugData.h>
 
 #include <map>
 
@@ -93,7 +93,7 @@ class AsmPrinter
 private:
 	std::string formatTypedName(TypedName _variable);
 	std::string appendTypeName(YulString _type, bool _isBoolLiteral = false) const;
-	std::string formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement);
+	std::string formatDebugData(langutil::DebugData::ConstPtr const& _debugData, bool _statement);
 	template <class T>
 	std::string formatDebugData(T const& _node)
 	{
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
index a60d2b2f56..280f50bf9b 100644
--- a/libyul/backends/evm/ConstantOptimiser.h
+++ b/libyul/backends/evm/ConstantOptimiser.h
@@ -27,7 +27,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/ASTForward.h>
 
-#include <liblangutil/SourceLocation.h>
+#include <liblangutil/DebugData.h>
 
 #include <libsolutil/Common.h>
 
@@ -74,7 +74,7 @@ class RepresentationFinder
 	RepresentationFinder(
 		EVMDialect const& _dialect,
 		GasMeter const& _meter,
-		std::shared_ptr<DebugData const> _debugData,
+		langutil::DebugData::ConstPtr _debugData,
 		std::map<u256, Representation>& _cache
 	):
 		m_dialect(_dialect),
@@ -100,7 +100,7 @@ class RepresentationFinder
 
 	EVMDialect const& m_dialect;
 	GasMeter const& m_meter;
-	std::shared_ptr<DebugData const> m_debugData;
+	langutil::DebugData::ConstPtr m_debugData;
 	/// Counter for the complexity of optimization, will stop when it reaches zero.
 	size_t m_maxSteps = 10000;
 	std::map<u256, Representation>& m_cache;
diff --git a/libyul/backends/evm/ControlFlowGraph.h b/libyul/backends/evm/ControlFlowGraph.h
index 853a9e705d..980787c522 100644
--- a/libyul/backends/evm/ControlFlowGraph.h
+++ b/libyul/backends/evm/ControlFlowGraph.h
@@ -76,7 +76,7 @@ struct FunctionReturnLabelSlot
 struct VariableSlot
 {
 	std::reference_wrapper<Scope::Variable const> variable;
-	std::shared_ptr<DebugData const> debugData{};
+	langutil::DebugData::ConstPtr debugData{};
 	bool operator==(VariableSlot const& _rhs) const { return &variable.get() == &_rhs.variable.get(); }
 	bool operator<(VariableSlot const& _rhs) const { return &variable.get() < &_rhs.variable.get(); }
 	static constexpr bool canBeFreelyGenerated = false;
@@ -85,7 +85,7 @@ struct VariableSlot
 struct LiteralSlot
 {
 	u256 value;
-	std::shared_ptr<DebugData const> debugData{};
+	langutil::DebugData::ConstPtr debugData{};
 	bool operator==(LiteralSlot const& _rhs) const { return value == _rhs.value; }
 	bool operator<(LiteralSlot const& _rhs) const { return value < _rhs.value; }
 	static constexpr bool canBeFreelyGenerated = true;
@@ -132,7 +132,7 @@ struct CFG
 
 	struct BuiltinCall
 	{
-		std::shared_ptr<DebugData const> debugData;
+		langutil::DebugData::ConstPtr debugData;
 		std::reference_wrapper<BuiltinFunction const> builtin;
 		std::reference_wrapper<yul::FunctionCall const> functionCall;
 		/// Number of proper arguments with a position on the stack, excluding literal arguments.
@@ -142,7 +142,7 @@ struct CFG
 	};
 	struct FunctionCall
 	{
-		std::shared_ptr<DebugData const> debugData;
+		langutil::DebugData::ConstPtr debugData;
 		std::reference_wrapper<Scope::Function const> function;
 		std::reference_wrapper<yul::FunctionCall const> functionCall;
 		/// True, if the call is recursive, i.e. entering the function involves a control flow path (potentially involving
@@ -153,7 +153,7 @@ struct CFG
 	};
 	struct Assignment
 	{
-		std::shared_ptr<DebugData const> debugData;
+		langutil::DebugData::ConstPtr debugData;
 		/// The variables being assigned to also occur as ``output`` in the ``Operation`` containing
 		/// the assignment, but are also stored here for convenience.
 		std::vector<VariableSlot> variables;
@@ -176,25 +176,25 @@ struct CFG
 		struct MainExit {};
 		struct ConditionalJump
 		{
-			std::shared_ptr<DebugData const> debugData;
+			langutil::DebugData::ConstPtr debugData;
 			StackSlot condition;
 			BasicBlock* nonZero = nullptr;
 			BasicBlock* zero = nullptr;
 		};
 		struct Jump
 		{
-			std::shared_ptr<DebugData const> debugData;
+			langutil::DebugData::ConstPtr debugData;
 			BasicBlock* target = nullptr;
 			/// The only backwards jumps are jumps from loop post to loop condition.
 			bool backwards = false;
 		};
 		struct FunctionReturn
 		{
-			std::shared_ptr<DebugData const> debugData;
+			langutil::DebugData::ConstPtr debugData;
 			CFG::FunctionInfo* info = nullptr;
 		};
 		struct Terminated {};
-		std::shared_ptr<DebugData const> debugData;
+		langutil::DebugData::ConstPtr 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
@@ -210,7 +210,7 @@ struct CFG
 
 	struct FunctionInfo
 	{
-		std::shared_ptr<DebugData const> debugData;
+		langutil::DebugData::ConstPtr debugData;
 		Scope::Function const& function;
 		FunctionDefinition const& functionDefinition;
 		BasicBlock* entry = nullptr;
@@ -238,7 +238,7 @@ struct CFG
 	/// the switch case literals when transforming the control flow of a switch to a sequence of conditional jumps.
 	std::list<yul::FunctionCall> ghostCalls;
 
-	BasicBlock& makeBlock(std::shared_ptr<DebugData const> _debugData)
+	BasicBlock& makeBlock(langutil::DebugData::ConstPtr _debugData)
 	{
 		return blocks.emplace_back(BasicBlock{std::move(_debugData), {}, {}});
 	}
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 9a0a73b35f..4b0da1e80d 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -333,7 +333,7 @@ void ControlFlowGraphBuilder::operator()(If const& _if)
 void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 {
 	yulAssert(m_currentBlock, "");
-	std::shared_ptr<DebugData const> preSwitchDebugData = debugDataOf(_switch);
+	langutil::DebugData::ConstPtr preSwitchDebugData = debugDataOf(_switch);
 
 	auto ghostVariableId = m_graph.ghostVariables.size();
 	YulString ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
@@ -393,7 +393,7 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 
 void ControlFlowGraphBuilder::operator()(ForLoop const& _loop)
 {
-	std::shared_ptr<DebugData const> preLoopDebugData = debugDataOf(_loop);
+	langutil::DebugData::ConstPtr preLoopDebugData = debugDataOf(_loop);
 	ScopedSaveAndRestore scopeRestore(m_scope, m_info.scopes.at(&_loop.pre).get());
 	(*this)(_loop.pre);
 
@@ -608,7 +608,7 @@ Scope::Variable const& ControlFlowGraphBuilder::lookupVariable(YulString _name)
 }
 
 void ControlFlowGraphBuilder::makeConditionalJump(
-	std::shared_ptr<DebugData const> _debugData,
+	langutil::DebugData::ConstPtr _debugData,
 	StackSlot _condition,
 	CFG::BasicBlock& _nonZero,
 	CFG::BasicBlock& _zero
@@ -627,7 +627,7 @@ void ControlFlowGraphBuilder::makeConditionalJump(
 }
 
 void ControlFlowGraphBuilder::jump(
-	std::shared_ptr<DebugData const> _debugData,
+	langutil::DebugData::ConstPtr _debugData,
 	CFG::BasicBlock& _target,
 	bool backwards
 )
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
index ffe935b0dd..5007d36108 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.h
@@ -67,13 +67,13 @@ class ControlFlowGraphBuilder
 	Scope::Variable const& lookupVariable(YulString _name) const;
 	/// Resets m_currentBlock to enforce a subsequent explicit reassignment.
 	void makeConditionalJump(
-		std::shared_ptr<DebugData const> _debugData,
+		langutil::DebugData::ConstPtr _debugData,
 		StackSlot _condition,
 		CFG::BasicBlock& _nonZero,
 		CFG::BasicBlock& _zero
 	);
 	void jump(
-		std::shared_ptr<DebugData const> _debugData,
+		langutil::DebugData::ConstPtr _debugData,
 		CFG::BasicBlock& _target,
 		bool _backwards = false
 	);
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 3df75bb88f..a3052a542f 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -237,7 +237,7 @@ void OptimizedEVMCodeTransform::validateSlot(StackSlot const& _slot, Expression
 	}, _expression);
 }
 
-void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData const> _debugData, Stack _targetStack)
+void OptimizedEVMCodeTransform::createStackLayout(langutil::DebugData::ConstPtr _debugData, Stack _targetStack)
 {
 	static constexpr auto slotVariableName = [](StackSlot const& _slot) {
 		return std::visit(util::GenericVisitor{
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.h b/libyul/backends/evm/OptimizedEVMCodeTransform.h
index ed03c14530..7e648ca964 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.h
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.h
@@ -83,7 +83,7 @@ class OptimizedEVMCodeTransform
 
 	/// Shuffles m_stack to the desired @a _targetStack while emitting the shuffling code to m_assembly.
 	/// Sets the source locations to the one in @a _debugData.
-	void createStackLayout(std::shared_ptr<DebugData const> _debugData, Stack _targetStack);
+	void createStackLayout(langutil::DebugData::ConstPtr _debugData, Stack _targetStack);
 
 	/// Generate code for the given block @a _block.
 	/// Expects the current stack layout m_stack to be a stack layout that is compatible with the
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index b08b113de0..7119091257 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -78,7 +78,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 				)
 				{
 					YulString condition = std::get<Identifier>(*_if.condition).name;
-					std::shared_ptr<DebugData const> debugData = _if.debugData;
+					langutil::DebugData::ConstPtr debugData = _if.debugData;
 					return make_vector<Statement>(
 						std::move(_s),
 						Assignment{
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 771b4e86bf..10f479a421 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -37,7 +37,7 @@ namespace
 {
 
 ExpressionStatement makeDiscardCall(
-	std::shared_ptr<DebugData const> const& _debugData,
+	langutil::DebugData::ConstPtr const& _debugData,
 	BuiltinFunction const& _discardFunction,
 	Expression&& _expression
 )
@@ -196,7 +196,7 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 	yulAssert(_switchStmt.cases.size() == 1, "Expected only one case!");
 
 	auto& switchCase = _switchStmt.cases.front();
-	std::shared_ptr<DebugData const> debugData = debugDataOf(*_switchStmt.expression);
+	langutil::DebugData::ConstPtr debugData = debugDataOf(*_switchStmt.expression);
 	YulString type = m_typeInfo.typeOf(*_switchStmt.expression);
 	if (switchCase.value)
 	{
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index 986bcb097f..6f0834d776 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -98,7 +98,7 @@ void ExpressionSplitter::outlineExpression(Expression& _expr)
 
 	visit(_expr);
 
-	std::shared_ptr<DebugData const> debugData = debugDataOf(_expr);
+	langutil::DebugData::ConstPtr debugData = debugDataOf(_expr);
 	YulString var = m_nameDispenser.newName({});
 	YulString type = m_typeInfo.typeOf(_expr);
 	m_statementsToPrefix.emplace_back(VariableDeclaration{
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index 2dd0832c42..33d8496f08 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -38,7 +38,7 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 		!std::holds_alternative<Identifier>(*_forLoop.condition)
 	)
 	{
-		std::shared_ptr<DebugData const> debugData = debugDataOf(*_forLoop.condition);
+		langutil::DebugData::ConstPtr debugData = debugDataOf(*_forLoop.condition);
 
 		_forLoop.body.statements.emplace(
 			begin(_forLoop.body.statements),
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index 363ecdf0c0..e2451bc6c6 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -54,7 +54,7 @@ void ForLoopConditionOutOfBody::operator()(ForLoop& _forLoop)
 		return;
 
 	YulString iszero = m_dialect.booleanNegationFunction()->name;
-	std::shared_ptr<DebugData const> debugData = debugDataOf(*firstStatement.condition);
+	langutil::DebugData::ConstPtr debugData = debugDataOf(*firstStatement.condition);
 
 	if (
 		std::holds_alternative<FunctionCall>(*firstStatement.condition) &&
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index 74a7701494..675d21acc3 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -84,7 +84,7 @@ 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"
-				std::shared_ptr<DebugData const> debugData = varDecl.debugData;
+				langutil::DebugData::ConstPtr debugData = varDecl.debugData;
 				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(varDecl.value)});
 				TypedNameList newVariables;
@@ -111,7 +111,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;
+				langutil::DebugData::ConstPtr debugData = assignment.debugData;
 				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(assignment.value)});
 				TypedNameList newVariables;
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index f8bbcf678a..7fe56026ac 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -234,7 +234,7 @@ evmasm::Instruction Pattern::instruction() const
 	return m_instruction;
 }
 
-Expression Pattern::toExpression(std::shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const
+Expression Pattern::toExpression(langutil::DebugData::ConstPtr const& _debugData, langutil::EVMVersion _evmVersion) const
 {
 	if (matchGroup())
 		return ASTCopier().translate(matchGroupValue());
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index e36730f054..5e498bd5c9 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -30,7 +30,7 @@
 #include <libsolutil/Numeric.h>
 
 #include <liblangutil/EVMVersion.h>
-#include <liblangutil/SourceLocation.h>
+#include <liblangutil/DebugData.h>
 
 #include <functional>
 #include <optional>
@@ -42,6 +42,8 @@ struct Dialect;
 struct AssignedValue;
 class Pattern;
 
+using DebugData = langutil::DebugData;
+
 /**
  * Container for all simplification rules.
  */
@@ -131,7 +133,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, langutil::EVMVersion _evmVersion) const;
+	Expression toExpression(langutil::DebugData::ConstPtr const& _debugData, langutil::EVMVersion _evmVersion) const;
 
 private:
 	Expression const& matchGroupValue() const;
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index ab39669b2d..dedb5cd382 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -36,7 +36,7 @@ namespace
 {
 std::vector<Statement> generateMemoryStore(
 	Dialect const& _dialect,
-	std::shared_ptr<DebugData const> const& _debugData,
+	langutil::DebugData::ConstPtr const& _debugData,
 	YulString _mpos,
 	Expression _value
 )
@@ -55,7 +55,7 @@ std::vector<Statement> generateMemoryStore(
 	return result;
 }
 
-FunctionCall generateMemoryLoad(Dialect const& _dialect, std::shared_ptr<DebugData const> const& _debugData, YulString _mpos)
+FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::ConstPtr const& _debugData, YulString _mpos)
 {
 	BuiltinFunction const* memoryLoadFunction = _dialect.memoryLoadFunction(_dialect.defaultType);
 	yulAssert(memoryLoadFunction, "");
diff --git a/test/tools/yulInterpreter/Inspector.cpp b/test/tools/yulInterpreter/Inspector.cpp
index 9c4701d00a..7746483a36 100644
--- a/test/tools/yulInterpreter/Inspector.cpp
+++ b/test/tools/yulInterpreter/Inspector.cpp
@@ -56,7 +56,7 @@ void InspectedInterpreter::run(
 	InspectedInterpreter{_inspector, _state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
 }
 
-Inspector::NodeAction Inspector::queryUser(DebugData const& _data, std::map<YulString, u256> const& _variables)
+Inspector::NodeAction Inspector::queryUser(langutil::DebugData const& _data, std::map<YulString, u256> const& _variables)
 {
 	if (m_stepMode == NodeAction::RunNode)
 	{
@@ -131,7 +131,7 @@ Inspector::NodeAction Inspector::queryUser(DebugData const& _data, std::map<YulS
 	}
 }
 
-std::string Inspector::currentSource(DebugData const& _data) const
+std::string Inspector::currentSource(langutil::DebugData const& _data) const
 {
 	return m_source.substr(
 		static_cast<size_t>(_data.nativeLocation.start),
diff --git a/test/tools/yulInterpreter/Inspector.h b/test/tools/yulInterpreter/Inspector.h
index 611279c6fe..f4518c7087 100644
--- a/test/tools/yulInterpreter/Inspector.h
+++ b/test/tools/yulInterpreter/Inspector.h
@@ -53,13 +53,13 @@ class Inspector
 	 * @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);
+	NodeAction queryUser(langutil::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)
+	void interactiveVisit(langutil::DebugData const& _debugData, std::map<YulString, u256> const& _variables, std::function<void()> _visitNode)
 	{
 		Inspector::NodeAction action = queryUser(_debugData, _variables);
 
@@ -78,7 +78,7 @@ class Inspector
 	}
 
 private:
-	std::string currentSource(DebugData const& _data) const;
+	std::string currentSource(langutil::DebugData const& _data) const;
 
 	/// Source of the file
 	std::string const& m_source;

From c7b8dcc52f28d68862ef298a94c7ce44f8080346 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 16 Feb 2024 20:40:05 +0100
Subject: [PATCH 0668/1140] [test] Add /usr/local/lib to search paths for
 macOS.

---
 test/Common.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/Common.cpp b/test/Common.cpp
index 14d90d837e..bb4d2db7eb 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -78,7 +78,10 @@ std::optional<fs::path> findInDefaultPath(std::string const& lib_name)
 		fs::current_path() / ".." / "deps" / "lib",
 		fs::current_path() / ".." / ".." / "deps",
 		fs::current_path() / ".." / ".." / "deps" / "lib",
-		fs::current_path()
+		fs::current_path(),
+#ifdef __APPLE__
+		fs::current_path().root_path() / fs::path("usr") / "local" / "lib",
+#endif
 	};
 	for (auto const& basePath: searchPath)
 	{

From 9b8ed03823569a48005f0826175a08d5e1281f80 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Sun, 18 Feb 2024 20:53:03 +0100
Subject: [PATCH 0669/1140] Fix typo in Assembly::fromJSON(..).

---
 libevmasm/Assembly.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index b6e4d0006c..ab6ac2c63f 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -555,7 +555,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 
 	result->importAssemblyItemsFromJSON(_json[".code"], _level == 0 ? parsedSourceList : _sourceList);
 
-	if (_json[".auxdata"])
+	if (_json.isMember(".auxdata"))
 	{
 		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
 		result->m_auxiliaryData = fromHex(_json[".auxdata"].asString());

From 5aed7515efd427b8f13f0abf3313539166292a3c Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 19 Feb 2024 10:22:12 +0100
Subject: [PATCH 0670/1140] Use ethers version 6.11.0 on openzeppelin external
 tests

---
 test/externalTests/zeppelin.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 64e6f5f0ec..9f72aa4ec9 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -110,6 +110,13 @@ function zeppelin_test
     # 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
 
+    # TODO: Remove when OpenZeppelin update to ethers 6.11.1+
+    # Prior versions of ethers accepts an object instead of a string as an argument to the toUtf8Bytes function.
+    # However, starting from Ethers version 6.11.1, string arguments are enforced,
+    # which causes the introduced assertion to fail in some OpenZeppelin tests.
+    # See: https://github.com/ethers-io/ethers.js/issues/4583
+    npm install ethers@6.11.0
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From c21490f3c2e5c66e224029fc7f9cb482168bd7fe Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 19 Feb 2024 13:34:15 +0100
Subject: [PATCH 0671/1140] [ci] Remove usage of ETH_EVMONE environment
 variable.

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b29c46bf8b..f3843a6898 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -498,7 +498,6 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j5
         CPUs: 5
-        ETH_EVMONE: /usr/local/lib/libevmone.dylib
 
   - base_python_small: &base_python_small
       docker:

From 18cabee1e4f60aae045ee9a0a0f2aba6d0d2c279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Jan 2024 14:08:38 +0100
Subject: [PATCH 0672/1140] CompilerStack: Don't swallow details include in
 OptimizerException

- By catching and asserting it we hide the line number and message.
- OptimizerException inherits from util::Exception so just letting it through will have the same effect as asserting.
---
 libsolidity/interface/CompilerStack.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 9b5c87818b..6939441758 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1480,15 +1480,8 @@ void CompilerStack::compileContract(
 	solAssert(!m_viaIR, "");
 	bytes cborEncodedMetadata = createCBORMetadata(compiledContract, /* _forIR */ false);
 
-	try
-	{
-		// Run optimiser and compile the contract.
-		compiler->compileContract(_contract, _otherCompilers, cborEncodedMetadata);
-	}
-	catch(evmasm::OptimizerException const&)
-	{
-		solAssert(false, "Optimizer exception during compilation");
-	}
+	// Run optimiser and compile the contract.
+	compiler->compileContract(_contract, _otherCompilers, cborEncodedMetadata);
 
 	_otherCompilers[compiledContract.contract] = compiler;
 

From f5188158f7edbc672cfc2b5b9125730bbf1886b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Jan 2024 16:44:27 +0100
Subject: [PATCH 0673/1140] Remove obsolete gas cost tiers

- They're no longer used because the cost depends on the EVM version.
---
 libevmasm/Assembly.cpp        |  1 -
 libevmasm/GasMeter.cpp        | 24 +++++++++++++-----------
 libevmasm/Instruction.cpp     | 12 ++++++------
 libevmasm/Instruction.h       |  2 --
 solc/CommandLineInterface.cpp |  2 --
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index ab6ac2c63f..3f067ff6bc 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -29,7 +29,6 @@
 #include <libevmasm/JumpdestRemover.h>
 #include <libevmasm/BlockDeduplicator.h>
 #include <libevmasm/ConstantOptimiser.h>
-#include <libevmasm/GasMeter.h>
 
 #include <liblangutil/CharStream.h>
 #include <liblangutil/Exceptions.h>
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 5982b8a080..e237e32a26 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -274,18 +274,20 @@ 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::WarmAccess:	return GasCosts::warmStorageReadCost;
-	default: break;
+	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;
+
+	case Tier::Special:
+	case Tier::Invalid:
+		assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
 	}
-	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
-	return 0;
+	util::unreachable();
 }
 
 u256 GasMeter::dataGas(bytes const& _data, bool _inCreation, langutil::EVMVersion _evmVersion)
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index a21f33e183..4e0684b6b4 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -211,7 +211,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::SIGNEXTEND,	{ "SIGNEXTEND",		0, 2, 1, false, Tier::Low } },
 	{ Instruction::KECCAK256,	{ "KECCAK256",			0, 2, 1, true, Tier::Special } },
 	{ Instruction::ADDRESS,		{ "ADDRESS",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::BALANCE,		{ "BALANCE",		0, 1, 1, false, Tier::Balance } },
+	{ Instruction::BALANCE,     { "BALANCE",        0, 1, 1, false, Tier::Special } },
 	{ Instruction::ORIGIN,		{ "ORIGIN",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::CALLER,		{ "CALLER",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::CALLVALUE,	{ "CALLVALUE",		0, 0, 1, false, Tier::Base } },
@@ -221,12 +221,12 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::CODESIZE,	{ "CODESIZE",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::CODECOPY,	{ "CODECOPY",		0, 3, 0, true, Tier::VeryLow } },
 	{ Instruction::GASPRICE,	{ "GASPRICE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::EXTCODESIZE,	{ "EXTCODESIZE",	0, 1, 1, false, Tier::ExtCode } },
-	{ 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::EXTCODESIZE, { "EXTCODESIZE",    0, 1, 1, false, Tier::Special } },
+	{ Instruction::EXTCODECOPY, { "EXTCODECOPY",    0, 4, 0, true, Tier::Special } },
+	{ 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::EXTCODEHASH, { "EXTCODEHASH",    0, 1, 1, false, Tier::Special } },
 	{ 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 } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 1733863aa5..d29a6feca7 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -297,8 +297,6 @@ enum class Tier
 	High,		// 10, Slow
 	Ext,		// 20, Ext
 	WarmAccess,	// 100, Warm Access
-	ExtCode,	// 700, Extcode
-	Balance,	// 400, Balance
 	Special,	// multiparam or otherwise special
 	Invalid		// Invalid.
 };
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 7181bfd4cc..4c08efb51a 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -43,9 +43,7 @@
 
 #include <libyul/YulStack.h>
 
-#include <libevmasm/Instruction.h>
 #include <libevmasm/Disassemble.h>
-#include <libevmasm/GasMeter.h>
 
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceReferenceFormatter.h>

From 686f5cd455c837d6a54f819c8cff66733e2ecc8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Jan 2024 15:54:03 +0100
Subject: [PATCH 0674/1140] Document the Tier enum and constants that come from
 Execution Specs

---
 libevmasm/GasMeter.h    | 56 +++++++++++++++++++++--------------------
 libevmasm/Instruction.h | 25 ++++++++++--------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
index ec19466447..e4bb199257 100644
--- a/libevmasm/GasMeter.h
+++ b/libevmasm/GasMeter.h
@@ -43,32 +43,34 @@ class KnownState;
 
 namespace GasCosts
 {
+	/// NOTE: The GAS_... constants referenced by comments are defined for each EVM version in the Execution Specs:
+	/// https://ethereum.github.io/execution-specs/autoapi/ethereum/<evm version>/vm/gas/index.html
+
 	static unsigned const stackLimit = 1024;
-	static unsigned const tier0Gas = 0;
-	static unsigned const tier1Gas = 2;
-	static unsigned const tier2Gas = 3;
-	static unsigned const tier3Gas = 5;
-	static unsigned const tier4Gas = 8;
-	static unsigned const tier5Gas = 10;
-	static unsigned const tier6Gas = 20;
-	static unsigned const tier7Gas = 0;
-	static unsigned const expGas = 10;
+	static unsigned const tier0Gas = 0;                       // GAS_ZERO (in Execution Specs)
+	static unsigned const tier1Gas = 2;                       // GAS_BASE
+	static unsigned const tier2Gas = 3;                       // GAS_VERY_LOW
+	static unsigned const tier3Gas = 5;                       // GAS_LOW / GAS_FAST_STEP
+	static unsigned const tier4Gas = 8;                       // GAS_MID
+	static unsigned const tier5Gas = 10;                      // GAS_HIGH
+	static unsigned const tier6Gas = 20;                      // GAS_BLOCK_HASH
+	static unsigned const expGas = 10;                        // GAS_EXPONENTIATION
 	inline unsigned expByteGas(langutil::EVMVersion _evmVersion)
 	{
-		return _evmVersion >= langutil::EVMVersion::spuriousDragon() ? 50 : 10;
+		return _evmVersion >= langutil::EVMVersion::spuriousDragon() ? 50 : 10; // GAS_EXPONENTIATION_PER_BYTE
 	}
-	static unsigned const keccak256Gas = 30;
-	static unsigned const keccak256WordGas = 6;
+	static unsigned const keccak256Gas = 30;                  // GAS_KECCAK256
+	static unsigned const keccak256WordGas = 6;               // GAS_KECCAK256_WORD
 	/// Corresponds to ACCESS_LIST_ADDRESS_COST from EIP-2930
 	static unsigned const accessListAddressCost = 2400;
 	/// Corresponds to ACCESS_LIST_STORAGE_COST from EIP-2930
 	static unsigned const accessListStorageKeyCost = 1900;
 	/// Corresponds to COLD_SLOAD_COST from EIP-2929
-	static unsigned const coldSloadCost = 2100;
+	static unsigned const coldSloadCost = 2100;               // GAS_COLD_SLOAD
 	/// Corresponds to COLD_ACCOUNT_ACCESS_COST from EIP-2929
-	static unsigned const coldAccountAccessCost = 2600;
+	static unsigned const coldAccountAccessCost = 2600;       // GAS_COLD_ACCOUNT_ACCESS
 	/// Corresponds to WARM_STORAGE_READ_COST from EIP-2929
-	static unsigned const warmStorageReadCost = 100;
+	static unsigned const warmStorageReadCost = 100;          // GAS_WARM_ACCESS
 	inline unsigned sloadGas(langutil::EVMVersion _evmVersion)
 	{
 		if (_evmVersion >= langutil::EVMVersion::berlin())
@@ -81,7 +83,7 @@ namespace GasCosts
 			return 50;
 	}
 	/// Corresponds to SSTORE_SET_GAS
-	static unsigned const sstoreSetGas = 20000;
+	static unsigned const sstoreSetGas = 20000;               // GAS_STORAGE_SET
 	/// Corresponds to SSTORE_RESET_GAS from EIP-2929
 	static unsigned const sstoreResetGas = 5000 - coldSloadCost;
 	/// Corresponds to SSTORE_CLEARS_SCHEDULE from EIP-2200
@@ -130,11 +132,11 @@ namespace GasCosts
 		else
 			return 20;
 	}
-	static unsigned const jumpdestGas = 1;
-	static unsigned const logGas = 375;
-	static unsigned const logDataGas = 8;
-	static unsigned const logTopicGas = 375;
-	static unsigned const createGas = 32000;
+	static unsigned const jumpdestGas = 1;                    // GAS_JUMPDEST
+	static unsigned const logGas = 375;                       // GAS_LOG
+	static unsigned const logDataGas = 8;                     // GAS_LOG_DATA
+	static unsigned const logTopicGas = 375;                  // GAS_LOG_TOPIC
+	static unsigned const createGas = 32000;                  // GAS_CREATE
 	inline unsigned callGas(langutil::EVMVersion _evmVersion)
 	{
 		if (_evmVersion >= langutil::EVMVersion::berlin())
@@ -144,10 +146,10 @@ namespace GasCosts
 		else
 			return 40;
 	}
-	static unsigned const callStipend = 2300;
-	static unsigned const callValueTransferGas = 9000;
-	static unsigned const callNewAccountGas = 25000;
-	inline unsigned selfdestructGas(langutil::EVMVersion _evmVersion)
+	static unsigned const callStipend = 2300;                  // GAS_CALL_STIPEND
+	static unsigned const callValueTransferGas = 9000;         // GAS_CALL_VALUE
+	static unsigned const callNewAccountGas = 25000;           // GAS_NEW_ACCOUNT / GAS_SELF_DESTRUCT_NEW_ACCOUNT
+	inline unsigned selfdestructGas(langutil::EVMVersion _evmVersion) // GAS_SELF_DESTRUCT
 	{
 		if (_evmVersion >= langutil::EVMVersion::berlin())
 			return coldAccountAccessCost;
@@ -164,9 +166,9 @@ namespace GasCosts
 		else
 			return 24000;
 	}
-	static unsigned const memoryGas = 3;
+	static unsigned const memoryGas = 3;                       // GAS_MEMORY / GAS_COPY / GAS_RETURN_DATA_COPY
 	static unsigned const quadCoeffDiv = 512;
-	static unsigned const createDataGas = 200;
+	static unsigned const createDataGas = 200;                 // GAS_CODE_DEPOSIT
 	static unsigned const txGas = 21000;
 	static unsigned const txCreateGas = 53000;
 	static unsigned const txDataZeroGas = 4;
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index d29a6feca7..7d551f71d7 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -287,18 +287,23 @@ inline Instruction logInstruction(unsigned _number)
 	return Instruction(unsigned(Instruction::LOG0) + _number);
 }
 
+/// Gas price tiers representing static cost of an instruction.
+/// Opcodes whose cost is dynamic or depends on EVM version should use the `Special` tier and need
+/// dedicated logic in GasMeter (especially in estimateMax()).
+/// The tiers loosely follow opcode groups originally defined in the Yellow Paper.
 enum class Tier
 {
-	Zero = 0,	// 0, Zero
-	Base,		// 2, Quick
-	VeryLow,	// 3, Fastest
-	Low,		// 5, Fast
-	Mid,		// 8, Mid
-	High,		// 10, Slow
-	Ext,		// 20, Ext
-	WarmAccess,	// 100, Warm Access
-	Special,	// multiparam or otherwise special
-	Invalid		// Invalid.
+	// NOTE: Tiers should be ordered by cost, since we sometimes perform comparisons between them.
+	Zero = 0,   // 0, Zero
+	Base,       // 2, Quick
+	VeryLow,    // 3, Fastest
+	Low,        // 5, Fast
+	Mid,        // 8, Mid
+	High,       // 10, Slow
+	Ext,        // 20, Ext
+	WarmAccess, // 100, Warm Access
+	Special,    // multiparam or otherwise special
+	Invalid,    // Invalid.
 };
 
 /// Information structure for a particular instruction.

From a973b4c6bffbd25497fb6b06fa1935ce4b63cbcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Jan 2024 17:13:42 +0100
Subject: [PATCH 0675/1140] Rename Ext gas cost tier to BlockHash

---
 libevmasm/GasMeter.cpp    | 2 +-
 libevmasm/Instruction.cpp | 2 +-
 libevmasm/Instruction.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index e237e32a26..b3d160585e 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -280,7 +280,7 @@ unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVer
 	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::BlockHash:   return GasCosts::tier6Gas;
 	case Tier::WarmAccess:  return GasCosts::warmStorageReadCost;
 
 	case Tier::Special:
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 4e0684b6b4..ca0dff185a 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -227,7 +227,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ 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::Special } },
-	{ Instruction::BLOCKHASH,	{ "BLOCKHASH",		0, 1, 1, false, Tier::Ext } },
+	{ Instruction::BLOCKHASH,   { "BLOCKHASH",      0, 1, 1, false, Tier::BlockHash } },
 	{ 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 } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 7d551f71d7..289469b5ef 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -300,7 +300,7 @@ enum class Tier
 	Low,        // 5, Fast
 	Mid,        // 8, Mid
 	High,       // 10, Slow
-	Ext,        // 20, Ext
+	BlockHash,  // 20
 	WarmAccess, // 100, Warm Access
 	Special,    // multiparam or otherwise special
 	Invalid,    // Invalid.

From 88ee7d8bb57075c94df3d70fce115357f1290b0c Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 19 Feb 2024 16:28:08 +0100
Subject: [PATCH 0676/1140] [ci] Remove code signature from universal binary.

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b29c46bf8b..672b77c96d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -242,6 +242,13 @@ commands:
   # --------------------------------------------------------------------------
   # Artifact Commands
 
+  remove_signature_from_universal_binary:
+    description: Remove signature from universal binary
+    steps:
+      - run:
+          name: Remove signature from universal binary
+          command: codesign --remove-signature build/solc/solc
+
   store_artifacts_solc:
     description: Store compiled solc executable as artifact
     steps:
@@ -1156,6 +1163,7 @@ jobs:
       - checkout
       - install_dependencies_osx
       - run_build
+      - remove_signature_from_universal_binary
       - store_artifacts_solc
       - store_artifacts_yul_phaser
       - persist_executables_to_workspace_osx

From ac54fe1972f25227f9932c8b224ef119360b0e2d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 11 Jan 2024 13:58:23 +0100
Subject: [PATCH 0677/1140] Purge using namespace std from test

---
 scripts/check_style.sh      |  1 +
 test/Common.cpp             | 34 +++++++-------
 test/CommonSyntaxTest.cpp   | 69 ++++++++++++++--------------
 test/EVMHost.cpp            | 55 +++++++++++------------
 test/ExecutionFramework.cpp | 45 +++++++++----------
 test/FilesystemUtils.cpp    | 17 ++++---
 test/Metadata.cpp           | 24 +++++-----
 test/TestCase.cpp           | 35 +++++++--------
 test/TestCaseReader.cpp     | 89 ++++++++++++++++++-------------------
 test/soltest.cpp            | 21 +++++----
 10 files changed, 192 insertions(+), 198 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index fe4d19734f..3c9acf86ca 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -39,6 +39,7 @@ NAMESPACE_STD_FREE_FILES=(
     libyul/backends/evm/*
     libyul/optimiser/*
     solc/*
+    test/*
     test/contracts/*
     test/libevmasm/*
     test/liblangutil/*
diff --git a/test/Common.cpp b/test/Common.cpp
index bb4d2db7eb..ae725774c4 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -32,8 +32,6 @@
 namespace fs = boost::filesystem;
 namespace po = boost::program_options;
 
-using namespace std;
-
 namespace solidity::test
 {
 
@@ -147,15 +145,15 @@ void CommonOptions::validate() const
 	);
 
 	if (!enforceGasTest)
-		cout << endl << "WARNING :: Gas cost expectations are not being enforced" << endl << endl;
+		std::cout << std::endl << "WARNING :: Gas cost expectations are not being enforced" << std::endl << std::endl;
 	else if (evmVersion() != langutil::EVMVersion{} || useABIEncoderV1)
 	{
-		cout << endl << "WARNING :: Enforcing gas cost expectations with non-standard settings:" << endl;
+		std::cout << std::endl << "WARNING :: Enforcing gas cost expectations with non-standard settings:" << std::endl;
 		if (evmVersion() != langutil::EVMVersion{})
-			cout << "- EVM version: " << evmVersion().name() << " (default: " << langutil::EVMVersion{}.name() << ")" << endl;
+			std::cout << "- EVM version: " << evmVersion().name() << " (default: " << langutil::EVMVersion{}.name() << ")" << std::endl;
 		if (useABIEncoderV1)
-			cout << "- ABI coder: v1 (default: v2)" << endl;
-		cout << endl << "DO NOT COMMIT THE UPDATED EXPECTATIONS." << endl << endl;
+			std::cout << "- ABI coder: v1 (default: v2)" << std::endl;
+		std::cout << std::endl << "DO NOT COMMIT THE UPDATED EXPECTATIONS." << std::endl << std::endl;
 	}
 }
 
@@ -176,7 +174,7 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 			// 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)));
+				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EOF version: " + std::to_string(eofVersion)));
 			m_eofVersion = 1;
 		}
 
@@ -213,18 +211,18 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 	return true;
 }
 
-string CommonOptions::toString(vector<string> const& _selectedOptions) const
+std::string CommonOptions::toString(std::vector<std::string> const& _selectedOptions) const
 {
 	if (_selectedOptions.empty())
 		return "";
 
-	auto boolToString = [](bool _value) -> string { return _value ? "true" : "false"; };
+	auto boolToString = [](bool _value) -> std::string { return _value ? "true" : "false"; };
 	// Using std::map to avoid if-else/switch-case block
-	map<string, string> optionValueMap = {
+	std::map<std::string, std::string> optionValueMap = {
 		{"evmVersion", evmVersion().name()},
 		{"optimize", boolToString(optimize)},
 		{"useABIEncoderV1", boolToString(useABIEncoderV1)},
-		{"batch", to_string(selectedBatch + 1) + "/" + to_string(batches)},
+		{"batch", std::to_string(selectedBatch + 1) + "/" + std::to_string(batches)},
 		{"enforceGasTest", boolToString(enforceGasTest)},
 		{"enforceGasTestMinValue", enforceGasTestMinValue.str()},
 		{"disableSemanticTests", boolToString(disableSemanticTests)},
@@ -233,18 +231,18 @@ string CommonOptions::toString(vector<string> const& _selectedOptions) const
 		{"showMetadata", boolToString(showMetadata)}
 	};
 
-	soltestAssert(ranges::all_of(_selectedOptions, [&optionValueMap](string const& _option) { return optionValueMap.count(_option) > 0; }));
+	soltestAssert(ranges::all_of(_selectedOptions, [&optionValueMap](std::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>();
+	std::vector<std::string> optionsWithValues = _selectedOptions |
+		ranges::views::transform([&optionValueMap](std::string const& _option) { return _option + "=" + optionValueMap.at(_option); }) |
+		ranges::to<std::vector>();
 
 	return solidity::util::joinHumanReadable(optionsWithValues);
 }
 
-void CommonOptions::printSelectedOptions(ostream& _stream, string const& _linePrefix, vector<string> const& _selectedOptions) const
+void CommonOptions::printSelectedOptions(std::ostream& _stream, std::string const& _linePrefix, std::vector<std::string> const& _selectedOptions) const
 {
-	_stream << _linePrefix << "Run Settings: " << toString(_selectedOptions) << endl;
+	_stream << _linePrefix << "Run Settings: " << toString(_selectedOptions) << std::endl;
 }
 
 langutil::EVMVersion CommonOptions::evmVersion() const
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 0dedd1fb04..3cb908118e 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -34,7 +34,6 @@
 #include <memory>
 #include <stdexcept>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::util::formatting;
@@ -48,10 +47,10 @@ namespace fs = boost::filesystem;
 namespace
 {
 
-int parseUnsignedInteger(string::iterator& _it, string::iterator _end)
+int parseUnsignedInteger(std::string::iterator& _it, std::string::iterator _end)
 {
 	if (_it == _end || !util::isDigit(*_it))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid test expectation. Source location expected."));
 	int result = 0;
 	while (_it != _end && util::isDigit(*_it))
 	{
@@ -64,7 +63,7 @@ int parseUnsignedInteger(string::iterator& _it, string::iterator _end)
 
 }
 
-CommonSyntaxTest::CommonSyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion):
+CommonSyntaxTest::CommonSyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion):
 	EVMVersionRestrictedTestCase(_filename),
 	m_sources(m_reader.sources()),
 	m_expectations(parseExpectations(m_reader.stream())),
@@ -72,7 +71,7 @@ CommonSyntaxTest::CommonSyntaxTest(string const& _filename, langutil::EVMVersion
 {
 }
 
-TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult CommonSyntaxTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	parseCustomExpectations(m_reader.stream());
 	parseAndAnalyze();
@@ -80,7 +79,7 @@ TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _line
 	return conclude(_stream, _linePrefix, _formatted);
 }
 
-TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult CommonSyntaxTest::conclude(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	if (expectationsMatch())
 		return TestResult::Success;
@@ -89,16 +88,16 @@ TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const&
 	return TestResult::Failure;
 }
 
-void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted)
+void CommonSyntaxTest::printExpectationAndError(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
-	string nextIndentLevel = _linePrefix + "  ";
-	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
+	std::string nextIndentLevel = _linePrefix + "  ";
+	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << std::endl;
 	printExpectedResult(_stream, nextIndentLevel, _formatted);
-	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
+	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << std::endl;
 	printObtainedResult(_stream, nextIndentLevel, _formatted);
 }
 
-void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void CommonSyntaxTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	if (m_sources.sources.empty())
 		return;
@@ -113,8 +112,8 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 				continue;
 
 			if (outputSourceNames)
-				_stream << _linePrefix << util::formatting::CYAN << "==== Source: " << name << " ====" << util::formatting::RESET << endl;
-			vector<char const*> sourceFormatting(source.length(), util::formatting::RESET);
+				_stream << _linePrefix << util::formatting::CYAN << "==== Source: " << name << " ====" << util::formatting::RESET << std::endl;
+			std::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)
 				{
@@ -143,7 +142,7 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 					_stream << source[i];
 				else
 				{
-					_stream << util::formatting::RESET << endl;
+					_stream << util::formatting::RESET << std::endl;
 					if (i + 1 < source.length())
 						_stream << _linePrefix << sourceFormatting[i];
 				}
@@ -158,9 +157,9 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 		}
 }
 
-void CommonSyntaxTest::parseCustomExpectations(istream& _stream)
+void CommonSyntaxTest::parseCustomExpectations(std::istream& _stream)
 {
-	string remainingExpectations = boost::trim_copy(readUntilEnd(_stream));
+	std::string remainingExpectations = boost::trim_copy(readUntilEnd(_stream));
 	soltestAssert(
 		remainingExpectations.empty(),
 		"Found custom expectations not supported by the test case:\n" + remainingExpectations
@@ -172,27 +171,27 @@ bool CommonSyntaxTest::expectationsMatch()
 	return m_expectations == m_errorList;
 }
 
-void CommonSyntaxTest::printExpectedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void CommonSyntaxTest::printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	printErrorList(_stream, m_expectations, _linePrefix, _formatted);
 }
 
-void CommonSyntaxTest::printObtainedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void CommonSyntaxTest::printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	printErrorList(_stream, m_errorList, _linePrefix, _formatted);
 }
 
 void CommonSyntaxTest::printErrorList(
-	ostream& _stream,
-	vector<SyntaxTestError> const& _errorList,
-	string const& _linePrefix,
+	std::ostream& _stream,
+	std::vector<SyntaxTestError> const& _errorList,
+	std::string const& _linePrefix,
 	bool _formatted
 )
 {
 	if (_errorList.empty())
 	{
 		if (_formatted)
-			util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
+			util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << std::endl;
 	}
 	else
 		for (auto const& error: _errorList)
@@ -220,11 +219,11 @@ void CommonSyntaxTest::printErrorList(
 					_stream << error.locationEnd;
 				_stream << "): ";
 			}
-			_stream << error.message << endl;
+			_stream << error.message << std::endl;
 		}
 }
 
-string CommonSyntaxTest::errorMessage(util::Exception const& _e)
+std::string CommonSyntaxTest::errorMessage(util::Exception const& _e)
 {
 	if (_e.comment() && !_e.comment()->empty())
 		return boost::replace_all_copy(*_e.comment(), "\n", "\\n");
@@ -232,13 +231,13 @@ string CommonSyntaxTest::errorMessage(util::Exception const& _e)
 		return "NONE";
 }
 
-vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
+std::vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(std::istream& _stream)
 {
-	static string const customExpectationsDelimiter("// ----");
+	static std::string const customExpectationsDelimiter("// ----");
 
-	vector<SyntaxTestError> expectations;
-	string line;
-	while (getline(_stream, line))
+	std::vector<SyntaxTestError> expectations;
+	std::string line;
+	while (std::getline(_stream, line))
 	{
 		auto it = line.begin();
 
@@ -254,17 +253,17 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		if (it == line.end()) continue;
 
 		auto typeBegin = it;
-		while (it != line.end() && isalpha(*it, locale::classic()))
+		while (it != line.end() && isalpha(*it, std::locale::classic()))
 			++it;
 
-		string errorTypeStr(typeBegin, it);
-		optional<Error::Type> errorType = Error::parseErrorType(errorTypeStr);
+		std::string errorTypeStr(typeBegin, it);
+		std::optional<Error::Type> errorType = Error::parseErrorType(errorTypeStr);
 		if (!errorType.has_value())
-			BOOST_THROW_EXCEPTION(runtime_error("Invalid error type: " + errorTypeStr));
+			BOOST_THROW_EXCEPTION(std::runtime_error("Invalid error type: " + errorTypeStr));
 
 		skipWhitespace(it, line.end());
 
-		optional<ErrorId> errorId;
+		std::optional<ErrorId> errorId;
 		if (it != line.end() && util::isDigit(*it))
 			errorId = ErrorId{static_cast<unsigned long long>(parseUnsignedInteger(it, line.end()))};
 
@@ -295,7 +294,7 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 
 		skipWhitespace(it, line.end());
 
-		string errorMessage(it, line.end());
+		std::string errorMessage(it, line.end());
 		expectations.emplace_back(SyntaxTestError{
 			errorType.value(),
 			std::move(errorId),
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 7e05ceec3e..9af4d7099d 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -31,16 +31,15 @@
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/picosha2.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::test;
 using namespace evmc::literals;
 
-evmc::VM& EVMHost::getVM(string const& _path)
+evmc::VM& EVMHost::getVM(std::string const& _path)
 {
 	static evmc::VM NullVM{nullptr};
-	static map<string, unique_ptr<evmc::VM>> vms;
+	static std::map<std::string, std::unique_ptr<evmc::VM>> vms;
 	if (vms.count(_path) == 0)
 	{
 		evmc_loader_error_code errorCode = {};
@@ -48,16 +47,16 @@ evmc::VM& EVMHost::getVM(string const& _path)
 		if (vm && errorCode == EVMC_LOADER_SUCCESS)
 		{
 			if (vm.get_capabilities() & (EVMC_CAPABILITY_EVM1))
-				vms[_path] = make_unique<evmc::VM>(evmc::VM(std::move(vm)));
+				vms[_path] = std::make_unique<evmc::VM>(evmc::VM(std::move(vm)));
 			else
-				cerr << "VM loaded does not support EVM1" << endl;
+				std::cerr << "VM loaded does not support EVM1" << std::endl;
 		}
 		else
 		{
-			cerr << "Error loading VM from " << _path;
+			std::cerr << "Error loading VM from " << _path;
 			if (char const* errorMsg = evmc_last_error_msg())
-				cerr << ":" << endl << errorMsg;
-			cerr << endl;
+				std::cerr << ":" << std::endl << errorMsg;
+			std::cerr << std::endl;
 		}
 	}
 
@@ -67,7 +66,7 @@ evmc::VM& EVMHost::getVM(string const& _path)
 	return NullVM;
 }
 
-bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
+bool EVMHost::checkVmPaths(std::vector<boost::filesystem::path> const& _vmPaths)
 {
 	bool evmVmFound = false;
 	for (auto const& path: _vmPaths)
@@ -79,7 +78,7 @@ bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
 		if (vm.has_capability(EVMC_CAPABILITY_EVM1))
 		{
 			if (evmVmFound)
-				BOOST_THROW_EXCEPTION(runtime_error("Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm."));
+				BOOST_THROW_EXCEPTION(std::runtime_error("Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm."));
 			evmVmFound = true;
 		}
 	}
@@ -92,7 +91,7 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 {
 	if (!m_vm)
 	{
-		cerr << "Unable to find evmone library" << endl;
+		std::cerr << "Unable to find evmone library" << std::endl;
 		assertThrow(false, Exception, "");
 	}
 
@@ -319,7 +318,7 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 		h160 createAddress(keccak256(
 			bytes{static_cast<uint8_t>(0xc0 + 21 + encodedNonce.size())} +
 			bytes{0x94} +
-			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
+			bytes(std::begin(message.sender.bytes), std::end(message.sender.bytes)) +
 			encodedNonce
 		), h160::AlignRight);
 
@@ -332,8 +331,8 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 	{
 		h160 createAddress(keccak256(
 			bytes{0xff} +
-			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
-			bytes(begin(message.create2_salt.bytes), end(message.create2_salt.bytes)) +
+			bytes(std::begin(message.sender.bytes), std::end(message.sender.bytes)) +
+			bytes(std::begin(message.create2_salt.bytes), std::end(message.create2_salt.bytes)) +
 			keccak256(bytes(message.input_data, message.input_data + message.input_size)).asBytes()
 		), h160::AlignRight);
 
@@ -421,7 +420,7 @@ evmc::bytes32 EVMHost::get_block_hash(int64_t _number) const noexcept
 
 h160 EVMHost::convertFromEVMC(evmc::address const& _addr)
 {
-	return h160(bytes(begin(_addr.bytes), end(_addr.bytes)));
+	return h160(bytes(std::begin(_addr.bytes), std::end(_addr.bytes)));
 }
 
 evmc::address EVMHost::convertToEVMC(h160 const& _addr)
@@ -434,7 +433,7 @@ evmc::address EVMHost::convertToEVMC(h160 const& _addr)
 
 h256 EVMHost::convertFromEVMC(evmc::bytes32 const& _data)
 {
-	return h256(bytes(begin(_data.bytes), end(_data.bytes)));
+	return h256(bytes(std::begin(_data.bytes), std::end(_data.bytes)));
 }
 
 evmc::bytes32 EVMHost::convertToEVMC(h256 const& _data)
@@ -452,7 +451,7 @@ evmc::Result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 	// Fixed cost of 3000 gas.
 	constexpr int64_t gas_cost = 3000;
 
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
+	static std::map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c"
@@ -509,7 +508,7 @@ evmc::Result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 		return 600 + 120 * ((size + 31) / 32);
 	};
 
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
+	static std::map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			bytes{},
 			{
@@ -628,7 +627,7 @@ evmc::Result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 	// Fixed 500 or 150 gas.
 	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 500 : 150;
 
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
+	static std::map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"0000000000000000000000000000000000000000000000000000000000000000"
@@ -896,7 +895,7 @@ evmc::Result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
 	// Fixed 40000 or 6000 gas.
 	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 40000 : 6000;
 
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
+	static std::map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"),
 			{
@@ -990,7 +989,7 @@ evmc::Result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 	};
 
 	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, EVMPrecompileOutput> const inputOutput{
+	static std::map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa9"
@@ -1155,7 +1154,7 @@ evmc::Result EVMHost::precompileBlake2f(evmc_message const&) noexcept
 
 evmc::Result EVMHost::precompileGeneric(
 	evmc_message const& _message,
-	map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
+	std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
 {
 	bytes input(_message.input_data, _message.input_data + _message.input_size);
 	if (_inOut.count(input))
@@ -1202,7 +1201,7 @@ StorageMap const& EVMHost::get_address_storage(evmc::address const& _addr)
 	return accounts[_addr].storage;
 }
 
-string EVMHostPrinter::state()
+std::string EVMHostPrinter::state()
 {
 	// Print state and execution trace.
 	if (m_host.account_exists(m_account))
@@ -1225,14 +1224,14 @@ void EVMHostPrinter::storage()
 				<< m_host.convertFromEVMC(slot)
 				<< ": "
 				<< m_host.convertFromEVMC(value.current)
-				<< endl;
+				<< std::endl;
 }
 
 void EVMHostPrinter::balance()
 {
 	m_stateStream << "BALANCE "
 		<< m_host.convertFromEVMC(m_host.get_balance(m_account))
-		<< endl;
+		<< std::endl;
 }
 
 void EVMHostPrinter::selfdestructRecords()
@@ -1242,12 +1241,12 @@ void EVMHostPrinter::selfdestructRecords()
 			m_stateStream << "SELFDESTRUCT"
 				<< " BENEFICIARY "
 				<< m_host.convertFromEVMC(beneficiary)
-				<< endl;
+				<< std::endl;
 }
 
 void EVMHostPrinter::callRecords()
 {
-	static auto constexpr callKind = [](evmc_call_kind _kind) -> string
+	static auto constexpr callKind = [](evmc_call_kind _kind) -> std::string
 	{
 		switch (_kind)
 		{
@@ -1270,5 +1269,5 @@ void EVMHostPrinter::callRecords()
 		m_stateStream << callKind(record.kind)
 			<< " VALUE "
 			<< m_host.convertFromEVMC(record.value)
-			<< endl;
+			<< std::endl;
 }
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index a18a73de06..9fc36440b3 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -41,7 +41,6 @@
 #include <cstdlib>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::test;
@@ -52,7 +51,7 @@ ExecutionFramework::ExecutionFramework():
 {
 }
 
-ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion, vector<boost::filesystem::path> const& _vmPaths):
+ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion, std::vector<boost::filesystem::path> const& _vmPaths):
 	m_evmVersion(_evmVersion),
 	m_optimiserSettings(solidity::frontend::OptimiserSettings::minimal()),
 	m_showMessages(solidity::test::CommonOptions::get().showMessages),
@@ -71,7 +70,7 @@ void ExecutionFramework::selectVM(evmc_capabilities _cap)
 		evmc::VM& vm = EVMHost::getVM(path.string());
 		if (vm.has_capability(_cap))
 		{
-			m_evmcHost = make_unique<EVMHost>(m_evmVersion, vm);
+			m_evmcHost = std::make_unique<EVMHost>(m_evmVersion, vm);
 			break;
 		}
 	}
@@ -87,7 +86,7 @@ void ExecutionFramework::reset()
 			EVMHost::convertToEVMC(u256(1) << 100);
 }
 
-std::pair<bool, string> ExecutionFramework::compareAndCreateMessage(
+std::pair<bool, std::string> ExecutionFramework::compareAndCreateMessage(
 	bytes const& _result,
 	bytes const& _expectation
 )
@@ -101,8 +100,8 @@ std::pair<bool, string> ExecutionFramework::compareAndCreateMessage(
 	auto expectedHex = boost::replace_all_copy(util::toHex(_expectation), "0", ".");
 	for (size_t i = 0; i < std::max(resultHex.size(), expectedHex.size()); i += 0x40)
 	{
-		std::string result{i >= resultHex.size() ? string{} : resultHex.substr(i, 0x40)};
-		std::string expected{i > expectedHex.size() ? string{} : expectedHex.substr(i, 0x40)};
+		std::string result{i >= resultHex.size() ? std::string{} : resultHex.substr(i, 0x40)};
+		std::string expected{i > expectedHex.size() ? std::string{} : expectedHex.substr(i, 0x40)};
 		message +=
 			(result == expected ? "   " : " X ") +
 			result +
@@ -137,7 +136,7 @@ u256 ExecutionFramework::gasPrice() const
 u256 ExecutionFramework::blockHash(u256 const& _number) const
 {
 	return u256{EVMHost::convertFromEVMC(
-		m_evmcHost->get_block_hash(static_cast<int64_t>(_number & numeric_limits<uint64_t>::max()))
+		m_evmcHost->get_block_hash(static_cast<int64_t>(_number & std::numeric_limits<uint64_t>::max()))
 	)};
 }
 
@@ -153,12 +152,12 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	if (m_showMessages)
 	{
 		if (_isCreation)
-			cout << "CREATE " << m_sender.hex() << ":" << endl;
+			std::cout << "CREATE " << m_sender.hex() << ":" << std::endl;
 		else
-			cout << "CALL   " << m_sender.hex() << " -> " << m_contractAddress.hex() << ":" << endl;
+			std::cout << "CALL   " << m_sender.hex() << " -> " << m_contractAddress.hex() << ":" << std::endl;
 		if (_value > 0)
-			cout << " value: " << _value << endl;
-		cout << " in:      " << util::toHex(_data) << endl;
+			std::cout << " value: " << _value << std::endl;
+		std::cout << " in:      " << util::toHex(_data) << std::endl;
 	}
 	evmc_message message{};
 	message.input_data = _data.data();
@@ -189,19 +188,19 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 
 	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);
+	auto const gasRefund = std::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 << " gas used (without refund): " << totalGasUsed.str() << endl;
-		cout << " gas refund (total):        " << result.gas_refund << endl;
-		cout << " gas refund (bound):        " << gasRefund.str() << endl;
+		std::cout << " out:                       " << util::toHex(m_output) << std::endl;
+		std::cout << " result:                    " << static_cast<size_t>(result.status_code) << std::endl;
+		std::cout << " gas used:                  " << m_gasUsed.str() << std::endl;
+		std::cout << " gas used (without refund): " << totalGasUsed.str() << std::endl;
+		std::cout << " gas refund (total):        " << result.gas_refund << std::endl;
+		std::cout << " gas refund (bound):        " << gasRefund.str() << std::endl;
 	}
 }
 
@@ -211,9 +210,9 @@ void ExecutionFramework::sendEther(h160 const& _addr, u256 const& _amount)
 
 	if (m_showMessages)
 	{
-		cout << "SEND_ETHER   " << m_sender.hex() << " -> " << _addr.hex() << ":" << endl;
+		std::cout << "SEND_ETHER   " << m_sender.hex() << " -> " << _addr.hex() << ":" << std::endl;
 		if (_amount > 0)
-			cout << " value: " << _amount << endl;
+			std::cout << " value: " << _amount << std::endl;
 	}
 	evmc_message message{};
 	message.sender = EVMHost::convertToEVMC(m_sender);
@@ -294,14 +293,14 @@ bool ExecutionFramework::storageEmpty(h160 const& _addr) const
 	return true;
 }
 
-vector<solidity::frontend::test::LogRecord> ExecutionFramework::recordedLogs() const
+std::vector<solidity::frontend::test::LogRecord> ExecutionFramework::recordedLogs() const
 {
-	vector<LogRecord> logs;
+	std::vector<LogRecord> logs;
 	for (evmc::MockedHost::log_record const& logRecord: m_evmcHost->recorded_logs)
 		logs.emplace_back(
 			EVMHost::convertFromEVMC(logRecord.creator),
 			bytes{logRecord.data.begin(), logRecord.data.end()},
-			logRecord.topics | ranges::views::transform([](evmc::bytes32 _bytes) { return EVMHost::convertFromEVMC(_bytes); }) | ranges::to<vector>
+			logRecord.topics | ranges::views::transform([](evmc::bytes32 _bytes) { return EVMHost::convertFromEVMC(_bytes); }) | ranges::to<std::vector>
 		);
 	return logs;
 }
diff --git a/test/FilesystemUtils.cpp b/test/FilesystemUtils.cpp
index 7506d677ec..2d917485d6 100644
--- a/test/FilesystemUtils.cpp
+++ b/test/FilesystemUtils.cpp
@@ -22,11 +22,10 @@
 
 #include <fstream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::test;
 
-void solidity::test::createFilesWithParentDirs(set<boost::filesystem::path> const& _paths, string const& _content)
+void solidity::test::createFilesWithParentDirs(std::set<boost::filesystem::path> const& _paths, std::string const& _content)
 {
 	for (boost::filesystem::path const& path: _paths)
 	{
@@ -34,23 +33,23 @@ void solidity::test::createFilesWithParentDirs(set<boost::filesystem::path> cons
 			boost::filesystem::create_directories(path.parent_path());
 
 		// Use binary mode to avoid line ending conversion on Windows.
-		ofstream newFile(path.string(), std::ofstream::binary);
+		std::ofstream newFile(path.string(), std::ofstream::binary);
 		newFile << _content;
 
 		if (newFile.fail() || !boost::filesystem::exists(path))
-			BOOST_THROW_EXCEPTION(runtime_error("Failed to create an empty file: \"" + path.string() + "\"."));
+			BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create an empty file: \"" + path.string() + "\"."));
 	}
 }
 
-void solidity::test::createFileWithContent(boost::filesystem::path const& _path, string const& _content)
+void solidity::test::createFileWithContent(boost::filesystem::path const& _path, std::string const& _content)
 {
 	if (boost::filesystem::is_regular_file(_path))
-		BOOST_THROW_EXCEPTION(runtime_error("File already exists: \"" + _path.string() + "\".")); \
+		BOOST_THROW_EXCEPTION(std::runtime_error("File already exists: \"" + _path.string() + "\".")); \
 
 	// Use binary mode to avoid line ending conversion on Windows.
-	ofstream newFile(_path.string(), std::ofstream::binary);
+	std::ofstream newFile(_path.string(), std::ofstream::binary);
 	if (newFile.fail() || !boost::filesystem::is_regular_file(_path))
-		BOOST_THROW_EXCEPTION(runtime_error("Failed to create a file: \"" + _path.string() + "\".")); \
+		BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create a file: \"" + _path.string() + "\".")); \
 
 	newFile << _content;
 }
@@ -80,7 +79,7 @@ bool solidity::test::createSymlinkIfSupportedByFilesystem(
 	)
 		return false;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error(
+		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"Failed to create a symbolic link: \"" + _linkName.string() + "\""
 			" -> " + _targetPath.string() + "\"."
 			" " + symlinkCreationError.message() + "."
diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 88a1f7b42f..2fea65c65b 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -26,8 +26,6 @@
 #include <libsolutil/CommonData.h>
 #include <test/Metadata.h>
 
-using namespace std;
-
 namespace solidity::test
 {
 
@@ -54,7 +52,7 @@ bytes bytecodeSansMetadata(bytes const& _bytecode)
 	return bytes(_bytecode.begin(), _bytecode.end() - static_cast<ptrdiff_t>(metadataSize) - 2);
 }
 
-string bytecodeSansMetadata(string const& _bytecode)
+std::string bytecodeSansMetadata(std::string const& _bytecode)
 {
 	return util::toHex(bytecodeSansMetadata(fromHex(_bytecode, util::WhenError::Throw)));
 }
@@ -73,11 +71,11 @@ class TinyCBORParser
 		assertThrow(nextType() == MajorType::Map, CBORException, "Fixed-length map expected.");
 		return readLength();
 	}
-	string readKey()
+	std::string readKey()
 	{
 		return readString();
 	}
-	string readValue()
+	std::string readValue()
 	{
 		switch(nextType())
 		{
@@ -132,7 +130,7 @@ class TinyCBORParser
 		if (length == 24)
 			return m_metadata.at(m_pos++);
 		// Unsupported length kind. (Only by this parser.)
-		assertThrow(false, CBORException, string("Unsupported length ") + to_string(length));
+		assertThrow(false, CBORException, std::string("Unsupported length ") + std::to_string(length));
 	}
 	bytes readBytes(unsigned length)
 	{
@@ -140,28 +138,28 @@ class TinyCBORParser
 		m_pos += length;
 		return ret;
 	}
-	string readString()
+	std::string readString()
 	{
 		// Expect a text string.
 		assertThrow(nextType() == MajorType::TextString, CBORException, "String expected.");
 		bytes tmp{readBytes(readLength())};
-		return string{tmp.begin(), tmp.end()};
+		return std::string{tmp.begin(), tmp.end()};
 	}
 	unsigned m_pos;
 	bytes const& m_metadata;
 };
 
-std::optional<map<string, string>> parseCBORMetadata(bytes const& _metadata)
+std::optional<std::map<std::string, std::string>> parseCBORMetadata(bytes const& _metadata)
 {
 	try
 	{
 		TinyCBORParser parser(_metadata);
-		map<string, string> ret;
+		std::map<std::string, std::string> ret;
 		unsigned count = parser.mapItemCount();
 		for (unsigned i = 0; i < count; i++)
 		{
-			string key = parser.readKey();
-			string value = parser.readValue();
+			std::string key = parser.readKey();
+			std::string value = parser.readValue();
 			ret[std::move(key)] = std::move(value);
 		}
 		return ret;
@@ -172,7 +170,7 @@ std::optional<map<string, string>> parseCBORMetadata(bytes const& _metadata)
 	}
 }
 
-bool isValidMetadata(string const& _serialisedMetadata)
+bool isValidMetadata(std::string const& _serialisedMetadata)
 {
 	Json::Value metadata;
 	if (!util::jsonParseStrict(_serialisedMetadata, metadata))
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index 51608bd4a3..ae89bb56f3 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -27,21 +27,20 @@
 #include <iostream>
 #include <stdexcept>
 
-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)
+void TestCase::printSettings(std::ostream& _stream, const std::string& _linePrefix, const bool)
 {
 	auto& settings = m_reader.settings();
 	if (settings.empty())
 		return;
 
-	_stream << _linePrefix << "// ====" << endl;
+	_stream << _linePrefix << "// ====" << std::endl;
 	for (auto const& setting: settings)
-		_stream << _linePrefix << "// " << setting.first << ": " << setting.second << endl;
+		_stream << _linePrefix << "// " << setting.first << ": " << setting.second << std::endl;
 }
 
 void TestCase::printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix)
@@ -51,7 +50,7 @@ void TestCase::printUpdatedSettings(std::ostream& _stream, std::string const& _l
 
 bool TestCase::isTestFilename(boost::filesystem::path const& _filename)
 {
-	string extension = _filename.extension().string();
+	std::string extension = _filename.extension().string();
 	return (extension == ".sol" || extension == ".yul" || extension == ".stack") &&
 		   !boost::starts_with(_filename.string(), "~") &&
 			!boost::starts_with(_filename.string(), ".");
@@ -63,19 +62,19 @@ bool TestCase::shouldRun()
 	return m_shouldRun;
 }
 
-void TestCase::expect(string::iterator& _it, string::iterator _end, string::value_type _c)
+void TestCase::expect(std::string::iterator& _it, std::string::iterator _end, std::string::value_type _c)
 {
 	if (_it == _end || *_it != _c)
-		BOOST_THROW_EXCEPTION(runtime_error(string("Invalid test expectation. Expected: \"") + _c + "\"."));
+		BOOST_THROW_EXCEPTION(std::runtime_error(std::string("Invalid test expectation. Expected: \"") + _c + "\"."));
 	++_it;
 }
 
-void TestCase::printSource(ostream& _stream, string const& _linePrefix, bool const) const
+void TestCase::printSource(std::ostream& _stream, std::string const& _linePrefix, bool const) const
 {
 	printPrefixed(_stream, m_source, _linePrefix);
 }
 
-void TestCase::printUpdatedExpectations(ostream& _stream, string const& _linePrefix) const
+void TestCase::printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const
 {
 	printPrefixed(_stream, m_obtainedResult, _linePrefix);
 }
@@ -84,30 +83,30 @@ TestCase::TestResult TestCase::checkResult(std::ostream& _stream, const std::str
 {
 	if (m_expectation != m_obtainedResult)
 	{
-		string nextIndentLevel = _linePrefix + "  ";
+		std::string nextIndentLevel = _linePrefix + "  ";
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Expected result:" << endl;
+			<< _linePrefix << "Expected result:" << std::endl;
 		// TODO could compute a simple diff with highlighted lines
 		printPrefixed(_stream, m_expectation, nextIndentLevel);
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Obtained result:" << endl;
+			<< _linePrefix << "Obtained result:" << std::endl;
 		printPrefixed(_stream, m_obtainedResult, nextIndentLevel);
 		return TestResult::Failure;
 	}
 	return TestResult::Success;
 }
 
-EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filename):
+EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(std::string const& _filename):
 	TestCase(_filename)
 {
-	string versionString = m_reader.stringSetting("EVMVersion", "any");
+	std::string versionString = m_reader.stringSetting("EVMVersion", "any");
 	if (versionString == "any")
 		return;
 
-	string comparator;
+	std::string comparator;
 	size_t versionBegin = 0;
 	for (auto character: versionString)
-		if (!isalpha(character, locale::classic()))
+		if (!isalpha(character, std::locale::classic()))
 		{
 			comparator += character;
 			versionBegin++;
@@ -118,7 +117,7 @@ EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filena
 	versionString = versionString.substr(versionBegin);
 	std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString);
 	if (!version)
-		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM version: \"" + versionString + "\""});
+		BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid EVM version: \"" + versionString + "\""});
 
 	langutil::EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	bool comparisonResult;
@@ -135,7 +134,7 @@ EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filena
 	else if (comparator == "!")
 		comparisonResult = !(evmVersion == version);
 	else
-		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM comparator: \"" + comparator + "\""});
+		BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid EVM comparator: \"" + comparator + "\""});
 
 	if (!comparisonResult)
 		m_shouldRun = false;
diff --git a/test/TestCaseReader.cpp b/test/TestCaseReader.cpp
index 7ad752ef81..da6174cbe9 100644
--- a/test/TestCaseReader.cpp
+++ b/test/TestCaseReader.cpp
@@ -23,36 +23,35 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 
-using namespace std;
 using namespace solidity::frontend::test;
 
 namespace fs = boost::filesystem;
 
-TestCaseReader::TestCaseReader(string const& _filename): m_fileStream(_filename), m_fileName(_filename)
+TestCaseReader::TestCaseReader(std::string const& _filename): m_fileStream(_filename), m_fileName(_filename)
 {
 	if (!m_fileStream)
-		BOOST_THROW_EXCEPTION(runtime_error("Cannot open file: \"" + _filename + "\"."));
-	m_fileStream.exceptions(ios::badbit);
+		BOOST_THROW_EXCEPTION(std::runtime_error("Cannot open file: \"" + _filename + "\"."));
+	m_fileStream.exceptions(std::ios::badbit);
 
-	tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(m_fileStream);
+	std::tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(m_fileStream);
 	m_unreadSettings = m_settings;
 }
 
-TestCaseReader::TestCaseReader(istringstream const& _str)
+TestCaseReader::TestCaseReader(std::istringstream const& _str)
 {
-	tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(
-		static_cast<istream&>(const_cast<istringstream&>(_str))
+	std::tie(m_sources, m_lineNumber) = parseSourcesAndSettingsWithLineNumber(
+		static_cast<std::istream&>(const_cast<std::istringstream&>(_str))
 	);
 }
 
-string const& TestCaseReader::source() const
+std::string const& TestCaseReader::source() const
 {
 	if (m_sources.sources.size() != 1)
-		BOOST_THROW_EXCEPTION(runtime_error("Expected single source definition, but got multiple sources."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Expected single source definition, but got multiple sources."));
 	return m_sources.sources.at(m_sources.mainSourceFile);
 }
 
-string TestCaseReader::simpleExpectations()
+std::string TestCaseReader::simpleExpectations()
 {
 	return parseSimpleExpectations(m_fileStream);
 }
@@ -63,13 +62,13 @@ bool TestCaseReader::boolSetting(std::string const& _name, bool _defaultValue)
 		return _defaultValue;
 
 	m_unreadSettings.erase(_name);
-	string value = m_settings.at(_name);
+	std::string value = m_settings.at(_name);
 	if (value == "false")
 		return false;
 	if (value == "true")
 		return true;
 
-	BOOST_THROW_EXCEPTION(runtime_error("Invalid Boolean value: " + value + "."));
+	BOOST_THROW_EXCEPTION(std::runtime_error("Invalid Boolean value: " + value + "."));
 }
 
 size_t TestCaseReader::sizetSetting(std::string const& _name, size_t _defaultValue)
@@ -83,7 +82,7 @@ size_t TestCaseReader::sizetSetting(std::string const& _name, size_t _defaultVal
 	return stoul(m_settings.at(_name));
 }
 
-string TestCaseReader::stringSetting(string const& _name, string const& _defaultValue)
+std::string TestCaseReader::stringSetting(std::string const& _name, std::string const& _defaultValue)
 {
 	if (m_settings.count(_name) == 0)
 		return _defaultValue;
@@ -95,26 +94,26 @@ string TestCaseReader::stringSetting(string const& _name, string const& _default
 void TestCaseReader::ensureAllSettingsRead() const
 {
 	if (!m_unreadSettings.empty())
-		BOOST_THROW_EXCEPTION(runtime_error(
+		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"Unknown setting(s): " +
 			util::joinHumanReadable(m_unreadSettings | ranges::views::keys)
 		));
 }
 
-pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(istream& _stream)
+std::pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(std::istream& _stream)
 {
-	map<string, string> sources;
-	map<string, boost::filesystem::path> externalSources;
-	string currentSourceName;
-	string currentSource;
-	string line;
+	std::map<std::string, std::string> sources;
+	std::map<std::string, boost::filesystem::path> externalSources;
+	std::string currentSourceName;
+	std::string currentSource;
+	std::string line;
 	size_t lineNumber = 1;
-	static string const externalSourceDelimiterStart("==== ExternalSource:");
-	static string const sourceDelimiterStart("==== Source:");
-	static string const sourceDelimiterEnd("====");
-	static string const comment("// ");
-	static string const settingsDelimiter("// ====");
-	static string const expectationsDelimiter("// ----");
+	static std::string const externalSourceDelimiterStart("==== ExternalSource:");
+	static std::string const sourceDelimiterStart("==== Source:");
+	static std::string const sourceDelimiterEnd("====");
+	static std::string const comment("// ");
+	static std::string const settingsDelimiter("// ====");
+	static std::string const expectationsDelimiter("// ----");
 	bool sourcePart = true;
 	while (getline(_stream, line))
 	{
@@ -138,19 +137,19 @@ pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(is
 					line.size() - sourceDelimiterEnd.size() - sourceDelimiterStart.size()
 				));
 				if (sources.count(currentSourceName))
-					BOOST_THROW_EXCEPTION(runtime_error("Multiple definitions of test source \"" + currentSourceName + "\"."));
+					BOOST_THROW_EXCEPTION(std::runtime_error("Multiple definitions of test source \"" + currentSourceName + "\"."));
 			}
 			else if (boost::algorithm::starts_with(line, externalSourceDelimiterStart) && boost::algorithm::ends_with(line, sourceDelimiterEnd))
 			{
-				string externalSourceString = boost::trim_copy(line.substr(
+				std::string externalSourceString = boost::trim_copy(line.substr(
 					externalSourceDelimiterStart.size(),
 					line.size() - sourceDelimiterEnd.size() - externalSourceDelimiterStart.size()
 				));
 
-				string externalSourceName;
+				std::string externalSourceName;
 				size_t remappingPos = externalSourceString.find('=');
 				// Does the external source define a remapping?
-				if (remappingPos != string::npos)
+				if (remappingPos != std::string::npos)
 				{
 					externalSourceName = boost::trim_copy(externalSourceString.substr(0, remappingPos));
 					externalSourceString = boost::trim_copy(externalSourceString.substr(remappingPos + 1));
@@ -164,16 +163,16 @@ pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(is
 				if (!externalSourceTarget.is_relative() || !externalSourceTarget.root_path().empty())
 					// NOTE: UNC paths (ones starting with // or \\) are considered relative by Boost
 					// since they have an empty root directory (but non-empty root name).
-					BOOST_THROW_EXCEPTION(runtime_error("External Source paths need to be relative to the location of the test case."));
+					BOOST_THROW_EXCEPTION(std::runtime_error("External Source paths need to be relative to the location of the test case."));
 				fs::path externalSourceFullPath = testCaseParentDir / externalSourceTarget;
-				string externalSourceContent;
+				std::string externalSourceContent;
 				if (!fs::exists(externalSourceFullPath))
-					BOOST_THROW_EXCEPTION(runtime_error("External Source '" + externalSourceTarget.string() + "' not found."));
+					BOOST_THROW_EXCEPTION(std::runtime_error("External Source '" + externalSourceTarget.string() + "' not found."));
 				else
 					externalSourceContent = util::readFileAsString(externalSourceFullPath);
 
 				if (sources.count(externalSourceName))
-					BOOST_THROW_EXCEPTION(runtime_error("Multiple definitions of test source \"" + externalSourceName + "\"."));
+					BOOST_THROW_EXCEPTION(std::runtime_error("Multiple definitions of test source \"" + externalSourceName + "\"."));
 				sources[externalSourceName] = externalSourceContent;
 				externalSources[externalSourceName] = externalSourceTarget;
 			}
@@ -183,32 +182,32 @@ pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(is
 		else if (boost::algorithm::starts_with(line, comment))
 		{
 			size_t colon = line.find(':');
-			if (colon == string::npos)
-				BOOST_THROW_EXCEPTION(runtime_error(string("Expected \":\" inside setting.")));
-			string key = line.substr(comment.size(), colon - comment.size());
-			string value = line.substr(colon + 1);
+			if (colon == std::string::npos)
+				BOOST_THROW_EXCEPTION(std::runtime_error(std::string("Expected \":\" inside setting.")));
+			std::string key = line.substr(comment.size(), colon - comment.size());
+			std::string value = line.substr(colon + 1);
 			boost::algorithm::trim(key);
 			boost::algorithm::trim(value);
 			m_settings[key] = value;
 		}
 		else
-			BOOST_THROW_EXCEPTION(runtime_error(string("Expected \"//\" or \"// ---\" to terminate settings and source.")));
+			BOOST_THROW_EXCEPTION(std::runtime_error(std::string("Expected \"//\" or \"// ---\" to terminate settings and source.")));
 	}
 	// Register the last source as the main one
 	sources[currentSourceName] = currentSource;
 	return {{std::move(sources), std::move(externalSources), std::move(currentSourceName)}, lineNumber};
 }
 
-string TestCaseReader::parseSimpleExpectations(istream& _file)
+std::string TestCaseReader::parseSimpleExpectations(std::istream& _file)
 {
-	string result;
-	string line;
-	while (getline(_file, line))
+	std::string result;
+	std::string line;
+	while (std::getline(_file, line))
 		if (boost::algorithm::starts_with(line, "// "))
 			result += line.substr(3) + "\n";
 		else if (line == "//")
 			result += "\n";
 		else
-			BOOST_THROW_EXCEPTION(runtime_error("Test expectations must start with \"// \"."));
+			BOOST_THROW_EXCEPTION(std::runtime_error("Test expectations must start with \"// \"."));
 	return result;
 }
diff --git a/test/soltest.cpp b/test/soltest.cpp
index 443c4c5de3..5fde4bda56 100644
--- a/test/soltest.cpp
+++ b/test/soltest.cpp
@@ -35,6 +35,7 @@
 #pragma warning(pop)
 #endif
 
+#pragma GCC diagnostic pop
 #pragma GCC diagnostic pop
 
 #include <test/InteractiveTests.h>
@@ -49,7 +50,6 @@
 using namespace boost::unit_test;
 using namespace solidity::frontend::test;
 namespace fs = boost::filesystem;
-using namespace std;
 
 namespace
 {
@@ -100,7 +100,7 @@ void runTestCase(TestCase::Config const& _config, TestCase::TestCaseCreator cons
 {
 	try
 	{
-		stringstream errorStream;
+		std::stringstream errorStream;
 		auto testCase = _testCaseCreator(_config);
 		if (testCase->shouldRun())
 			switch (testCase->run(errorStream))
@@ -133,7 +133,7 @@ int registerTests(
 	boost::unit_test::test_suite& _suite,
 	boost::filesystem::path const& _basepath,
 	boost::filesystem::path const& _path,
-	vector<string> const& _labels,
+	std::vector<std::string> const& _labels,
 	TestCase::TestCaseCreator _testCaseCreator,
 	solidity::test::Batcher& _batcher
 )
@@ -176,9 +176,9 @@ int registerTests(
 			// 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;
+			static std::vector<std::unique_ptr<std::string const>> filenames;
 
-			filenames.emplace_back(make_unique<string>(_path.string()));
+			filenames.emplace_back(std::make_unique<std::string>(_path.string()));
 			auto test_case = make_test_case(
 				[config, _testCaseCreator]
 				{
@@ -236,11 +236,14 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 			exit(EXIT_FAILURE);
 
 		if (solidity::test::CommonOptions::get().disableSemanticTests)
-			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
+			std::cout << std::endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << std::endl << std::endl;
+
+		if (!solidity::test::CommonOptions::get().enforceGasTest)
+			std::cout << std::endl << "WARNING :: Gas Cost Expectations are not being enforced" << std::endl << std::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;
+			std::cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << std::endl;
 
 		// Batch the boost tests
 		BoostBatcher boostBatcher(batcher);
@@ -287,12 +290,12 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 	}
 	catch (solidity::test::ConfigException const& exception)
 	{
-		cerr << exception.what() << endl;
+		std::cerr << exception.what() << std::endl;
 		exit(EXIT_FAILURE);
 	}
 	catch (std::runtime_error const& exception)
 	{
-		cerr << exception.what() << endl;
+		std::cerr << exception.what() << std::endl;
 		exit(EXIT_FAILURE);
 	}
 

From ac398869ad8ab1191f5c52fc58703877e3766ebc Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 7 Feb 2024 12:38:41 +0100
Subject: [PATCH 0678/1140] SMTChecker: Respect signedness of integer type

When creating zero-value expression, we need to respect the signedness of the passed type.
---
 libsolidity/formal/SymbolicTypes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 45b872b3d0..350e18bdcf 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -476,7 +476,7 @@ smtutil::Expression zeroValue(frontend::Type const* _type)
 	if (isSupportedType(*_type))
 	{
 		if (isNumber(*_type))
-			return 0;
+			return isSigned(_type) ? smtutil::Expression(s256(0)) : smtutil::Expression(static_cast<size_t>(0));
 		if (isBool(*_type))
 			return smtutil::Expression(false);
 		if (isArray(*_type) || isMapping(*_type))

From 8770952466d9c7c16cabe534c843e29ef27f7a78 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 7 Feb 2024 12:39:04 +0100
Subject: [PATCH 0679/1140] SMTChecker: Unsigned number expressions should have
 unsigned type

---
 libsmtutil/SolverInterface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index 4a21f18410..82f8111335 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -124,7 +124,7 @@ class Expression
 	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::uintSort) {}
-	Expression(u256 const& _number): Expression(_number.str(), {}, SortProvider::sintSort) {}
+	Expression(u256 const& _number): Expression(_number.str(), {}, SortProvider::uintSort) {}
 	Expression(s256 const& _number): Expression(
 		_number >= 0 ? _number.str() : "-",
 		_number >= 0 ?

From a1ad970aa10cb9dcf55af859a0de57ed41893722 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Fri, 9 Feb 2024 16:07:52 +0100
Subject: [PATCH 0680/1140] SMTChecker: Add test case

---
 test/libsolidity/smtCheckerTests/types/mapping_6.sol | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/types/mapping_6.sol

diff --git a/test/libsolidity/smtCheckerTests/types/mapping_6.sol b/test/libsolidity/smtCheckerTests/types/mapping_6.sol
new file mode 100644
index 0000000000..f2b6d74d7a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/mapping_6.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+
+
+// Regression for handling signedness, see issues #14791 and #14792
+contract C {
+    mapping(bool => int240) internal v1;
+    mapping(bytes14 => bytes15) internal v;
+
+    function f() public payable {
+        delete v["A"];
+    }
+}

From 22da46c91ceaa4e1a8061b16b69123b5b4ca2457 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Fri, 9 Feb 2024 16:25:56 +0100
Subject: [PATCH 0681/1140] Update changelog

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

diff --git a/Changelog.md b/Changelog.md
index 3d64b1b80e..a33421f1cc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
 
 
 ### 0.8.24 (2024-01-25)

From 4d163ff4bb6b84afff0dfd5817ad52b03e5aa521 Mon Sep 17 00:00:00 2001
From: Simon Perriard <simon.perriard@chainsecurity.com>
Date: Sun, 18 Feb 2024 20:13:37 +0100
Subject: [PATCH 0682/1140] Convert tagPos to a size for address size
 computation

---
 libevmasm/Assembly.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 203db8613d..acf6067697 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -861,8 +861,8 @@ LinkerObject const& Assembly::assemble() const
 			immutableReferencesBySub = linkerObject.immutableReferences;
 		}
 		for (size_t tagPos: sub->m_tagPositionsInBytecode)
-			if (tagPos != std::numeric_limits<size_t>::max() && tagPos > subTagSize)
-				subTagSize = tagPos;
+			if (tagPos != std::numeric_limits<size_t>::max() && numberEncodingSize(tagPos) > subTagSize)
+				subTagSize = numberEncodingSize(tagPos);
 	}
 
 	bool setsImmutables = false;

From 8e212553d6f96031d000914cd19550cfbc06eca6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 19 Feb 2024 21:10:34 +0100
Subject: [PATCH 0683/1140] Account for subassemblies in tag size calculation,
 test adjustments and changelog entry.

---
 Changelog.md                                     |  1 +
 libevmasm/Assembly.cpp                           | 12 ++++++++++++
 test/cmdlineTests/function_debug_info/output     |  2 +-
 .../output.json                                  |  4 ++--
 test/libsolidity/GasCosts.cpp                    | 16 ++++++++--------
 .../semanticTests/arithmetics/check_var_init.sol |  2 +-
 .../array/constant_var_as_array_length.sol       |  2 +-
 ...leanup_during_multi_element_per_slot_copy.sol |  6 +++---
 .../array/fixed_arrays_in_constructors.sol       |  2 +-
 .../semanticTests/array/reusing_memory.sol       |  2 +-
 .../byte_array_to_storage_cleanup.sol            |  6 +++---
 .../constructor/arrays_in_constructors.sol       |  2 +-
 .../constructor/bytes_in_constructors_packer.sol |  2 +-
 .../bytes_in_constructors_unpacker.sol           |  2 +-
 .../constructor_arguments_external.sol           |  4 ++--
 .../constructor_static_array_argument.sol        |  2 +-
 .../constructor_inheritance_init_order.sol       |  2 +-
 .../constructor_inheritance_init_order_2.sol     |  6 +++---
 .../semanticTests/constructor_with_params.sol    |  4 ++--
 ...nstructor_with_params_diamond_inheritance.sol |  4 ++--
 .../constructor_with_params_inheritance.sol      |  4 ++--
 .../events/event_emit_from_other_contract.sol    |  6 +++---
 .../externalContracts/FixedFeeRegistrar.sol      |  6 +++---
 .../semanticTests/externalContracts/base64.sol   |  6 +++---
 .../externalContracts/deposit_contract.sol       |  4 ++--
 .../externalContracts/prbmath_signed.sol         |  6 +++---
 .../externalContracts/prbmath_unsigned.sol       |  6 +++---
 .../externalContracts/ramanujan_pi.sol           |  6 +++---
 .../semanticTests/externalContracts/strings.sol  |  6 +++---
 .../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 +++---
 .../functionCall/send_zero_ether.sol             |  2 +-
 .../semanticTests/immutable/use_scratch.sol      |  4 ++--
 .../inheritance/member_notation_ctor.sol         |  4 ++--
 .../inheritance/value_for_constructor.sol        |  4 ++--
 .../isoltestTesting/balance_other_contract.sol   |  6 +++---
 .../salted_create/prediction_example.sol         |  2 +-
 .../salted_create/salted_create_with_value.sol   |  2 +-
 .../semanticTests/smoke/constructor.sol          |  6 +++---
 .../semanticTests/state/blockhash_basic.sol      |  6 +++---
 .../semanticTests/userDefinedValueType/erc20.sol |  4 ++--
 .../semanticTests/various/code_length.sol        |  2 +-
 test/libsolidity/semanticTests/various/erc20.sol |  4 ++--
 .../various/negative_stack_height.sol            |  4 ++--
 ...estruct_pre_cancun_multiple_beneficiaries.sol |  2 +-
 .../various/selfdestruct_pre_cancun_redeploy.sol |  6 +++---
 .../semanticTests/various/senders_balance.sol    |  6 +++---
 .../semanticTests/various/value_complex.sol      |  6 +++---
 .../semanticTests/various/value_insane.sol       |  6 +++---
 .../sizeLimits/combined_too_large_shanghai.sol   |  2 +-
 .../sizeLimits/initcode_too_large_shanghai.sol   |  2 +-
 53 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a33421f1cc..b2ac59c65a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Assembler: Prevent incorrect calculation of tag sizes.
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
 
 
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index acf6067697..569ecda26a 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -890,6 +890,18 @@ LinkerObject const& Assembly::assemble() const
 	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);
+	// Adjust bytesPerTag for references to sub assemblies.
+	for (AssemblyItem const& i: m_items)
+		if (i.type() == PushTag)
+		{
+			auto [subId, tagId] = i.splitForeignPushTag();
+			if (subId == std::numeric_limits<size_t>::max())
+				continue;
+			assertThrow(subId < m_subs.size(), AssemblyException, "Invalid sub id");
+			auto subTagPosition = m_subs[subId]->m_tagPositionsInBytecode.at(tagId);
+			assertThrow(subTagPosition != std::numeric_limits<size_t>::max(), AssemblyException, "Reference to tag without position.");
+			bytesPerTag = std::max(bytesPerTag, numberEncodingSize(subTagPosition));
+		}
 	uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
 
 	unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1 + static_cast<unsigned>(m_auxiliaryData.size());
diff --git a/test/cmdlineTests/function_debug_info/output b/test/cmdlineTests/function_debug_info/output
index b9ca3f3c40..c359d4e1c1 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": 92,
+          "entryPoint": 88,
           "parameterSlots": 2,
           "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 169e99961e..3a69e3e2d7 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": 174
+                                        "start": 173
                                     },
                                     {
                                         "length": 20,
-                                        "start": 350
+                                        "start": 349
                                     }
                                 ]
                             }
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index 5207328101..d8dad9e027 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		if (CommonOptions::get().useABIEncoderV1)
 			CHECK_DEPLOY_GAS(133045, 129731, evmVersion);
 		else
-			CHECK_DEPLOY_GAS(144999, 121229, evmVersion);
+			CHECK_DEPLOY_GAS(144995, 121229, evmVersion);
 	}
 	// This is only correct on >=Constantinople.
 	else if (!CommonOptions::get().useABIEncoderV1)
@@ -110,22 +110,22 @@ 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);
+				CHECK_DEPLOY_GAS(0, 109237, evmVersion);
 			else if (evmVersion < EVMVersion::shanghai())
-				CHECK_DEPLOY_GAS(0, 97697, evmVersion);
+				CHECK_DEPLOY_GAS(0, 97693, evmVersion);
 			// Shanghai is cheaper due to `push0`
 			else
-				CHECK_DEPLOY_GAS(0, 97071, evmVersion);
+				CHECK_DEPLOY_GAS(0, 97067, evmVersion);
 		}
 		else
 		{
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(139013, 123969, evmVersion);
+				CHECK_DEPLOY_GAS(139009, 123969, evmVersion);
 			else if (evmVersion < EVMVersion::shanghai())
-				CHECK_DEPLOY_GAS(123361, 110969, evmVersion);
+				CHECK_DEPLOY_GAS(123357, 110969, evmVersion);
 			// Shanghai is cheaper due to `push0`
 			else
-				CHECK_DEPLOY_GAS(121493, 110969, evmVersion);
+				CHECK_DEPLOY_GAS(121489, 110969, evmVersion);
 		}
 	}
 	else if (evmVersion < EVMVersion::istanbul())
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 	else if (evmVersion < EVMVersion::shanghai())
 		CHECK_DEPLOY_GAS(114077, 96461, evmVersion);
 	else
-		CHECK_DEPLOY_GAS(114077, 95835, evmVersion);
+		CHECK_DEPLOY_GAS(114077, 95831, evmVersion);
 
 	if (evmVersion >= EVMVersion::byzantium())
 	{
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index 6cc02bd975..fc5418cb0e 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: 100388
+// gas legacy: 100380
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 ca65f07065..45861babaa 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: 139656
+// gas irOptimized: 139616
 // gas legacy: 180517
 // gas legacyOptimized: 150462
 // a(uint256): 0 -> 1
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 d2361dac54..8be8328926 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: 226349
-// gas legacy: 215757
-// gas legacyOptimized: 181760
+// gas irOptimized: 226321
+// gas legacy: 215753
+// gas legacyOptimized: 181756
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index ac11d779a5..c7b2dc77a3 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: 126363
+// gas irOptimized: 126327
 // gas legacy: 174186
 // gas legacyOptimized: 128709
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 92b0c06bfb..8f6afe30ba 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -25,5 +25,5 @@ contract Main {
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
 // gas irOptimized: 111924
-// gas legacy: 125162
+// gas legacy: 125154
 // 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 dc77f0dff8..877e2a1bce 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: 443406
-// gas legacy: 711299
-// gas legacyOptimized: 482382
+// gas irOptimized: 443402
+// gas legacy: 711295
+// gas legacyOptimized: 482378
 // 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/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 3d9c1ffece..19d79b6c4f 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -25,5 +25,5 @@ contract Creator {
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 424526
-// gas legacy: 581443
+// gas legacy: 581426
 // 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 067a64e0e5..cfa74f016f 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: 275102
-// gas legacy: 418462
+// gas legacy: 418433
 // 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 0665cb807a..39da45e8a5 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: 269225
-// gas legacy: 311324
+// gas legacy: 310820
 // gas legacyOptimized: 258604
 // 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 3037aaa317..714ae3e554 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: 104394
+// gas irOptimized: 104374
 // gas legacy: 143300
-// gas legacyOptimized: 102961
+// gas legacyOptimized: 102933
 // 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 22acd1cc3f..a61192742d 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: 171015
+// gas irOptimized: 170975
 // gas legacy: 218378
 // gas legacyOptimized: 176211
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 20cd8760b9..ece0cc31a6 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: 119640
+// gas irOptimized: 119636
 // 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 820c56a4ee..654c9af56d 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: 119640
-// gas legacy: 133594
-// gas legacyOptimized: 115341
+// gas irOptimized: 119636
+// gas legacy: 133574
+// gas legacyOptimized: 115337
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 1916f692fd..e427f6d9ab 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: 101390
-// gas legacy: 115678
+// gas irOptimized: 101370
+// gas legacy: 115614
 // 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 b2f66e4500..6507081447 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: 151966
+// gas irOptimized: 151950
 // gas legacy: 168623
-// gas legacyOptimized: 144577
+// gas legacyOptimized: 144521
 // 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 f5b20d9816..8cc7c69f68 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: 121805
+// gas irOptimized: 121781
 // gas legacy: 137193
-// gas legacyOptimized: 118548
+// gas legacyOptimized: 118504
 // 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 f8b5141b97..0c56cbb671 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: 165386
-// gas legacy: 244800
-// gas legacyOptimized: 171615
+// gas irOptimized: 165370
+// gas legacy: 244776
+// gas legacyOptimized: 171587
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index f9f53275bb..011fecbd34 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: 384610
-// gas legacy: 913421
-// gas legacyOptimized: 476928
+// gas irOptimized: 384606
+// gas legacy: 913417
+// gas legacyOptimized: 476924
 // 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 646601e6fb..ee2745d1ac 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: 405832
-// gas legacy: 735054
-// gas legacyOptimized: 522722
+// gas irOptimized: 405828
+// gas legacy: 735050
+// gas legacyOptimized: 522718
 // 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 4f3342dea7..caa7fc39c8 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -177,8 +177,8 @@ contract DepositContract is IDepositContract, ERC165 {
 // ----
 // constructor()
 // gas irOptimized: 1386886
-// gas legacy: 2369061
-// gas legacyOptimized: 1740144
+// gas legacy: 2368733
+// gas legacyOptimized: 1740004
 // 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 3311a8dcf4..ba7a208fd7 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: 1841740
-// gas legacy: 2414091
-// gas legacyOptimized: 1847616
+// gas irOptimized: 1841736
+// gas legacy: 2414087
+// gas legacyOptimized: 1847612
 // 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 fb1d1a4352..90b283db46 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: 1716327
-// gas legacy: 2193550
-// gas legacyOptimized: 1725061
+// gas irOptimized: 1716323
+// gas legacy: 2193546
+// gas legacyOptimized: 1725057
 // 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 3f555405dd..4442b6d479 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: 407507
-// gas legacy: 615090
-// gas legacyOptimized: 451871
+// gas irOptimized: 407503
+// gas legacy: 615086
+// gas legacyOptimized: 451867
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
 // gas legacy: 100947
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 18d6db37df..3f88fc39c6 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 630224
-// gas legacy: 1061957
-// gas legacyOptimized: 718937
+// gas irOptimized: 630220
+// gas legacy: 1061953
+// gas legacyOptimized: 718933
 // 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 39592f4a48..34aac74efa 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: 192703
-// gas legacy: 241234
-// gas legacyOptimized: 192961
+// gas irOptimized: 192663
+// gas legacy: 241170
+// gas legacyOptimized: 192897
 // 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 3850a0be7f..cb26a6e26a 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: 192866
-// gas legacy: 241606
-// gas legacyOptimized: 193193
+// gas irOptimized: 192826
+// gas legacy: 241536
+// gas legacyOptimized: 193129
 // 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 79a829aa77..8396cb12db 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,9 +38,9 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 252642
-// gas legacy: 391588
-// gas legacyOptimized: 268089
+// gas irOptimized: 252626
+// gas legacy: 391568
+// gas legacyOptimized: 268069
 // 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 71b6ebb2c7..9d9c3f603f 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,9 +37,9 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 252642
-// gas legacy: 391588
-// gas legacyOptimized: 268089
+// gas irOptimized: 252626
+// gas legacy: 391568
+// gas legacyOptimized: 268069
 // 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 18a1997929..a737de5cd4 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -16,6 +16,6 @@ contract Main {
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 100264
-// gas legacy: 113411
+// gas legacy: 110555
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 0a5ccf729f..a7c8ea6a50 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: 123542
+// gas irOptimized: 123526
 // gas legacy: 197645
-// gas legacyOptimized: 137678
+// gas legacyOptimized: 137658
 // f() -> 84, 23
 // m(uint256): 3 -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index 33392e8d48..263588abab 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -19,6 +19,6 @@ contract A {
 }
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 102086
+// gas legacy: 102078
 // g(int256): 10 -> 10
-// gas legacy: 101714
+// gas legacy: 101706
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index d8fd8766fe..9627ad025d 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -39,9 +39,9 @@ contract Main {
 }
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 261888
+// gas irOptimized: 261864
 // gas legacy: 392786
-// gas legacyOptimized: 261633
+// gas legacyOptimized: 261593
 // 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 306bc35670..1a5c9b19b4 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: 169915
-// gas legacy: 230038
-// gas legacyOptimized: 173883
+// gas irOptimized: 169907
+// gas legacy: 230018
+// gas legacyOptimized: 173867
 // balance -> 1500
 // gas irOptimized: 191881
 // gas legacy: 235167
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index 1c5ce63ad4..e7171536d6 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: 102943
+// gas legacy: 102841
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 c4db174742..58b3f07603 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -23,4 +23,4 @@ contract A {
 // f(), 10 ether -> 3007, 3008, 3009
 // gas irOptimized: 253005
 // gas legacy: 381063
-// gas legacyOptimized: 279694
+// gas legacyOptimized: 279658
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 79b92867bc..55789b2f4b 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: 104412
-// gas legacy: 148308
-// gas legacyOptimized: 106727
+// gas irOptimized: 104396
+// gas legacy: 148256
+// gas legacyOptimized: 106699
 // 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 01069aa0c6..03d6f9fe76 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: 108150
-// gas legacy: 152179
-// gas legacyOptimized: 106750
+// gas irOptimized: 108138
+// gas legacy: 152171
+// gas legacyOptimized: 106738
 // 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 27ab530cd7..ac8609d713 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,8 +113,8 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 352698
-// gas legacy: 834932
+// gas irOptimized: 352682
+// gas legacy: 834752
 // gas legacyOptimized: 412648
 // totalSupply() -> 20
 // gas irOptimized: 23415
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index 97a7637976..a8aac5306f 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -59,5 +59,5 @@ contract C {
 }
 // ----
 // constructor()
-// gas legacy: 124168
+// gas legacy: 124136
 // f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index b752a52101..00c12fb18a 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,8 +96,8 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 353276
-// gas legacy: 807683
+// gas irOptimized: 353248
+// gas legacy: 807559
 // gas legacyOptimized: 408718
 // totalSupply() -> 20
 // gas irOptimized: 23415
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
index 3c9130e9fd..7289d2bbd9 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: 575272
-// gas legacyOptimized: 345026
+// gas legacy: 575268
+// gas legacyOptimized: 345022
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
index 57b2d5c66a..87e81a2902 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
@@ -36,7 +36,7 @@ contract D {
 // ----
 // constructor(), 2 ether ->
 // gas irOptimized: 223918
-// gas legacy: 374228
+// gas legacy: 374024
 // gas legacyOptimized: 239815
 // balance: 0x1111111111111111111111111111111111111111 -> 0
 // balance: 0x2222222222222222222222222222222222222222 -> 0
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
index 9c9949854a..e0885782c2 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
@@ -79,9 +79,9 @@ contract D {
 // EVMVersion: =shanghai
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 430265
-// gas legacy: 690264
-// gas legacyOptimized: 412819
+// gas irOptimized: 430253
+// gas legacy: 690244
+// gas legacyOptimized: 412799
 // exists() -> false
 // test_deploy_and_terminate() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 6628454db9..a1c7d4147f 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: 167865
-// gas legacy: 218459
-// gas legacyOptimized: 167292
+// gas irOptimized: 167857
+// gas legacy: 218435
+// gas legacyOptimized: 167276
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 9f262fbdeb..2adac6bf4c 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: 172407
-// gas legacy: 252296
-// gas legacyOptimized: 180352
+// gas irOptimized: 172399
+// gas legacy: 252276
+// gas legacyOptimized: 180336
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 1e591050c3..87fa01485d 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: 173271
-// gas legacy: 253820
-// gas legacyOptimized: 180784
+// gas irOptimized: 173263
+// gas legacy: 253800
+// gas legacyOptimized: 180768
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
index 3fc466db39..32e8d9133b 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
@@ -29,4 +29,4 @@ contract test {
 // 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.
+// Warning 3860: (27321-27398): Contract initcode size is 54618 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 f82434d5d6..d48693db05 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 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.
+// Warning 3860: (20321-20415): Contract initcode size is 60882 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 c49d84784e62082756b671bd1ed85c076185fe31 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 20 Feb 2024 07:27:58 +0100
Subject: [PATCH 0684/1140] Force install python3.12 for Window bytecode
 compare job

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ab0b056a2..72d96fe4f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1697,8 +1697,12 @@ 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/Python312/python /c/Python312/python3
+      - run:
+          name: Force install python3.12.2
+          command: choco install python3 --pre --force --version=3.12.2
+      - run:
+          name: Create a symlink for python3
+          command: ln -s /c/ProgramData/chocolatey/bin/python3.12 /c/ProgramData/chocolatey/bin/python3
       - attach_workspace:
           at: build
       - prepare_bytecode_report:

From 1185ad0400223a54777904d1521102eec599d666 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 20 Feb 2024 14:49:28 +0100
Subject: [PATCH 0685/1140] Build hardhat from latest release in
 t_ems_ext_hardhat

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ab0b056a2..5b13a79456 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1386,7 +1386,31 @@ jobs:
       - checkout
       - attach_workspace:
           at: /tmp/workspace
-      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git
+      - run:
+          name: Ensure pnpm is installed if npm is present
+          command: |
+            if command -v npm &> /dev/null; then
+              sudo npm install -g pnpm
+            fi
+      - run:
+          name: Retrieve Hardhat latest release tag
+          command: |
+            # Make authenticated requests when the Github token is available
+            if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
+              EXTRA_HEADERS=(--header 'Authorization: Bearer '"${GITHUB_ACCESS_TOKEN}")
+            fi
+            HARDHAT_RELEASE_TAG=$(
+              curl \
+                --silent \
+                --location \
+                --fail \
+                --show-error \
+                "${EXTRA_HEADERS[@]}" \
+                https://api.github.com/repos/nomiclabs/hardhat/releases/latest \
+                | jq --raw-output .tag_name \
+            )
+            echo "export HARDHAT_RELEASE_TAG='${HARDHAT_RELEASE_TAG}'" >> "$BASH_ENV"
+      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git --branch $HARDHAT_RELEASE_TAG
       - run:
           name: Install dependencies
           command: |

From d703b829b2f13d6a6d7b7bdd6271ec3fecdae4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 16:04:27 +0100
Subject: [PATCH 0686/1140] gas_diff_stats.py: Add basic unit tests

---
 .circleci/config.yml                |  6 +-
 test/scripts/test_gas_diff_stats.py | 87 +++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 test/scripts/test_gas_diff_stats.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72d96fe4f8..e14a4ec78c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -973,6 +973,10 @@ jobs:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
+      - run:
+          # TODO: Add these to the base image
+          name: Install gas_diff_stats.py dependencies
+          command: python3 -m pip install --user parsec tabulate
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
@@ -985,7 +989,7 @@ jobs:
       - checkout
       - run:
           name: Install dependencies
-          command: python -m pip install --user requests
+          command: python -m pip install --user requests parsec tabulate
       - run:
           name: Python unit tests
           command: python.exe test/pyscriptTests.py
diff --git a/test/scripts/test_gas_diff_stats.py b/test/scripts/test_gas_diff_stats.py
new file mode 100644
index 0000000000..4980293aea
--- /dev/null
+++ b/test/scripts/test_gas_diff_stats.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+
+import unittest
+from textwrap import dedent
+
+# 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 gas_diff_stats import collect_statistics
+# pragma pylint: enable=import-error
+
+class TestGasDiffStats(unittest.TestCase):
+    def test_collect_statistics_should_fail_on_empty_diff(self):
+        with self.assertRaises(RuntimeError):
+            self.assertEqual(collect_statistics(""), (0, 0, 0, 0, 0, 0))
+
+    def test_collect_statistics_should_accept_whitespace_only_diff(self):
+        # TODO: Should it really work this way?
+        # If we're rejecting empty diff, not sure why whitespace is accepted.
+        self.assertEqual(collect_statistics("\n"), (0, 0, 0, 0, 0, 0))
+        self.assertEqual(collect_statistics("\n  \n\t\n\n"), (0, 0, 0, 0, 0, 0))
+
+    def test_collect_statistics_should_report_sum_of_gas_costs(self):
+        diff_output = dedent("""
+            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 1306529d4..77a330f3c 100644
+            --- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+            +++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+            @@ -38 +38,2 @@ contract D {
+            -// gas legacy: 102095
+            +// gas legacy: 76495
+            @@ -40,3 +41,6 @@ contract D {
+            -// gas irOptimized: 98438588
+            -// gas legacy: 98438774
+            -// gas legacyOptimized: 98438580
+            +// gas irOptimized: 25388
+            +// gas legacy: 98413174
+            +// gas legacyOptimized: 25380
+            @@ -44,3 +48,6 @@ contract D {
+            -// gas irOptimized: 98438589
+            -// gas legacy: 98438774
+            -// gas legacyOptimized: 98438580
+            +// gas irOptimized: 25389
+            +// gas legacy: 98413174
+            +// gas legacyOptimized: 25380
+        """).splitlines()
+
+        self.assertEqual(collect_statistics(diff_output), (
+            98438588 + 98438589,          # -irOptimized
+            98438580 + 98438580,          # -legacyOptimized
+            102095 + 98438774 + 98438774, # -legacy
+            25388 + 25389,                # +irOptimized
+            25380 + 25380,                # +legacyOptimized
+            76495 + 98413174 + 98413174,  # +legacy
+        ))
+
+    def test_collect_statistics_should_ignore_ir_costs(self):
+        diff_output = dedent("""
+            -// gas legacy: 1
+            -// gas ir: 2
+            +// gas legacy: 3
+            +// gas ir: 4
+        """).splitlines()
+
+        self.assertEqual(collect_statistics(diff_output), (
+            0, # -irOptimized
+            0, # -legacyOptimized
+            1, # -legacy
+            0, # +irOptimized
+            0, # +legacyOptimized
+            3, # +legacy
+        ))
+
+    def test_collect_statistics_should_ignore_unchanged_costs(self):
+        diff_output = dedent("""
+            -// gas legacy: 1
+             // gas legacyOptimized: 2
+            +// gas legacy: 3
+        """).splitlines()
+
+        self.assertEqual(collect_statistics(diff_output), (
+            0, # -irOptimized
+            0, # -legacyOptimized
+            1, # -legacy
+            0, # +irOptimized
+            0, # +legacyOptimized
+            3, # +legacy
+        ))

From c6e23311cca599f25d1df87dcae8d2ce1f758793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 13:29:28 +0100
Subject: [PATCH 0687/1140] gas_diff_stats.py: Add a Python shebang

- The script is executable but executes as a Bash script and fails.
---
 scripts/gas_diff_stats.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 234d42df0c..90a153cd31 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """A script to collect gas statistics and print it.
 
 Useful to summarize gas differences to semantic tests for a PR / branch.

From e28a1d436a15e698b933f2a6cc5b160f2bcb3616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 13:31:42 +0100
Subject: [PATCH 0688/1140] gas_diff_stats.py: Print errors to stderr, not
 stdout

---
 scripts/gas_diff_stats.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 90a153cd31..b220485c00 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -18,7 +18,9 @@
 repository. The changes are compared against ``origin/develop``.
 
 """
+
 import subprocess
+import sys
 from pathlib import Path
 from enum import Enum
 from parsec import generate, ParseError, regex, string
@@ -110,8 +112,8 @@ def try_parse_git_diff(fname):
             if diff_output:
                 return collect_statistics(diff_output)
         except subprocess.CalledProcessError as e:
-            print("Error in the git diff:")
-            print(e.output)
+            print("Error in the git diff:", file=sys.stderr)
+            print(e.output, file=sys.stderr)
         return None
     def stat(old, new):
         return ((new - old) / old) * 100  if old else 0

From 5518a3074f0804e7d075122d27733b71812549c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 13:35:50 +0100
Subject: [PATCH 0689/1140] gas_diff_stats.py: Don't let shell evaluate file
 names and support names with spaces

---
 scripts/gas_diff_stats.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index b220485c00..6f8087d481 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -105,8 +105,7 @@ def semantictest_statistics():
     def try_parse_git_diff(fname):
         try:
             diff_output = subprocess.check_output(
-                "git diff --unified=0 origin/develop HEAD " + fname,
-                shell=True,
+                ["git", "diff", "--unified=0", "origin/develop", "HEAD", fname],
                 universal_newlines=True
             ).splitlines()
             if diff_output:

From 39f3e7673f84f874a33515f383efca029b2abc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 13:36:26 +0100
Subject: [PATCH 0690/1140] gas_diff_stats.py: Fail when the semantic test dir
 does not exist

---
 scripts/gas_diff_stats.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 6f8087d481..922aa7de45 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -35,6 +35,8 @@ class Diff(Enum):
     Minus = 1
     Plus = 2
 
+SEMANTIC_TEST_DIR = Path("test/libsolidity/semanticTests/")
+
 minus = string("-").result(Diff.Minus)
 plus = string("+").result(Diff.Plus)
 
@@ -119,7 +121,10 @@ def stat(old, new):
 
     table = []
 
-    for path in Path("test/libsolidity/semanticTests").rglob("*.sol"):
+    if not SEMANTIC_TEST_DIR.is_dir():
+        sys.exit(f"Semantic tests not found. '{SEMANTIC_TEST_DIR.absolute()}' is missing or not a directory.")
+
+    for path in SEMANTIC_TEST_DIR.rglob("*.sol"):
         fname = path.as_posix()
         parsed = try_parse_git_diff(fname)
         if parsed is None:

From 855096b84b71aa5f5dd949f83e2dc90831f1e3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 15:17:41 +0100
Subject: [PATCH 0691/1140] gas_diff_stats.py: Skip non-gas lines to avoid
 having to silence parsing errors

---
 scripts/gas_diff_stats.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 922aa7de45..5d95d5a193 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -89,7 +89,12 @@ def try_parse(line):
             pass
         return None
 
-    out = [parsed for line in lines if (parsed := try_parse(line)) is not None]
+    out = [
+        parsed
+        for line in lines
+        if line.startswith('+// gas ') or line.startswith('-// gas ')
+        if (parsed := try_parse(line)) is not None
+    ]
     diff_kinds = [Diff.Minus, Diff.Plus]
     codegen_kinds = [Kind.IrOptimized, Kind.LegacyOptimized, Kind.Legacy]
     return tuple(

From b9c7b69c76ed73c57aef3681d6f29dd155d1607e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 15:57:36 +0100
Subject: [PATCH 0692/1140] gas_diff_stats.py: Explicitly ignore ir gas instead
 of failing to parse it

---
 scripts/gas_diff_stats.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 5d95d5a193..518d8c2c75 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -27,9 +27,10 @@
 from tabulate import tabulate
 
 class Kind(Enum):
-    IrOptimized = 1
-    Legacy = 2
-    LegacyOptimized = 3
+    Ir = 1
+    IrOptimized = 2
+    Legacy = 3
+    LegacyOptimized = 4
 
 class Diff(Enum):
     Minus = 1
@@ -44,6 +45,7 @@ class Diff(Enum):
 comment = string("//")
 colon = string(":")
 
+gas_ir = string("gas ir").result(Kind.Ir)
 gas_ir_optimized = string("gas irOptimized").result(Kind.IrOptimized)
 gas_legacy_optimized = string("gas legacyOptimized").result(Kind.LegacyOptimized)
 gas_legacy = string("gas legacy").result(Kind.Legacy)
@@ -64,7 +66,7 @@ def diff_string() -> (Kind, Diff, int):
     diff_kind = yield minus | plus
     yield comment
     yield space
-    codegen_kind = yield gas_ir_optimized ^ gas_legacy_optimized ^ gas_legacy
+    codegen_kind = yield gas_ir_optimized ^ gas_ir ^ gas_legacy_optimized ^ gas_legacy
     yield colon
     yield space
     val = yield number()

From 65031d3b3e128cd30283afcec254d2326030069d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 15:22:17 +0100
Subject: [PATCH 0693/1140] gas_diff_stats.py: Handle errors instead of
 ignoring them

- It's possible now that errors are something really exceptional and don't happen on every run.
---
 scripts/gas_diff_stats.py | 46 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 518d8c2c75..3527002524 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -84,18 +84,11 @@ def collect_statistics(lines) -> (int, int, int, int, int, int):
     if not lines:
         raise RuntimeError("Empty list")
 
-    def try_parse(line):
-        try:
-            return diff_string.parse(line)
-        except ParseError:
-            pass
-        return None
-
     out = [
         parsed
         for line in lines
         if line.startswith('+// gas ') or line.startswith('-// gas ')
-        if (parsed := try_parse(line)) is not None
+        if (parsed := diff_string.parse(line)) is not None
     ]
     diff_kinds = [Diff.Minus, Diff.Plus]
     codegen_kinds = [Kind.IrOptimized, Kind.LegacyOptimized, Kind.Legacy]
@@ -111,18 +104,15 @@ def try_parse(line):
 
 def semantictest_statistics():
     """Prints the tabulated statistics that can be pasted in github."""
-    def try_parse_git_diff(fname):
-        try:
-            diff_output = subprocess.check_output(
-                ["git", "diff", "--unified=0", "origin/develop", "HEAD", fname],
-                universal_newlines=True
-            ).splitlines()
-            if diff_output:
-                return collect_statistics(diff_output)
-        except subprocess.CalledProcessError as e:
-            print("Error in the git diff:", file=sys.stderr)
-            print(e.output, file=sys.stderr)
-        return None
+    def parse_git_diff(fname):
+        diff_output = subprocess.check_output(
+            ["git", "diff", "--unified=0", "origin/develop", "HEAD", fname],
+            universal_newlines=True
+        ).splitlines()
+        if len(diff_output) == 0:
+            return None
+        return collect_statistics(diff_output)
+
     def stat(old, new):
         return ((new - old) / old) * 100  if old else 0
 
@@ -133,7 +123,7 @@ def stat(old, new):
 
     for path in SEMANTIC_TEST_DIR.rglob("*.sol"):
         fname = path.as_posix()
-        parsed = try_parse_git_diff(fname)
+        parsed = parse_git_diff(fname)
         if parsed is None:
             continue
         ir_optimized = stat(parsed[0], parsed[3])
@@ -150,5 +140,17 @@ def stat(old, new):
     else:
         print("No differences found.")
 
+def main():
+    try:
+        semantictest_statistics()
+    except subprocess.CalledProcessError as exception:
+        sys.exit(f"Error in the git diff:\n{exception.output}")
+    except ParseError as exception:
+        sys.exit(
+            f"ParseError: {exception}\n\n"
+            f"{exception.text}\n"
+            f"{' ' * exception.index}^\n"
+        )
+
 if __name__ == "__main__":
-    semantictest_statistics()
+    main()

From 43274fddef0ecc55f4026d089fef3928b0617680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 14:14:17 +0100
Subject: [PATCH 0694/1140] gas_diff_stats.py: Improve table and number
 formatting

- Use blanks if percentage is infinite instead of misleadingly showing zero.
- Round percentages to nearest integer (but indicate when numbers are only close to zero rather than exactly zero). Differences below one percent are rarely relevant, if ever.
- Include % after the numbers.
- Put file names in backticks to get them displayed using fixed-width font on github.
---
 scripts/gas_diff_stats.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 3527002524..0707b9857b 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -114,7 +114,16 @@ def parse_git_diff(fname):
         return collect_statistics(diff_output)
 
     def stat(old, new):
-        return ((new - old) / old) * 100  if old else 0
+        if old == 0:
+            return ''
+        percentage = (new - old) / old * 100
+        prefix = (
+            # Distinguish actual zero from very small differences
+            '+' if round(percentage) == 0 and percentage > 0 else
+            '-' if round(percentage) == 0 and percentage < 0 else
+            ''
+        )
+        return f'{prefix}{round(percentage)}%'
 
     table = []
 
@@ -129,12 +138,12 @@ def stat(old, new):
         ir_optimized = stat(parsed[0], parsed[3])
         legacy_optimized = stat(parsed[1], parsed[4])
         legacy = stat(parsed[2], parsed[5])
-        fname = fname.split('/', 3)[-1]
-        table += [map(str, [fname, ir_optimized, legacy_optimized, legacy])]
+        fname = f"`{fname.split('/', 3)[-1]}`"
+        table += [[fname, ir_optimized, legacy_optimized, legacy]]
 
     if table:
         print("<details><summary>Click for a table of gas differences</summary>\n")
-        table_header = ["File name", "IR-optimized (%)", "Legacy-Optimized (%)", "Legacy (%)"]
+        table_header = ["File name", "IR optimized", "Legacy optimized", "Legacy"]
         print(tabulate(table, headers=table_header, tablefmt="github"))
         print("</details>")
     else:

From b88d690c66b963282a77e214001b160873434ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 14:16:33 +0100
Subject: [PATCH 0695/1140] gas_diff_stats.py: Order rows in a deterministic
 way (by file path)

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

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 0707b9857b..7403b39172 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -144,7 +144,7 @@ def stat(old, new):
     if table:
         print("<details><summary>Click for a table of gas differences</summary>\n")
         table_header = ["File name", "IR optimized", "Legacy optimized", "Legacy"]
-        print(tabulate(table, headers=table_header, tablefmt="github"))
+        print(tabulate(sorted(table), headers=table_header, tablefmt="github"))
         print("</details>")
     else:
         print("No differences found.")

From 36f2d39282a9f951b0f4780193398f5084073874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 16:15:52 +0100
Subject: [PATCH 0696/1140] CI: Add a smoke test run for gas_diff_stats.py

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e14a4ec78c..8a16effd0f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -980,6 +980,9 @@ jobs:
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
+      - run:
+          name: Smoke test for gas_diff_stats.py
+          command: scripts/gas_diff_stats.py
       - matrix_notify_failure_unless_pr
 
   t_win_pyscripts:

From a851c59bb9c6f226cfb483767a73ebf8b79e8329 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 21 Feb 2024 20:52:11 +0100
Subject: [PATCH 0697/1140] Fix ENS external test ensuring it applies
 memory-safe-assembly filter on files and not directories

---
 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 aee291a1a4..178f468549 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -81,7 +81,7 @@ function ens_test
     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/' '{}' \;
+    find . -name "*.sol" -type f -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

From d7aa37de2eaa20e5463d2a266d8804c5fa2c80e4 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 20 Feb 2024 18:35:07 +0100
Subject: [PATCH 0698/1140] Use latest release instead of main branch on
 external tests

---
 scripts/externalTests/common.sh        | 39 +++++++++++++------------
 scripts/externalTests/runners/base.py  |  3 +-
 scripts/externalTests/test_helpers.py  | 40 +++++++++++++++-----------
 test/externalTests/bleeps.sh           |  3 +-
 test/externalTests/brink.sh            | 12 ++------
 test/externalTests/chainlink.sh        |  3 +-
 test/externalTests/colony.sh           |  3 +-
 test/externalTests/elementfi.sh        |  5 ++--
 test/externalTests/ens.sh              |  3 +-
 test/externalTests/euler.sh            |  3 +-
 test/externalTests/gnosis.sh           |  6 ++--
 test/externalTests/gp2.sh              | 15 ++--------
 test/externalTests/perpetual-pools.sh  |  3 +-
 test/externalTests/pool-together.sh    |  8 ++----
 test/externalTests/prb-math.py         |  3 +-
 test/externalTests/trident.sh          |  3 +-
 test/externalTests/uniswap.sh          |  3 +-
 test/externalTests/yield-liquidator.sh |  3 +-
 test/externalTests/zeppelin.sh         | 18 ++----------
 19 files changed, 68 insertions(+), 108 deletions(-)

diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
index 3bca968a5a..e49be6c8a0 100644
--- a/scripts/externalTests/common.sh
+++ b/scripts/externalTests/common.sh
@@ -106,25 +106,28 @@ function setup_solc
 
 function download_project
 {
-    local repo="$1"
-    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
+    local repo_url="$1"
+    local ref="$2"
+    local test_dir="$3"
+
+    printLog "Cloning ${repo_url}..."
+    # Clone the repo ignoring all blobs until needed by git.
+    # This allows access to commit history but with a fast initial clone
+    git clone --filter=blob:none "$repo_url" "$test_dir/ext"
+    cd "$test_dir/ext"
+
+    # If the ref is '<latest-release>' try to use the latest tag as ref
+    # NOTE: Sadly this will not work with monorepos and may not always
+    # return the latest tag.
+    if [[ "$ref" == "<latest-release>" ]]; then
+        ref=$(git tag --sort=-v:refname | head --lines=1)
     fi
+
+    [[ $ref != "" ]] || assertFail
+
+    printLog "Using ref: ${ref}"
+    git checkout "$ref"
+
     echo "Current commit hash: $(git rev-parse HEAD)"
 }
 
diff --git a/scripts/externalTests/runners/base.py b/scripts/externalTests/runners/base.py
index a79ed53442..c3807c528c 100644
--- a/scripts/externalTests/runners/base.py
+++ b/scripts/externalTests/runners/base.py
@@ -47,7 +47,6 @@
 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))
@@ -134,7 +133,7 @@ def run_test(runner: BaseRunner):
     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)
+    download_project(runner.test_dir, runner.config.repo_url, runner.config.ref)
 
     # Configure run environment
     runner.setup_environment()
diff --git a/scripts/externalTests/test_helpers.py b/scripts/externalTests/test_helpers.py
index 9a573d50ad..576db4429b 100644
--- a/scripts/externalTests/test_helpers.py
+++ b/scripts/externalTests/test_helpers.py
@@ -96,23 +96,29 @@ def parse_command_line(description: str, args: List[str]):
     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)
+def download_project(test_dir: Path, repo_url: str, ref: str = "<latest-release>"):
+    print(f"Cloning {repo_url}...")
+    # Clone the repo ignoring all blobs until needed by git.
+    # This allows access to commit history but with a fast initial clone
+    subprocess.run(["git", "clone", "--filter", "blob:none", repo_url, test_dir.resolve()], check=True)
+    if not test_dir.exists():
+        raise RuntimeError("Failed to clone the project.")
+    os.chdir(test_dir)
+
+    # If the ref is '<latest-release>' try to use the latest tag as ref
+    # NOTE: Sadly this will not work with monorepos and may not always
+    # return the latest tag.
+    if ref == "<latest-release>":
+        tags = subprocess.check_output(
+            ["git", "tag", "--sort", "-v:refname"],
+            encoding="ascii"
+        ).strip().split('\n')
+        if len(tags) == 0:
+            raise RuntimeError("Failed to retrieve latest release tag.")
+        ref = tags[0]
+
+    print(f"Using ref: {ref}")
+    subprocess.run(["git", "checkout", ref], check=True)
 
     if (test_dir / ".gitmodules").exists():
         subprocess.run(["git", "submodule", "update", "--init"], check=True)
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 30f0ec9240..5090e6c12e 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -38,7 +38,6 @@ function test_fn { HARDHAT_DEPLOY_FIXTURE=true npx --no hardhat --no-compile tes
 function bleeps_test
 {
     local repo="https://github.com/wighawag/bleeps"
-    local ref_type=branch
     local ref=main
     local config_file="hardhat.config.ts"
     local config_var=config
@@ -58,7 +57,7 @@ function bleeps_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     pushd "common-lib/"
     neutralize_package_json_hooks
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 1c3ad2e19a..48cc4028f3 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -37,8 +37,7 @@ 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 ref="<latest-release>"
     local config_file="hardhat.config.js"
     local config_var=""
     local extra_settings="metadata: {bytecodeHash: 'none'}"
@@ -60,25 +59,18 @@ function brink_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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" src/Test/MockEIP1271Validator.sol
 
-    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.
-    # 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
-
     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"
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index 4d5080730f..f11156713c 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -37,7 +37,6 @@ 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
@@ -58,7 +57,7 @@ function chainlink_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     cd "contracts/"
 
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 402865107a..1dcd7deaa3 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -37,7 +37,6 @@ function test_fn { yarn run test:contracts; }
 function colony_test
 {
     local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
-    local ref_type=branch
     local ref="develop_080"
     local config_file="truffle.js"
 
@@ -57,7 +56,7 @@ function colony_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 94e622d10c..f3ecbb1417 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -37,8 +37,7 @@ 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 ref="<latest-release>"
     local config_file="hardhat.config.ts"
     local config_var=config
 
@@ -60,7 +59,7 @@ function elementfi_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     chmod +x scripts/load-balancer-contracts.sh
     scripts/load-balancer-contracts.sh
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index aee291a1a4..a79d26c4ef 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -37,7 +37,6 @@ function test_fn { yarn test; }
 function ens_test
 {
     local repo="https://github.com/ensdomains/ens-contracts.git"
-    local ref_type=commit
     local ref="083d29a2c50cd0a8307386abf8fadc217b256256"
     local config_file="hardhat.config.js"
 
@@ -57,7 +56,7 @@ function ens_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     neutralize_package_lock
     neutralize_package_json_hooks
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 80f18e702d..9ede1a3406 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -40,7 +40,6 @@ function test_fn {
 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"
 
@@ -59,7 +58,7 @@ function euler_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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.
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 5f7ea48765..218a5a7504 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -37,8 +37,7 @@ function test_fn { npm test; }
 function gnosis_safe_test
 {
     local repo="https://github.com/safe-global/safe-contracts.git"
-    local ref_type=branch
-    local ref=main
+    local ref="<latest-release>"
     local config_file="hardhat.config.ts"
     local config_var=userConfig
 
@@ -58,7 +57,7 @@ function gnosis_safe_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     # NOTE: The patterns below intentionally have hard-coded versions.
@@ -77,7 +76,6 @@ function gnosis_safe_test
     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
 
-    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"
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index bbb442226f..1e52134a43 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -37,8 +37,7 @@ function test_fn { yarn test; }
 function gp2_test
 {
     local repo="https://github.com/cowprotocol/contracts.git"
-    local ref_type=branch
-    local ref=main
+    local ref="<latest-release>"
     local config_file="hardhat.config.ts"
     local config_var="config"
 
@@ -58,10 +57,9 @@ function gp2_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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"
@@ -69,14 +67,6 @@ 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/
 
@@ -104,7 +94,6 @@ function gp2_test
     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"
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 8d8dc34e21..31748a40ca 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -37,7 +37,6 @@ function test_fn { yarn test; }
 function perpetual_pools_test
 {
     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"
     local config_var="config"
@@ -57,7 +56,7 @@ function perpetual_pools_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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.
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 3f7141d9ba..f841206ef2 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -36,9 +36,8 @@ 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 repo="https://github.com/pooltogether/v4-core.git"
+    local ref="<latest-release>"
     local config_file="hardhat.config.ts"
     local config_var="config"
 
@@ -57,13 +56,12 @@ function pool_together_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     # 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
 
-    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"
diff --git a/test/externalTests/prb-math.py b/test/externalTests/prb-math.py
index e57688ec2e..2d1469fc90 100755
--- a/test/externalTests/prb-math.py
+++ b/test/externalTests/prb-math.py
@@ -51,8 +51,7 @@ def configure(self):
 test_config = TestConfig(
     name="PRBMath",
     repo_url="https://github.com/PaulRBerg/prb-math.git",
-    ref_type="branch",
-    ref="main",
+    ref="<latest-release>",
     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.
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index d8d94eb3c1..e5fa914e9c 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -45,7 +45,6 @@ function test_fn {
 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"
@@ -66,7 +65,7 @@ function trident_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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/uniswap.sh b/test/externalTests/uniswap.sh
index 8d2551b619..bf5f828987 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -37,7 +37,6 @@ 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
@@ -57,7 +56,7 @@ function uniswap_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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.
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index 7a4353af57..16a6287e53 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -37,7 +37,6 @@ 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"
@@ -57,7 +56,7 @@ function yield_liquidator_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$ref" "$DIR"
 
     neutralize_package_lock
     neutralize_package_json_hooks
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 9f72aa4ec9..655e4814f7 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -42,8 +42,7 @@ function test_fn { npm test; }
 function zeppelin_test
 {
     local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
-    local ref_type=branch
-    local ref="master"
+    local ref="<latest-release>"
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(
@@ -62,7 +61,7 @@ function zeppelin_test
     print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    download_project "$repo" "$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.
@@ -100,25 +99,12 @@ function zeppelin_test
     # 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")"
     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
-
-    # TODO: Remove when OpenZeppelin update to ethers 6.11.1+
-    # Prior versions of ethers accepts an object instead of a string as an argument to the toUtf8Bytes function.
-    # However, starting from Ethers version 6.11.1, string arguments are enforced,
-    # which causes the introduced assertion to fail in some OpenZeppelin tests.
-    # See: https://github.com/ethers-io/ethers.js/issues/4583
-    npm install ethers@6.11.0
-
     replace_version_pragmas
-
     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"

From a9a870d8fc87e43e89467cabfe9c6b84217c715b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 7 Feb 2024 14:53:31 +0100
Subject: [PATCH 0699/1140] Test coverage for existing parsing and formatting
 functionality of gas expectations

---
 test/libsolidity/util/TestFileParserTests.cpp | 70 +++++++++++++++----
 .../util/TestFunctionCallTests.cpp            | 28 ++++++++
 2 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/test/libsolidity/util/TestFileParserTests.cpp b/test/libsolidity/util/TestFileParserTests.cpp
index 59934fdb25..46499c1475 100644
--- a/test/libsolidity/util/TestFileParserTests.cpp
+++ b/test/libsolidity/util/TestFileParserTests.cpp
@@ -49,18 +49,18 @@ std::vector<FunctionCall> parse(std::string const& _source, std::map<std::string
 }
 
 void testFunctionCall(
-		FunctionCall const& _call,
-		FunctionCall::DisplayMode _mode,
-		std::string _signature = "",
-		bool _failure = true,
-		bytes _arguments = bytes{},
-		bytes _expectations = bytes{},
-		FunctionValue _value = { 0 },
-		std::string _argumentComment = "",
-		std::string _expectationComment = "",
-		std::vector<std::string> _rawArguments = std::vector<std::string>{},
-		bool _isConstructor = false,
-		bool _isLibrary = false
+	FunctionCall const& _call,
+	FunctionCall::DisplayMode _mode,
+	std::string _signature = "",
+	bool _failure = true,
+	bytes _arguments = bytes{},
+	bytes _expectations = bytes{},
+	FunctionValue _value = { 0 },
+	std::string _argumentComment = "",
+	std::string _expectationComment = "",
+	std::vector<std::string> _rawArguments = std::vector<std::string>{},
+	bool _isConstructor = false,
+	bool _isLibrary = false
 )
 {
 	BOOST_REQUIRE_EQUAL(_call.expectations.failure, _failure);
@@ -1063,6 +1063,52 @@ BOOST_AUTO_TEST_CASE(call_effects)
 	BOOST_CHECK_THROW(parse(source, builtins), std::exception);
 }
 
+BOOST_AUTO_TEST_CASE(gas)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: 3245
+		// gas legacy: 5000
+		// gas legacyOptimized: 0
+	)";
+	auto const calls = parse(source);
+	BOOST_REQUIRE_EQUAL(calls.size(), 1);
+	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
+	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
+		{"ir", 3245},
+		{"legacy", 5000},
+		{"legacyOptimized", 0},
+	}));
+}
+
+BOOST_AUTO_TEST_CASE(gas_before_call)
+{
+	char const* source = R"(
+		// gas ir: 3245
+		// f() ->
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_invalid_run_type)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: 3245
+		// gas experimental: 5000
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_duplicate_run_type)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: 3245
+		// gas ir: 3245
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
index fa3fe995ca..74a45c3268 100644
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ b/test/libsolidity/util/TestFunctionCallTests.cpp
@@ -250,6 +250,34 @@ BOOST_AUTO_TEST_CASE(format_failure_singleline)
 	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8): 1 -> FAILURE");
 }
 
+BOOST_AUTO_TEST_CASE(format_gas)
+{
+	FunctionCall call{
+		"f()",
+		FunctionValue{0},
+		FunctionCallArgs{},
+		FunctionCallExpectations{
+			std::vector<Parameter>{},
+			false, // failure
+			"some comment",
+			{
+				{"ir", 3245},
+				{"legacy", 5000},
+				{"legacy optimized", 0},
+			},
+		}
+	};
+	call.omitsArrow = false;
+
+	BOOST_REQUIRE_EQUAL(
+		TestFunctionCall(call).format(),
+		"// f() -> #some comment#\n"
+		"// gas ir: 3245\n"
+		"// gas legacy: 5000\n"
+		"// gas legacy optimized: 0"
+	);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

From e47e948ff6d1319660b98d1502eff44356c303aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 13:07:13 +0100
Subject: [PATCH 0700/1140] SoltesTypes: Fix outdated comment about allowed
 keys in gasUsed

---
 test/libsolidity/util/SoltestTypes.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
index b5b746e325..672e705534 100644
--- a/test/libsolidity/util/SoltestTypes.h
+++ b/test/libsolidity/util/SoltestTypes.h
@@ -216,7 +216,9 @@ struct FunctionCallExpectations
 		return raw;
 	}
 	/// Gas used by function call
-	/// Should have values for Yul, YulOptimized, Legacy and LegacyOptimized
+	/// Keys represent all distinct combinations of compilation settings that affect produced
+	/// bytecode (and therefore the cost), except for EVM version. E.g. IR codegen without
+	/// optimization legacy codegen with optimization.
 	std::map<std::string, u256> gasUsed;
 };
 

From d98c9438b2779ad554a179ca2d537d3da2dda33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 7 Feb 2024 18:39:44 +0100
Subject: [PATCH 0701/1140] TestFunctionCall::formatGasExpectations(): runType
 can't be empty in practice

---
 test/libsolidity/util/TestFunctionCall.cpp | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 64dfbd9825..716dbff13b 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -339,27 +339,28 @@ std::string TestFunctionCall::formatGasExpectations(
 {
 	std::stringstream os;
 	for (auto const& [runType, gasUsed]: (_useActualCost ? m_gasCosts : m_call.expectations.gasUsed))
-		if (!runType.empty())
-		{
-			bool differentResults =
-				m_gasCosts.count(runType) > 0 &&
-				m_call.expectations.gasUsed.count(runType) > 0 &&
-				m_gasCosts.at(runType) != m_call.expectations.gasUsed.at(runType);
-
-			s256 difference = 0;
-			if (differentResults)
-				difference =
-					static_cast<s256>(m_gasCosts.at(runType)) -
-					static_cast<s256>(m_call.expectations.gasUsed.at(runType));
-			int percent = 0;
-			if (differentResults)
-				percent = static_cast<int>(
-					100.0 * (static_cast<double>(difference) / static_cast<double>(m_call.expectations.gasUsed.at(runType)))
-				);
-			os << std::endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
-			if (_showDifference && differentResults && _useActualCost)
-				os << " [" << std::showpos << difference << " (" << percent << "%)]";
-		}
+	{
+		soltestAssert(runType != "");
+
+		bool differentResults =
+			m_gasCosts.count(runType) > 0 &&
+			m_call.expectations.gasUsed.count(runType) > 0 &&
+			m_gasCosts.at(runType) != m_call.expectations.gasUsed.at(runType);
+
+		s256 difference = 0;
+		if (differentResults)
+			difference =
+				static_cast<s256>(m_gasCosts.at(runType)) -
+				static_cast<s256>(m_call.expectations.gasUsed.at(runType));
+		int percent = 0;
+		if (differentResults)
+			percent = static_cast<int>(
+				100.0 * (static_cast<double>(difference) / static_cast<double>(m_call.expectations.gasUsed.at(runType)))
+			);
+		os << std::endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
+		if (_showDifference && differentResults && _useActualCost)
+			os << " [" << std::showpos << difference << " (" << percent << "%)]";
+	}
 	return os.str();
 }
 

From c55c8b5504fdb8789741883e5af6f890be2b5cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 7 Feb 2024 19:42:41 +0100
Subject: [PATCH 0702/1140] TestFunctionCall::formatGasExpectations(): Move
 diffing into a helper

---
 test/libsolidity/util/TestFunctionCall.cpp | 43 +++++++++++++---------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 716dbff13b..1d8c721919 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -21,6 +21,7 @@
 
 #include <boost/algorithm/string.hpp>
 
+#include <fmt/format.h>
 #include <optional>
 #include <stdexcept>
 #include <string>
@@ -331,6 +332,23 @@ std::string TestFunctionCall::formatRawParameters(
 	return os.str();
 }
 
+namespace
+{
+
+std::string formatGasDiff(std::optional<u256> const& _gasUsed, std::optional<u256> const& _reference)
+{
+	if (!_reference.has_value() || !_gasUsed.has_value() || _gasUsed == _reference)
+		return "";
+
+	s256 difference = static_cast<s256>(*_gasUsed) - static_cast<s256>(*_reference);
+	int percent = static_cast<int>(
+		100.0 * (static_cast<double>(difference) / static_cast<double>(*_reference))
+	);
+	return fmt::format("{} ({:+}%)", difference.str(), percent);
+}
+
+}
+
 std::string TestFunctionCall::formatGasExpectations(
 	std::string const& _linePrefix,
 	bool _useActualCost,
@@ -342,24 +360,13 @@ std::string TestFunctionCall::formatGasExpectations(
 	{
 		soltestAssert(runType != "");
 
-		bool differentResults =
-			m_gasCosts.count(runType) > 0 &&
-			m_call.expectations.gasUsed.count(runType) > 0 &&
-			m_gasCosts.at(runType) != m_call.expectations.gasUsed.at(runType);
-
-		s256 difference = 0;
-		if (differentResults)
-			difference =
-				static_cast<s256>(m_gasCosts.at(runType)) -
-				static_cast<s256>(m_call.expectations.gasUsed.at(runType));
-		int percent = 0;
-		if (differentResults)
-			percent = static_cast<int>(
-				100.0 * (static_cast<double>(difference) / static_cast<double>(m_call.expectations.gasUsed.at(runType)))
-			);
-		os << std::endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
-		if (_showDifference && differentResults && _useActualCost)
-			os << " [" << std::showpos << difference << " (" << percent << "%)]";
+		os << std::endl << _linePrefix << "// gas " << runType << ": " << gasUsed.str();
+		std::string gasDiff = formatGasDiff(
+			m_gasCosts.count(runType) > 0 ? std::make_optional<u256>(m_gasCosts.at(runType)) : std::nullopt,
+			m_call.expectations.gasUsed.count(runType) > 0 ? std::make_optional<u256>(m_call.expectations.gasUsed.at(runType)) : std::nullopt
+		);
+		if (_showDifference && !gasDiff.empty() && _useActualCost)
+			os << " [" << gasDiff << "]";
 	}
 	return os.str();
 }

From cd94139f3f666ea3087122a46ab8b461722bd4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 7 Feb 2024 19:51:57 +0100
Subject: [PATCH 0703/1140] TestFunctionCall::formatGasExpectations(): Handle
 corner cases properly

---
 test/libsolidity/util/TestFunctionCall.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 1d8c721919..7a77f72879 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -340,7 +340,13 @@ std::string formatGasDiff(std::optional<u256> const& _gasUsed, std::optional<u25
 	if (!_reference.has_value() || !_gasUsed.has_value() || _gasUsed == _reference)
 		return "";
 
+	solUnimplementedAssert(*_gasUsed < u256(1) << 255);
+	solUnimplementedAssert(*_reference < u256(1) << 255);
 	s256 difference = static_cast<s256>(*_gasUsed) - static_cast<s256>(*_reference);
+
+	if (*_reference == 0)
+		return fmt::format("{}", difference.str());
+
 	int percent = static_cast<int>(
 		100.0 * (static_cast<double>(difference) / static_cast<double>(*_reference))
 	);

From d5bae3f5973c54395e450762ce8df25ba1dd3285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 7 Feb 2024 20:00:19 +0100
Subject: [PATCH 0704/1140] TestFunctionCall::formatGasExpectations(): Helper
 for getting optional values from a map

---
 test/libsolidity/util/TestFunctionCall.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 7a77f72879..54dd769d61 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -353,6 +353,16 @@ std::string formatGasDiff(std::optional<u256> const& _gasUsed, std::optional<u25
 	return fmt::format("{} ({:+}%)", difference.str(), percent);
 }
 
+// TODO: Convert this into a generic helper for getting optional form a map
+std::optional<u256> gasOrNullopt(std::map<std::string, u256> const& _map, std::string const& _key)
+{
+	auto it = _map.find(_key);
+	if (it == _map.end())
+		return std::nullopt;
+
+	return it->second;
+}
+
 }
 
 std::string TestFunctionCall::formatGasExpectations(
@@ -368,8 +378,8 @@ std::string TestFunctionCall::formatGasExpectations(
 
 		os << std::endl << _linePrefix << "// gas " << runType << ": " << gasUsed.str();
 		std::string gasDiff = formatGasDiff(
-			m_gasCosts.count(runType) > 0 ? std::make_optional<u256>(m_gasCosts.at(runType)) : std::nullopt,
-			m_call.expectations.gasUsed.count(runType) > 0 ? std::make_optional<u256>(m_call.expectations.gasUsed.at(runType)) : std::nullopt
+			gasOrNullopt(m_gasCosts, runType),
+			gasOrNullopt(m_call.expectations.gasUsed, runType)
 		);
 		if (_showDifference && !gasDiff.empty() && _useActualCost)
 			os << " [" << gasDiff << "]";

From 2ee4d6b1eeaee104007a64ce0b23faa57862800d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 9 Feb 2024 19:24:34 +0100
Subject: [PATCH 0705/1140] Keep track of code deposit gas when executing
 contract code

---
 test/EVMHost.cpp            | 7 ++++++-
 test/EVMHost.h              | 7 +++++++
 test/ExecutionFramework.cpp | 2 ++
 test/ExecutionFramework.h   | 6 ++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 9af4d7099d..c43d53d6bc 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -161,6 +161,7 @@ void EVMHost::reset()
 	recorded_calls.clear();
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
+	m_totalCodeDepositGas = 0;
 
 	// Mark all precompiled contracts as existing. Existing here means to have a balance (as per EIP-161).
 	// NOTE: keep this in sync with `EVMHost::call` below.
@@ -203,6 +204,7 @@ void EVMHost::newTransactionFrame()
 			// Otherwise, the previous behavior (pre-Cancun) is maintained.
 			accounts.erase(address);
 	newlyCreatedAccounts.clear();
+	m_totalCodeDepositGas = 0;
 	recorded_selfdestructs.clear();
 }
 
@@ -392,15 +394,18 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 
 	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
 	{
-		result.gas_left -= static_cast<int64_t>(evmasm::GasCosts::createDataGas * result.output_size);
+		int64_t codeDepositGas = static_cast<int64_t>(evmasm::GasCosts::createDataGas * result.output_size);
+		result.gas_left -= codeDepositGas;
 		if (result.gas_left < 0)
 		{
+			m_totalCodeDepositGas += -result.gas_left;
 			result.gas_left = 0;
 			result.status_code = EVMC_OUT_OF_GAS;
 			// TODO clear some fields?
 		}
 		else
 		{
+			m_totalCodeDepositGas += codeDepositGas;
 			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}));
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 144596e05e..848314c879 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -94,6 +94,8 @@ class EVMHost: public evmc::MockedHost
 	/// @returns contents of storage at @param _addr.
 	StorageMap const& get_address_storage(evmc::address const& _addr);
 
+	u256 totalCodeDepositGas() const { return m_totalCodeDepositGas; }
+
 	static Address convertFromEVMC(evmc::address const& _addr);
 	static evmc::address convertToEVMC(Address const& _addr);
 	static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
@@ -137,6 +139,11 @@ class EVMHost: public evmc::MockedHost
 	langutil::EVMVersion m_evmVersion;
 	/// EVM version requested from EVMC (matches the above)
 	evmc_revision m_evmRevision;
+
+	/// The part of the total cost of the current transaction that paid for the code deposits.
+	/// I.e. GAS_CODE_DEPOSIT times the total size of deployed code of all newly created contracts,
+	/// including the current contract itself if it was a creation transaction.
+	u256 m_totalCodeDepositGas;
 };
 
 class EVMHostPrinter
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 9fc36440b3..0081ba4a9d 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -191,6 +191,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	auto const gasRefund = std::min(u256(result.gas_refund), totalGasUsed / refundRatio);
 
 	m_gasUsed = totalGasUsed - gasRefund;
+	m_gasUsedForCodeDeposit = m_evmcHost->totalCodeDepositGas();
 	m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
 
 	if (m_showMessages)
@@ -199,6 +200,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 		std::cout << " result:                    " << static_cast<size_t>(result.status_code) << std::endl;
 		std::cout << " gas used:                  " << m_gasUsed.str() << std::endl;
 		std::cout << " gas used (without refund): " << totalGasUsed.str() << std::endl;
+		std::cout << "     code deposits only:    " << m_gasUsedForCodeDeposit.str() << std::endl;
 		std::cout << " gas refund (total):        " << result.gas_refund << std::endl;
 		std::cout << " gas refund (bound):        " << gasRefund.str() << std::endl;
 	}
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index 27ceb4f280..5d66ea10d0 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -303,7 +303,13 @@ class ExecutionFramework
 	util::h160 m_sender = account(0);
 	util::h160 m_contractAddress;
 	bytes m_output;
+
+	/// Total gas used by the transaction, after refund.
 	u256 m_gasUsed;
+
+	/// The portion of @a m_gasUsed spent on code deposits of newly created contracts.
+	/// May exceed @a m_gasUsed in rare corner cases due to refunds.
+	u256 m_gasUsedForCodeDeposit;
 };
 
 #define ABI_CHECK(result, expectation) do { \

From 96233864437e304b6c02c867b29ffe428a72c630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 9 Feb 2024 19:27:07 +0100
Subject: [PATCH 0706/1140] Separate 'code' gas settings in semantic tests

---
 test/libsolidity/SemanticTest.cpp             |  10 +-
 test/libsolidity/util/SoltestTypes.h          |   5 +
 test/libsolidity/util/TestFileParser.cpp      |  42 ++++++--
 test/libsolidity/util/TestFileParserTests.cpp | 102 ++++++++++++++++++
 test/libsolidity/util/TestFunctionCall.cpp    |  22 ++++
 test/libsolidity/util/TestFunctionCall.h      |   9 +-
 .../util/TestFunctionCallTests.cpp            |  65 ++++++++---
 7 files changed, 231 insertions(+), 24 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 25113b689d..676c39eaf9 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -569,6 +569,11 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 		(_compileViaYul ? "ir"s : "legacy"s) +
 		(m_optimiserSettings == OptimiserSettings::full() ? "Optimized" : "");
 
+	soltestAssert(
+		io_test.call().expectations.gasUsed.count(setting) ==
+		io_test.call().expectations.gasUsedForCodeDeposit.count(setting)
+	);
+
 	// 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
@@ -587,9 +592,12 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 	solAssert(!m_runWithABIEncoderV1Only, "");
 
 	io_test.setGasCost(setting, m_gasUsed);
+	io_test.setCodeDepositGasCost(setting, m_gasUsedForCodeDeposit);
+
 	return
 		io_test.call().expectations.gasUsed.count(setting) > 0 &&
-		m_gasUsed == io_test.call().expectations.gasUsed.at(setting);
+		m_gasUsed == io_test.call().expectations.gasUsed.at(setting) &&
+		m_gasUsedForCodeDeposit == io_test.call().expectations.gasUsedForCodeDeposit.at(setting);
 }
 
 void SemanticTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
index 672e705534..a2d593fd3c 100644
--- a/test/libsolidity/util/SoltestTypes.h
+++ b/test/libsolidity/util/SoltestTypes.h
@@ -220,6 +220,11 @@ struct FunctionCallExpectations
 	/// bytecode (and therefore the cost), except for EVM version. E.g. IR codegen without
 	/// optimization legacy codegen with optimization.
 	std::map<std::string, u256> gasUsed;
+
+	/// The portion of @a gasUsed spent on code deposits of newly created contracts.
+	/// May exceed @a gasUsed in rare corner cases due to refunds.
+	/// Keys must always match @a gasUsedExcludingCode.
+	std::map<std::string, u256> gasUsedForCodeDeposit;
 };
 
 /**
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 3fba998a07..e7e20f7c5c 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -84,18 +84,31 @@ std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctio
 							BOOST_THROW_EXCEPTION(TestParserError("Expected function call before gas usage filter."));
 
 						std::string runType = m_scanner.currentLiteral();
-						if (std::set<std::string>{"ir", "irOptimized", "legacy", "legacyOptimized"}.count(runType) > 0)
-						{
-							m_scanner.scanNextToken();
-							expect(Token::Colon);
-							if (calls.back().expectations.gasUsed.count(runType) > 0)
-								throw TestParserError("Gas usage expectation set multiple times.");
-							calls.back().expectations.gasUsed[runType] = u256(parseDecimalNumber());
-						}
-						else
+						if (std::set<std::string>{"ir", "irOptimized", "legacy", "legacyOptimized"}.count(runType) == 0)
 							BOOST_THROW_EXCEPTION(TestParserError(
 								"Expected \"ir\", \"irOptimized\", \"legacy\", or \"legacyOptimized\"."
 							));
+						m_scanner.scanNextToken();
+
+						bool isCodeDepositCost = false;
+						if (accept(Token::Identifier))
+						{
+							if (m_scanner.currentLiteral() != "code")
+								BOOST_THROW_EXCEPTION(TestParserError("Expected \"code\" or \":\"."));
+							isCodeDepositCost = true;
+							m_scanner.scanNextToken();
+						}
+
+						expect(Token::Colon);
+
+						std::map<std::string, u256>& gasExpectationMap = (isCodeDepositCost ?
+							calls.back().expectations.gasUsedForCodeDeposit :
+							calls.back().expectations.gasUsed
+						);
+						if (gasExpectationMap.count(runType) > 0)
+							throw TestParserError("Gas usage expectation set multiple times.");
+
+						gasExpectationMap[runType] = u256(parseDecimalNumber());
 					}
 					else
 					{
@@ -189,6 +202,17 @@ std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctio
 			}
 		}
 	}
+
+	for (FunctionCall& call: calls)
+	{
+		// Ensure that each specified gas expectation has both components to simplify working with them.
+		for (auto const& [runType, gas]: call.expectations.gasUsedForCodeDeposit)
+			call.expectations.gasUsed.try_emplace({runType, 0});
+
+		for (auto const& [runType, gas]: call.expectations.gasUsed)
+			call.expectations.gasUsedForCodeDeposit.try_emplace({runType, 0});
+	}
+
 	return calls;
 }
 
diff --git a/test/libsolidity/util/TestFileParserTests.cpp b/test/libsolidity/util/TestFileParserTests.cpp
index 46499c1475..7a794f9152 100644
--- a/test/libsolidity/util/TestFileParserTests.cpp
+++ b/test/libsolidity/util/TestFileParserTests.cpp
@@ -1079,6 +1079,11 @@ BOOST_AUTO_TEST_CASE(gas)
 		{"legacy", 5000},
 		{"legacyOptimized", 0},
 	}));
+	BOOST_TEST(calls[0].expectations.gasUsedForCodeDeposit == (std::map<std::string, u256>{
+		{"ir", 0},
+		{"legacy", 0},
+		{"legacyOptimized", 0},
+	}));
 }
 
 BOOST_AUTO_TEST_CASE(gas_before_call)
@@ -1109,6 +1114,103 @@ BOOST_AUTO_TEST_CASE(gas_duplicate_run_type)
 	)";
 	BOOST_REQUIRE_THROW(parse(source), TestParserError);
 }
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost)
+{
+	char const* source = R"(
+		// f() ->
+		// gas legacyOptimized code: 1
+		// gas ir: 13000
+		// gas irOptimized: 6666
+		// gas irOptimized code: 666
+		// gas legacy code: 0
+		// gas legacyOptimized: 2
+	)";
+	auto const calls = parse(source);
+	BOOST_REQUIRE_EQUAL(calls.size(), 1);
+	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
+	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
+		{"ir", 13000},
+		{"irOptimized", 6666},
+		{"legacy", 0},
+		{"legacyOptimized", 2},
+	}));
+	BOOST_TEST(calls[0].expectations.gasUsedForCodeDeposit == (std::map<std::string, u256>{
+		{"ir", 0},
+		{"irOptimized", 666},
+		{"legacy", 0},
+		{"legacyOptimized", 1},
+	}));
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_invalid_suffix)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir data: 3245
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_tokens_after_suffix)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir code code: 3245
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_double_code_gas)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: 3245
+		// gas ir code: 1
+		// gas ir code: 1
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_non_code_cost)
+{
+	// NOTE: This arrangement is unlikely but may still be possible due to refunds.
+	char const* source = R"(
+		// f() ->
+		// gas ir: 10
+		// gas ir code: 20
+	)";
+	auto const calls = parse(source);
+	BOOST_REQUIRE_EQUAL(calls.size(), 1);
+	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
+	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
+		{"ir", 10},
+	}));
+	BOOST_TEST(calls[0].expectations.gasUsedForCodeDeposit == (std::map<std::string, u256>{
+		{"ir", 20},
+	}));
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_total_cost)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: -10
+		// gas ir code: 20
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
+BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_code_cost)
+{
+	char const* source = R"(
+		// f() ->
+		// gas ir: 20
+		// gas ir code: -10
+	)";
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 54dd769d61..b22ac3716a 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -22,6 +22,9 @@
 #include <boost/algorithm/string.hpp>
 
 #include <fmt/format.h>
+#include <range/v3/view/map.hpp>
+#include <range/v3/view/set_algorithm.hpp>
+
 #include <optional>
 #include <stdexcept>
 #include <string>
@@ -371,11 +374,19 @@ std::string TestFunctionCall::formatGasExpectations(
 	bool _showDifference
 ) const
 {
+	using ranges::views::keys;
+	using ranges::views::set_symmetric_difference;
+
+	soltestAssert(set_symmetric_difference(m_codeDepositGasCosts | keys, m_gasCosts | keys).empty());
+	soltestAssert(set_symmetric_difference(m_call.expectations.gasUsedForCodeDeposit | keys, m_call.expectations.gasUsed | keys).empty());
+
 	std::stringstream os;
 	for (auto const& [runType, gasUsed]: (_useActualCost ? m_gasCosts : m_call.expectations.gasUsed))
 	{
 		soltestAssert(runType != "");
 
+		u256 gasUsedForCodeDeposit = (_useActualCost ? m_codeDepositGasCosts : m_call.expectations.gasUsedForCodeDeposit).at(runType);
+
 		os << std::endl << _linePrefix << "// gas " << runType << ": " << gasUsed.str();
 		std::string gasDiff = formatGasDiff(
 			gasOrNullopt(m_gasCosts, runType),
@@ -383,6 +394,17 @@ std::string TestFunctionCall::formatGasExpectations(
 		);
 		if (_showDifference && !gasDiff.empty() && _useActualCost)
 			os << " [" << gasDiff << "]";
+
+		if (gasUsedForCodeDeposit != 0)
+		{
+			os << std::endl << _linePrefix << "// gas " << runType << " code: " << gasUsedForCodeDeposit.str();
+			std::string codeGasDiff = formatGasDiff(
+				gasOrNullopt(m_codeDepositGasCosts, runType),
+				gasOrNullopt(m_call.expectations.gasUsedForCodeDeposit, runType)
+			);
+			if (_showDifference && !codeGasDiff.empty() && _useActualCost)
+				os << " [" << codeGasDiff << "]";
+			}
 	}
 	return os.str();
 }
diff --git a/test/libsolidity/util/TestFunctionCall.h b/test/libsolidity/util/TestFunctionCall.h
index 8b4ed5019d..cf05b6a216 100644
--- a/test/libsolidity/util/TestFunctionCall.h
+++ b/test/libsolidity/util/TestFunctionCall.h
@@ -51,7 +51,11 @@ class TestFunctionCall
 		ExpectedValuesActualGas
 	};
 
-	TestFunctionCall(FunctionCall _call): m_call(std::move(_call)), m_gasCosts(m_call.expectations.gasUsed) {}
+	TestFunctionCall(FunctionCall _call):
+		m_call(std::move(_call)),
+		m_gasCosts(m_call.expectations.gasUsed),
+		m_codeDepositGasCosts(m_call.expectations.gasUsedForCodeDeposit)
+	{}
 
 	/// Formats this function call test and applies the format that was detected during parsing.
 	/// _renderMode determines the source of values to be inserted into the updated test expectations.
@@ -94,6 +98,7 @@ class TestFunctionCall
 	void setFailure(const bool _failure) { m_failure = _failure; }
 	void setRawBytes(const bytes _rawBytes) { m_rawBytes = _rawBytes; }
 	void setGasCost(std::string const& _runType, u256 const& _gasCost) { m_gasCosts[_runType] = _gasCost; }
+	void setCodeDepositGasCost(std::string const& _runType, u256 const& _gasCost) { m_codeDepositGasCosts[_runType] = _gasCost; }
 	void setContractABI(Json::Value _contractABI) { m_contractABI = std::move(_contractABI); }
 	void setSideEffects(std::vector<std::string> _sideEffects) { m_call.actualSideEffects = _sideEffects; }
 
@@ -143,6 +148,8 @@ class TestFunctionCall
 	bytes m_rawBytes = bytes{};
 	/// Actual gas costs
 	std::map<std::string, u256> m_gasCosts;
+	/// Actual code deposit gas costs
+	std::map<std::string, u256> m_codeDepositGasCosts;
 	/// Transaction status of the actual call. False in case of a REVERT or any other failure.
 	bool m_failure = true;
 	/// JSON object which holds the contract ABI and that is used to set the output formatting
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
index 74a45c3268..b78b7e5f29 100644
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ b/test/libsolidity/util/TestFunctionCallTests.cpp
@@ -38,7 +38,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -58,7 +58,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -78,7 +78,7 @@ 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{std::vector<Parameter>{result}, false, std::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;
@@ -93,7 +93,7 @@ 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{std::vector<Parameter>{param, param}, false, std::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;
@@ -107,7 +107,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -127,7 +127,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -149,7 +149,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -163,7 +163,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -184,7 +184,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -198,7 +198,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -213,7 +213,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -227,7 +227,7 @@ 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{std::vector<Parameter>{param}, false, std::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;
@@ -241,7 +241,7 @@ 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{std::vector<Parameter>{}, true, std::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;
@@ -265,6 +265,11 @@ BOOST_AUTO_TEST_CASE(format_gas)
 				{"legacy", 5000},
 				{"legacy optimized", 0},
 			},
+			{
+				{"ir", 0},
+				{"legacy", 0},
+				{"legacy optimized", 0},
+			},
 		}
 	};
 	call.omitsArrow = false;
@@ -278,6 +283,40 @@ BOOST_AUTO_TEST_CASE(format_gas)
 	);
 }
 
+BOOST_AUTO_TEST_CASE(format_gas_with_code_deposit)
+{
+	FunctionCall call{
+		"f()",
+		FunctionValue{0},
+		FunctionCallArgs{},
+		FunctionCallExpectations{
+			std::vector<Parameter>{},
+			false, // failure
+			"some comment",
+			{
+				{"ir", 0}, // Zero costs are shown
+				{"legacy", 5000},
+				{"legacy optimized", 300},
+			},
+			{
+				{"ir", 0}, // Zero code deposit costs are omitted
+				{"legacy", 125},
+				{"legacy optimized", 0},
+			},
+		}
+	};
+	call.omitsArrow = false;
+
+	BOOST_REQUIRE_EQUAL(
+		TestFunctionCall(call).format(),
+		"// f() -> #some comment#\n"
+		"// gas ir: 0\n"
+		"// gas legacy: 5000\n"
+		"// gas legacy code: 125\n"
+		"// gas legacy optimized: 300"
+	);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

From 96ce95aa3a21f285ee32d30d8b2eed8017a2bdd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 9 Feb 2024 21:30:46 +0100
Subject: [PATCH 0707/1140] Do not include code deposit gas in the total
 visible in test expectations

---
 test/libsolidity/SemanticTest.cpp             | 13 +++++----
 ...2_in_function_inherited_in_v1_contract.sol |  9 ++++--
 ...ode_v2_in_modifier_used_in_v1_contract.sol |  3 +-
 .../arithmetics/check_var_init.sol            |  3 +-
 .../array/constant_var_as_array_length.sol    |  9 ++++--
 ...nup_during_multi_element_per_slot_copy.sol |  9 ++++--
 .../array/fixed_arrays_as_return_type.sol     |  9 ++++--
 .../array/fixed_arrays_in_constructors.sol    |  9 ++++--
 .../array/function_array_cross_calls.sol      |  9 ++++--
 .../semanticTests/array/reusing_memory.sol    |  9 ++++--
 .../byte_array_to_storage_cleanup.sol         |  9 ++++--
 .../constructor/arrays_in_constructors.sol    |  9 ++++--
 .../bytes_in_constructors_packer.sol          |  9 ++++--
 .../bytes_in_constructors_unpacker.sol        |  9 ++++--
 .../constructor_arguments_external.sol        |  9 ++++--
 .../constructor_function_complex.sol          |  3 +-
 .../constructor_static_array_argument.sol     |  9 ++++--
 .../constructor/no_callvalue_check.sol        |  9 ++++--
 .../constructor_inheritance_init_order.sol    |  3 +-
 .../constructor_inheritance_init_order_2.sol  |  9 ++++--
 .../semanticTests/constructor_with_params.sol |  6 ++--
 ...ructor_with_params_diamond_inheritance.sol |  9 ++++--
 .../constructor_with_params_inheritance.sol   |  9 ++++--
 .../events/event_emit_from_other_contract.sol |  9 ++++--
 .../externalContracts/FixedFeeRegistrar.sol   |  9 ++++--
 .../externalContracts/base64.sol              |  9 ++++--
 .../externalContracts/deposit_contract.sol    |  9 ++++--
 .../externalContracts/prbmath_signed.sol      |  9 ++++--
 .../externalContracts/prbmath_unsigned.sol    |  9 ++++--
 .../externalContracts/ramanujan_pi.sol        |  9 ++++--
 .../externalContracts/strings.sol             |  9 ++++--
 .../freeFunctions/new_operator.sol            |  3 +-
 .../creation_function_call_no_args.sol        |  3 +-
 .../creation_function_call_with_args.sol      |  9 ++++--
 .../creation_function_call_with_salt.sol      |  9 ++++--
 .../external_call_to_nonexisting.sol          |  9 ++++--
 ...ernal_call_to_nonexisting_debugstrings.sol |  9 ++++--
 .../functionCall/failed_create.sol            |  9 ++++--
 .../functionCall/gas_and_value_basic.sol      |  9 ++++--
 .../gas_and_value_brace_syntax.sol            |  9 ++++--
 .../functionCall/send_zero_ether.sol          |  3 +-
 .../functionTypes/store_function.sol          |  6 ++--
 .../immutable/multi_creation.sol              |  9 ++++--
 .../semanticTests/immutable/use_scratch.sol   |  9 ++++--
 .../address_overload_resolution.sol           |  6 ++--
 ...d_function_calldata_calldata_interface.sol |  3 +-
 ...ted_function_calldata_memory_interface.sol |  6 ++--
 .../inheritance/member_notation_ctor.sol      |  6 ++--
 .../inheritance/value_for_constructor.sol     |  9 ++++--
 .../balance_other_contract.sol                |  9 ++++--
 .../operator_making_pure_external_call.sol    | 12 +++++---
 .../operator_making_view_external_call.sol    | 12 +++++---
 .../salted_create/prediction_example.sol      |  3 +-
 .../salted_create/salted_create.sol           |  9 ++++--
 .../salted_create_with_value.sol              |  9 ++++--
 .../semanticTests/smoke/alignment.sol         |  3 +-
 .../semanticTests/smoke/constructor.sol       |  9 ++++--
 .../semanticTests/state/blockhash_basic.sol   |  9 ++++--
 .../userDefinedValueType/erc20.sol            |  9 ++++--
 .../using/using_global_invisible.sol          |  3 +-
 .../semanticTests/various/address_code.sol    |  9 ++++--
 .../various/code_access_content.sol           |  6 ++--
 .../various/code_access_create.sol            |  3 +-
 .../various/code_access_runtime.sol           |  3 +-
 .../semanticTests/various/code_length.sol     |  3 +-
 .../semanticTests/various/create_calldata.sol |  9 ++++--
 .../semanticTests/various/erc20.sol           |  9 ++++--
 .../various/external_types_in_calls.sol       |  3 +-
 .../various/many_subassemblies.sol            |  9 ++++--
 .../various/negative_stack_height.sol         |  6 ++--
 .../various/selfdestruct_pre_cancun.sol       |  9 ++++--
 ...ruct_pre_cancun_multiple_beneficiaries.sol | 21 +++++++++-----
 .../selfdestruct_pre_cancun_redeploy.sol      | 18 ++++++++----
 .../semanticTests/various/senders_balance.sol |  9 ++++--
 .../various/staticcall_for_view_and_pure.sol  | 21 +++++++++-----
 .../semanticTests/various/value_complex.sol   |  9 ++++--
 .../semanticTests/various/value_insane.sol    |  9 ++++--
 test/libsolidity/util/SoltestTypes.h          |  6 ++--
 test/libsolidity/util/TestFileParser.cpp      |  6 ++--
 test/libsolidity/util/TestFileParserTests.cpp | 29 +++++++------------
 test/libsolidity/util/TestFunctionCall.cpp    | 12 ++++----
 test/libsolidity/util/TestFunctionCall.h      |  6 ++--
 .../util/TestFunctionCallTests.cpp            |  4 +--
 83 files changed, 444 insertions(+), 244 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 676c39eaf9..381ec5bda5 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -570,7 +570,7 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 		(m_optimiserSettings == OptimiserSettings::full() ? "Optimized" : "");
 
 	soltestAssert(
-		io_test.call().expectations.gasUsed.count(setting) ==
+		io_test.call().expectations.gasUsedExcludingCode.count(setting) ==
 		io_test.call().expectations.gasUsedForCodeDeposit.count(setting)
 	);
 
@@ -584,19 +584,22 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 		!m_enforceGasCost ||
 		m_gasUsed < m_enforceGasCostMinValue ||
 		m_gasUsed >= InitialGas ||
-		(setting == "ir" && io_test.call().expectations.gasUsed.count(setting) == 0) ||
+		(setting == "ir" && io_test.call().expectations.gasUsedExcludingCode.count(setting) == 0) ||
 		io_test.call().kind == FunctionCall::Kind::Builtin
 	)
 		return true;
 
 	solAssert(!m_runWithABIEncoderV1Only, "");
 
-	io_test.setGasCost(setting, m_gasUsed);
+	// NOTE: Cost excluding code is unlikely to be negative but it may still be possible due to refunds.
+	// We'll deal with it when we actually have a test case like that.
+	solUnimplementedAssert(m_gasUsed >= m_gasUsedForCodeDeposit);
+	io_test.setGasCostExcludingCode(setting, m_gasUsed - m_gasUsedForCodeDeposit);
 	io_test.setCodeDepositGasCost(setting, m_gasUsedForCodeDeposit);
 
 	return
-		io_test.call().expectations.gasUsed.count(setting) > 0 &&
-		m_gasUsed == io_test.call().expectations.gasUsed.at(setting) &&
+		io_test.call().expectations.gasUsedExcludingCode.count(setting) > 0 &&
+		m_gasUsed - m_gasUsedForCodeDeposit == io_test.call().expectations.gasUsedExcludingCode.at(setting) &&
 		m_gasUsedForCodeDeposit == io_test.call().expectations.gasUsedForCodeDeposit.at(setting);
 }
 
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 55f7991def..c41905e2a4 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,9 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 110348
-// gas legacy: 151866
-// gas legacyOptimized: 110373
+// gas irOptimized: 55148
+// gas irOptimized code: 55200
+// gas legacy: 57266
+// gas legacy code: 94600
+// gas legacyOptimized: 55173
+// gas legacyOptimized code: 55200
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 7de2630120..7a2395549b 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,5 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
-// gas legacy: 102651
+// gas legacy: 66251
+// gas legacy code: 36400
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index fc5418cb0e..9061cd284d 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -16,4 +16,5 @@ contract D {
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
-// gas legacy: 100380
+// gas legacy: 76780
+// gas legacy code: 23600
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 45861babaa..19acb7cba1 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -8,9 +8,12 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 139616
-// gas legacy: 180517
-// gas legacyOptimized: 150462
+// gas irOptimized: 124816
+// gas irOptimized code: 14800
+// gas legacy: 134317
+// gas legacy code: 46200
+// gas legacyOptimized: 127062
+// gas legacyOptimized code: 23400
 // a(uint256): 0 -> 1
 // a(uint256): 1 -> 2
 // a(uint256): 2 -> 3
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 8be8328926..36b94d7c39 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,10 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 226321
-// gas legacy: 215753
-// gas legacyOptimized: 181756
+// gas irOptimized: 89121
+// gas irOptimized code: 137200
+// gas legacy: 89553
+// gas legacy code: 126200
+// gas legacyOptimized: 83556
+// gas legacyOptimized code: 98200
 // f() -> 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 dd90985735..0fb513543b 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,9 @@ contract B {
 }
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 114404
-// gas legacy: 230001
-// gas legacyOptimized: 130637
+// gas irOptimized: 59204
+// gas irOptimized code: 55200
+// gas legacy: 68001
+// gas legacy code: 162000
+// gas legacyOptimized: 60037
+// gas legacyOptimized code: 70600
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index c7b2dc77a3..0eb0f1e90e 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -9,8 +9,11 @@ contract Creator {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 126327
-// gas legacy: 174186
-// gas legacyOptimized: 128709
+// gas irOptimized: 103927
+// gas irOptimized code: 22400
+// gas legacy: 115186
+// gas legacy code: 59000
+// gas legacyOptimized: 104909
+// gas legacyOptimized code: 23800
 // 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 773e904cc0..e35e24bbf1 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,6 +42,9 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 255728
-// gas legacy: 440376
-// gas legacyOptimized: 278651
+// gas irOptimized: 86128
+// gas irOptimized code: 169600
+// gas legacy: 97576
+// gas legacy code: 342800
+// gas legacyOptimized: 87851
+// gas legacyOptimized code: 190800
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 8f6afe30ba..a7608f6e0c 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,9 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 111924
-// gas legacy: 125154
-// gas legacyOptimized: 113012
+// gas irOptimized: 99524
+// gas irOptimized code: 12400
+// gas legacy: 101554
+// gas legacy code: 23600
+// gas legacyOptimized: 99612
+// gas legacyOptimized code: 13400
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index 877e2a1bce..14130926e7 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,9 +28,12 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 443402
-// gas legacy: 711295
-// gas legacyOptimized: 482378
+// gas irOptimized: 82402
+// gas irOptimized code: 361000
+// gas legacy: 101895
+// gas legacy code: 609400
+// gas legacyOptimized: 85378
+// gas legacyOptimized code: 397000
 // 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/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 19d79b6c4f..3e60ba451c 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,9 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 424526
-// gas legacy: 581426
-// gas legacyOptimized: 444599
+// gas irOptimized: 328126
+// gas irOptimized code: 96400
+// gas legacy: 336626
+// gas legacy code: 244800
+// gas legacyOptimized: 329599
+// gas legacyOptimized code: 115000
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index cfa74f016f..7885d3ceec 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,9 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 275102
-// gas legacy: 418433
-// gas legacyOptimized: 291960
+// gas irOptimized: 169902
+// gas irOptimized code: 105200
+// gas legacy: 173433
+// gas legacy code: 245000
+// gas legacyOptimized: 170360
+// gas legacyOptimized code: 121600
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 39da45e8a5..1d6b01127c 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,8 +8,11 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 269225
-// gas legacy: 310820
-// gas legacyOptimized: 258604
+// gas irOptimized: 182025
+// gas irOptimized code: 87200
+// gas legacy: 196220
+// gas legacy code: 114600
+// gas legacyOptimized: 182604
+// gas legacyOptimized code: 76000
 // 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 714ae3e554..8fa725dad5 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -17,8 +17,11 @@ contract Main {
 }
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 104374
-// gas legacy: 143300
-// gas legacyOptimized: 102933
+// gas irOptimized: 80174
+// gas irOptimized code: 24200
+// gas legacy: 85100
+// gas legacy code: 58200
+// gas legacyOptimized: 80133
+// gas legacyOptimized code: 22800
 // 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 4117b84b64..33650aff6f 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -17,4 +17,5 @@ contract C {
 }
 // ----
 // f() -> 16
-// gas legacy: 102082
+// gas legacy: 78482
+// gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index a61192742d..e6ce445ada 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,9 +9,12 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 170975
-// gas legacy: 218378
-// gas legacyOptimized: 176211
+// gas irOptimized: 147975
+// gas irOptimized code: 23000
+// gas legacy: 157978
+// gas legacy code: 60400
+// gas legacyOptimized: 150011
+// gas legacyOptimized code: 26200
 // 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 eec01005eb..b1dc80a408 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,6 +17,9 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 119441
-// gas legacy: 122621
-// gas legacyOptimized: 122490
+// gas irOptimized: 117641
+// gas irOptimized code: 1800
+// gas legacy: 117821
+// gas legacy code: 4800
+// gas legacyOptimized: 117690
+// gas legacyOptimized code: 4800
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index ece0cc31a6..ef53142d45 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -14,5 +14,6 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 119636
+// gas irOptimized: 99436
+// gas irOptimized code: 20200
 // 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 654c9af56d..e19ad39cfa 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -9,7 +9,10 @@ contract B is A {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 119636
-// gas legacy: 133574
-// gas legacyOptimized: 115337
+// gas irOptimized: 99436
+// gas irOptimized code: 20200
+// gas legacy: 100974
+// gas legacy code: 32600
+// gas legacyOptimized: 99137
+// gas legacyOptimized code: 16200
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index e427f6d9ab..1c5a170202 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -9,7 +9,9 @@ contract C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 101370
-// gas legacy: 115614
+// gas irOptimized: 81170
+// gas irOptimized code: 20200
+// gas legacy: 83614
+// gas legacy code: 32000
 // 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 6507081447..29f401a773 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -21,9 +21,12 @@ contract D is B, C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 151950
-// gas legacy: 168623
-// gas legacyOptimized: 144521
+// gas irOptimized: 124350
+// gas irOptimized code: 27600
+// gas legacy: 128223
+// gas legacy code: 40400
+// gas legacyOptimized: 123921
+// gas legacyOptimized code: 20600
 // 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 8cc7c69f68..b0373b74f1 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -12,8 +12,11 @@ contract D is C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 121781
-// gas legacy: 137193
-// gas legacyOptimized: 118504
+// gas irOptimized: 101581
+// gas irOptimized code: 20200
+// gas legacy: 105193
+// gas legacy code: 32000
+// gas legacyOptimized: 101504
+// gas legacyOptimized code: 17000
 // 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 0c56cbb671..6a01d00192 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,11 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 165370
-// gas legacy: 244776
-// gas legacyOptimized: 171587
+// gas irOptimized: 113970
+// gas irOptimized code: 51400
+// gas legacy: 119776
+// gas legacy code: 125000
+// gas legacyOptimized: 114187
+// gas legacyOptimized code: 57400
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 011fecbd34..d308d4597e 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,9 +74,12 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 384606
-// gas legacy: 913417
-// gas legacyOptimized: 476924
+// gas irOptimized: 78006
+// gas irOptimized code: 306600
+// gas legacy: 115817
+// gas legacy code: 797600
+// gas legacyOptimized: 84924
+// gas legacyOptimized code: 392000
 // 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 ee2745d1ac..b712092ed0 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,12 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 405828
-// gas legacy: 735050
-// gas legacyOptimized: 522718
+// gas irOptimized: 79428
+// gas irOptimized code: 326400
+// gas legacy: 102450
+// gas legacy code: 632600
+// gas legacyOptimized: 88318
+// gas legacyOptimized code: 434400
 // 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 caa7fc39c8..0ef87edd4f 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,9 +176,12 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1386886
-// gas legacy: 2368733
-// gas legacyOptimized: 1740004
+// gas irOptimized: 815686
+// gas irOptimized code: 571200
+// gas legacy: 925933
+// gas legacy code: 1442800
+// gas legacyOptimized: 854404
+// gas legacyOptimized code: 885600
 // 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 ba7a208fd7..ddd6397183 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,9 +48,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1841736
-// gas legacy: 2414087
-// gas legacyOptimized: 1847612
+// gas irOptimized: 177336
+// gas irOptimized code: 1664400
+// gas legacy: 209687
+// gas legacy code: 2204400
+// gas legacyOptimized: 178012
+// gas legacyOptimized code: 1669600
 // 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 90b283db46..deacfd0564 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,9 +48,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1716323
-// gas legacy: 2193546
-// gas legacyOptimized: 1725057
+// gas irOptimized: 168523
+// gas irOptimized code: 1547800
+// gas legacy: 195146
+// gas legacy code: 1998400
+// gas legacyOptimized: 168857
+// gas legacyOptimized code: 1556200
 // 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 4442b6d479..cdaec8797e 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,9 +33,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 407503
-// gas legacy: 615086
-// gas legacyOptimized: 451867
+// gas irOptimized: 79503
+// gas irOptimized code: 328000
+// gas legacy: 92086
+// gas legacy code: 523000
+// gas legacyOptimized: 82667
+// gas legacyOptimized code: 369200
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
 // gas legacy: 100947
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 3f88fc39c6..a4b0f9fd35 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 630220
-// gas legacy: 1061953
-// gas legacyOptimized: 718933
+// gas irOptimized: 96420
+// gas irOptimized code: 533800
+// gas legacy: 126553
+// gas legacy code: 935400
+// gas legacyOptimized: 102933
+// gas legacyOptimized code: 616000
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index dd44a1b595..d621629c3b 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -13,4 +13,5 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 100211
+// gas legacy: 76611
+// gas legacy code: 23600
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 b6a33fb7e8..6044065958 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,5 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 100185
+// gas legacy: 76585
+// gas legacy code: 23600
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 34aac74efa..1133dc2be3 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,10 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 192663
-// gas legacy: 241170
-// gas legacyOptimized: 192897
+// gas irOptimized: 138863
+// gas irOptimized code: 53800
+// gas legacy: 145570
+// gas legacy code: 95600
+// gas legacyOptimized: 138297
+// gas legacyOptimized code: 54600
 // 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 cb26a6e26a..ba90a8ecd5 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,10 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 192826
-// gas legacy: 241536
-// gas legacyOptimized: 193129
+// gas irOptimized: 139026
+// gas irOptimized code: 53800
+// gas legacy: 145936
+// gas legacy code: 95600
+// gas legacyOptimized: 138529
+// gas legacyOptimized code: 54600
 // 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 a1c74cf898..9d521f7777 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -22,9 +22,12 @@ contract C {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 262355
-// gas legacy: 441442
-// gas legacyOptimized: 292862
+// gas irOptimized: 89555
+// gas irOptimized code: 172800
+// gas legacy: 103042
+// gas legacy code: 338400
+// gas legacyOptimized: 91862
+// gas legacyOptimized code: 201000
 // 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 96f097ce7f..9baacd8127 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -25,9 +25,12 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 390464
-// gas legacy: 809985
-// gas legacyOptimized: 498331
+// gas irOptimized: 99264
+// gas irOptimized code: 291200
+// gas legacy: 123585
+// gas legacy code: 686400
+// gas legacyOptimized: 107331
+// gas legacyOptimized code: 391000
 // 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 091e5a77a6..b6c077753a 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,9 +17,12 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 166148
-// gas legacy: 285547
-// gas legacyOptimized: 168515
+// gas irOptimized: 61548
+// gas irOptimized code: 104600
+// gas legacy: 70147
+// gas legacy code: 215400
+// gas legacyOptimized: 61715
+// gas legacyOptimized code: 106800
 // f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
 // 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 8396cb12db..806c8eb41b 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,9 +38,12 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 252626
-// gas legacy: 391568
-// gas legacyOptimized: 268069
+// gas irOptimized: 120226
+// gas irOptimized code: 132400
+// gas legacy: 130568
+// gas legacy code: 261000
+// gas legacyOptimized: 121069
+// gas legacyOptimized code: 147000
 // 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 9d9c3f603f..c186fc40b2 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,9 +37,12 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 252626
-// gas legacy: 391568
-// gas legacyOptimized: 268069
+// gas irOptimized: 120226
+// gas irOptimized code: 132400
+// gas legacy: 130568
+// gas legacy code: 261000
+// gas legacyOptimized: 121069
+// gas legacyOptimized code: 147000
 // 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 a737de5cd4..94a7213232 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -16,6 +16,7 @@ contract Main {
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 100264
-// gas legacy: 110555
+// gas legacy: 57555
+// gas legacy code: 53000
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index 132a6c9565..5397d0b701 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -26,5 +26,7 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99064
-// gas legacy: 149095
-// gas legacyOptimized: 106188
+// gas legacy: 79495
+// gas legacy code: 69600
+// gas legacyOptimized: 77588
+// gas legacyOptimized code: 28600
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 145c32add6..c8806c50d0 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,8 +27,11 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 124021
-// gas legacy: 148528
-// gas legacyOptimized: 123971
+// gas irOptimized: 86821
+// gas irOptimized code: 37200
+// gas legacy: 87728
+// gas legacy code: 60800
+// gas legacyOptimized: 86771
+// gas legacyOptimized code: 37200
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index a7c8ea6a50..dc07086c29 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -15,8 +15,11 @@ contract C {
 }
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 123526
-// gas legacy: 197645
-// gas legacyOptimized: 137658
+// gas irOptimized: 81126
+// gas irOptimized code: 42400
+// gas legacy: 88245
+// gas legacy code: 109400
+// gas legacyOptimized: 81858
+// gas legacyOptimized code: 55800
 // 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 c65d1abec5..0865ed2876 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -21,7 +21,9 @@ contract D {
 // ----
 // f() -> 1
 // gas irOptimized: 77051
-// gas legacy: 112280
+// gas legacy: 54480
+// gas legacy code: 57800
 // g() -> 5
 // gas irOptimized: 77106
-// gas legacy: 112816
+// gas legacy: 55016
+// gas legacy code: 57800
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 3114c80f19..0567c2ab14 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -23,4 +23,5 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 80813
-// gas legacy: 122471
+// gas legacy: 55871
+// gas legacy code: 66600
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 74bf42ec7e..d5ff54b68a 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -23,5 +23,7 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 100282
-// gas legacy: 180440
-// gas legacyOptimized: 112596
+// gas legacy: 56840
+// gas legacy code: 123600
+// gas legacyOptimized: 54996
+// gas legacyOptimized code: 57600
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index 263588abab..e704a297bb 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -19,6 +19,8 @@ contract A {
 }
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 102078
+// gas legacy: 77878
+// gas legacy code: 24200
 // g(int256): 10 -> 10
-// gas legacy: 101706
+// gas legacy: 77506
+// gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 9627ad025d..fdd0bafaad 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -39,9 +39,12 @@ contract Main {
 }
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 261864
-// gas legacy: 392786
-// gas legacyOptimized: 261593
+// gas irOptimized: 143864
+// gas irOptimized code: 118000
+// gas legacy: 156586
+// gas legacy code: 236200
+// gas legacyOptimized: 143593
+// gas legacyOptimized code: 118000
 // 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 1a5c9b19b4..0ad55b5ddf 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,9 +16,12 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 169907
-// gas legacy: 230018
-// gas legacyOptimized: 173867
+// gas irOptimized: 114107
+// gas irOptimized code: 55800
+// gas legacy: 118618
+// gas legacy code: 111400
+// gas legacyOptimized: 114067
+// gas legacyOptimized code: 59800
 // 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 ce6a0f48db..a621b4c12a 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
@@ -53,9 +53,13 @@ contract C {
 // ----
 // testMul(int32,int32): 42, 10 -> 420
 // gas irOptimized: 102563
-// gas legacy: 183981
-// gas legacyOptimized: 123563
+// gas legacy: 56981
+// gas legacy code: 127000
+// gas legacyOptimized: 55163
+// gas legacyOptimized code: 68400
 // testInc(int32): 42 -> 43
 // gas irOptimized: 102386
-// gas legacy: 183239
-// gas legacyOptimized: 123251
+// gas legacy: 56239
+// gas legacy code: 127000
+// gas legacyOptimized: 54851
+// gas legacyOptimized code: 68400
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 f3f8ebdc63..84f6bf08e7 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
@@ -59,9 +59,13 @@ contract C {
 // ----
 // testMul(int32,int32): 42, 10 -> 420
 // gas irOptimized: 102563
-// gas legacy: 183981
-// gas legacyOptimized: 123563
+// gas legacy: 56981
+// gas legacy code: 127000
+// gas legacyOptimized: 55163
+// gas legacyOptimized code: 68400
 // testInc(int32): 42 -> 43
 // gas irOptimized: 102386
-// gas legacy: 183239
-// gas legacyOptimized: 123251
+// gas legacy: 56239
+// gas legacy code: 127000
+// gas legacyOptimized: 54851
+// gas legacyOptimized code: 68400
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index e7171536d6..6fa865440b 100644
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -26,4 +26,5 @@ contract C {
 // compileViaYul: also
 // ----
 // createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 102841
+// gas legacy: 79241
+// gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 743ff5fd2a..535a2813c1 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -21,6 +21,9 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438895
-// gas legacy: 98439109
-// gas legacyOptimized: 98438967
+// gas irOptimized: 98438295
+// gas irOptimized code: 600
+// gas legacy: 98437509
+// gas legacy code: 1600
+// gas legacyOptimized: 98437367
+// gas legacyOptimized code: 1600
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 58b3f07603..735731c8ab 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,9 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 253005
-// gas legacy: 381063
-// gas legacyOptimized: 279658
+// gas irOptimized: 187005
+// gas irOptimized code: 66000
+// gas legacy: 190863
+// gas legacy code: 190200
+// gas legacyOptimized: 187258
+// gas legacyOptimized code: 92400
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index 3e8016f988..296ae01617 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -25,5 +25,6 @@ contract D {
 // stateDecimal() -> right(42)
 // stateBytes() -> left(0x4200ef)
 // internalStateDecimal() -> 0x20
-// gas legacy: 100265
+// gas legacy: 76665
+// gas legacy code: 23600
 // 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 55789b2f4b..2783fe4a8c 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -12,9 +12,12 @@ contract C {
 }
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 104396
-// gas legacy: 148256
-// gas legacyOptimized: 106699
+// gas irOptimized: 78996
+// gas irOptimized code: 25400
+// gas legacy: 83056
+// gas legacy code: 65200
+// gas legacyOptimized: 78899
+// gas legacyOptimized code: 27800
 // 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 03d6f9fe76..64b8d55a26 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -12,9 +12,12 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 108138
-// gas legacy: 152171
-// gas legacyOptimized: 106738
+// gas irOptimized: 80338
+// gas irOptimized code: 27800
+// gas legacy: 83571
+// gas legacy code: 68600
+// gas legacyOptimized: 80338
+// gas legacyOptimized code: 26400
 // 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 ac8609d713..8976cf3c52 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,9 +113,12 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 352682
-// gas legacy: 834752
-// gas legacyOptimized: 412648
+// gas irOptimized: 121082
+// gas irOptimized code: 231600
+// gas legacy: 163352
+// gas legacy code: 671400
+// gas legacyOptimized: 127448
+// gas legacyOptimized code: 285200
 // 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 3e767a185d..818707f6fe 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -40,4 +40,5 @@ contract D {
 // ----
 // library: "A":L
 // test() -> 3
-// gas legacy: 120881
+// gas legacy: 59681
+// gas legacy code: 61200
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 7e48b00ca8..6a97c0bf7e 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,9 +14,12 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 173273
-// gas legacy: 241796
-// gas legacyOptimized: 153670
+// gas irOptimized: 70873
+// gas irOptimized code: 102400
+// gas legacy: 82796
+// gas legacy code: 159000
+// gas legacyOptimized: 69870
+// gas legacyOptimized code: 83800
 // 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 92d31d6214..dc4e49b2da 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -38,6 +38,8 @@ contract C {
 }
 // ----
 // testRuntime() -> true
-// gas legacy: 100177
+// gas legacy: 76577
+// gas legacy code: 23600
 // testCreation() -> true
-// gas legacy: 100600
+// gas legacy: 77000
+// gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index 075682129c..d2b7f92f4e 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -23,4 +23,5 @@ contract C {
 }
 // ----
 // test() -> 7
-// gas legacy: 100849
+// gas legacy: 76649
+// gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index 9a9e7a80bf..b62eb0b853 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -23,4 +23,5 @@ contract C {
 // EVMVersion: >=constantinople
 // ----
 // test() -> 42
-// gas legacy: 100235
+// gas legacy: 76035
+// gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index a8aac5306f..c30ac838fe 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -59,5 +59,6 @@ contract C {
 }
 // ----
 // constructor()
-// gas legacy: 124136
+// gas legacy: 66936
+// gas legacy code: 57200
 // f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index c3d038136f..2db42adebb 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,7 +8,10 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 145578
-// gas legacy: 173845
-// gas legacyOptimized: 137877
+// gas irOptimized: 68378
+// gas irOptimized code: 77200
+// gas legacy: 78445
+// gas legacy code: 95400
+// gas legacyOptimized: 68677
+// gas legacyOptimized code: 69200
 // s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 00c12fb18a..f7956c4c50 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,9 +96,12 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 353248
-// gas legacy: 807559
-// gas legacyOptimized: 408718
+// gas irOptimized: 121248
+// gas irOptimized code: 232000
+// gas legacy: 159959
+// gas legacy code: 647600
+// gas legacyOptimized: 126918
+// gas legacyOptimized code: 281800
 // 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 e8742c2346..aff302d26e 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -24,5 +24,6 @@ contract C {
 }
 // ----
 // test() -> 9, 7
-// gas legacy: 127514
+// gas legacy: 80314
+// gas legacy code: 47200
 // t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/many_subassemblies.sol b/test/libsolidity/semanticTests/various/many_subassemblies.sol
index 26c3a1bbff..67a576da78 100644
--- a/test/libsolidity/semanticTests/various/many_subassemblies.sol
+++ b/test/libsolidity/semanticTests/various/many_subassemblies.sol
@@ -30,6 +30,9 @@ contract D {
 }
 // ----
 // run() ->
-// gas irOptimized: 381615
-// gas legacy: 392719
-// gas legacyOptimized: 392719
+// gas irOptimized: 375015
+// gas irOptimized code: 6600
+// gas legacy: 375119
+// gas legacy code: 17600
+// gas legacyOptimized: 375119
+// gas legacyOptimized code: 17600
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
index 7289d2bbd9..44fd0089cf 100644
--- a/test/libsolidity/semanticTests/various/negative_stack_height.sol
+++ b/test/libsolidity/semanticTests/various/negative_stack_height.sol
@@ -65,5 +65,7 @@ contract C {
 // compileViaYul: false
 // ----
 // constructor() ->
-// gas legacy: 575268
-// gas legacyOptimized: 345022
+// gas legacy: 92268
+// gas legacy code: 483000
+// gas legacyOptimized: 75022
+// gas legacyOptimized code: 270000
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
index 4142eb25cf..a39b6c4235 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
@@ -62,9 +62,12 @@ contract D {
 // EVMVersion: =shanghai
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 242428
-// gas legacy: 373563
-// gas legacyOptimized: 234516
+// gas irOptimized: 67028
+// gas irOptimized code: 175400
+// gas legacy: 76163
+// gas legacy code: 297400
+// gas legacyOptimized: 66516
+// gas legacyOptimized code: 168000
 // exists() -> false
 // test_create_and_terminate() ->
 // exists() -> false
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
index 87e81a2902..a09a7cac68 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
@@ -35,23 +35,30 @@ contract D {
 // EVMVersion: <=shanghai
 // ----
 // constructor(), 2 ether ->
-// gas irOptimized: 223918
-// gas legacy: 374024
-// gas legacyOptimized: 239815
+// gas irOptimized: 107718
+// gas irOptimized code: 116200
+// gas legacy: 120424
+// gas legacy code: 253600
+// gas legacyOptimized: 109015
+// gas legacyOptimized code: 130800
 // balance: 0x1111111111111111111111111111111111111111 -> 0
 // balance: 0x2222222222222222222222222222222222222222 -> 0
 // balance -> 2000000000000000000
 // exists() -> false
 // test_deploy_and_terminate_twice() ->
-// gas irOptimized: 135350
-// gas legacy: 165584
-// gas legacyOptimized: 144396
+// gas irOptimized: 121350
+// gas irOptimized code: 14000
+// gas legacy: 122384
+// gas legacy code: 43200
+// gas legacyOptimized: 121596
+// gas legacyOptimized code: 22800
 // exists() -> false
 // balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
 // balance: 0x2222222222222222222222222222222222222222 -> 0
 // balance -> 1000000000000000000
 // deploy() ->
-// gas legacy: 101691
+// gas legacy: 58491
+// gas legacy code: 43200
 // exists() -> true
 // balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
 // balance: 0x2222222222222222222222222222222222222222 -> 0
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
index e0885782c2..fc650ebba7 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
@@ -79,15 +79,21 @@ contract D {
 // EVMVersion: =shanghai
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 430253
-// gas legacy: 690244
-// gas legacyOptimized: 412799
+// gas irOptimized: 133253
+// gas irOptimized code: 297000
+// gas legacy: 151644
+// gas legacy code: 538600
+// gas legacyOptimized: 131799
+// gas legacyOptimized code: 281000
 // exists() -> false
 // test_deploy_and_terminate() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 117489
-// gas legacy: 118895
-// gas legacyOptimized: 117137
+// gas irOptimized: 96689
+// gas irOptimized code: 20800
+// gas legacy: 98095
+// gas legacy code: 20800
+// gas legacyOptimized: 96337
+// gas legacyOptimized code: 20800
 // exists() -> false
 // deploy_create2() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index a1c7d4147f..5b4371149f 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -16,7 +16,10 @@ contract D {
 }
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 167857
-// gas legacy: 218435
-// gas legacyOptimized: 167276
+// gas irOptimized: 114057
+// gas irOptimized code: 53800
+// gas legacy: 117835
+// gas legacy code: 100600
+// gas legacyOptimized: 113676
+// gas legacyOptimized code: 53600
 // 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 1306529d41..77a330f3cd 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,19 @@ contract D {
 // EVMVersion: >=byzantium
 // ----
 // f() -> 0x1 # This should work, next should throw #
-// gas legacy: 102095
+// gas legacy: 76495
+// gas legacy code: 25600
 // fview() -> FAILURE
-// gas irOptimized: 98438588
-// gas legacy: 98438774
-// gas legacyOptimized: 98438580
+// gas irOptimized: 98425388
+// gas irOptimized code: 13200
+// gas legacy: 98413174
+// gas legacy code: 25600
+// gas legacyOptimized: 98425380
+// gas legacyOptimized code: 13200
 // fpure() -> FAILURE
-// gas irOptimized: 98438589
-// gas legacy: 98438774
-// gas legacyOptimized: 98438580
+// gas irOptimized: 98425389
+// gas irOptimized code: 13200
+// gas legacy: 98413174
+// gas legacy code: 25600
+// gas legacyOptimized: 98425380
+// gas legacyOptimized code: 13200
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 2adac6bf4c..427a006dc1 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -19,7 +19,10 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 172399
-// gas legacy: 252276
-// gas legacyOptimized: 180336
+// gas irOptimized: 114399
+// gas irOptimized code: 58000
+// gas legacy: 120076
+// gas legacy code: 132200
+// gas legacyOptimized: 114536
+// gas legacyOptimized code: 65800
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 87fa01485d..97fbbab1e6 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -18,7 +18,10 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 173263
-// gas legacy: 253800
-// gas legacyOptimized: 180768
+// gas irOptimized: 114463
+// gas irOptimized code: 58800
+// gas legacy: 120200
+// gas legacy code: 133600
+// gas legacyOptimized: 114568
+// gas legacyOptimized code: 66200
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
index a2d593fd3c..791cea0116 100644
--- a/test/libsolidity/util/SoltestTypes.h
+++ b/test/libsolidity/util/SoltestTypes.h
@@ -215,11 +215,11 @@ struct FunctionCallExpectations
 			raw += param.rawBytes;
 		return raw;
 	}
-	/// Gas used by function call
-	/// Keys represent all distinct combinations of compilation settings that affect produced
+	/// Gas used by function call minus the portion spent on code deposits (which is tracked
+	/// separately, in @a gasUsedForCodeDeposit).
 	/// bytecode (and therefore the cost), except for EVM version. E.g. IR codegen without
 	/// optimization legacy codegen with optimization.
-	std::map<std::string, u256> gasUsed;
+	std::map<std::string, u256> gasUsedExcludingCode;
 
 	/// The portion of @a gasUsed spent on code deposits of newly created contracts.
 	/// May exceed @a gasUsed in rare corner cases due to refunds.
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index e7e20f7c5c..5a32a1591a 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -103,7 +103,7 @@ std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctio
 
 						std::map<std::string, u256>& gasExpectationMap = (isCodeDepositCost ?
 							calls.back().expectations.gasUsedForCodeDeposit :
-							calls.back().expectations.gasUsed
+							calls.back().expectations.gasUsedExcludingCode
 						);
 						if (gasExpectationMap.count(runType) > 0)
 							throw TestParserError("Gas usage expectation set multiple times.");
@@ -207,9 +207,9 @@ std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctio
 	{
 		// Ensure that each specified gas expectation has both components to simplify working with them.
 		for (auto const& [runType, gas]: call.expectations.gasUsedForCodeDeposit)
-			call.expectations.gasUsed.try_emplace({runType, 0});
+			call.expectations.gasUsedExcludingCode.try_emplace({runType, 0});
 
-		for (auto const& [runType, gas]: call.expectations.gasUsed)
+		for (auto const& [runType, gas]: call.expectations.gasUsedExcludingCode)
 			call.expectations.gasUsedForCodeDeposit.try_emplace({runType, 0});
 	}
 
diff --git a/test/libsolidity/util/TestFileParserTests.cpp b/test/libsolidity/util/TestFileParserTests.cpp
index 7a794f9152..4bb4aed3ac 100644
--- a/test/libsolidity/util/TestFileParserTests.cpp
+++ b/test/libsolidity/util/TestFileParserTests.cpp
@@ -1074,7 +1074,7 @@ BOOST_AUTO_TEST_CASE(gas)
 	auto const calls = parse(source);
 	BOOST_REQUIRE_EQUAL(calls.size(), 1);
 	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
-	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
+	BOOST_TEST(calls[0].expectations.gasUsedExcludingCode == (std::map<std::string, u256>{
 		{"ir", 3245},
 		{"legacy", 5000},
 		{"legacyOptimized", 0},
@@ -1121,19 +1121,19 @@ BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost)
 		// f() ->
 		// gas legacyOptimized code: 1
 		// gas ir: 13000
-		// gas irOptimized: 6666
+		// gas irOptimized: 6000
 		// gas irOptimized code: 666
 		// gas legacy code: 0
-		// gas legacyOptimized: 2
+		// gas legacyOptimized: 1
 	)";
 	auto const calls = parse(source);
 	BOOST_REQUIRE_EQUAL(calls.size(), 1);
 	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
-	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
+	BOOST_TEST(calls[0].expectations.gasUsedExcludingCode == (std::map<std::string, u256>{
 		{"ir", 13000},
-		{"irOptimized", 6666},
+		{"irOptimized", 6000},
 		{"legacy", 0},
-		{"legacyOptimized", 2},
+		{"legacyOptimized", 1},
 	}));
 	BOOST_TEST(calls[0].expectations.gasUsedForCodeDeposit == (std::map<std::string, u256>{
 		{"ir", 0},
@@ -1175,27 +1175,20 @@ BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_double_code_gas)
 BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_non_code_cost)
 {
 	// NOTE: This arrangement is unlikely but may still be possible due to refunds.
+	// We'll deal with it when we actually have a test case like that.
 	char const* source = R"(
 		// f() ->
-		// gas ir: 10
+		// gas ir: -10
 		// gas ir code: 20
 	)";
-	auto const calls = parse(source);
-	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	BOOST_REQUIRE_EQUAL(calls[0].expectations.failure, false);
-	BOOST_TEST(calls[0].expectations.gasUsed == (std::map<std::string, u256>{
-		{"ir", 10},
-	}));
-	BOOST_TEST(calls[0].expectations.gasUsedForCodeDeposit == (std::map<std::string, u256>{
-		{"ir", 20},
-	}));
+	BOOST_REQUIRE_THROW(parse(source), TestParserError);
 }
 
 BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_total_cost)
 {
 	char const* source = R"(
 		// f() ->
-		// gas ir: -10
+		// gas ir: -30
 		// gas ir code: 20
 	)";
 	BOOST_REQUIRE_THROW(parse(source), TestParserError);
@@ -1205,7 +1198,7 @@ BOOST_AUTO_TEST_CASE(gas_with_code_deposit_cost_negative_code_cost)
 {
 	char const* source = R"(
 		// f() ->
-		// gas ir: 20
+		// gas ir: 10
 		// gas ir code: -10
 	)";
 	BOOST_REQUIRE_THROW(parse(source), TestParserError);
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index b22ac3716a..dd74d4035c 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -377,20 +377,20 @@ std::string TestFunctionCall::formatGasExpectations(
 	using ranges::views::keys;
 	using ranges::views::set_symmetric_difference;
 
-	soltestAssert(set_symmetric_difference(m_codeDepositGasCosts | keys, m_gasCosts | keys).empty());
-	soltestAssert(set_symmetric_difference(m_call.expectations.gasUsedForCodeDeposit | keys, m_call.expectations.gasUsed | keys).empty());
+	soltestAssert(set_symmetric_difference(m_codeDepositGasCosts | keys, m_gasCostsExcludingCode | keys).empty());
+	soltestAssert(set_symmetric_difference(m_call.expectations.gasUsedForCodeDeposit | keys, m_call.expectations.gasUsedExcludingCode | keys).empty());
 
 	std::stringstream os;
-	for (auto const& [runType, gasUsed]: (_useActualCost ? m_gasCosts : m_call.expectations.gasUsed))
+	for (auto const& [runType, gasUsedExcludingCode]: (_useActualCost ? m_gasCostsExcludingCode : m_call.expectations.gasUsedExcludingCode))
 	{
 		soltestAssert(runType != "");
 
 		u256 gasUsedForCodeDeposit = (_useActualCost ? m_codeDepositGasCosts : m_call.expectations.gasUsedForCodeDeposit).at(runType);
 
-		os << std::endl << _linePrefix << "// gas " << runType << ": " << gasUsed.str();
+		os << std::endl << _linePrefix << "// gas " << runType << ": " << gasUsedExcludingCode.str();
 		std::string gasDiff = formatGasDiff(
-			gasOrNullopt(m_gasCosts, runType),
-			gasOrNullopt(m_call.expectations.gasUsed, runType)
+			gasOrNullopt(m_gasCostsExcludingCode, runType),
+			gasOrNullopt(m_call.expectations.gasUsedExcludingCode, runType)
 		);
 		if (_showDifference && !gasDiff.empty() && _useActualCost)
 			os << " [" << gasDiff << "]";
diff --git a/test/libsolidity/util/TestFunctionCall.h b/test/libsolidity/util/TestFunctionCall.h
index cf05b6a216..724cb8286c 100644
--- a/test/libsolidity/util/TestFunctionCall.h
+++ b/test/libsolidity/util/TestFunctionCall.h
@@ -53,7 +53,7 @@ class TestFunctionCall
 
 	TestFunctionCall(FunctionCall _call):
 		m_call(std::move(_call)),
-		m_gasCosts(m_call.expectations.gasUsed),
+		m_gasCostsExcludingCode(m_call.expectations.gasUsedExcludingCode),
 		m_codeDepositGasCosts(m_call.expectations.gasUsedForCodeDeposit)
 	{}
 
@@ -97,7 +97,7 @@ class TestFunctionCall
 	void calledNonExistingFunction() { m_calledNonExistingFunction = true; }
 	void setFailure(const bool _failure) { m_failure = _failure; }
 	void setRawBytes(const bytes _rawBytes) { m_rawBytes = _rawBytes; }
-	void setGasCost(std::string const& _runType, u256 const& _gasCost) { m_gasCosts[_runType] = _gasCost; }
+	void setGasCostExcludingCode(std::string const& _runType, u256 const& _gasCost) { m_gasCostsExcludingCode[_runType] = _gasCost; }
 	void setCodeDepositGasCost(std::string const& _runType, u256 const& _gasCost) { m_codeDepositGasCosts[_runType] = _gasCost; }
 	void setContractABI(Json::Value _contractABI) { m_contractABI = std::move(_contractABI); }
 	void setSideEffects(std::vector<std::string> _sideEffects) { m_call.actualSideEffects = _sideEffects; }
@@ -147,7 +147,7 @@ class TestFunctionCall
 	/// Result of the actual call been made.
 	bytes m_rawBytes = bytes{};
 	/// Actual gas costs
-	std::map<std::string, u256> m_gasCosts;
+	std::map<std::string, u256> m_gasCostsExcludingCode;
 	/// Actual code deposit gas costs
 	std::map<std::string, u256> m_codeDepositGasCosts;
 	/// Transaction status of the actual call. False in case of a REVERT or any other failure.
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
index b78b7e5f29..5741ccd0de 100644
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ b/test/libsolidity/util/TestFunctionCallTests.cpp
@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE(format_gas_with_code_deposit)
 			"some comment",
 			{
 				{"ir", 0}, // Zero costs are shown
-				{"legacy", 5000},
+				{"legacy", 4875},
 				{"legacy optimized", 300},
 			},
 			{
@@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(format_gas_with_code_deposit)
 		TestFunctionCall(call).format(),
 		"// f() -> #some comment#\n"
 		"// gas ir: 0\n"
-		"// gas legacy: 5000\n"
+		"// gas legacy: 4875\n"
 		"// gas legacy code: 125\n"
 		"// gas legacy optimized: 300"
 	);

From 381b149b8dd3fe87ae9d1af49514788adaa3e997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 16:03:50 +0100
Subject: [PATCH 0708/1140] gas_diff_stats.py: Include code deposit costs in
 total cost

---
 scripts/gas_diff_stats.py           |  5 ++++-
 test/scripts/test_gas_diff_stats.py | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 7403b39172..13d8a59e8d 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -23,7 +23,7 @@
 import sys
 from pathlib import Path
 from enum import Enum
-from parsec import generate, ParseError, regex, string
+from parsec import generate, ParseError, regex, string, optional
 from tabulate import tabulate
 
 class Kind(Enum):
@@ -49,6 +49,7 @@ class Diff(Enum):
 gas_ir_optimized = string("gas irOptimized").result(Kind.IrOptimized)
 gas_legacy_optimized = string("gas legacyOptimized").result(Kind.LegacyOptimized)
 gas_legacy = string("gas legacy").result(Kind.Legacy)
+code_suffix = string("code")
 
 def number() -> int:
     """Parse number."""
@@ -67,6 +68,8 @@ def diff_string() -> (Kind, Diff, int):
     yield comment
     yield space
     codegen_kind = yield gas_ir_optimized ^ gas_ir ^ gas_legacy_optimized ^ gas_legacy
+    yield optional(space)
+    yield optional(code_suffix)
     yield colon
     yield space
     val = yield number()
diff --git a/test/scripts/test_gas_diff_stats.py b/test/scripts/test_gas_diff_stats.py
index 4980293aea..e67bd0be89 100644
--- a/test/scripts/test_gas_diff_stats.py
+++ b/test/scripts/test_gas_diff_stats.py
@@ -85,3 +85,25 @@ def test_collect_statistics_should_ignore_unchanged_costs(self):
             0, # +legacyOptimized
             3, # +legacy
         ))
+
+    def test_collect_statistics_should_include_code_deposit_in_total_cost(self):
+        diff_output = dedent("""
+            -// gas irOptimized: 1
+            -// gas legacy: 20
+            -// gas legacyOptimized: 300
+            +// gas irOptimized: 4000
+            +// gas irOptimized code: 50000
+            +// gas legacy: 600000
+            +// gas legacyOptimized: 7000000
+            +// gas legacyOptimized code: 80000000
+            -// gas legacy code: 900000000
+        """).splitlines()
+
+        self.assertEqual(collect_statistics(diff_output), (
+            1,         # -irOptimized
+            300,       # -legacyOptimized
+            900000020, # -legacy
+            54000,     # +irOptimized
+            87000000,  # +legacyOptimized
+            600000,    # +legacy
+        ))

From e7312a501086e1b0751bc3abbc7e7f08de8b8acd Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 21 Feb 2024 21:09:09 +0100
Subject: [PATCH 0709/1140] Use CircleCI rust+node convenience image for
 t_ems_ext_hardhat job

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 663c64520e..30c0229642 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1385,7 +1385,7 @@ jobs:
   t_ems_ext_hardhat:
     <<: *base_node_small
     docker:
-      - image: cimg/node:18.16
+      - image: cimg/rust:1.74.0-node
     environment:
       <<: *base_node_small_env
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
@@ -1395,18 +1395,15 @@ jobs:
           at: /tmp/workspace
       - run:
           name: Ensure pnpm is installed if npm is present
-          command: |
-            if command -v npm &> /dev/null; then
-              sudo npm install -g pnpm
-            fi
+          command: sudo npm install -g pnpm
       - run:
           name: Retrieve Hardhat latest release tag
           command: |
             # Make authenticated requests when the Github token is available
             if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
-              EXTRA_HEADERS=(--header 'Authorization: Bearer '"${GITHUB_ACCESS_TOKEN}")
+              EXTRA_HEADERS=(--header "Authorization: Bearer ${GITHUB_ACCESS_TOKEN}")
             fi
-            HARDHAT_RELEASE_TAG=$(
+            HARDHAT_LATEST_RELEASE_TAG=$(
               curl \
                 --silent \
                 --location \
@@ -1416,8 +1413,8 @@ jobs:
                 https://api.github.com/repos/nomiclabs/hardhat/releases/latest \
                 | jq --raw-output .tag_name \
             )
-            echo "export HARDHAT_RELEASE_TAG='${HARDHAT_RELEASE_TAG}'" >> "$BASH_ENV"
-      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git --branch $HARDHAT_RELEASE_TAG
+            echo "export HARDHAT_LATEST_RELEASE_TAG='${HARDHAT_LATEST_RELEASE_TAG}'" >> "$BASH_ENV"
+      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git --branch "$HARDHAT_LATEST_RELEASE_TAG"
       - run:
           name: Install dependencies
           command: |

From c8358f5677a786847fb4783866f995d0e140389c Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 21 Feb 2024 21:01:28 +0100
Subject: [PATCH 0710/1140] Fix detect_hardhat_artifact_dir in externalTests
 scripts

---
 scripts/externalTests/common.sh | 41 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
index 3bca968a5a..082a25c4c5 100644
--- a/scripts/externalTests/common.sh
+++ b/scripts/externalTests/common.sh
@@ -570,17 +570,15 @@ 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 detect_hardhat_artifact_dirs
+{
+    # NOTE: The artifacts path is a configured parameter in Hardhat, so the below may fail for new external tests
+    # See: https://hardhat.org/hardhat-runner/docs/config#path-configuration
+    local artifact_dir=()
+    [[ -e build/artifacts ]] && artifact_dir+=("build/artifacts")
+    [[ -e artifacts/ ]] && artifact_dir+=("artifacts")
+    (( ${#artifact_dir[@]} != 0 )) || assertFail
+    echo -n "${artifact_dir[@]}"
 }
 
 function bytecode_size_json_from_truffle_artifacts
@@ -605,16 +603,17 @@ function bytecode_size_json_from_truffle_artifacts
 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"
+    for artifact_dir in $(detect_hardhat_artifact_dirs); do
+        for artifact in "$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
     done
 }
 

From 4af244f4aa0dd97e3e2178a3a1fd4dd53760b529 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 2 Feb 2024 14:55:12 +0100
Subject: [PATCH 0711/1140] Separate nightly-ossfuzz workflow from nightly
 workflow

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30c0229642..9d3105a277 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1978,10 +1978,6 @@ workflows:
           <<: *on_develop
 
     jobs:
-      # OSSFUZZ builds and (regression) tests
-      - b_ubu_ossfuzz: *requires_nothing
-      - t_ubu_ossfuzz: *requires_b_ubu_ossfuzz
-
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *requires_nothing
       - t_ubu_codecov: *requires_b_ubu_codecov
@@ -1997,3 +1993,15 @@ 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
+
+  nightly-ossfuzz:
+
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          <<: *on_develop
+
+    jobs:
+      # OSSFUZZ builds and (regression) tests
+      - b_ubu_ossfuzz: *requires_nothing
+      - t_ubu_ossfuzz: *requires_b_ubu_ossfuzz

From e095590330dfbd3022db12eb5f106606f818dd21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 2 Nov 2023 18:59:14 +0100
Subject: [PATCH 0712/1140] Parser::parseFunctionDefinition(): Return
 FunctionDefinition, not ASTNode

---
 libsolidity/parsing/Parser.cpp | 2 +-
 libsolidity/parsing/Parser.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 42be1ab9ee..c7f0c313fd 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -627,7 +627,7 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _isStateVari
 	return result;
 }
 
-ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction, bool _allowBody)
+ASTPointer<FunctionDefinition> Parser::parseFunctionDefinition(bool _freeFunction, bool _allowBody)
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index d4c48c7a63..86dd2843fd 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -102,7 +102,7 @@ class Parser: public langutil::ParserBase
 	ASTPointer<OverrideSpecifier> parseOverrideSpecifier();
 	StateMutability parseStateMutability();
 	FunctionHeaderParserResult parseFunctionHeader(bool _isStateVariable);
-	ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false, bool _allowBody = true);
+	ASTPointer<FunctionDefinition> parseFunctionDefinition(bool _freeFunction = false, bool _allowBody = true);
 	ASTPointer<StructDefinition> parseStructDefinition();
 	ASTPointer<EnumDefinition> parseEnumDefinition();
 	ASTPointer<UserDefinedValueTypeDefinition> parseUserDefinedValueTypeDefinition();

From fa35ed5b98baa56e6e03abe61f3e6b9b42643e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 2 Nov 2023 18:37:14 +0100
Subject: [PATCH 0713/1140] Add ForAllQuantifier AST node

---
 libsolidity/ast/AST.h            | 32 ++++++++++++++++++++++++++++++++
 libsolidity/ast/ASTAnnotations.h |  4 ++++
 libsolidity/ast/ASTForward.h     |  1 +
 libsolidity/ast/ASTVisitor.h     |  4 ++++
 libsolidity/ast/AST_accept.h     | 20 ++++++++++++++++++++
 5 files changed, 61 insertions(+)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index b9cc2118ef..27926721aa 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -2625,6 +2625,38 @@ class Builtin: public Expression
 	SourceLocation m_nameParameterLocation;
 };
 
+// TODO: NatSpec used on the quantifier should be recognized as applying to the function.
+class ForAllQuantifier: public ASTNode, public Scopable, public ScopeOpener
+{
+public:
+	ForAllQuantifier(
+		int64_t _id,
+		SourceLocation _location,
+		ASTPointer<ParameterList> _typeVariableDeclarations,
+		ASTPointer<FunctionDefinition> _quantifiedDeclaration
+	):
+		ASTNode(_id, std::move(_location)),
+		m_typeVariableDeclarations(std::move(_typeVariableDeclarations)),
+		m_quantifiedDeclaration(std::move(_quantifiedDeclaration))
+	{
+		solAssert(m_typeVariableDeclarations);
+		solAssert(m_quantifiedDeclaration);
+	}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+	ForAllQuantifierAnnotation& annotation() const override { return initAnnotation<ForAllQuantifierAnnotation>(); }
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+	ParameterList const& typeVariableDeclarations() const { return *m_typeVariableDeclarations; }
+	FunctionDefinition const& quantifiedDeclaration() const { return *m_quantifiedDeclaration; }
+
+private:
+	ASTPointer<ParameterList> m_typeVariableDeclarations;
+	ASTPointer<FunctionDefinition> m_quantifiedDeclaration;
+};
+
 /// @}
 
 }
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index e68614f464..f7519250a3 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -350,6 +350,10 @@ struct FunctionCallAnnotation: ExpressionAnnotation
 struct TypeClassDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocumentedAnnotation
 {
 };
+
+struct ForAllQuantifierAnnotation: StatementAnnotation, ScopableAnnotation
+{
+};
 /// @}
 
 }
diff --git a/libsolidity/ast/ASTForward.h b/libsolidity/ast/ASTForward.h
index f7c3d60237..b8a3a4ae00 100644
--- a/libsolidity/ast/ASTForward.h
+++ b/libsolidity/ast/ASTForward.h
@@ -106,6 +106,7 @@ class TypeClassInstantiation;
 class TypeClassName;
 class TypeDefinition;
 class Builtin;
+class ForAllQuantifier;
 /// @}
 
 class VariableScope;
diff --git a/libsolidity/ast/ASTVisitor.h b/libsolidity/ast/ASTVisitor.h
index f9196d6b95..f985a44901 100644
--- a/libsolidity/ast/ASTVisitor.h
+++ b/libsolidity/ast/ASTVisitor.h
@@ -116,6 +116,7 @@ class ASTVisitor
 	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 bool visit(ForAllQuantifier& _node) { return visitNode(_node); }
 	///  @}
 
 	virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); }
@@ -180,6 +181,7 @@ class ASTVisitor
 	virtual void endVisit(TypeDefinition& _node) { endVisitNode(_node); }
 	virtual void endVisit(TypeClassName& _node) { endVisitNode(_node); }
 	virtual void endVisit(Builtin& _node) { endVisitNode(_node); }
+	virtual void endVisit(ForAllQuantifier& _node) { endVisitNode(_node); }
 	///  @}
 
 protected:
@@ -266,6 +268,7 @@ class ASTConstVisitor
 	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 bool visit(ForAllQuantifier const& _node) { return visitNode(_node); }
 	///  @}
 
 	virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); }
@@ -330,6 +333,7 @@ class ASTConstVisitor
 	virtual void endVisit(TypeDefinition const& _node) { endVisitNode(_node); }
 	virtual void endVisit(TypeClassName const& _node) { endVisitNode(_node); }
 	virtual void endVisit(Builtin const& _node) { endVisitNode(_node); }
+	virtual void endVisit(ForAllQuantifier const& _node) { endVisitNode(_node); }
 	///  @}
 
 protected:
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
index be9de64db7..55ebe2a78c 100644
--- a/libsolidity/ast/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -1140,6 +1140,26 @@ void Builtin::accept(ASTConstVisitor& _visitor) const
 	_visitor.visit(*this);
 	_visitor.endVisit(*this);
 }
+
+void ForAllQuantifier::accept(ASTVisitor& _visitor)
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeVariableDeclarations->accept(_visitor);
+		m_quantifiedDeclaration->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void ForAllQuantifier::accept(ASTConstVisitor& _visitor) const
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeVariableDeclarations->accept(_visitor);
+		m_quantifiedDeclaration->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
 /// @}
 
 }

From 4d051c1fcefa9c8766f7083139e294703503d88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 2 Nov 2023 19:07:44 +0100
Subject: [PATCH 0714/1140] Add parser support for quantified function
 definitions

---
 liblangutil/Token.h                           |  1 +
 .../experimental/analysis/TypeInference.cpp   | 13 ++++++
 .../experimental/analysis/TypeInference.h     |  1 +
 libsolidity/parsing/Parser.cpp                | 24 +++++++++++
 libsolidity/parsing/Parser.h                  |  1 +
 .../parsing/forall_free_function.sol          | 27 ++++++++++++
 .../forall_free_function_no_type_var.sol      | 14 ++++++
 .../forall_free_function_with_sorts.sol       | 43 +++++++++++++++++++
 .../parsing/forall_type_class.sol             |  8 ++++
 .../forall_type_class_instantiation.sol       | 12 ++++++
 10 files changed, 144 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing/forall_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_no_type_var.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_with_sorts.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing/forall_type_class.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing/forall_type_class_instantiation.sol

diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index 98de0b228d..0f7c2df080 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -276,6 +276,7 @@ namespace solidity::langutil
 	K(Itself, "itself", 0)                                             \
 	K(StaticAssert, "static_assert", 0)                                \
 	K(Builtin, "__builtin", 0)                                         \
+	K(ForAll, "forall", 0)                                             \
 	T(ExperimentalEnd, nullptr, 0) /* used as experimental enum end marker */ \
 	\
 	/* Illegal token - not able to scan. */                            \
diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index 63a377f90d..8625937a35 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -129,6 +129,19 @@ bool TypeInference::analyze(SourceUnit const& _sourceUnit)
 	return !m_errorReporter.hasErrors();
 }
 
+bool TypeInference::visit(ForAllQuantifier const& _quantifier)
+{
+	solAssert(m_expressionContext == ExpressionContext::Term);
+
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+		_quantifier.typeVariableDeclarations().accept(*this);
+	}
+
+	_quantifier.quantifiedDeclaration().accept(*this);
+	return false;
+}
+
 bool TypeInference::visit(FunctionDefinition const& _functionDefinition)
 {
 	solAssert(m_expressionContext == ExpressionContext::Term);
diff --git a/libsolidity/experimental/analysis/TypeInference.h b/libsolidity/experimental/analysis/TypeInference.h
index 3eb2ad94cf..0932367995 100644
--- a/libsolidity/experimental/analysis/TypeInference.h
+++ b/libsolidity/experimental/analysis/TypeInference.h
@@ -56,6 +56,7 @@ class TypeInference: public ASTConstVisitor
 	void endVisit(VariableDeclarationStatement const& _variableDeclarationStatement) override;
 	bool visit(VariableDeclaration const& _variableDeclaration) override;
 
+	bool visit(ForAllQuantifier const& _forAllQuantifier) override;
 	bool visit(FunctionDefinition const& _functionDefinition) override;
 	void endVisit(FunctionDefinition const& _functionDefinition) override;
 	bool visit(ParameterList const&) override { return true; }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index c7f0c313fd..f650e0dbf1 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -137,6 +137,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 			case Token::Function:
 				nodes.push_back(parseFunctionDefinition(true));
 				break;
+			case Token::ForAll:
+				nodes.push_back(parseQuantifiedFunctionDefinition());
+				break;
 			case Token::Event:
 				nodes.push_back(parseEventDefinition());
 				break;
@@ -627,6 +630,27 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _isStateVari
 	return result;
 }
 
+ASTPointer<ForAllQuantifier> Parser::parseQuantifiedFunctionDefinition()
+{
+	solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	expectToken(Token::ForAll);
+	ASTPointer<ParameterList> typeVariableDeclarations = parseParameterList();
+	nodeFactory.markEndPosition();
+
+	if (m_scanner->currentToken() != Token::Function)
+		fatalParserError(5709_error, "Expected a function definition.");
+
+	ASTPointer<FunctionDefinition> quantifiedFunction = parseFunctionDefinition(true /* _freeFunction */, true /* _allowBody */);
+
+	return nodeFactory.createNode<ForAllQuantifier>(
+		std::move(typeVariableDeclarations),
+		std::move(quantifiedFunction)
+	);
+}
+
 ASTPointer<FunctionDefinition> Parser::parseFunctionDefinition(bool _freeFunction, bool _allowBody)
 {
 	RecursionGuard recursionGuard(*this);
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index 86dd2843fd..aedfdb7ddd 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -102,6 +102,7 @@ class Parser: public langutil::ParserBase
 	ASTPointer<OverrideSpecifier> parseOverrideSpecifier();
 	StateMutability parseStateMutability();
 	FunctionHeaderParserResult parseFunctionHeader(bool _isStateVariable);
+	ASTPointer<ForAllQuantifier> parseQuantifiedFunctionDefinition();
 	ASTPointer<FunctionDefinition> parseFunctionDefinition(bool _freeFunction = false, bool _allowBody = true);
 	ASTPointer<StructDefinition> parseStructDefinition();
 	ASTPointer<EnumDefinition> parseEnumDefinition();
diff --git a/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function.sol b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function.sol
new file mode 100644
index 0000000000..ba22a9fae4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function.sol
@@ -0,0 +1,27 @@
+pragma experimental solidity;
+
+forall (A)
+function f(a: A) {}
+
+forall (A, B)
+function g(a: A, 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: (38-41): Inferred type: 's:type
+// Info 4164: (39-40): Inferred type: 's:type
+// Info 4164: (42-61): Inferred type: 's:type -> ()
+// Info 4164: (52-58): Inferred type: 's:type
+// Info 4164: (53-57): Inferred type: 's:type
+// Info 4164: (56-57): Inferred type: 's:type
+// Info 4164: (70-76): Inferred type: ('v:type, 'w:type)
+// Info 4164: (71-72): Inferred type: 'v:type
+// Info 4164: (74-75): Inferred type: 'w:type
+// Info 4164: (77-102): Inferred type: ('v:type, 'w:type) -> ()
+// Info 4164: (87-99): Inferred type: ('v:type, 'w:type)
+// Info 4164: (88-92): Inferred type: 'v:type
+// Info 4164: (91-92): Inferred type: 'v:type
+// Info 4164: (94-98): Inferred type: 'w:type
+// Info 4164: (97-98): Inferred type: 'w:type
diff --git a/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_no_type_var.sol b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_no_type_var.sol
new file mode 100644
index 0000000000..66753fdd0f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_no_type_var.sol
@@ -0,0 +1,14 @@
+pragma experimental solidity;
+
+forall ()
+function f(x: ()) {}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (38-40): Inferred type: ()
+// Info 4164: (41-61): Inferred type: () -> ()
+// Info 4164: (51-58): Inferred type: ()
+// Info 4164: (52-57): Inferred type: ()
+// Info 4164: (55-57): Inferred type: ()
diff --git a/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_with_sorts.sol b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_with_sorts.sol
new file mode 100644
index 0000000000..1ab09fd2bd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing/forall_free_function_with_sorts.sol
@@ -0,0 +1,43 @@
+pragma experimental solidity;
+
+class Self: Class1 {}
+class Self: Class2 {}
+
+forall (A: (Class1, Class2), B: Class1)
+function f(a: A: Class1, b: B: Class1) {}
+
+forall A: Class1
+function g(a: A) {}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-52): Inferred type: Class1
+// Info 4164: (37-41): Inferred type: 'k:(type, Class1)
+// Info 4164: (53-74): Inferred type: Class2
+// Info 4164: (59-63): Inferred type: 'l:(type, Class2)
+// Info 4164: (83-115): Inferred type: ('ba:(type, Class1, Class2), 'bg:(type, Class1))
+// Info 4164: (84-103): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (87-103): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (88-94): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (96-102): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (105-114): Inferred type: 'bg:(type, Class1)
+// Info 4164: (108-114): Inferred type: 'bg:(type, Class1)
+// Info 4164: (116-157): Inferred type: ('ba:(type, Class1, Class2), 'bg:(type, Class1)) -> ()
+// Info 4164: (126-154): Inferred type: ('ba:(type, Class1, Class2), 'bg:(type, Class1))
+// Info 4164: (127-139): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (130-139): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (130-131): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (133-139): Inferred type: 'ba:(type, Class1, Class2)
+// Info 4164: (141-153): Inferred type: 'bg:(type, Class1)
+// Info 4164: (144-153): Inferred type: 'bg:(type, Class1)
+// Info 4164: (144-145): Inferred type: 'bg:(type, Class1)
+// Info 4164: (147-153): Inferred type: 'bg:(type, Class1)
+// Info 4164: (166-175): Inferred type: 'bi:(type, Class1)
+// Info 4164: (166-175): Inferred type: 'bi:(type, Class1)
+// Info 4164: (169-175): Inferred type: 'bi:(type, Class1)
+// Info 4164: (176-195): Inferred type: 'bi:(type, Class1) -> ()
+// Info 4164: (186-192): Inferred type: 'bi:(type, Class1)
+// Info 4164: (187-191): Inferred type: 'bi:(type, Class1)
+// Info 4164: (190-191): Inferred type: 'bi:(type, Class1)
diff --git a/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class.sol b/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class.sol
new file mode 100644
index 0000000000..aa0012eac1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+forall (A, B)
+class Self: C {}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// ParserError 5709: (45-50): Expected a function definition.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class_instantiation.sol b/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class_instantiation.sol
new file mode 100644
index 0000000000..31573447a3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing/forall_type_class_instantiation.sol
@@ -0,0 +1,12 @@
+pragma experimental solidity;
+
+type T;
+
+class Self: C {}
+
+forall (A, B)
+instantiation T: C {}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// ParserError 5709: (72-85): Expected a function definition.

From cd52e5aa9c282e75654709cd2890638e52561521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Nov 2023 12:01:25 +0100
Subject: [PATCH 0715/1140] TypeInference: Require declarations for type
 variables

---
 libsolidity/analysis/NameAndTypeResolver.cpp  | 31 ++++++--
 .../experimental/analysis/TypeInference.cpp   |  6 +-
 .../undeclared_type_variable_in_function.sol  | 17 +++++
 ...d_type_variable_in_quantified_function.sol | 12 ++++
 ...undeclared_type_variable_in_type_class.sol | 17 +++++
 .../inference/polymorphic_function_call.sol   | 70 ++++++++++---------
 .../inference/polymorphic_type.sol            | 41 ++++++-----
 ...ulti_use_function_parameter_and_return.sol | 16 +++++
 ...variable_multi_use_function_parameters.sol | 16 +++++
 9 files changed, 169 insertions(+), 57 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_function.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_quantified_function.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_type_class.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameter_and_return.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameters.sol

diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 94d0568118..642e87a53b 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -703,11 +703,34 @@ void DeclarationRegistrationHelper::registerDeclaration(Declaration& _declaratio
 	solAssert(m_currentScope && m_scopes.count(m_currentScope), "No current scope.");
 	solAssert(m_currentScope == _declaration.scope(), "Unexpected current scope.");
 
-	// Register declaration as inactive if we are in block scope.
-	bool inactive =
-		(dynamic_cast<Block const*>(m_currentScope) || dynamic_cast<ForStatement const*>(m_currentScope));
+	// Functions defined inside quantifiers should be visible in the scope containing the quantifier
+	// TODO: Turn it into a more generic mechanism in the same vein as Scopable and ScopeOpener if
+	// it turns out we need more special-casing here.
+	auto const* quantifier = dynamic_cast<ForAllQuantifier const*>(m_currentScope);
+	auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(&_declaration);
+	if (quantifier && functionDefinition)
+	{
+		solAssert(quantifier->scope());
+		solAssert(
+			// forall quantifiers cannot be used in block scope so the declaration is always active.
+			!dynamic_cast<Block const*>(quantifier->scope()) &&
+			!dynamic_cast<ForStatement const*>(quantifier->scope())
+		);
 
-	registerDeclaration(*m_scopes[m_currentScope], _declaration, nullptr, nullptr, inactive, m_errorReporter);
+		// NOTE: We're registering the function outside of its scope(). This will only affect
+		// name lookups. An more general alternative would be to modify Scoper to simply assign it
+		// that scope in the first place, but this would complicate the AST traversal here, which
+		// currently assumes that scopes follow ScopeOpener nesting.
+		registerDeclaration(*m_scopes.at(quantifier->scope()), _declaration, nullptr, nullptr, false /* inactive */, m_errorReporter);
+	}
+	else
+	{
+		// Register declaration as inactive if we are in block scope.
+		bool inactive =
+			(dynamic_cast<Block const*>(m_currentScope) || dynamic_cast<ForStatement const*>(m_currentScope));
+
+		registerDeclaration(*m_scopes[m_currentScope], _declaration, nullptr, nullptr, inactive, m_errorReporter);
+	}
 
 	solAssert(_declaration.annotation().scope == m_currentScope, "");
 	solAssert(_declaration.annotation().contract == m_currentContract, "");
diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index 8625937a35..6913dc0bf7 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -580,9 +580,11 @@ bool TypeInference::visit(Identifier const& _identifier)
 		solAssert(false);
 		break;
 	case ExpressionContext::Type:
-		// TODO: register free type variable name!
+		m_errorReporter.typeError(5934_error, _identifier.location(), "Undeclared type variable.");
+
+		// Assign it a fresh variable anyway just so that we can continue analysis.
 		identifierAnnotation.type = m_typeSystem.freshTypeVariable({});
-		return false;
+		break;
 	case ExpressionContext::Sort:
 		// TODO: error handling
 		solAssert(false);
diff --git a/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_function.sol b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_function.sol
new file mode 100644
index 0000000000..da11699691
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_function.sol
@@ -0,0 +1,17 @@
+pragma experimental solidity;
+
+type T(X);
+
+function f(p: P, q: T(Q)) {
+    let r: (R, S);
+    let s: S;
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 5934: (57-58): Undeclared type variable.
+// TypeError 5934: (65-66): Undeclared type variable.
+// TypeError 5934: (83-84): Undeclared type variable.
+// TypeError 5934: (86-87): Undeclared type variable.
+// TypeError 5934: (101-102): Undeclared type variable.
diff --git a/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_quantified_function.sol b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_quantified_function.sol
new file mode 100644
index 0000000000..91b7345693
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_quantified_function.sol
@@ -0,0 +1,12 @@
+pragma experimental solidity;
+
+forall A
+function f(b: B) {
+    let c: C;
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 5934: (54-55): Undeclared type variable.
+// TypeError 5934: (70-71): Undeclared type variable.
diff --git a/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_type_class.sol b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_type_class.sol
new file mode 100644
index 0000000000..8af0cce826
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/forall/undeclared_type_variable_in_type_class.sol
@@ -0,0 +1,17 @@
+pragma experimental solidity;
+
+type T(X);
+
+class Self: C {
+    function f(self: Self);
+}
+
+instantiation T(Y): C {
+    function f(self: T(Z)) {}
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 5934: (137-138): Undeclared type variable.
+// TypeError 7428: (90-145): Instantiation function 'f' does not match the declaration in the type class (T('bc:type) -> () != T('y:type) -> ()).
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
index c73a857a2f..c9c7e01109 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
@@ -3,6 +3,7 @@ pragma experimental solidity;
 type T;
 type U(A);
 
+forall (X, Y)
 function f(x, y: X, z: U(Y)) {}
 
 function run(a: T, b: U(T), c: U(U(T))) {
@@ -18,36 +19,39 @@ function run(a: T, b: U(T), c: U(U(T))) {
 // 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
-// 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))
+// Info 4164: (58-64): Inferred type: ('u:type, 'v:type)
+// Info 4164: (59-60): Inferred type: 'u:type
+// Info 4164: (62-63): Inferred type: 'v:type
+// Info 4164: (65-96): Inferred type: ('y:type, 'u:type, U('v:type)) -> ()
+// Info 4164: (75-93): Inferred type: ('y:type, 'u:type, U('v:type))
+// Info 4164: (76-77): Inferred type: 'y:type
+// Info 4164: (79-83): Inferred type: 'u:type
+// Info 4164: (82-83): Inferred type: 'u:type
+// Info 4164: (85-92): Inferred type: U('v:type)
+// Info 4164: (88-92): Inferred type: U('v:type)
+// Info 4164: (88-89): Inferred type: tfun('v:type, U('v:type))
+// Info 4164: (90-91): Inferred type: 'v:type
+// Info 4164: (98-173): Inferred type: (T, U(T), U(U(T))) -> ()
+// Info 4164: (110-137): Inferred type: (T, U(T), U(U(T)))
+// Info 4164: (111-115): Inferred type: T
+// Info 4164: (114-115): Inferred type: T
+// Info 4164: (117-124): Inferred type: U(T)
+// Info 4164: (120-124): Inferred type: U(T)
+// Info 4164: (120-121): Inferred type: tfun(T, U(T))
+// Info 4164: (122-123): Inferred type: T
+// Info 4164: (126-136): Inferred type: U(U(T))
+// Info 4164: (129-136): Inferred type: U(U(T))
+// Info 4164: (129-130): Inferred type: tfun(U(T), U(U(T)))
+// Info 4164: (131-135): Inferred type: U(T)
+// Info 4164: (131-132): Inferred type: tfun(T, U(T))
+// Info 4164: (133-134): Inferred type: T
+// Info 4164: (144-154): Inferred type: ()
+// Info 4164: (144-145): Inferred type: (T, T, U(T)) -> ()
+// Info 4164: (146-147): Inferred type: T
+// Info 4164: (149-150): Inferred type: T
+// Info 4164: (152-153): Inferred type: U(T)
+// Info 4164: (160-170): Inferred type: ()
+// Info 4164: (160-161): Inferred type: (U(T), U(T), U(U(T))) -> ()
+// Info 4164: (162-163): Inferred type: U(T)
+// Info 4164: (165-166): Inferred type: U(T)
+// Info 4164: (168-169): Inferred type: U(U(T))
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
index ca83ca2ec7..85f810a9dc 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
@@ -7,6 +7,7 @@ type V;
 class Self: C {}
 class Self: D {}
 
+forall (X, Y, Z)
 function run() {
     let x: T(U, X, Z: C);
     let y: T(V, Y, Z: D);
@@ -27,21 +28,25 @@ function run() {
 // Info 4164: (71-75): Inferred type: 'k:(type, C)
 // Info 4164: (82-98): Inferred 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, ?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: ?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: ?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)
+// Info 4164: (107-116): Inferred type: (?bc:type, ?bd:type, ?bq:(type, C, D))
+// Info 4164: (108-109): Inferred type: ?bc:type
+// Info 4164: (111-112): Inferred type: ?bd:type
+// Info 4164: (114-115): Inferred type: ?bq:(type, C, D)
+// Info 4164: (117-187): Inferred type: () -> ()
+// Info 4164: (129-131): Inferred type: ()
+// Info 4164: (142-158): Inferred type: T(U, ?bc:type, ?bq:(type, C, D))
+// Info 4164: (145-158): Inferred type: T(U, ?bc:type, ?bq:(type, C, D))
+// Info 4164: (145-146): Inferred type: tfun((U, ?bc:type, ?bq:(type, C, D)), T(U, ?bc:type, ?bq:(type, C, D)))
+// Info 4164: (147-148): Inferred type: U
+// Info 4164: (150-151): Inferred type: ?bc:type
+// Info 4164: (153-157): Inferred type: ?bq:(type, C, D)
+// Info 4164: (153-154): Inferred type: ?bq:(type, C, D)
+// Info 4164: (156-157): Inferred type: ?bq:(type, C, D)
+// Info 4164: (168-184): Inferred type: T(V, ?bd:type, ?bq:(type, C, D))
+// Info 4164: (171-184): Inferred type: T(V, ?bd:type, ?bq:(type, C, D))
+// Info 4164: (171-172): Inferred type: tfun((V, ?bd:type, ?bq:(type, C, D)), T(V, ?bd:type, ?bq:(type, C, D)))
+// Info 4164: (173-174): Inferred type: V
+// Info 4164: (176-177): Inferred type: ?bd:type
+// Info 4164: (179-183): Inferred type: ?bq:(type, C, D)
+// Info 4164: (179-180): Inferred type: ?bq:(type, C, D)
+// Info 4164: (182-183): Inferred type: ?bq:(type, C, D)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameter_and_return.sol b/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameter_and_return.sol
new file mode 100644
index 0000000000..00cd7b1207
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameter_and_return.sol
@@ -0,0 +1,16 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+forall X
+function f(x: X) -> X {}
+
+function test(t: T, u: U) {
+    t = f(u);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 8456: (115-123): Cannot unify T and U.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameters.sol b/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameters.sol
new file mode 100644
index 0000000000..7122cdd9ef
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/type_variable_multi_use_function_parameters.sol
@@ -0,0 +1,16 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+forall X
+function f(x: X, y: X) {}
+
+function test(t: T, u: U) {
+    f(t, u);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 8456: (116-123): Cannot unify T and U.

From 180f744c434dc6a5fbeb09715e194ab05a30bd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 26 Feb 2024 19:44:15 +0100
Subject: [PATCH 0716/1140] gas_diff_stats.py: Sort the table by average change

---
 scripts/gas_diff_stats.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 13d8a59e8d..e593bb9a97 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -116,10 +116,16 @@ def parse_git_diff(fname):
             return None
         return collect_statistics(diff_output)
 
-    def stat(old, new):
-        if old == 0:
+    def percent(old, new):
+        return (int(new) - int(old)) / int(old) * 100 if int(old) != 0 else None
+
+    def percent_or_zero(old, new):
+        result = percent(old, new)
+        return result if result is not None else 0
+
+    def format_percent(percentage):
+        if percentage is None:
             return ''
-        percentage = (new - old) / old * 100
         prefix = (
             # Distinguish actual zero from very small differences
             '+' if round(percentage) == 0 and percentage > 0 else
@@ -128,6 +134,9 @@ def stat(old, new):
         )
         return f'{prefix}{round(percentage)}%'
 
+    def stat(old, new):
+        return format_percent(percent(old, new))
+
     table = []
 
     if not SEMANTIC_TEST_DIR.is_dir():
@@ -138,16 +147,24 @@ def stat(old, new):
         parsed = parse_git_diff(fname)
         if parsed is None:
             continue
+        assert len(parsed) == 6
         ir_optimized = stat(parsed[0], parsed[3])
         legacy_optimized = stat(parsed[1], parsed[4])
         legacy = stat(parsed[2], parsed[5])
         fname = f"`{fname.split('/', 3)[-1]}`"
-        table += [[fname, ir_optimized, legacy_optimized, legacy]]
+        average = ((
+            percent_or_zero(parsed[0], parsed[3]) +
+            percent_or_zero(parsed[1], parsed[4]) +
+            percent_or_zero(parsed[2], parsed[5])
+        ) / 3)
+        table += [[average, fname, ir_optimized, legacy_optimized, legacy]]
+
+    sorted_table = [row[1:] for row in sorted(table, reverse=True)]
 
     if table:
         print("<details><summary>Click for a table of gas differences</summary>\n")
         table_header = ["File name", "IR optimized", "Legacy optimized", "Legacy"]
-        print(tabulate(sorted(table), headers=table_header, tablefmt="github"))
+        print(tabulate(sorted_table, headers=table_header, tablefmt="github"))
         print("</details>")
     else:
         print("No differences found.")

From 125767ed17b9a6ab517aaf6ef910b7eaabe82fe0 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 27 Feb 2024 17:21:34 +0100
Subject: [PATCH 0717/1140] SMTCommand: Remember to flush query before calling
 solver

On MacOS I often experienced a problem that the solver reported SMT-LIB
file as malformed. It appears that the whole query was not written to
the file and using std::flush fixed the problem.
---
 Changelog.md                               | 1 +
 libsolidity/interface/SMTSolverCommand.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index b2ac59c65a..33e2793d5c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
 Bugfixes:
  * Assembler: Prevent incorrect calculation of tag sizes.
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
+ * SMTChecker: Ensure query is properly flushed to a file before calling solver when using SMT-LIB interface.
 
 
 ### 0.8.24 (2024-01-25)
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 92e0485b84..d1c58c0c0a 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -51,7 +51,7 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 		auto queryFileName = tempDir.path() / ("query_" + queryHash.hex() + ".smt2");
 
 		auto queryFile = boost::filesystem::ofstream(queryFileName);
-		queryFile << _query;
+		queryFile << _query << std::flush;
 
 		auto eldBin = boost::process::search_path(m_solverCmd);
 

From 51eff63222ae7866ebbda2cc280c3291e74ac719 Mon Sep 17 00:00:00 2001
From: ByeongSu Go <107296751+eclipse1228@users.noreply.github.com>
Date: Thu, 29 Feb 2024 18:45:48 +0900
Subject: [PATCH 0718/1140] Update introduction-to-smart-contracts.rst (#14884)

---
 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 c4cc1201b0..614cb275d4 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -156,7 +156,7 @@ 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>`.
 
 Mappings can be seen as `hash tables <https://en.wikipedia.org/wiki/Hash_table>`_ which are
-virtually initialised such that every possible key exists from the start and is mapped to a
+virtually initialized such that every possible key exists from the start and is mapped to a
 value whose byte-representation is all zeros. However, it is neither possible to obtain a list of all keys of
 a mapping, nor a list of all values. Record what you
 added to the mapping, or use it in a context where this is not needed. Or

From e7aaf03d57e560d29a6c3e7ae631aba7c3fbccf7 Mon Sep 17 00:00:00 2001
From: Vojtch <vojta159.studeny@gmail.com>
Date: Thu, 29 Feb 2024 10:58:53 +0100
Subject: [PATCH 0719/1140] docs: Replace references to "mining" with
 "attestation" (#14147)

* docs: fix old wording

Updated mining to attestation, but maybe it doesn't even make sense to put it like this. This is for the maintainers to decide but maybe it'd make sense to remove "(which is called "attestation")" altogether and just add a link to more information about LMD-GHOST.

* Update docs/introduction-to-smart-contracts.rst

---------

Co-authored-by: Vishwa Mehta <vishwa.mehta@ethereum.org>
---
 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 614cb275d4..3c43e5f193 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -304,7 +304,7 @@ These blocks form a linear sequence in time, and that is where the word "blockch
 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
+As part of the "order selection mechanism", which is called `attestation <https://ethereum.org/en/developers/docs/consensus-mechanisms/pos/attestations/>`_, it may happen that
 blocks are reverted from time to time, but only at the "tip" of the chain. The more
 blocks are added on top of a particular block, the less likely this block will be reverted. So it might be that your transactions
 are reverted and even removed from the blockchain, but the longer you wait, the less

From 9bd2424cffbd7b21ee37b736c7c339f606bd6667 Mon Sep 17 00:00:00 2001
From: Chomtana <Chomtana001@gmail.com>
Date: Thu, 29 Feb 2024 17:02:31 +0700
Subject: [PATCH 0720/1140] Fix typos in variable names and comment (#14876)

* Fix word determinsm -> determinism

* Fix word Optimzation -> Optimization

* Fix word affilate -> affiliate

* fix: import_base assertion
---
 libyul/optimiser/StackCompressor.cpp          |  6 ++---
 test/compilationTests/corion/ico.sol          | 22 +++++++++----------
 .../smtCheckerTests/imports/import_base.sol   |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 87a5e411c5..58552147a6 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -253,7 +253,7 @@ bool StackCompressor::run(
 			_optimizeStackAllocation &&
 			evmDialect->evmVersion().canOverchargeGasForCall() &&
 			evmDialect->providesObjectAccess();
-	bool allowMSizeOptimzation = !MSizeFinder::containsMSize(_dialect, *_object.code);
+	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, *_object.code);
 	if (usesOptimizedCodeGenerator)
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
@@ -262,7 +262,7 @@ bool StackCompressor::run(
 			_dialect,
 			*_object.code,
 			StackLayoutGenerator::reportStackTooDeep(*cfg),
-			allowMSizeOptimzation
+			allowMSizeOptimization
 		);
 	}
 	else
@@ -275,7 +275,7 @@ bool StackCompressor::run(
 				_dialect,
 				*_object.code,
 				stackSurplus,
-				allowMSizeOptimzation
+				allowMSizeOptimization
 			);
 		}
 	return false;
diff --git a/test/compilationTests/corion/ico.sol b/test/compilationTests/corion/ico.sol
index 36510ea658..35960fe43a 100644
--- a/test/compilationTests/corion/ico.sol
+++ b/test/compilationTests/corion/ico.sol
@@ -284,7 +284,7 @@ contract ico is safeMath {
         require( buy(payable(msg.sender), address(0x00)) );
     }
 
-    function buy(address payable beneficiaryAddress, address affilateAddress) public payable returns (bool success) {
+    function buy(address payable beneficiaryAddress, address affiliateAddress) public payable returns (bool success) {
         /*
             Buying a token
 
@@ -297,12 +297,12 @@ contract ico is safeMath {
                 More than 1e10 token: 3%
                 More than 1e9 token: 2% below 1%
             @beneficiaryAddress     The address of the accredited where the token will be sent.
-            @affilateAddress        The address of the person who offered who will get the referral reward. It can not be equal with the beneficiaryAddress.
+            @affiliateAddress        The address of the person who offered who will get the referral reward. It can not be equal with the beneficiaryAddress.
         */
         require( isICO() );
         if ( beneficiaryAddress == address(0x00)) { beneficiaryAddress = payable(msg.sender); }
-        if ( beneficiaryAddress == affilateAddress ) {
-            affilateAddress = address(0x00);
+        if ( beneficiaryAddress == affiliateAddress ) {
+            affiliateAddress = address(0x00);
         }
         uint256 _value = msg.value;
         if ( beneficiaryAddress.balance < 0.2 ether ) {
@@ -317,9 +317,9 @@ contract ico is safeMath {
         totalMint = safeAdd(totalMint, _reward);
         require( foundationAddress.send(_value * 10 / 100) );
         uint256 extra;
-        if ( affilateAddress != address(0x00) && ( brought[affilateAddress].eth > 0 || interestDB[affilateAddress][0].amount > 0 ) ) {
-            affiliate[affilateAddress].weight = safeAdd(affiliate[affilateAddress].weight, _reward);
-            extra = affiliate[affilateAddress].weight;
+        if ( affiliateAddress != address(0x00) && ( brought[affiliateAddress].eth > 0 || interestDB[affiliateAddress][0].amount > 0 ) ) {
+            affiliate[affiliateAddress].weight = safeAdd(affiliate[affiliateAddress].weight, _reward);
+            extra = affiliate[affiliateAddress].weight;
             uint256 rate;
             if (extra >= 1e12) {
                 rate = 5;
@@ -332,12 +332,12 @@ contract ico is safeMath {
             } else {
                 rate = 1;
             }
-            extra = safeSub(extra * rate / 100, affiliate[affilateAddress].paid);
-            affiliate[affilateAddress].paid = safeAdd(affiliate[affilateAddress].paid, extra);
-            token(tokenAddr).mint(affilateAddress, extra);
+            extra = safeSub(extra * rate / 100, affiliate[affiliateAddress].paid);
+            affiliate[affiliateAddress].paid = safeAdd(affiliate[affiliateAddress].paid, extra);
+            token(tokenAddr).mint(affiliateAddress, extra);
         }
         checkPremium(beneficiaryAddress);
-        emit EICO(beneficiaryAddress, _reward, affilateAddress, extra);
+        emit EICO(beneficiaryAddress, _reward, affiliateAddress, extra);
         return true;
     }
 
diff --git a/test/libsolidity/smtCheckerTests/imports/import_base.sol b/test/libsolidity/smtCheckerTests/imports/import_base.sol
index 3e8aeefe48..fb6ed2ee48 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_base.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_base.sol
@@ -12,7 +12,7 @@ contract Base {
 import "base";
 contract Der is Base {
 	function g(uint y) public {
-		require(x < 10); // added to restrict the search space and avoid non-determinsm in Spacer
+		require(x < 10); // added to restrict the search space and avoid non-determinism in Spacer
 		x += f();
 		assert(y > x);
 	}
@@ -20,5 +20,5 @@ contract Der is Base {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (der:173-186): CHC: Assertion violation happens here.
+// Warning 6328: (der:174-187): 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.

From 7676ab1014b9fe6bd4314cb648ef790933992e7f Mon Sep 17 00:00:00 2001
From: Aditya Kode <105551807+adityakode@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:38:54 +0530
Subject: [PATCH 0721/1140] Update natspec-format.rst : Added structs and enums
 to Tags (#14267)

* Update natspec-format.rst

* Update docs/natspec-format.rst

---------

Co-authored-by: Vishwa Mehta <vishwa.mehta@ethereum.org>
---
 docs/natspec-format.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index 0265fef3e6..f92958b90c 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -115,10 +115,10 @@ in the same way as if it were tagged with ``@notice``.
 =============== ====================================================================================== =============================
 Tag                                                                                                    Context
 =============== ====================================================================================== =============================
-``@title``      A title that should describe the contract/interface                                    contract, library, interface
-``@author``     The name of the author                                                                 contract, library, interface
-``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event
-``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event
+``@title``      A title that should describe the contract/interface                                    contract, library, interface, struct, enum
+``@author``     The name of the author                                                                 contract, library, interface, struct, enum
+``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event, struct, enum
+``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event, struct, enum
 ``@param``      Documents a parameter just like in Doxygen (must be followed by parameter name)        function, event
 ``@return``     Documents the return variables of a contract's function                                function, public state variable
 ``@inheritdoc`` Copies all missing tags from the base function (must be followed by the contract name) function, public state variable

From 6b417ddf521dd8620fc00b7bebb14ede24b3d747 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 1 Mar 2024 19:40:14 +0100
Subject: [PATCH 0722/1140] [evmasm] Fix handling of missing source locations
 during import.

---
 Changelog.md                                  |  1 +
 libevmasm/Assembly.cpp                        |  6 ++++--
 .../asm_json_import_all_valid_flags/output    | 20 +++++++++----------
 .../output                                    |  1 -
 .../output                                    |  1 -
 .../output                                    |  1 -
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 33e2793d5c..c279531cfe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 Bugfixes:
  * Assembler: Prevent incorrect calculation of tag sizes.
+ * EVM Assembly Import: Fix handling of missing source locations during import.
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
  * SMTChecker: Ensure query is properly flushed to a file before calling solver when using SMT-LIB interface.
 
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 569ecda26a..067e230343 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -124,8 +124,10 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
 
 	SourceLocation location;
-	location.start = get<int>(_json["begin"]);
-	location.end = get<int>(_json["end"]);
+	if (_json.isMember("begin"))
+		location.start = get<int>(_json["begin"]);
+	if (_json.isMember("end"))
+		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"], "");
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/output b/test/cmdlineTests/asm_json_import_all_valid_flags/output
index 7b8aa02979..837187d195 100644
--- a/test/cmdlineTests/asm_json_import_all_valid_flags/output
+++ b/test/cmdlineTests/asm_json_import_all_valid_flags/output
@@ -8,8 +8,8 @@
                 ".code":
                 [
                     {
-                        "begin": 0,
-                        "end": 0,
+                        "begin": -1,
+                        "end": -1,
                         "name": "PUSH",
                         "source": -1,
                         "value": "0"
@@ -22,8 +22,8 @@
                         ".code":
                         [
                             {
-                                "begin": 0,
-                                "end": 0,
+                                "begin": -1,
+                                "end": -1,
                                 "name": "PUSH",
                                 "source": -1,
                                 "value": "1"
@@ -40,8 +40,8 @@
             "bin": "5ffe",
             "bin-runtime": "6001",
             "opcodes": "PUSH0 INVALID ",
-            "srcmap": "0:0::-:0",
-            "srcmap-runtime": "0:0::-:0"
+            "srcmap": ":::-:0",
+            "srcmap-runtime": ":::-:0"
         }
     },
     "sourceList":
@@ -60,8 +60,8 @@ EVM assembly:
     ".code":
     [
         {
-            "begin": 0,
-            "end": 0,
+            "begin": -1,
+            "end": -1,
             "name": "PUSH",
             "source": -1,
             "value": "0"
@@ -74,8 +74,8 @@ EVM assembly:
             ".code":
             [
                 {
-                    "begin": 0,
-                    "end": 0,
+                    "begin": -1,
+                    "end": -1,
                     "name": "PUSH",
                     "source": -1,
                     "value": "1"
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
index 3d19f83d66..1713fb49b6 100644
--- a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
+++ b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
@@ -1,6 +1,5 @@
 Opcodes:
 PREVRANDAO PREVRANDAO 
 EVM assembly:
-    /*   */
   prevrandao
   prevrandao
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
index 873465aa1f..60f114ba68 100644
--- a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
+++ b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
@@ -1,7 +1,6 @@
 Opcodes:
 PUSH0 INVALID 
 EVM assembly:
-    /*   */
   0x00
 stop
 
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/output b/test/cmdlineTests/asm_json_import_random_order_data_index/output
index b23848e5dd..ab2f02dc7c 100644
--- a/test/cmdlineTests/asm_json_import_random_order_data_index/output
+++ b/test/cmdlineTests/asm_json_import_random_order_data_index/output
@@ -1,7 +1,6 @@
 Opcodes:
 PUSH0 INVALID 
 EVM assembly:
-    /*   */
   0x00
 stop
 

From b630c0a415fd49e6fdc398bc9fef38ea3cef2a0e Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Thu, 27 Jul 2023 13:38:27 +0900
Subject: [PATCH 0723/1140] fix: rename RedundantAssignEliminator to
 UnusedAssignEliminator

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

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 70896333c2..0a160d6119 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -298,7 +298,7 @@ The following transformation steps are the main components:
 - SSA Transform
 - Common Subexpression Eliminator
 - Expression Simplifier
-- Redundant Assign Eliminator
+- Unused Assign Eliminator
 - Full Inliner
 
 .. _optimizer-steps:
@@ -335,11 +335,11 @@ Abbreviation Full name
 ``T``        :ref:`literal-rematerialiser`
 ``L``        :ref:`load-resolver`
 ``M``        :ref:`loop-invariant-code-motion`
-``r``        :ref:`redundant-assign-eliminator`
 ``m``        :ref:`rematerialiser`
 ``V``        :ref:`SSA-reverser`
 ``a``        :ref:`SSA-transform`
 ``t``        :ref:`structural-simplifier`
+``r``        :ref:`unused-assign-eliminator`
 ``p``        :ref:`unused-function-parameter-pruner`
 ``S``        :ref:`unused-store-eliminator`
 ``u``        :ref:`unused-pruner`
@@ -652,7 +652,7 @@ the block, a new SSA variable will be created at the location where control flow
 this includes the beginning of loop post/body block and the location right after
 If/Switch/ForLoop/Block statement.
 
-After this stage, the Redundant Assign Eliminator is recommended to remove the unnecessary
+After this stage, the Unused Assign Eliminator is recommended to remove the unnecessary
 intermediate assignments.
 
 This stage provides best results if the Expression Splitter and the Common Subexpression Eliminator
@@ -660,10 +660,10 @@ are run right before it, because then it does not generate excessive amounts of
 On the other hand, the Common Subexpression Eliminator could be more efficient if run after the
 SSA transform.
 
-.. _redundant-assign-eliminator:
+.. _unused-assign-eliminator:
 
-RedundantAssignEliminator
-^^^^^^^^^^^^^^^^^^^^^^^^^
+UnusedAssignEliminator
+^^^^^^^^^^^^^^^^^^^^^^
 
 The SSA transform always generates an assignment of the form ``a := a_i``, even though
 these might be unnecessary in many cases, like the following example:
@@ -691,7 +691,7 @@ The SSA transform converts this snippet to the following:
         sstore(a_3, 1)
     }
 
-The Redundant Assign Eliminator removes all the three assignments to ``a``, because
+The Unused Assign Eliminator removes all the three assignments to ``a``, because
 the value of ``a`` is not used and thus turn this
 snippet into strict SSA form:
 
@@ -704,7 +704,7 @@ snippet into strict SSA form:
         sstore(a_3, 1)
     }
 
-Of course the intricate parts of determining whether an assignment is redundant or not
+Of course the intricate parts of determining whether an assignment is unused or not
 are connected to joining control flow.
 
 The component works as follows in detail:
@@ -829,7 +829,7 @@ current value if the value is an identifier.
 The combination of the two rules above allow to compute a local value
 numbering, which means that if two variables have the same
 value, one of them will always be unused. The Unused Pruner or the
-Redundant Assign Eliminator will then be able to fully eliminate such
+Unused Assign Eliminator will then be able to fully eliminate such
 variables.
 
 This step is especially efficient if the expression splitter is run

From 8709ae9304a58f22053d74c9f08100360696a5c5 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Thu, 17 Aug 2023 12:29:00 +0900
Subject: [PATCH 0724/1140] fix: typos

---
 docs/bugs.rst                  |  2 +-
 docs/cheatsheet.rst            |  2 +-
 docs/contracts/inheritance.rst |  2 +-
 docs/contributing.rst          |  4 ++--
 docs/installing-solidity.rst   | 16 ++++++++--------
 docs/internals/optimizer.rst   |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/bugs.rst b/docs/bugs.rst
index 350b1e7a48..f7f18e9a7f 100644
--- a/docs/bugs.rst
+++ b/docs/bugs.rst
@@ -7,7 +7,7 @@ List of Known Bugs
 ##################
 
 Below, you can find a JSON-formatted list of some of the known security-relevant bugs in the
-Solidity compiler. The file itself is hosted in the `Github repository
+Solidity compiler. The file itself is hosted in the `GitHub repository
 <https://github.com/ethereum/solidity/blob/develop/docs/bugs.json>`_.
 The list stretches back as far as version 0.3.0, bugs known to be present only
 in versions preceding that are not listed.
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 2b68d73119..e4f7beabd5 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -159,7 +159,7 @@ Modifiers
 - ``pure`` for functions: Disallows modification or access of state.
 - ``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.
+- ``constant`` for state variables: Disallows assignment (except initialization), does not occupy storage slot.
 - ``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.
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index c787c5af6a..02ab19163f 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -398,7 +398,7 @@ Constructors
 
 A constructor is an optional function declared with the ``constructor`` keyword
 which is executed upon contract creation, and where you can run contract
-initialisation code.
+initialization code.
 
 Before the constructor code is executed, state variables are initialised to
 their specified value if you initialise them inline, or their :ref:`default value<default-value>` if you do not.
diff --git a/docs/contributing.rst b/docs/contributing.rst
index ac4e2375eb..8ce402680b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -128,7 +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``.
 
-The ``evmone`` library should both end with the file name
+The ``evmone`` library should 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
@@ -552,7 +552,7 @@ topics, issues or feature implementations are debated in detail. The invitation
 
 We are also sharing feedback surveys and other content that is relevant to language design in the forum.
 
-If you want to know where the team is standing in terms or implementing new features, you can follow the implementation status in the `Solidity Github project <https://github.com/ethereum/solidity/projects/43>`_.
+If you want to know where the team is standing in terms or implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/ethereum/solidity/projects/43>`_.
 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>`_.
 
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 2f048fe3c1..ab688a8f44 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -83,14 +83,14 @@ and runs it in a new container, passing the ``--help`` argument.
 
     docker run ethereum/solc:stable --help
 
-For example, You can specify release build versions in the tag for the 0.5.4 release.
+You can specify release build versions in the tag. For example:
 
 .. 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
-local folder for input and output, and specify the contract to compile. For example.
+local folder for input and output, and specify the contract to compile. For example:
 
 .. code-block:: bash
 
@@ -183,7 +183,7 @@ If you need a specific version of Solidity you can install a
 Homebrew formula directly from Github.
 
 View
-`solidity.rb commits on Github <https://github.com/ethereum/homebrew-ethereum/commits/master/solidity.rb>`_.
+`solidity.rb commits on GitHub <https://github.com/ethereum/homebrew-ethereum/commits/master/solidity.rb>`_.
 
 Copy the commit hash of the version you want and check it out on your machine.
 
@@ -224,8 +224,8 @@ out-of-the-box but it is also meant to be friendly to third-party tools:
   (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.
 
-The same binaries are in most cases available on the `Solidity release page on Github`_. The
-difference is that we do not generally update old releases on the Github release page. This means
+The same binaries are in most cases available on the `Solidity release page on GitHub`_. The
+difference is that we do not generally update old releases on the GitHub release page. This means
 that we do not rename them if the naming convention changes and we do not add builds for platforms
 that were not supported at the time of release. This only happens in ``solc-bin``.
 
@@ -301,7 +301,7 @@ This means that:
 .. _IPFS: https://ipfs.io
 .. _Swarm: https://swarm-gateways.net/bzz:/swarm.eth
 .. _solc-bin: https://github.com/ethereum/solc-bin/
-.. _Solidity release page on github: https://github.com/ethereum/solidity/releases
+.. _Solidity release page on GitHub: https://github.com/ethereum/solidity/releases
 .. _sha3sum: https://github.com/maandree/sha3sum
 .. _keccak256() function from ethereumjs-util: https://github.com/ethereumjs/ethereumjs-util/blob/master/docs/modules/_hash_.md#const-keccak256
 .. _WebAssembly builds: https://emscripten.org/docs/compiling/WebAssembly.html
@@ -461,11 +461,11 @@ you should fork Solidity and add your personal fork as a second remote:
     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:
+    please use the source tarball on the GitHub release page:
 
     https://github.com/ethereum/solidity/releases/download/v0.X.Y/solidity_0.X.Y.tar.gz
 
-    (not the "Source code" provided by github).
+    (not the "Source code" provided by GitHub).
 
 Command-Line Build
 ------------------
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 0a160d6119..4588cb4835 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -482,7 +482,7 @@ is transformed to
     }
 
 This eases the rest of the optimization process because we can ignore
-the complicated scoping rules of the for loop initialisation block.
+the complicated scoping rules of the for loop initialization block.
 
 .. _var-decl-initializer:
 
@@ -1217,7 +1217,7 @@ 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
-code than more efficient code. In same cases, though, inlining a function
+code than more efficient code. In some cases, though, inlining a function
 can have positive effects on subsequent optimizer steps. This is the case
 if one of the function arguments is a constant, for example.
 

From f96a8514ad8a4119b793a54227ef7e83e2fbdb85 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Thu, 17 Aug 2023 12:31:32 +0900
Subject: [PATCH 0725/1140] chore: update example version of solidity in docker
 command

---
 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 ab688a8f44..123f17422d 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -87,7 +87,7 @@ You can specify release build versions in the tag. For example:
 
 .. code-block:: bash
 
-    docker run ethereum/solc:0.5.4 --help
+    docker run ethereum/solc:0.8.21 --help
 
 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:

From 0225d9d336578e33480432b651ed02d2266f024c Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Fri, 1 Mar 2024 22:46:20 +0530
Subject: [PATCH 0726/1140] Update installing-solidity.rst

---
 docs/installing-solidity.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 123f17422d..4e0948189d 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -87,7 +87,12 @@ You can specify release build versions in the tag. For example:
 
 .. code-block:: bash
 
-    docker run ethereum/solc:0.8.21 --help
+    docker run ethereum/solc:stable --help
+
+Note: Specific version tags are supported for the Docker tag such as `docker run ethereum/solc:0.8.23 --help`.
+
+We will be passing the `stable` tag here instead of specific version tag to ensure that users get the latest version 
+by default and avoid the issue of an out-of-date version.
 
 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:

From 51b697676c47b775370c727094106939092fea92 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Fri, 1 Mar 2024 22:53:45 +0530
Subject: [PATCH 0727/1140] Update installing-solidity.rst

---
 docs/installing-solidity.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 4e0948189d..bc20ae3461 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -89,10 +89,11 @@ You can specify release build versions in the tag. For example:
 
     docker run ethereum/solc:stable --help
 
-Note: Specific version tags are supported for the Docker tag such as `docker run ethereum/solc:0.8.23 --help`.
+Note
 
-We will be passing the `stable` tag here instead of specific version tag to ensure that users get the latest version 
-by default and avoid the issue of an out-of-date version.
+Specific version tags are supported for the Docker tag such as `docker run ethereum/solc:0.8.23 --help`. We will be passing the
+`stable` tag here instead of specific version tag to ensure that users get the latest version by default and avoid the issue of
+an out-of-date version.
 
 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:

From 8f0cb8a7afb59b653b1dcf334b16243023934309 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Mon, 4 Mar 2024 12:41:49 +0530
Subject: [PATCH 0728/1140] Update docs/installing-solidity.rst

Co-authored-by: r0qs <rodrigo.saramago@protonmail.com>
---
 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 bc20ae3461..8d5b421d3a 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -91,7 +91,7 @@ You can specify release build versions in the tag. For example:
 
 Note
 
-Specific version tags are supported for the Docker tag such as `docker run ethereum/solc:0.8.23 --help`. We will be passing the
+Specific compiler versions are supported as the Docker image tag such as `ethereum/solc:0.8.23`. We will be passing the
 `stable` tag here instead of specific version tag to ensure that users get the latest version by default and avoid the issue of
 an out-of-date version.
 

From cbd84372da1d6e02a5a023b46a1921eefccb2abd Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 4 Mar 2024 14:53:53 +0100
Subject: [PATCH 0729/1140] Fix python snippet causing "SyntaxWarning" in
 Scanner.

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

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 3166cd6b5d..4f7b88fe97 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -216,7 +216,7 @@ 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*\],?","\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\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

From a6830fd939e7be9f0406761da4a5c51f398bd5ef Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 28 Feb 2024 22:52:25 -0300
Subject: [PATCH 0730/1140] Emit transient storage warning only once

---
 Changelog.md                                  |  1 +
 liblangutil/ErrorReporter.cpp                 | 11 +++++++++
 liblangutil/ErrorReporter.h                   |  3 +++
 libyul/AsmAnalysis.cpp                        |  3 ++-
 ...e_warning_only_once_multiple_contracts.sol | 23 +++++++++++++++++++
 .../tstore_warning_only_once.yul              | 10 ++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_contracts.sol
 create mode 100644 test/libyul/yulSyntaxTests/tstore_warning_only_once.yul

diff --git a/Changelog.md b/Changelog.md
index c279531cfe..6defb4d72b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 Compiler Features:
  * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
+ * Yul Analyzer: Emit transient storage warning only for the first occurrence of ``tstore``.
 
 
 Bugfixes:
diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
index 298e4f630f..bf10483aa5 100644
--- a/liblangutil/ErrorReporter.cpp
+++ b/liblangutil/ErrorReporter.cpp
@@ -23,6 +23,7 @@
 
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceLocation.h>
+#include <range/v3/algorithm/find_if.hpp>
 #include <memory>
 
 using namespace solidity;
@@ -81,6 +82,16 @@ bool ErrorReporter::hasExcessiveErrors() const
 	return m_errorCount > c_maxErrorsAllowed;
 }
 
+bool ErrorReporter::hasError(ErrorId _errorId) const
+{
+	auto errorMatch = [&](std::shared_ptr<Error const> const& error) -> bool {
+		solAssert(error.get());
+		return error->errorId() == _errorId;
+	};
+
+	return ranges::find_if(m_errorList, errorMatch) != ranges::end(m_errorList);
+}
+
 bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
 {
 	if (_type == Error::Type::Warning)
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index 6901e87b94..c78b6f498d 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -137,6 +137,9 @@ class ErrorReporter
 	// @returns true if the maximum error count has been reached.
 	bool hasExcessiveErrors() const;
 
+	/// @returns true if there is at least one occurrence of error
+	bool hasError(ErrorId _errorId) const;
+
 	class ErrorWatcher
 	{
 	public:
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index cc811f75d1..0efaa12c2c 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -324,7 +324,8 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			);
 		else if (
 			m_evmVersion.supportsTransientStorage() &&
-			_funCall.functionName.name == "tstore"_yulstring
+			_funCall.functionName.name == "tstore"_yulstring &&
+			!m_errorReporter.hasError({2394})
 		)
 			m_errorReporter.warning(
 				2394_error,
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_contracts.sol b/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_contracts.sol
new file mode 100644
index 0000000000..5b05831f65
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_contracts.sol
@@ -0,0 +1,23 @@
+contract C {
+    function f() external {
+        assembly {
+            tstore(0, 0)
+            let a := tload(0)
+            tstore(0, 1)
+            tstore(1, a)
+        }
+    }
+}
+
+contract D {
+    function g() external {
+        assembly {
+            tstore(0, 0)
+            tstore(0, 1)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (72-78): 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_warning_only_once.yul b/test/libyul/yulSyntaxTests/tstore_warning_only_once.yul
new file mode 100644
index 0000000000..44a6b59b49
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/tstore_warning_only_once.yul
@@ -0,0 +1,10 @@
+{
+    tstore(0, 0)
+    tstore(0, 1)
+    let x := tload(0)
+    tstore(1, 0)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (6-12): 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.

From ad77fd7c67fcff25e5963b6398a909a67220725a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 6 Feb 2024 14:39:21 +0100
Subject: [PATCH 0731/1140] EVMHost: Rename newlyCreatedAccounts to
 m_newlyCreatedAccounts

---
 test/EVMHost.cpp | 6 +++---
 test/EVMHost.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index c43d53d6bc..b4005e16ea 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -198,12 +198,12 @@ void EVMHost::newTransactionFrame()
 	}
 	// Process selfdestruct list
 	for (auto& [address, _]: recorded_selfdestructs)
-		if (m_evmVersion < langutil::EVMVersion::cancun() || newlyCreatedAccounts.count(address))
+		if (m_evmVersion < langutil::EVMVersion::cancun() || m_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();
+	m_newlyCreatedAccounts.clear();
 	m_totalCodeDepositGas = 0;
 	recorded_selfdestructs.clear();
 }
@@ -358,7 +358,7 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 	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);
+		m_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 848314c879..121adbc159 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -131,15 +131,15 @@ 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;
 	/// EVM version requested from EVMC (matches the above)
 	evmc_revision m_evmRevision;
 
+	/// Store the accounts that have been created in the current transaction.
+	std::unordered_set<evmc::address> m_newlyCreatedAccounts;
+
 	/// The part of the total cost of the current transaction that paid for the code deposits.
 	/// I.e. GAS_CODE_DEPOSIT times the total size of deployed code of all newly created contracts,
 	/// including the current contract itself if it was a creation transaction.

From 41363d723cc530fe7e0d586454d96ccdd41ac7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 6 Feb 2024 14:39:41 +0100
Subject: [PATCH 0732/1140] EVMHost: Reset m_newlyCreatedAccounts() in reset()

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

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index b4005e16ea..e74491862a 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -161,6 +161,7 @@ void EVMHost::reset()
 	recorded_calls.clear();
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
+	m_newlyCreatedAccounts.clear();
 	m_totalCodeDepositGas = 0;
 
 	// Mark all precompiled contracts as existing. Existing here means to have a balance (as per EIP-161).

From c09d2c091bd98048c7ba86f22c0364ab991e21b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 18:59:16 +0100
Subject: [PATCH 0733/1140] EVMHost: Note about newly created accounts not
 being rolled back

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

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index e74491862a..2243758356 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -359,6 +359,7 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 	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
+		// TODO: Should we roll changes back on failure like we do for `accounts`?
 		m_newlyCreatedAccounts.emplace(message.recipient);
 
 	if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE)

From 2b2c76c214c9c5770856f91601426ab6b79a2d0b Mon Sep 17 00:00:00 2001
From: racerole <jiangyifeng@outlook.com>
Date: Wed, 6 Mar 2024 10:52:46 +0800
Subject: [PATCH 0734/1140] remove repetitive word

Signed-off-by: racerole <jiangyifeng@outlook.com>
---
 test/libyul/yulInterpreterTests/mcopy.yul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libyul/yulInterpreterTests/mcopy.yul b/test/libyul/yulInterpreterTests/mcopy.yul
index 6483239cb1..3ec6af0021 100644
--- a/test/libyul/yulInterpreterTests/mcopy.yul
+++ b/test/libyul/yulInterpreterTests/mcopy.yul
@@ -7,7 +7,7 @@
     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(0x2f, 0x90, 2) // Copy the 0x4400 straddling msize back into the middle of second word
     mcopy(0xa0, 0, 160)  // Duplicate the whole thing
 }
 // ====

From 1affe8e0d7445803402bc643599a5f475cf9a112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Mar 2024 17:13:21 +0100
Subject: [PATCH 0735/1140] gp2: Remove config section that requires an
 Etherscan key

---
 test/externalTests/gp2.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 1e52134a43..af77f99aa8 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -67,6 +67,9 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn
 
+    # Remove the config section that requires an Etherscan key. We don't need it just to run tests.
+    sed -i '/^  etherscan: {$/,/^  },$/d' hardhat.config.ts
+
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 

From 21566ccf82cff1cb72a71e428139db7c7ee7cf0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Mar 2024 17:17:14 +0100
Subject: [PATCH 0736/1140] bleeps: Disable the ir-optimize-evm+yul preset,
 which now results in StackTooDeep

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

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 5090e6c12e..5a987e4593 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -47,7 +47,7 @@ function bleeps_test
         "${compile_only_presets[@]}"
         #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
+        #ir-optimize-evm+yul       # Compilation fails with: "YulException: Variable expr_15208_mpos is 1 too deep in the stack". No memoryguard was present.
         #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

From ce63512f9526b5cf0e5994591114ecb81bde7379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Mar 2024 15:59:35 +0100
Subject: [PATCH 0737/1140] chainlink: Switch base image back to node 16

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30c0229642..c2394cdce0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -819,7 +819,7 @@ defaults:
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
-      image: cimg/node:18.16
+      image: cimg/node:16.20
       resource_class: large # Tests run out of memory on a smaller machine
 
   - job_native_test_ext_gp2: &job_native_test_ext_gp2

From 95bcc632cefe3f2c8cdec449290fb0b4dee82c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Mar 2024 19:00:39 +0100
Subject: [PATCH 0738/1140] Convert all the disabled external tests into
 compile-only tests

This way we can still get bytecode size benchmarks for them
---
 .circleci/config.yml | 86 ++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c2394cdce0..f30429fe61 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -720,11 +720,14 @@ defaults:
       image: cimg/node:14.20
       python2: true
 
-  - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
+  - job_native_compile_ext_gnosis: &job_native_compile_ext_gnosis
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_gnosis
+      name: t_native_compile_ext_gnosis
       project: gnosis
       binary_type: native
+      # 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.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
@@ -742,18 +745,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_trident: &job_native_test_ext_trident
+  - job_native_compile_ext_trident: &job_native_compile_ext_trident
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_trident
+      name: t_native_compile_ext_trident
       project: trident
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       image: cimg/node:18.16
 
-  - job_native_test_ext_euler: &job_native_test_ext_euler
+  - job_native_compile_ext_euler: &job_native_compile_ext_euler
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_euler
+      name: t_native_compile_ext_euler
       project: euler
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       resource_class: medium
 
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
@@ -763,18 +772,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
+  - job_native_compile_ext_bleeps: &job_native_compile_ext_bleeps
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_bleeps
+      name: t_native_compile_ext_bleeps
       project: bleeps
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       resource_class: medium
 
-  - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
+  - job_native_compile_ext_pool_together: &job_native_compile_ext_pool_together
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_pool_together
+      name: t_native_compile_ext_pool_together
       project: pool-together
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
@@ -814,19 +829,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
+  - job_native_compile_ext_chainlink: &job_native_compile_ext_chainlink
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_chainlink
+      name: t_native_compile_ext_chainlink
       project: chainlink
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       image: cimg/node:16.20
       resource_class: large # Tests run out of memory on a smaller machine
 
-  - job_native_test_ext_gp2: &job_native_test_ext_gp2
+  - job_native_compile_ext_gp2: &job_native_compile_ext_gp2
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_gp2
+      name: t_native_compile_ext_gp2
       project: gp2
       binary_type: native
+      # NOTE: test suite disabled due to constant failures.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
@@ -1868,9 +1888,7 @@ workflows:
 
       - t_ext: *job_ems_compile_ext_colony
 
-      # 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_compile_ext_gnosis
       - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
@@ -1879,23 +1897,18 @@ workflows:
       - t_ext: *job_native_test_ext_prb_math
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
-      # 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
-      #- 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
+      - t_ext: *job_native_compile_ext_gp2
+      - t_ext: *job_native_compile_ext_trident
+      - t_ext: *job_native_compile_ext_euler
+      - t_ext: *job_native_compile_ext_bleeps
+      - t_ext: *job_native_compile_ext_pool_together
+      - t_ext: *job_native_compile_ext_chainlink
 
       - c_ext_benchmarks:
           <<: *requires_nothing
           requires:
             - t_ems_compile_ext_colony
-            # 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_compile_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator
@@ -1903,18 +1916,15 @@ workflows:
             - t_native_test_ext_uniswap
             - 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
+            - t_native_compile_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
-            #- t_native_test_ext_euler
-            #- t_native_test_ext_bleeps
-            #- t_native_test_ext_pool_together
-            #- t_native_test_ext_chainlink
+            - t_native_compile_ext_trident
+            - t_native_compile_ext_euler
+            - t_native_compile_ext_bleeps
+            - t_native_compile_ext_pool_together
+            - t_native_compile_ext_chainlink
 
       # Windows build and tests
       - b_win: *requires_nothing

From 5aed3c4bbb04f0d43c6467d64e9a5a8cfb963dd8 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 6 Mar 2024 15:11:25 +0100
Subject: [PATCH 0739/1140] Fix hardhat version to 2.20.0 on uniswap and
 perpetual_pools external tests

---
 test/externalTests/perpetual-pools.sh | 5 +++++
 test/externalTests/uniswap.sh         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 31748a40ca..1d7bb8f33b 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -69,7 +69,12 @@ function perpetual_pools_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"
+
     yarn install
+    # We set hardhat version to 2.20.0 since version 2.21.0 has issues with solidity-coverage plugin
+    # that often causes out-of-memory errors.
+    # See hardhat note about the issue here: https://github.com/NomicFoundation/hardhat/releases/tag/hardhat@2.21.0
+    yarn add hardhat@2.20.0
 
     replace_version_pragmas
 
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index bf5f828987..04f27ab3f7 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -90,6 +90,11 @@ function uniswap_test
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
     yarn add ethers@5.6.1
 
+    # We set hardhat version to 2.20.0 since version 2.21.0 has issues with solidity-coverage plugin
+    # that often causes out-of-memory errors.
+    # See hardhat note about the issue here: https://github.com/NomicFoundation/hardhat/releases/tag/hardhat@2.21.0
+    yarn add hardhat@2.20.0
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From d29eded2da25e91fc7bb126e67030ea09da44d9c Mon Sep 17 00:00:00 2001
From: Saw-mon & Natalie <3140080+Saw-mon-and-Natalie@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:33:17 +0100
Subject: [PATCH 0740/1140] reorders assertThrow statements and adds one to the
 MCOPY case.

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

diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index c5e14d5f4b..978fb7ce2a 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -87,8 +87,8 @@ 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, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		Operation op;
 		op.effect = memory(_instruction);
 		op.location = Location::Memory;
@@ -126,6 +126,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 readOperation;
 		readOperation.effect = Read;

From 6ee38afed8792dd1dd669612a226bf8080a49ae2 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Thu, 7 Mar 2024 21:19:08 +0100
Subject: [PATCH 0741/1140] [solutil] Add missing include guard.

---
 libsolutil/cxx20.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libsolutil/cxx20.h b/libsolutil/cxx20.h
index c65b0454b8..a21a73e681 100644
--- a/libsolutil/cxx20.h
+++ b/libsolutil/cxx20.h
@@ -15,6 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 // SPDX-License-Identifier: GPL-3.0
+#pragma once
 
 #include <map>
 

From e084f71f7b28294e38576458d72d32855aa4e0e5 Mon Sep 17 00:00:00 2001
From: Cyrus <yecity@gmail.com>
Date: Fri, 8 Mar 2024 12:11:48 +0800
Subject: [PATCH 0742/1140] fix typos

---
 libevmasm/GasMeter.h         | 2 +-
 libevmasm/Inliner.cpp        | 2 +-
 libsolidity/parsing/Parser.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
index e4bb199257..c91e0f0971 100644
--- a/libevmasm/GasMeter.h
+++ b/libevmasm/GasMeter.h
@@ -216,7 +216,7 @@ class GasMeter
 
 	/// @returns an upper bound on the gas consumed by the given instruction and updates
 	/// the state.
-	/// @param _inculdeExternalCosts if true, include costs caused by other contracts in calls.
+	/// @param _includeExternalCosts if true, include costs caused by other contracts in calls.
 	GasConsumption estimateMax(AssemblyItem const& _item, bool _includeExternalCosts = true);
 
 	u256 const& largestMemoryAccess() const { return m_largestMemoryAccess; }
diff --git a/libevmasm/Inliner.cpp b/libevmasm/Inliner.cpp
index ded5172ddc..67918e558b 100644
--- a/libevmasm/Inliner.cpp
+++ b/libevmasm/Inliner.cpp
@@ -44,7 +44,7 @@ using namespace solidity::evmasm;
 
 namespace
 {
-/// @returns an estimation of the runtime gas cost of the AsssemblyItems in @a _itemRange.
+/// @returns an estimation of the runtime gas cost of the AssemblyItems in @a _itemRange.
 template<typename RangeType>
 u256 executionCost(RangeType const& _itemRange, langutil::EVMVersion _evmVersion)
 {
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index aedfdb7ddd..8f0868ac11 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -223,10 +223,10 @@ class Parser: public langutil::ParserBase
 	/// or an expression;
 	IndexAccessedPath parseIndexAccessedPath();
 	/// @returns a typename parsed in look-ahead fashion from something like "a.b[8][2**70]",
-	/// or an empty pointer if an empty @a _pathAndIncides has been supplied.
+	/// or an empty pointer if an empty @a _pathAndIndices has been supplied.
 	ASTPointer<TypeName> typeNameFromIndexAccessStructure(IndexAccessedPath const& _pathAndIndices);
 	/// @returns an expression parsed in look-ahead fashion from something like "a.b[8][2**70]",
-	/// or an empty pointer if an empty @a _pathAndIncides has been supplied.
+	/// or an empty pointer if an empty @a _pathAndIndices has been supplied.
 	ASTPointer<Expression> expressionFromIndexAccessStructure(IndexAccessedPath const& _pathAndIndices);
 
 	ASTPointer<ASTString> expectIdentifierToken();

From 86444080a45f475a1065522ffd0ee32e28120c72 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 29 Nov 2023 15:46:30 -0300
Subject: [PATCH 0743/1140] Move deprecated evm versions to nightly CI workflow

---
 .circleci/config.yml     | 27 ++++++++++++++++++++++++++-
 .circleci/soltest_all.sh |  7 +++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59d00ff415..af5ddef21b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -220,11 +220,18 @@ commands:
           command: .circleci/soltest.sh
 
   run_soltest_all:
+    parameters:
+      # NOTE: If not specified, soltest_all.sh will use the default values as specified in the script.
+      # In other words, it will execute for all EVM versions that are not marked as deprecated.
+      evm_versions:
+        description: "List of EVM versions (separated by space)."
+        type: string
+        default: ""
     steps:
       - run:
           name: soltest_all
           no_output_timeout: 30m
-          command: .circleci/soltest_all.sh
+          command: .circleci/soltest_all.sh "<< parameters.evm_versions >>"
 
   run_cmdline_tests:
     steps:
@@ -1267,6 +1274,20 @@ jobs:
     steps:
       - soltest_all
 
+  t_ubu_soltest_deprecated_evm_versions: &t_ubu_soltest_deprecated_evm_versions
+    <<: *base_ubuntu2204_large
+    parallelism: 50
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run_soltest_all:
+          evm_versions: homestead byzantium
+      - store_test_results:
+          path: test_results/
+      - store_artifacts_test_results
+      - matrix_notify_failure_unless_pr
+
   t_ubu_lsp: &t_ubu_lsp
     <<: *base_ubuntu2204_small
     steps:
@@ -2004,6 +2025,10 @@ workflows:
       - t_ubu_ubsan_clang_soltest: *requires_b_ubu_ubsan_clang
       - t_ubu_ubsan_clang_cli: *requires_b_ubu_ubsan_clang
 
+      # Deprecated EVM versions tests
+      - b_ubu: *requires_nothing
+      - t_ubu_soltest_deprecated_evm_versions: *requires_b_ubu
+
   nightly-ossfuzz:
 
     triggers:
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 1e941731da..40ee75b270 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,9 +31,12 @@ 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 cancun)
+DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shanghai cancun)
+# Deserialize the EVM_VALUES array if it was provided as argument or
+# set EVM_VALUES to the default values.
+IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
+
 DEFAULT_EVM=shanghai
-[[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
 
 # Run for ABI encoder v1, without SMTChecker tests.

From 9762ebb24cdb79e22d94215e0ebccc27937c63e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Mar 2024 18:55:33 +0100
Subject: [PATCH 0744/1140] Fix unnecessary compilation when --via-ir is used
 on its own

---
 Changelog.md                            |   1 +
 libsolidity/interface/CompilerStack.cpp |   2 +-
 test/cmdlineTests/abi_via_ir/args       |   1 +
 test/cmdlineTests/abi_via_ir/input.sol  |  28 ++++
 test/cmdlineTests/abi_via_ir/output     | 167 ++++++++++++++++++++++++
 5 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 test/cmdlineTests/abi_via_ir/args
 create mode 100644 test/cmdlineTests/abi_via_ir/input.sol
 create mode 100644 test/cmdlineTests/abi_via_ir/output

diff --git a/Changelog.md b/Changelog.md
index 6defb4d72b..ab62f25eb8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
 
 Bugfixes:
  * Assembler: Prevent incorrect calculation of tag sizes.
+ * Commandline Interface: Do not run IR pipeline when ``--via-ir`` is used but no output that depends on the IR is requested.
  * EVM Assembly Import: Fix handling of missing source locations during import.
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
  * SMTChecker: Ensure query is properly flushed to a file before calling solver when using SMT-LIB interface.
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 6939441758..eca1b50be4 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -736,7 +736,7 @@ bool CompilerStack::compile(State _stopAfter)
 				{
 					try
 					{
-						if (m_viaIR || m_generateIR)
+						if ((m_generateEvmBytecode && m_viaIR) || m_generateIR)
 							generateIR(*contract);
 						if (m_generateEvmBytecode)
 						{
diff --git a/test/cmdlineTests/abi_via_ir/args b/test/cmdlineTests/abi_via_ir/args
new file mode 100644
index 0000000000..5dc346ecb4
--- /dev/null
+++ b/test/cmdlineTests/abi_via_ir/args
@@ -0,0 +1 @@
+--abi --via-ir --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/abi_via_ir/input.sol b/test/cmdlineTests/abi_via_ir/input.sol
new file mode 100644
index 0000000000..1f5c758f71
--- /dev/null
+++ b/test/cmdlineTests/abi_via_ir/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/abi_via_ir/output b/test/cmdlineTests/abi_via_ir/output
new file mode 100644
index 0000000000..daf18f3497
--- /dev/null
+++ b/test/cmdlineTests/abi_via_ir/output
@@ -0,0 +1,167 @@
+
+======= abi_via_ir/input.sol:C =======
+Contract JSON ABI
+[
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "z",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "w",
+                "type": "uint256"
+            }
+        ],
+        "name": "err",
+        "type": "error"
+    },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "z",
+                "type": "uint256"
+            }
+        ],
+        "name": "fileLevelError",
+        "type": "error"
+    },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "r",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryError",
+        "type": "error"
+    },
+    {
+        "anonymous": true,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "y",
+                "type": "uint256"
+            }
+        ],
+        "name": "anon_ev",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "y",
+                "type": "uint256"
+            }
+        ],
+        "name": "ev",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "r",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryEvent",
+        "type": "event"
+    },
+    {
+        "inputs":
+        [
+            {
+                "components":
+                [
+                    {
+                        "internalType": "uint256",
+                        "name": "x",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct C.S",
+                "name": "s",
+                "type": "tuple"
+            }
+        ],
+        "name": "f",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+]
+
+======= abi_via_ir/input.sol:L =======
+Contract JSON ABI
+[
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "r",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryError",
+        "type": "error"
+    },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "u",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryErrorUnused",
+        "type": "error"
+    },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "r",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryEvent",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "u",
+                "type": "uint256"
+            }
+        ],
+        "name": "libraryEventUnused",
+        "type": "event"
+    }
+]

From 0c4bca56a176116940740d0de4f371a0b5357484 Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Fri, 8 Mar 2024 20:46:24 +0100
Subject: [PATCH 0745/1140] fix typo

---
 test/compilationTests/corion/ico.sol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/compilationTests/corion/ico.sol b/test/compilationTests/corion/ico.sol
index 35960fe43a..801b6d402f 100644
--- a/test/compilationTests/corion/ico.sol
+++ b/test/compilationTests/corion/ico.sol
@@ -372,5 +372,5 @@ contract ico is safeMath {
         return startBlock <= block.number && block.number <= icoDelay && ( ! aborted ) && ( ! closed );
     }
 
-    event EICO(address indexed Address, uint256 indexed value, address Affiliate, uint256 AffilateValue);
+    event EICO(address indexed Address, uint256 indexed value, address Affiliate, uint256 AffiliateValue);
 }

From 193a4579aec550f71af7b5355d82ad57a8588d9d Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Fri, 8 Mar 2024 20:50:22 +0100
Subject: [PATCH 0746/1140] fix typo

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

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index f8085b63de..dfdcf46519 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -944,7 +944,7 @@ the arguments.
 |complex)                           |                                      |
 +-----------------------------------+--------------------------------------+
 |external functions without         |BMC: Erase state knowledge and assume |
-|implementation                     |result is nondeterminisc.             |
+|implementation                     |result is nondeterministic.           |
 |                                   |CHC: Nondeterministic summary.        |
 |                                   |Try to infer invariants that hold     |
 |                                   |after the call returns.               |

From 0219d1e0f2df22cac5ba8e944f26f20860f7a56e Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 5 Mar 2024 13:14:32 +0100
Subject: [PATCH 0747/1140] SMTChecker: Fix usage of Eldarica with SMT callback

Previously, CHC engine with SMT interface would always call Eldarica if
it was present in the system, regardless whether user specified
model-checker-solver as smtlib2 or eld.
Here we make sure Eldarica is called only when it is specified as the
solver of choice.

The proposed solution is to make SMTSolverCommand modifiable and set it
up properly based on the user settings. This requires changes also in
UniversalCallback, because in the compiler we must be able to check if
the given callback is UniversalCallback provided by CommandLineInterface.

This mechanism can be used to migrate also other solvers to the SMTLIB
interface by further extending/adapting SMTSolverCommand.
Its advantage is that meaning of the callback stays the same, thus there
is not need to change anything on the side of solc-js.
---
 Changelog.md                               |  3 ++-
 libsolidity/formal/ModelCheckerSettings.h  |  2 +-
 libsolidity/interface/CompilerStack.cpp    |  6 ++++++
 libsolidity/interface/SMTSolverCommand.cpp | 23 +++++++++++++++++---
 libsolidity/interface/SMTSolverCommand.h   |  7 +++---
 libsolidity/interface/UniversalCallback.h  | 25 +++++++++++++---------
 solc/CommandLineInterface.h                |  2 +-
 7 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6defb4d72b..6564cb9a3e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,8 +11,9 @@ Compiler Features:
 Bugfixes:
  * Assembler: Prevent incorrect calculation of tag sizes.
  * EVM Assembly Import: Fix handling of missing source locations during import.
- * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
  * SMTChecker: Ensure query is properly flushed to a file before calling solver when using SMT-LIB interface.
+ * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
+ * SMTChecker: Run Eldarica only when explicitly requested with `--model-checker-solvers eld`, even when it is present on the system.
 
 
 ### 0.8.24 (2024-01-25)
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index b645f7c3b6..0cfa370c40 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -175,7 +175,7 @@ struct ModelCheckerSettings
 	bool showUnsupported = false;
 	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
 	ModelCheckerTargets targets = ModelCheckerTargets::Default();
-	std::optional<unsigned> timeout;
+	std::optional<unsigned> timeout; // in milliseconds
 
 	bool operator!=(ModelCheckerSettings const& _other) const noexcept { return !(*this == _other); }
 	bool operator==(ModelCheckerSettings const& _other) const noexcept
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 6939441758..e9df599630 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -53,6 +53,7 @@
 #include <libsolidity/interface/Natspec.h>
 #include <libsolidity/interface/GasEstimator.h>
 #include <libsolidity/interface/StorageLayout.h>
+#include <libsolidity/interface/UniversalCallback.h>
 #include <libsolidity/interface/Version.h>
 #include <libsolidity/parsing/Parser.h>
 
@@ -654,7 +655,12 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 		// 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 (auto* universalCallback = m_readFile.target<frontend::UniversalCallback>())
+				if (m_modelCheckerSettings.solvers.eld)
+					universalCallback->smtCommand().setEldarica(m_modelCheckerSettings.timeout);
+		}
 
 		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
 		modelChecker.checkRequestedSourcesAndContracts(allSources);
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index d1c58c0c0a..8ef36cb751 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -37,7 +37,17 @@ using solidity::util::errinfo_comment;
 namespace solidity::frontend
 {
 
-SMTSolverCommand::SMTSolverCommand(std::string _solverCmd) : m_solverCmd(_solverCmd) {}
+void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMilliseconds)
+{
+	m_arguments.clear();
+	m_solverCmd = "eld";
+	if (timeoutInMilliseconds)
+	{
+		unsigned int timeoutInSeconds = timeoutInMilliseconds.value() / 1000u;
+		timeoutInSeconds = timeoutInSeconds == 0 ? 1 : timeoutInSeconds;
+		m_arguments.push_back("-t:" + std::to_string(timeoutInSeconds));
+	}
+}
 
 ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
 {
@@ -46,6 +56,9 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 		if (_kind != ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
 			solAssert(false, "SMTQuery callback used as callback kind " + _kind);
 
+		if (m_solverCmd.empty())
+			return ReadCallback::Result{false, "No solver set."};
+
 		auto tempDir = solidity::util::TemporaryDirectory("smt");
 		util::h256 queryHash = util::keccak256(_query);
 		auto queryFileName = tempDir.path() / ("query_" + queryHash.hex() + ".smt2");
@@ -58,11 +71,15 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 		if (eldBin.empty())
 			return ReadCallback::Result{false, m_solverCmd + " binary not found."};
 
+		auto args = m_arguments;
+		args.push_back(queryFileName.string());
+
 		boost::process::ipstream pipe;
 		boost::process::child eld(
 			eldBin,
-			queryFileName,
-			boost::process::std_out > pipe
+			args,
+			boost::process::std_out > pipe,
+			boost::process::std_err >boost::process::null
 		);
 
 		std::vector<std::string> data;
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
index 56a6ba1710..1d1201e490 100644
--- a/libsolidity/interface/SMTSolverCommand.h
+++ b/libsolidity/interface/SMTSolverCommand.h
@@ -28,8 +28,6 @@ namespace solidity::frontend
 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);
 
@@ -38,9 +36,12 @@ class SMTSolverCommand
 		return [this](std::string const& _kind, std::string const& _query) { return solve(_kind, _query); };
 	}
 
+	void setEldarica(std::optional<unsigned int> timeoutInMilliseconds);
+
 private:
 	/// The name of the solver's binary.
-	std::string const m_solverCmd;
+	std::string m_solverCmd;
+	std::vector<std::string> m_arguments;
 };
 
 }
diff --git a/libsolidity/interface/UniversalCallback.h b/libsolidity/interface/UniversalCallback.h
index 3fe74c65e4..ef5450a1c5 100644
--- a/libsolidity/interface/UniversalCallback.h
+++ b/libsolidity/interface/UniversalCallback.h
@@ -34,22 +34,27 @@ class UniversalCallback
 		m_solver{_solver}
 	{}
 
+	ReadCallback::Result operator()(std::string const& _kind, std::string const& _data)
+	{
+		if (_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile))
+			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.");
+	}
+
 	frontend::ReadCallback::Callback callback()
 	{
-		return [this](std::string const& _kind, std::string const& _data) -> ReadCallback::Result {
-			if (_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile))
-				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.");
-		};
+		return *this;
 	}
 
 	void resetImportCallback() { m_fileReader = nullptr; }
 
+	SMTSolverCommand& smtCommand() { return m_solver; }
+
 private:
 	FileReader* m_fileReader;
 	SMTSolverCommand& m_solver;
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 906b34d62b..1fb4ac00bc 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -147,7 +147,7 @@ class CommandLineInterface
 	std::ostream& m_serr;
 	bool m_hasOutput = false;
 	FileReader m_fileReader;
-	SMTSolverCommand m_solverCommand{"eld"};
+	SMTSolverCommand m_solverCommand;
 	UniversalCallback m_universalCallback{&m_fileReader, m_solverCommand};
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;

From b18b23daf6c4d812211ff9ef329ae8c44999fb17 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 12 Mar 2024 15:18:39 +0100
Subject: [PATCH 0748/1140] Add missing hardhat networks settings to external
 tests

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

diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
index bab5890aa4..de9b8da96d 100644
--- a/scripts/externalTests/common.sh
+++ b/scripts/externalTests/common.sh
@@ -332,12 +332,16 @@ function force_hardhat_compiler_settings
         echo "require('hardhat-gas-reporter');"
         echo "module.exports.gasReporter = ${gas_reporter_settings};"
         echo "module.exports.solidity = ${compiler_settings};"
+        echo "module.exports.networks.hardhat = module.exports.networks.hardhat || { hardfork: '${evm_version}' }"
+        echo "module.exports.networks.hardhat.hardfork = '${evm_version}'"
     else
         [[ $config_file == *\.ts ]] || assertFail
         [[ $config_var_name != "" ]] || assertFail
         echo 'import "hardhat-gas-reporter";'
         echo "${config_var_name}.gasReporter = ${gas_reporter_settings};"
         echo "${config_var_name}.solidity = {compilers: [${compiler_settings}]};"
+        echo "${config_var_name}.networks!.hardhat = ${config_var_name}.networks!.hardhat ?? { hardfork: '${evm_version}' };"
+        echo "${config_var_name}.networks!.hardhat!.hardfork = '${evm_version}'"
     fi >> "$config_file"
 }
 

From c82707cae6a085585421f6952eedffccffb7cb56 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 12 Mar 2024 16:50:51 +0100
Subject: [PATCH 0749/1140] Fix hardhat version to version that supports cancun
 hardfork

---
 test/externalTests/brink.sh         | 1 +
 test/externalTests/elementfi.sh     | 4 +---
 test/externalTests/gnosis.sh        | 1 +
 test/externalTests/pool-together.sh | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 48cc4028f3..d8ad001ac0 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -64,6 +64,7 @@ function brink_test
     # 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" src/Test/MockEIP1271Validator.sol
 
+    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"
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index f3ecbb1417..f34a169e95 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -99,9 +99,7 @@ function elementfi_test
     # "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
-
+    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"
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 218a5a7504..416d361536 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -76,6 +76,7 @@ function gnosis_safe_test
     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
 
+    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"
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index f841206ef2..0fc8aafbd6 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -66,6 +66,9 @@ function pool_together_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
+    # Hardhat 2.20.0 is the last version that works. Newer versions throw this error:
+    # Unexpected config HardhatConfig.networks.hardhat.initialBaseFeePerGas found - This field is only valid for networks with EIP-1559. Try a newer hardfork or remove it.
+    yarn add hardhat@2.20.0
 
     # These come with already compiled artifacts. We want them recompiled with latest compiler.
     rm -r node_modules/@pooltogether/yield-source-interface/artifacts/

From 6b3ca241105fd9298a3ff7f9dcb62bf1d58f952b Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 12 Mar 2024 18:51:24 +0100
Subject: [PATCH 0750/1140] Disable trident, chainlink and bleeps external
 tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af5ddef21b..e437e1d387 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1919,11 +1919,13 @@ workflows:
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
       - t_ext: *job_native_compile_ext_gp2
-      - t_ext: *job_native_compile_ext_trident
       - t_ext: *job_native_compile_ext_euler
-      - t_ext: *job_native_compile_ext_bleeps
       - t_ext: *job_native_compile_ext_pool_together
-      - t_ext: *job_native_compile_ext_chainlink
+      # TODO: Dropping the external tests below since they are based on old forks and
+      # fail after update the default evm version to cancun.
+      #- t_ext: *job_native_compile_ext_trident
+      #- t_ext: *job_native_compile_ext_chainlink
+      #- t_ext: *job_native_compile_ext_bleeps
 
       - c_ext_benchmarks:
           <<: *requires_nothing
@@ -1941,11 +1943,13 @@ workflows:
             # 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
-            - t_native_compile_ext_trident
             - t_native_compile_ext_euler
-            - t_native_compile_ext_bleeps
             - t_native_compile_ext_pool_together
-            - t_native_compile_ext_chainlink
+            # TODO: Dropping the external tests below since they are based on old forks and
+            # fail after update the default evm version to cancun.
+            #- t_native_compile_ext_trident
+            #- t_native_compile_ext_chainlink
+            #- t_native_compile_ext_bleeps
 
       # Windows build and tests
       - b_win: *requires_nothing

From 7c6f9f1154b757b040b1cbd9e4383caf04ceeaa9 Mon Sep 17 00:00:00 2001
From: Twice <twice@apache.org>
Date: Thu, 14 Mar 2024 00:49:02 +0900
Subject: [PATCH 0751/1140] Use move ctor instead of copy ctor in
 stringOrDefault

---
 libsolutil/Assertions.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libsolutil/Assertions.h b/libsolutil/Assertions.h
index 6735cda166..4879299bf0 100644
--- a/libsolutil/Assertions.h
+++ b/libsolutil/Assertions.h
@@ -28,6 +28,7 @@
 #include <libsolutil/Exceptions.h>
 
 #include <string>
+#include <utility>
 
 namespace solidity::util
 {
@@ -69,7 +70,7 @@ inline std::string stringOrDefault(std::string _string, std::string _defaultStri
 {
 	// NOTE: Putting this in a function rather than directly in a macro prevents the string from
 	// being evaluated multiple times if it's not just a literal.
-	return (!_string.empty() ? _string : _defaultString);
+	return (!_string.empty() ? std::move(_string) : std::move(_defaultString));
 }
 
 }

From ab55b0a49840491cd6e47e87e519360e21e9c518 Mon Sep 17 00:00:00 2001
From: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:55:48 -0300
Subject: [PATCH 0752/1140] Add multiple source test to ensure transient
 storage is emitted only once during compilation (#14935)

---
 ...ore_warning_only_once_multiple_sources.sol | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_sources.sol

diff --git a/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_sources.sol b/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_sources.sol
new file mode 100644
index 0000000000..51e3a19bcc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/tstore_warning_only_once_multiple_sources.sol
@@ -0,0 +1,34 @@
+==== Source: A ====
+contract C {
+    function f() external {
+        assembly {
+            tstore(0, 0)
+            let a := tload(0)
+            tstore(0, 1)
+            tstore(1, a)
+        }
+    }
+}
+==== Source: B ====
+import {C as C} from "A";
+contract D {
+    function g() external {
+        assembly {
+            tstore(0, 0)
+            tstore(0, 1)
+        }
+    }
+}
+==== Source: C ====
+contract X {
+    function h() external {
+        assembly {
+            tstore(0, 0)
+            tstore(0, 0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (A:72-78): 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.

From 7115a63f2d4e159d41a5c517472af92e219d85f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Wed, 13 Mar 2024 20:09:52 +0100
Subject: [PATCH 0753/1140] Update release checklist (#14812)

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

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 167417a95d..5db731cfc5 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -50,7 +50,7 @@ At least a day before the release:
 ### 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``.
-       Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
+       Include the following warning: ``**The release is still in progress. You may see broken links and binaries may not yet be available from all sources.**``.
        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.
@@ -68,6 +68,7 @@ At least a day before the release:
  - [ ] 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 ``npm install`` if you've got a clean checkout of the solc-bin repo.
  - [ ] 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.
 

From a15da0a70f3a06822f9a07f0d991bf8250acfa53 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Wed, 24 Jan 2024 18:49:14 +0530
Subject: [PATCH 0754/1140] Clean up docs to reflect changes in the behaviour
 of SELFDESTRUCT as per EIP-6780

---
 docs/cheatsheet.rst                      |   2 +-
 docs/contracts/function-modifiers.rst    |  16 +--
 docs/contracts/inheritance.rst           | 133 +++++++++++++++--------
 docs/examples/micropayment.rst           | 101 ++++++++++++-----
 docs/introduction-to-smart-contracts.rst |  20 +++-
 docs/metadata.rst                        |   4 +-
 docs/style-guide.rst                     |   9 +-
 docs/units-and-global-variables.rst      |  20 +++-
 docs/using-the-compiler.rst              |   4 +-
 9 files changed, 207 insertions(+), 102 deletions(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index e4f7beabd5..bc678c647d 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -118,7 +118,7 @@ Contract-related
 
 - ``this`` (current contract's type): the current contract, explicitly convertible to ``address`` or ``address payable``
 - ``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
+- ``selfdestruct(address payable recipient)``: send all funds to the given address and (only on EVMs before Cancun or when invoked within the transaction creating the contract) destroy the contract.
 
 .. index:: type;name, type;creationCode, type;runtimeCode, type;interfaceId, type;min, type;max
 
diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index 454e12ab65..2fd0357db0 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -19,7 +19,6 @@ 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); }
@@ -41,16 +40,6 @@ if they are marked ``virtual``. For details, please see
         }
     }
 
-    contract destructible is owned {
-        // This contract inherits the `onlyOwner` modifier from
-        // `owned` and applies it to the `destroy` function, which
-        // causes that calls to `destroy` only have an effect if
-        // they are made by the stored owner.
-        function destroy() public onlyOwner {
-            selfdestruct(owner);
-        }
-    }
-
     contract priced {
         // Modifiers can receive arguments:
         modifier costs(uint price) {
@@ -60,7 +49,7 @@ if they are marked ``virtual``. For details, please see
         }
     }
 
-    contract Register is priced, destructible {
+    contract Register is priced, owned {
         mapping(address => bool) registeredAddresses;
         uint price;
 
@@ -73,6 +62,9 @@ if they are marked ``virtual``. For details, please see
             registeredAddresses[msg.sender] = true;
         }
 
+        // This contract inherits the `onlyOwner` modifier from
+        // the `owned` contract. As a result, calls to `changePrice` will
+        // only take effect if they are made by the stored owner.
         function changePrice(uint price_) public onlyOwner {
             price = price_;
         }
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 02ab19163f..fccfee6095 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -40,27 +40,27 @@ 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); }
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
     }
 
-
     // Use `is` to derive from another contract. Derived
     // contracts can access all non-private members including
     // internal functions and state variables. These cannot be
     // accessed externally via `this`, though.
-    contract Destructible is Owned {
+    contract Emittable is Owned {
+        event Emitted();
+
         // The keyword `virtual` means that the function can change
         // its behavior in derived classes ("overriding").
-        function destroy() virtual public {
-            if (msg.sender == owner) selfdestruct(owner);
+        function emitEvent() virtual public {
+            if (msg.sender == owner)
+                emit Emitted();
         }
     }
 
-
     // These abstract contracts are only provided to make the
     // interface known to the compiler. Note the function
     // without body. If a contract does not implement all
@@ -69,37 +69,35 @@ Details are given in the following example.
         function lookup(uint id) public virtual returns (address adr);
     }
 
-
     abstract contract NameReg {
         function register(bytes32 name) public virtual;
         function unregister() public virtual;
     }
 
-
     // Multiple inheritance is possible. Note that `Owned` is
-    // also a base class of `Destructible`, yet there is only a single
+    // also a base class of `Emittable`, yet there is only a single
     // instance of `Owned` (as for virtual inheritance in C++).
-    contract Named is Owned, Destructible {
+    contract Named is Owned, Emittable {
         constructor(bytes32 name) {
             Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);
             NameReg(config.lookup(1)).register(name);
         }
 
         // Functions can be overridden by another function with the same name and
-        // the same number/types of inputs.  If the overriding function has different
+        // the same number/types of inputs. If the overriding function has different
         // types of output parameters, that causes an error.
         // Both local and message-based function calls take these overrides
         // into account.
         // If you want the function to override, you need to use the
         // `override` keyword. You need to specify the `virtual` keyword again
         // if you want this function to be overridden again.
-        function destroy() public virtual override {
+        function emitEvent() public virtual override {
             if (msg.sender == owner) {
                 Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);
                 NameReg(config.lookup(1)).unregister();
                 // It is still possible to call a specific
                 // overridden function.
-                Destructible.destroy();
+                Emittable.emitEvent();
             }
         }
     }
@@ -108,93 +106,132 @@ Details are given in the following example.
     // If a constructor takes an argument, it needs to be
     // provided in the header or modifier-invocation-style at
     // the constructor of the derived contract (see below).
-    contract PriceFeed is Owned, Destructible, Named("GoldFeed") {
+    contract PriceFeed is Owned, Emittable, Named("GoldFeed") {
+        uint info;
+
         function updateInfo(uint newInfo) public {
             if (msg.sender == owner) info = newInfo;
         }
 
         // Here, we only specify `override` and not `virtual`.
         // This means that contracts deriving from `PriceFeed`
-        // cannot change the behavior of `destroy` anymore.
-        function destroy() public override(Destructible, Named) { Named.destroy(); }
+        // cannot change the behavior of `emitEvent` anymore.
+        function emitEvent() public override(Emittable, Named) { Named.emitEvent(); }
         function get() public view returns(uint r) { return info; }
-
-        uint info;
     }
 
-Note that above, we call ``Destructible.destroy()`` to "forward" the
-destruction request. The way this is done is problematic, as
+Note that above, we call ``Emittable.emitEvent()`` to "forward" the
+emit event request. The way this is done is problematic, as
 seen in the following example:
 
 .. code-block:: solidity
 
     // 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); }
+    contract Owned {
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
     }
 
-    contract Destructible is owned {
-        function destroy() public virtual {
-            if (msg.sender == owner) selfdestruct(owner);
+    contract Emittable is Owned {
+        event Emitted();
+
+        function emitEvent() virtual public {
+            if (msg.sender == owner) {
+                emit Emitted();
+            }
         }
     }
 
-    contract Base1 is Destructible {
-        function destroy() public virtual override { /* do cleanup 1 */ Destructible.destroy(); }
+    contract Base1 is Emittable {
+        event Base1Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base1 logic */
+            emit Base1Emitted();
+            Emittable.emitEvent();
+        }
     }
 
-    contract Base2 is Destructible {
-        function destroy() public virtual override { /* do cleanup 2 */ Destructible.destroy(); }
+    contract Base2 is Emittable {
+        event Base2Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base2 logic */
+            emit Base2Emitted();
+            Emittable.emitEvent();
+        }
     }
 
     contract Final is Base1, Base2 {
-        function destroy() public override(Base1, Base2) { Base2.destroy(); }
+        event FinalEmitted();
+        function emitEvent() public override(Base1, Base2) {
+            /* Here, we emit an event to simulate some Final logic */
+            emit FinalEmitted();
+            Base2.emitEvent();
+        }
     }
 
-A call to ``Final.destroy()`` will call ``Base2.destroy`` because we specify it
+A call to ``Final.emitEvent()`` will call ``Base2.emitEvent`` because we specify it
 explicitly in the final override, but this function will bypass
-``Base1.destroy``. The way around this is to use ``super``:
+``Base1.emitEvent``, resulting in the following sequence of events:
+``FinalEmitted -> Base2Emitted -> Emitted``, instead of the expected sequence:
+``FinalEmitted -> Base2Emitted -> Base1Emitted -> Emitted``.
+The way around this is to use ``super``:
 
 .. code-block:: solidity
 
     // 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); }
+    contract Owned {
         address payable owner;
+        constructor() { owner = payable(msg.sender); }
     }
 
-    contract Destructible is owned {
-        function destroy() virtual public {
-            if (msg.sender == owner) selfdestruct(owner);
+    contract Emittable is Owned {
+        event Emitted();
+
+        function emitEvent() virtual public {
+            if (msg.sender == owner) {
+                emit Emitted();
+            }
         }
     }
 
-    contract Base1 is Destructible {
-        function destroy() public virtual override { /* do cleanup 1 */ super.destroy(); }
+    contract Base1 is Emittable {
+        event Base1Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base1 logic */
+            emit Base1Emitted();
+            super.emitEvent();
+        }
     }
 
 
-    contract Base2 is Destructible {
-        function destroy() public virtual override { /* do cleanup 2 */ super.destroy(); }
+    contract Base2 is Emittable {
+        event Base2Emitted();
+        function emitEvent() public virtual override {
+            /* Here, we emit an event to simulate some Base2 logic */
+            emit Base2Emitted();
+            super.emitEvent();
+        }
     }
 
     contract Final is Base1, Base2 {
-        function destroy() public override(Base1, Base2) { super.destroy(); }
+        event FinalEmitted();
+        function emitEvent() public override(Base1, Base2) {
+            /* Here, we emit an event to simulate some Final logic */
+            emit FinalEmitted();
+            super.emitEvent();
+        }
     }
 
-If ``Base2`` calls a function of ``super``, it does not simply
+If ``Final`` calls a function of ``super``, it does not simply
 call this function on one of its base contracts.  Rather, it
 calls this function on the next base contract in the final
-inheritance graph, so it will call ``Base1.destroy()`` (note that
+inheritance graph, so it will call ``Base1.emitEvent()`` (note that
 the final inheritance sequence is -- starting with the most
-derived contract: Final, Base2, Base1, Destructible, owned).
+derived contract: Final, Base2, Base1, Emittable, Owned).
 The actual function that is called when using super is
 not known in the context of the class where it is used,
 although its type is known. This is similar for ordinary
diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index 50f28005bf..c3aef0d653 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -55,7 +55,7 @@ as it provides a number of other security benefits.
 What to Sign
 ------------
 
-For a contract that fulfils payments, the signed message must include:
+For a contract that fulfills payments, the signed message must include:
 
     1. The recipient's address.
     2. The amount to be transferred.
@@ -80,6 +80,10 @@ the contract's address itself will be accepted. You can find
 an example of this in the first two lines of the ``claimPayment()``
 function of the full contract at the end of this section.
 
+Furthermore, instead of destroying the contract by calling ``selfdestruct``,
+which is currently deprecated, we will disable the contract's functionalities by freezing it,
+resulting in the reversion of any call after it being frozen.
+
 Packing arguments
 -----------------
 
@@ -144,30 +148,54 @@ 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;
 
+    contract Owned {
+        address payable owner;
+        constructor() {
+            owner = payable(msg.sender);
+        }
+    }
+
+    contract Freezable is Owned {
+        bool private _frozen = false;
+
+        modifier notFrozen() {
+            require(!_frozen, "Inactive Contract.");
+            _;
+        }
+
+        function freeze() internal {
+            if (msg.sender == owner)
+                _frozen = true;
+        }
+    }
+
+    contract ReceiverPays is Freezable {
         mapping(uint256 => bool) usedNonces;
 
         constructor() payable {}
 
-        function claimPayment(uint256 amount, uint256 nonce, bytes memory signature) external {
+        function claimPayment(uint256 amount, uint256 nonce, bytes memory signature)
+            external
+            notFrozen
+        {
             require(!usedNonces[nonce]);
             usedNonces[nonce] = true;
 
             // this recreates the message that was signed on the client
             bytes32 message = prefixed(keccak256(abi.encodePacked(msg.sender, amount, nonce, this)));
-
             require(recoverSigner(message, signature) == owner);
-
             payable(msg.sender).transfer(amount);
         }
 
-        /// destroy the contract and reclaim the leftover funds.
-        function shutdown() external {
+        /// freeze the contract and reclaim the leftover funds.
+        function shutdown()
+            external
+            notFrozen
+        {
             require(msg.sender == owner);
-            selfdestruct(payable(msg.sender));
+            freeze();
+            payable(msg.sender).transfer(address(this).balance);
         }
 
         /// signature methods.
@@ -196,7 +224,6 @@ The full contract
             returns (address)
         {
             (uint8 v, bytes32 r, bytes32 s) = splitSignature(sig);
-
             return ecrecover(message, v, r, s);
         }
 
@@ -305,7 +332,7 @@ Closing the Payment Channel
 When Bob is ready to receive his funds, it is time to
 close the payment channel by calling a ``close`` function on the smart contract.
 Closing the channel pays the recipient the Ether they are owed and
-destroys the contract, sending any remaining Ether back to Alice. To
+deactivates the contract by freezing it, sending any remaining Ether back to Alice. To
 close the channel, Bob needs to provide a message signed by Alice.
 
 The smart contract must verify that the message contains a valid signature from the sender.
@@ -320,7 +347,7 @@ they could provide a message with a lower amount and cheat the recipient out of
 
 The function verifies the signed message matches the given parameters.
 If everything checks out, the recipient is sent their portion of the Ether,
-and the sender is sent the rest via a ``selfdestruct``.
+and the sender is sent the remaining funds via a ``transfer``.
 You can see the ``close`` function in the full contract.
 
 Channel Expiration
@@ -342,11 +369,24 @@ 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.
-        uint256 public expiration;  // Timeout in case the recipient never closes.
+
+    contract Frozeable {
+        bool private _frozen = false;
+
+        modifier notFrozen() {
+            require(!_frozen, "Inactive Contract.");
+            _;
+        }
+
+        function freeze() internal {
+            _frozen = true;
+        }
+    }
+
+    contract SimplePaymentChannel is Frozeable {
+        address payable public sender;    // The account sending payments.
+        address payable public recipient; // The account receiving the payments.
+        uint256 public expiration;        // Timeout in case the recipient never closes.
 
         constructor (address payable recipientAddress, uint256 duration)
             payable
@@ -359,16 +399,23 @@ The full contract
         /// the recipient can close the channel at any time by presenting a
         /// signed amount from the sender. the recipient will be sent that amount,
         /// and the remainder will go back to the sender
-        function close(uint256 amount, bytes memory signature) external {
+        function close(uint256 amount, bytes memory signature)
+            external
+            notFrozen
+        {
             require(msg.sender == recipient);
             require(isValidSignature(amount, signature));
 
             recipient.transfer(amount);
-            selfdestruct(sender);
+            freeze();
+            sender.transfer(address(this).balance);
         }
 
         /// the sender can extend the expiration at any time
-        function extend(uint256 newExpiration) external {
+        function extend(uint256 newExpiration)
+            external
+            notFrozen
+        {
             require(msg.sender == sender);
             require(newExpiration > expiration);
 
@@ -377,9 +424,13 @@ The full contract
 
         /// if the timeout is reached without the recipient closing the channel,
         /// then the Ether is released back to the sender.
-        function claimTimeout() external {
+        function claimTimeout()
+            external
+            notFrozen
+        {
             require(block.timestamp >= expiration);
-            selfdestruct(sender);
+            freeze();
+            sender.transfer(address(this).balance);
         }
 
         function isValidSignature(uint256 amount, bytes memory signature)
@@ -388,14 +439,12 @@ The full contract
             returns (bool)
         {
             bytes32 message = prefixed(keccak256(abi.encodePacked(this, amount)));
-
             // check that the signature is from the payment sender
             return recoverSigner(message, signature) == sender;
         }
 
         /// All functions below this are just taken from the chapter
         /// 'creating and verifying signatures' chapter.
-
         function splitSignature(bytes memory sig)
             internal
             pure
@@ -411,7 +460,6 @@ The full contract
                 // final byte (first byte of the next 32 bytes)
                 v := byte(0, mload(add(sig, 96)))
             }
-
             return (v, r, s);
         }
 
@@ -421,7 +469,6 @@ The full contract
             returns (address)
         {
             (uint8 v, bytes32 r, bytes32 s) = splitSignature(sig);
-
             return ecrecover(message, v, r, s);
         }
 
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 3c43e5f193..a31b06616a 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -563,9 +563,23 @@ 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 behavior
-    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    From ``EVM >= Cancun`` onwards, ``selfdestruct`` will **only** send all Ether in the account to the given recipient and not destroy the contract.
+    However, when ``selfdestruct`` is called in the same transaction that creates the contract calling it,
+    the behaviour of ``selfdestruct`` before Cancun hardfork (i.e., ``EVM <= Shanghai``) is preserved and will destroy the current contract,
+    deleting any data, including storage keys, code and the account itself.
+    See `EIP-6780 <https://eips.ethereum.org/EIPS/eip-6780>`_ for more details.
+
+    The new behaviour is the result of a network-wide change that affects all contracts present on
+    the Ethereum mainnet and testnets.
+    It is important to note that this change is dependent on the EVM version of the chain on which
+    the contract is deployed.
+    The ``--evm-version`` setting used when compiling the contract has no bearing on it.
+
+    Also, note that the ``selfdestruct`` opcode has been deprecated in Solidity version 0.8.18,
+    as recommended by `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    The deprecation is still in effect and the compiler will still emit warnings on its use.
+    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::
     Even if a contract is removed by ``selfdestruct``, it is still part of the
diff --git a/docs/metadata.rst b/docs/metadata.rst
index ede16a73fd..a44d987538 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -175,9 +175,9 @@ explanatory purposes.
       },
       // Required: Compilation source files/source units, keys are file paths
       "sources": {
-        "destructible": {
+        "settable": {
           // Required (unless "url" is used): literal contents of the source file
-          "content": "contract destructible is owned { function destroy() { if (msg.sender == owner) selfdestruct(owner); } }",
+          "content": "contract settable is owned { uint256 private x = 0; function set(uint256 _x) public { if (msg.sender == owner) x = _x; } }",
           // Required: keccak256 hash of the source file
           "keccak256": "0x234..."
         },
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 427ede5ee3..0ac890cb34 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -662,10 +662,11 @@ Yes:
         return balanceOf[from];
     }
 
-    function shutdown() public onlyOwner {
-        selfdestruct(owner);
+    function increment(uint x) public onlyOwner pure returns (uint) {
+        return x + 1;
     }
 
+
 No:
 
 .. code-block:: solidity
@@ -674,8 +675,8 @@ No:
         return balanceOf[from];
     }
 
-    function shutdown() onlyOwner public {
-        selfdestruct(owner);
+    function increment(uint x) onlyOwner public pure returns (uint) {
+        return x + 1;
     }
 
 For long function declarations, it is recommended to drop each argument onto
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index a0422c32df..a743441d56 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -339,9 +339,23 @@ Contract-related
 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 behavior
-    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    From ``EVM >= Cancun`` onwards, ``selfdestruct`` will **only** send all Ether in the account to the given recipient and not destroy the contract.
+    However, when ``selfdestruct`` is called in the same transaction that creates the contract calling it,
+    the behaviour of ``selfdestruct`` before Cancun hardfork (i.e., ``EVM <= Shanghai``) is preserved and will destroy the current contract,
+    deleting any data, including storage keys, code and the account itself.
+    See `EIP-6780 <https://eips.ethereum.org/EIPS/eip-6780>`_ for more details.
+
+    The new behaviour is the result of a network-wide change that affects all contracts present on
+    the Ethereum mainnet and testnets.
+    It is important to note that this change is dependent on the EVM version of the chain on which
+    the contract is deployed.
+    The ``--evm-version`` setting used when compiling the contract has no bearing on it.
+
+    Also, note that the ``selfdestruct`` opcode has been deprecated in Solidity version 0.8.18,
+    as recommended by `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+    The deprecation is still in effect and the compiler will still emit warnings on its use.
+    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.
 
 .. note::
     Prior to version 0.5.0, there was a function called ``suicide`` with the same
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 97abbdba9d..219c2f42ed 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -236,12 +236,12 @@ Input Description
             // `--allow-paths <path>`.
           ]
         },
-        "destructible":
+        "settable":
         {
           // Optional: keccak256 hash of the source file
           "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); } }"
+          "content": "contract settable is owned { uint256 private x = 0; function set(uint256 _x) public { if (msg.sender == owner) x = _x; } }"
         },
         "myFile.sol_json.ast":
         {

From a547f615c271dc357e753abb5c95c24b9d3d0e0b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 13 Mar 2024 22:31:14 +0100
Subject: [PATCH 0755/1140] Disable gp2 and zeppelin ext tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e437e1d387..7fe8967b44 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1910,7 +1910,8 @@ workflows:
       - t_ext: *job_ems_compile_ext_colony
 
       - t_ext: *job_native_compile_ext_gnosis
-      - t_ext: *job_native_test_ext_zeppelin
+      # TODO: Re-enable once bumped to use Cancun supported hardhat version
+      # - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
       - t_ext: *job_native_test_ext_perpetual_pools
@@ -1918,7 +1919,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_compile_ext_gp2
+      # TODO: Re-enable once bumped to use Cancun supported hardhat version
+      # - t_ext: *job_native_compile_ext_gp2
       - t_ext: *job_native_compile_ext_euler
       - t_ext: *job_native_compile_ext_pool_together
       # TODO: Dropping the external tests below since they are based on old forks and
@@ -1932,14 +1934,16 @@ workflows:
           requires:
             - t_ems_compile_ext_colony
             - t_native_compile_ext_gnosis
-            - t_native_test_ext_zeppelin
+            # TODO: Re-enable once bumped to use Cancun supported hardhat version
+            # - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator
             - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
-            - t_native_compile_ext_gp2
+            # TODO: Re-enable once bumped to use Cancun supported hardhat version
+            # - t_native_compile_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

From fbeef890ea61c1d07b716a90c5e7548cf791fba7 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 13 Mar 2024 02:01:35 +0100
Subject: [PATCH 0756/1140] Set cancun hardfork in hardhat stack traces tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7fe8967b44..dc4cec2019 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1469,6 +1469,9 @@ jobs:
 
             # NOTE: This is expected to work without running `pnpm build` first.
             cd hardhat/packages/hardhat-core
+            # TODO: temporarily set hardhat stack traces tests to use cancun hardfork
+            # Remove this when hardhat switch to cancun by default: https://github.com/NomicFoundation/hardhat/issues/4851
+            sed -i 's/hardfork: "shanghai",/hardfork: "cancun",/' test/internal/hardhat-network/stack-traces/execution.ts
             pnpm test
       - matrix_notify_failure_unless_pr
 

From a388ccb2c464493ecb62797462df6e9d9e6cf047 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 4 Mar 2024 15:25:05 -0300
Subject: [PATCH 0757/1140] Make cancun the default EVM version

---
 .circleci/soltest_all.sh                      |  2 +-
 Changelog.md                                  |  1 +
 docs/using-the-compiler.rst                   |  8 +-
 liblangutil/EVMVersion.h                      |  2 +-
 libyul/AsmAnalysis.cpp                        |  9 +-
 scripts/error_codes.py                        |  1 -
 scripts/externalTests/common.sh               |  2 +-
 scripts/externalTests/runners/base.py         |  2 +-
 scripts/tests.sh                              |  2 +-
 .../debug_info_in_yul_snippet_escaping/output | 22 ++---
 test/cmdlineTests/metadata/output             |  2 +-
 test/cmdlineTests/name_simplifier/output      | 10 +--
 .../standard_metadata/output.json             |  2 +-
 .../output.json                               |  2 +-
 .../viair_subobject_optimization/output       | 82 +++++++------------
 .../output                                    |  2 +-
 .../yul_string_format_ascii/output.json       |  6 +-
 .../yul_string_format_ascii_long/output.json  |  6 +-
 test/libsolidity/StandardCompiler.cpp         |  4 +-
 test/libsolidity/gasTests/abiv2.sol           |  6 +-
 test/libsolidity/gasTests/abiv2_optimised.sol |  4 +-
 .../abi_encode_calldata_slice.sol             | 12 +--
 .../abi_encode_calldata_slice.sol             | 12 +--
 .../abiEncoderV2/abi_encode_v2.sol            |  6 +-
 .../abiEncoderV2/calldata_array.sol           |  2 +-
 .../calldata_overlapped_dynamic_arrays.sol    |  6 +-
 .../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_masking_long.sol |  6 +-
 .../byte_array_to_storage_cleanup.sol         | 12 +--
 .../bytes_in_constructors_packer.sol          | 12 +--
 .../bytes_in_constructors_unpacker.sol        | 12 +--
 .../externalContracts/FixedFeeRegistrar.sol   | 12 +--
 .../externalContracts/base64.sol              | 12 +--
 .../externalContracts/deposit_contract.sol    | 36 ++++----
 .../externalContracts/strings.sol             | 12 +--
 .../external_call_to_nonexisting.sol          | 12 +--
 ...ernal_call_to_nonexisting_debugstrings.sol | 12 +--
 .../inlineAssembly/blobhash_pre_cancun.sol    |  2 +-
 .../transient_storage_low_level_calls.sol     |  6 ++
 .../transient_storage_selfdestruct.sol        | 10 +++
 .../tstore_hidden_staticcall.sol              |  3 +
 .../salted_create/prediction_example.sol      |  2 +-
 .../structs/copy_from_mapping.sol             |  6 +-
 .../copy_substructures_from_mapping.sol       |  6 +-
 .../structs/copy_substructures_to_mapping.sol | 18 ++--
 .../semanticTests/structs/copy_to_mapping.sol | 24 +++---
 .../semanticTests/various/address_code.sol    | 12 +--
 .../semanticTests/various/create_calldata.sol | 12 +--
 .../various/selfdestruct_post_cancun.sol      |  9 +-
 ...uct_post_cancun_multiple_beneficiaries.sol | 14 ++++
 .../selfdestruct_post_cancun_redeploy.sol     | 20 +++--
 .../skip_dynamic_types_for_structs.sol        |  6 +-
 .../blobhash_pre_cancun_not_declared.sol      |  4 +-
 .../inlineAssembly/mcopy_pre_cancun.sol       |  4 +-
 .../transient_storage_invalid_pre_cancun.sol  |  6 +-
 .../types/magic_block_blobbasefee_error.sol   |  2 +-
 61 files changed, 298 insertions(+), 299 deletions(-)

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 40ee75b270..009852710e 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -36,7 +36,7 @@ DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shang
 # set EVM_VALUES to the default values.
 IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
 
-DEFAULT_EVM=shanghai
+DEFAULT_EVM=cancun
 OPTIMIZE_VALUES=(0 1)
 
 # Run for ABI encoder v1, without SMTChecker tests.
diff --git a/Changelog.md b/Changelog.md
index 8c6df568e9..ba5dff6787 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
  * Yul Analyzer: Emit transient storage warning only for the first occurrence of ``tstore``.
+ * EVM: Set default EVM version to ``cancun``.
 
 
 Bugfixes:
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 219c2f42ed..875c15b09d 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -174,9 +174,9 @@ 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``
    - 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**)
+- ``shanghai``
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
-- ``cancun``
+- ``cancun`` (**default**)
    - 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>`_).
@@ -344,8 +344,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 (default)
-        "evmVersion": "shanghai",
+        // petersburg, istanbul, berlin, london, paris, shanghai or cancun (default)
+        "evmVersion": "cancun",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.
         "viaIR": true,
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 992933a898..58b54f3dca 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -119,7 +119,7 @@ class EVMVersion:
 
 	EVMVersion(Version _version): m_version(_version) {}
 
-	Version m_version = Version::Shanghai;
+	Version m_version = Version::Cancun;
 };
 
 }
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 0efaa12c2c..1972d26745 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -752,14 +752,11 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 	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);
+		errorForVM(8314_error, "only available for Cancun-compatible");
 	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);
+		errorForVM(7755_error, "only available for Cancun-compatible");
 	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);
+		errorForVM(6243_error, "only available for Cancun-compatible");
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 8ffb7f2160..27e7b1102b 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -202,7 +202,6 @@ 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
-        "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/externalTests/common.sh b/scripts/externalTests/common.sh
index de9b8da96d..8bc9bdf7bd 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=shanghai
+CURRENT_EVM_VERSION=cancun
 
 AVAILABLE_PRESETS=(
     legacy-no-optimize
diff --git a/scripts/externalTests/runners/base.py b/scripts/externalTests/runners/base.py
index c3807c528c..cd94fab6b8 100644
--- a/scripts/externalTests/runners/base.py
+++ b/scripts/externalTests/runners/base.py
@@ -41,7 +41,7 @@
 from test_helpers import settings_from_preset
 from test_helpers import SettingsPreset
 
-CURRENT_EVM_VERSION: str = "shanghai"
+CURRENT_EVM_VERSION: str = "cancun"
 
 @dataclass
 class TestConfig:
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 9df40e385c..26eaf4b4b1 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" == "shanghai" ]]
+        if [[ "$vm" == "cancun" ]]
         then
             FORCE_ABIV1_RUNS="no yes" # run both in paris
         fi
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 4c90d9054d..0bd6285b78 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -181,11 +181,7 @@ object "D_27" {
 
             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)))
-                }
+                mcopy(dst, src, length)
                 mstore(add(dst, length), 0)
 
             }
@@ -470,8 +466,7 @@ object "D_27" {
                         }
                         mstore(_2, newFreePtr)
                         mstore(memPtr, 2)
-                        let _6 := 32
-                        mstore(add(memPtr, _6), "/*")
+                        mstore(add(memPtr, 32), "/*")
                         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()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
@@ -482,17 +477,14 @@ object "D_27" {
                         }
                         mstore(_2, newFreePtr_1)
                         mstore(memPtr_1, 39)
-                        mstore(add(memPtr_1, _6), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
+                        let _6 := add(memPtr_1, 32)
+                        mstore(_6, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
                         mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
                         let memPos := mload(_2)
-                        mstore(memPos, _6)
+                        mstore(memPos, 32)
                         let length := mload(memPtr_1)
-                        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), _6)))
-                        }
+                        mstore(add(memPos, 32), length)
+                        mcopy(add(memPos, _2), _6, length)
                         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/metadata/output b/test/cmdlineTests/metadata/output
index bf1e750c95..b6a684b844 100644
--- a/test/cmdlineTests/metadata/output
+++ b/test/cmdlineTests/metadata/output
@@ -1,4 +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}
+{"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":"cancun","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/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index ed4c6e5c02..0a461e3e4a 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -98,9 +98,9 @@ object "C_59" {
                         }
                         mstore(_9, newFreePtr_2)
                         mstore(memPtr_1, 100)
-                        mstore(add(memPtr_1, _3), "longstringlongstringlongstringlo")
+                        let _11 := add(memPtr_1, _3)
+                        mstore(_11, "longstringlongstringlongstringlo")
                         mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
-                        let _11 := 96
                         mstore(add(memPtr_1, 96), "stringlongstringlongstringlongst")
                         mstore(add(memPtr_1, 128), "ring")
                         let memPos := mload(_9)
@@ -108,11 +108,7 @@ object "C_59" {
                         mstore(add(memPos, _3), _9)
                         let length := mload(memPtr_1)
                         mstore(add(memPos, _9), length)
-                        let i := 0
-                        for { } lt(i, length) { i := add(i, _3) }
-                        {
-                            mstore(add(add(memPos, i), _11), mload(add(add(memPtr_1, i), _3)))
-                        }
+                        mcopy(add(memPos, 96), _11, length)
                         mstore(add(add(memPos, length), 96), 0)
                         return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), 96))
                     }
diff --git a/test/cmdlineTests/standard_metadata/output.json b/test/cmdlineTests/standard_metadata/output.json
index 4429466676..955d30c344 100644
--- a/test/cmdlineTests/standard_metadata/output.json
+++ b/test/cmdlineTests/standard_metadata/output.json
@@ -5,7 +5,7 @@
         {
             "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}"
+                "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\":\"cancun\",\"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}"
             }
         }
     },
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
index ac01fb1eba..aae6d02f6b 100644
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
@@ -40,7 +40,7 @@
                         "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}",
+                "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\":\"cancun\",\"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": [],
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 4804d13843..5090c282bb 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -117,77 +117,70 @@ 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 {... */
-      0x3f
+      swap1
+      not(0x1f)
+      swap1
       dup2
+      0x3f
+      dup5
       add
-      dup3
       and
-      dup4
+      dup2
       add
-      swap1
+      swap2
+      dup2
       dup4
-      dup3
       lt
       0xffffffffffffffff
-      dup4
+      dup5
       gt
       or
       tag_9
       jumpi
-      swap3
-      swap1
-      0x40
-      swap1
       0x40
+      swap3
+      dup4
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       dup4
       dup3
       mstore
       0x20
+      dup3
+      add
       swap4
       dataOffset(sub_0)
-      0x20
-      dup5
-      add
+      dup6
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      mload(0x40)
+      0x1f
+      dup4
+      mload
+      swap5
+      dup6
       swap4
-      dup5
-      swap3
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       0x20
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup5
+      dup6
       mstore
-      dup1
       mload
-      swap3
-      dup4
+      dup1
+      swap2
+      dup2
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       0x20
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup7
+      dup8
       add
       mstore
-      0x00
-    tag_11:
-      dup5
-      dup2
-      lt
-      tag_12
-      jumpi
-      dup6
-      0x40
-      dup2
-      dup10
-      0x1f
-      dup10
+      dup7
+      dup7
+      add
+      mcopy
       0x00
       dup6
       dup3
@@ -203,25 +196,6 @@ sub_0: assembly {
       add
       swap1
       return
-    tag_12:
-      dup3
-      dup2
-      add
-      dup5
-      add
-      mload
-      dup9
-      dup3
-      add
-      dup4
-      add
-      mstore
-      dup8
-      swap6
-      pop
-      dup4
-      add
-      jump(tag_11)
     tag_9:
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x41)
diff --git a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output
index 9ee6810792..6873abe60e 100644
--- a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output
+++ b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output
@@ -130,4 +130,4 @@ object "C_28" {
 }
 
 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}
+{"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":"cancun","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/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index 1a9612c777..edb76c0cd4 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -97,11 +97,7 @@ object \"C_11\" {
 
             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)))
-                }
+                mcopy(dst, src, length)
                 mstore(add(dst, length), 0)
 
             }
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index 5adeabfdff..36d6cfd954 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -97,11 +97,7 @@ object \"C_11\" {
 
             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)))
-                }
+                mcopy(dst, src, length)
                 mstore(add(dst, length), 0)
 
             }
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index ab013692d5..7fafa2a62e 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1050,9 +1050,11 @@ BOOST_AUTO_TEST_CASE(evm_version)
 	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\"") != std::string::npos);
+	result = compile(inputForVersion("\"evmVersion\": \"cancun\","));
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"cancun\"") != std::string::npos);
 	// test default
 	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"cancun\"") != std::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 aacb333bfe..6fa822fade 100644
--- a/test/libsolidity/gasTests/abiv2.sol
+++ b/test/libsolidity/gasTests/abiv2.sol
@@ -14,9 +14,9 @@ contract C {
 }
 // ----
 // creation:
-//   codeDepositCost: 1213200
-//   executionCost: 1259
-//   totalCost: 1214459
+//   codeDepositCost: 1208000
+//   executionCost: 1252
+//   totalCost: 1209252
 // external:
 //   a(): 2425
 //   b(uint256): infinite
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index 1ab8803d28..8f407e6ede 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: 639000
+//   codeDepositCost: 634600
 //   executionCost: 668
-//   totalCost: 639668
+//   totalCost: 635268
 // 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 f548c50bcf..3dd5dd2693 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: 321332
-// gas legacy: 319111
-// gas legacyOptimized: 269317
+// gas irOptimized: 306908
+// gas legacy: 305827
+// gas legacyOptimized: 255013
 // test_uint256() ->
-// gas irOptimized: 447646
-// gas legacy: 433627
-// gas legacyOptimized: 365410
+// gas irOptimized: 435054
+// gas legacy: 421315
+// gas legacyOptimized: 352838
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 686164de85..5457e7f674 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: 321332
-// gas legacy: 319111
-// gas legacyOptimized: 269317
+// gas irOptimized: 306908
+// gas legacy: 305827
+// gas legacyOptimized: 255013
 // test_uint256() ->
-// gas irOptimized: 447646
-// gas legacy: 433627
-// gas legacyOptimized: 365410
+// gas irOptimized: 435054
+// gas legacy: 421315
+// gas legacyOptimized: 352838
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 5e50d5e9a8..c0d5f5d3fb 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: 112630
-// gas legacy: 114794
-// gas legacyOptimized: 112572
+// gas irOptimized: 111708
+// gas legacy: 113892
+// gas legacyOptimized: 111646
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 22aad67492..f749e403b5 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: 120043
+// gas irOptimized: 117157
 // gas legacy: 101568
 // 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 a923360971..46df313331 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -33,8 +33,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: 111642
-// gas legacy: 112944
-// gas legacyOptimized: 112092
+// gas irOptimized: 111395
+// gas legacy: 112709
+// gas legacyOptimized: 111852
 // 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 3307567535..14699df572 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: 180720
-// gas legacy: 184830
-// gas legacyOptimized: 181493
+// gas irOptimized: 180103
+// gas legacy: 184235
+// gas legacyOptimized: 180873
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112425
-// gas legacy: 115398
-// gas legacyOptimized: 112982
+// gas irOptimized: 112104
+// gas legacy: 115091
+// gas legacyOptimized: 112666
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index c06d2b24c4..9f59c43155 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: 135661
-// gas legacy: 137278
-// gas legacyOptimized: 136048
+// gas irOptimized: 135452
+// gas legacy: 137096
+// gas legacyOptimized: 135834
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 38dbe52bcc..24565b4c62 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: 104476
-// gas legacy: 112974
-// gas legacyOptimized: 112717
+// gas irOptimized: 103283
+// gas legacy: 112883
+// gas legacyOptimized: 112629
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 118962
-// gas legacy: 129034
-// gas legacyOptimized: 128952
+// gas irOptimized: 117740
+// gas legacy: 128943
+// gas legacyOptimized: 128864
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 125419
-// gas legacy: 136234
-// gas legacyOptimized: 135643
+// gas irOptimized: 124080
+// gas legacy: 136071
+// gas legacyOptimized: 135479
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 129529
-// gas legacy: 148834
-// gas legacyOptimized: 148873
+// gas irOptimized: 127140
+// gas legacy: 148671
+// gas legacyOptimized: 148709
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 421911
-// gas legacy: 459355
-// gas legacyOptimized: 461066
+// gas irOptimized: 416966
+// gas legacy: 458976
+// gas legacyOptimized: 460674
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 5482f615f2..33a4c7045a 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: 179750
-// gas legacy: 181001
-// gas legacyOptimized: 180018
+// gas irOptimized: 179420
+// gas legacy: 180675
+// gas legacyOptimized: 179700
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106679
-// gas legacy: 109720
-// gas legacyOptimized: 106932
+// gas irOptimized: 106349
+// gas legacy: 109394
+// gas legacyOptimized: 106614
 // 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 275a0fca1b..56a4150790 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: 116645
-// gas legacy: 118936
-// gas legacyOptimized: 116975
+// gas irOptimized: 116546
+// gas legacy: 118845
+// gas legacyOptimized: 116887
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103246
-// gas legacy: 102745
-// gas legacyOptimized: 101669
+// gas irOptimized: 103147
+// gas legacy: 102654
+// gas legacyOptimized: 101581
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 211477c553..0e8cff97fd 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: 202731
-// gas legacy: 204798
-// gas legacyOptimized: 203357
+// gas irOptimized: 202162
+// gas legacy: 204328
+// gas legacyOptimized: 202887
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 5b1a618391..674b0841e6 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: 107343
-// gas legacy: 121408
-// gas legacyOptimized: 120534
+// gas irOptimized: 107183
+// gas legacy: 121245
+// gas legacyOptimized: 120370
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index 14130926e7..8d0cb0a012 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,12 +28,12 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 82402
-// gas irOptimized code: 361000
-// gas legacy: 101895
-// gas legacy code: 609400
-// gas legacyOptimized: 85378
-// gas legacyOptimized code: 397000
+// gas irOptimized: 81932
+// gas irOptimized code: 355200
+// gas legacy: 101472
+// gas legacy code: 604200
+// gas legacyOptimized: 85004
+// gas legacyOptimized code: 392400
 // 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 7885d3ceec..c0b9df16c3 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,9 +24,9 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 169902
-// gas irOptimized code: 105200
-// gas legacy: 173433
-// gas legacy code: 245000
-// gas legacyOptimized: 170360
-// gas legacyOptimized code: 121600
+// gas irOptimized: 169361
+// gas irOptimized code: 99200
+// gas legacy: 172944
+// gas legacy code: 239800
+// gas legacyOptimized: 169858
+// gas legacyOptimized code: 117000
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 1d6b01127c..0918a970e2 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,11 +8,11 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 182025
-// gas irOptimized code: 87200
-// gas legacy: 196220
-// gas legacy code: 114600
-// gas legacyOptimized: 182604
-// gas legacyOptimized code: 76000
+// gas irOptimized: 180756
+// gas irOptimized code: 79200
+// gas legacy: 195165
+// gas legacy code: 109400
+// gas legacyOptimized: 181600
+// gas legacyOptimized code: 71400
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index d308d4597e..925ed54e6d 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,12 +74,12 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 78006
-// gas irOptimized code: 306600
-// gas legacy: 115817
-// gas legacy code: 797600
-// gas legacyOptimized: 84924
-// gas legacyOptimized code: 392000
+// gas irOptimized: 77654
+// gas irOptimized code: 302200
+// gas legacy: 115395
+// gas legacy code: 792400
+// gas legacyOptimized: 84566
+// gas legacyOptimized code: 387600
 // 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 b712092ed0..aed2a11df2 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,12 +33,12 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 79428
-// gas irOptimized code: 326400
-// gas legacy: 102450
-// gas legacy code: 632600
-// gas legacyOptimized: 88318
-// gas legacyOptimized code: 434400
+// gas irOptimized: 78952
+// gas irOptimized code: 320600
+// gas legacy: 102034
+// gas legacy code: 627400
+// gas legacyOptimized: 87950
+// gas legacyOptimized code: 429800
 // 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 0ef87edd4f..ce77683aab 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,38 +176,38 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 815686
-// gas irOptimized code: 571200
-// gas legacy: 925933
-// gas legacy code: 1442800
-// gas legacyOptimized: 854404
-// gas legacyOptimized code: 885600
+// gas irOptimized: 809248
+// gas irOptimized code: 558000
+// gas legacy: 919945
+// gas legacy code: 1437600
+// gas legacyOptimized: 848464
+// gas legacyOptimized code: 875200
 // 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: 115231
-// gas legacy: 148205
-// gas legacyOptimized: 122303
+// gas irOptimized: 109009
+// gas legacy: 142735
+// gas legacyOptimized: 117558
 // 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: 115231
-// gas legacy: 148205
-// gas legacyOptimized: 122303
+// gas irOptimized: 109009
+// gas legacy: 142735
+// gas legacyOptimized: 117558
 // 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: 115216
-// gas legacy: 148214
-// gas legacyOptimized: 122315
+// gas irOptimized: 108994
+// gas legacy: 142744
+// gas legacyOptimized: 117570
 // 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: 115216
-// gas legacy: 148214
-// gas legacyOptimized: 122315
+// gas irOptimized: 108994
+// gas legacy: 142744
+// gas legacyOptimized: 117570
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index a4b0f9fd35..102c85ae0f 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,12 +49,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 96420
-// gas irOptimized code: 533800
-// gas legacy: 126553
-// gas legacy code: 935400
-// gas legacyOptimized: 102933
-// gas legacyOptimized code: 616000
+// gas irOptimized: 95949
+// gas irOptimized code: 528000
+// gas legacy: 126106
+// gas legacy code: 930200
+// gas legacyOptimized: 102559
+// gas legacyOptimized code: 611400
 // 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 9d521f7777..5b254a9f6c 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -22,12 +22,12 @@ contract C {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 89555
-// gas irOptimized code: 172800
-// gas legacy: 103042
-// gas legacy code: 338400
-// gas legacyOptimized: 91862
-// gas legacyOptimized code: 201000
+// gas irOptimized: 89155
+// gas irOptimized code: 167800
+// gas legacy: 102626
+// gas legacy code: 333200
+// gas legacyOptimized: 91471
+// gas legacyOptimized code: 196200
 // 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 9baacd8127..8bf182a89e 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -25,12 +25,12 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 99264
-// gas irOptimized code: 291200
-// gas legacy: 123585
-// gas legacy code: 686400
-// gas legacyOptimized: 107331
-// gas legacyOptimized code: 391000
+// gas irOptimized: 98842
+// gas irOptimized code: 286000
+// gas legacy: 123163
+// gas legacy code: 681200
+// gas legacyOptimized: 106957
+// gas legacyOptimized code: 386400
 // 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/inlineAssembly/blobhash_pre_cancun.sol b/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
index 8972958e1f..d3a41fc07b 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
@@ -15,7 +15,7 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <=shanghai
+// EVMVersion: <cancun
 // ----
 // f() -> 1
 // g() -> 1000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
index f3fe038447..e43fc47574 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
@@ -68,3 +68,9 @@ contract C {
 // testCall() -> true
 // tloadAllowedStaticCall() -> true
 // tstoreNotAllowedStaticCall() -> true
+// gas irOptimized: 98419720
+// gas irOptimized code: 19000
+// gas legacy: 98409086
+// gas legacy code: 30000
+// gas legacyOptimized: 98420962
+// gas legacyOptimized code: 17800
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
index 935435420e..f4975cd4c7 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
@@ -40,5 +40,15 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor() ->
+// gas irOptimized: 127944
+// gas irOptimized code: 225200
+// gas legacy: 149357
+// gas legacy code: 499800
+// gas legacyOptimized: 125830
+// gas legacyOptimized code: 203200
 // destroy() ->
 // createAndDestroy() ->
+// gas legacy: 67044
+// gas legacy code: 92600
+// gas legacyOptimized: 65675
+// gas legacyOptimized code: 39400
diff --git a/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
index bdd9401ee5..d64c7dfb5f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
@@ -18,3 +18,6 @@ contract C {
 // EVMVersion: >=cancun
 // ----
 // test() -> FAILURE
+// gas irOptimized: 98437877
+// gas legacy: 98437872
+// gas legacyOptimized: 98437873
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index 6fa865440b..7517472932 100644
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -26,5 +26,5 @@ contract C {
 // compileViaYul: also
 // ----
 // createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 79241
+// gas legacy: 78574
 // gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index 1d1783a162..8ee19a278a 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: 121481
-// gas legacy: 123069
-// gas legacyOptimized: 121756
+// gas irOptimized: 121394
+// gas legacy: 122978
+// gas legacyOptimized: 121648
 // 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 a1b0999ff5..9b0fa9207a 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 legacy: 123208
-// gas legacyOptimized: 121763
+// gas irOptimized: 121511
+// gas legacy: 123117
+// gas legacyOptimized: 121655
 // 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 b884661134..a0834ca5bf 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: 123039
-// gas legacy: 130227
-// gas legacyOptimized: 128758
+// gas irOptimized: 122952
+// gas legacy: 130136
+// gas legacyOptimized: 128650
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121709
-// gas legacy: 123282
-// gas legacyOptimized: 121868
+// gas irOptimized: 121622
+// gas legacy: 123191
+// gas legacyOptimized: 121760
 // 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: 115130
-// gas legacy: 122516
-// gas legacyOptimized: 120804
+// gas irOptimized: 115043
+// gas legacy: 122425
+// gas legacyOptimized: 120696
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index e6b569922c..033f0f518c 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: 121686
-// gas legacy: 123144
-// gas legacyOptimized: 121808
+// gas irOptimized: 121599
+// gas legacy: 123053
+// gas legacyOptimized: 121700
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121731
-// gas legacy: 123193
-// gas legacyOptimized: 121860
+// gas irOptimized: 121644
+// gas legacy: 123102
+// gas legacyOptimized: 121752
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122947
-// gas legacy: 130088
-// gas legacyOptimized: 128754
+// gas irOptimized: 122860
+// gas legacy: 129997
+// gas legacyOptimized: 128646
 // 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: 115045
-// gas legacy: 118301
-// gas legacyOptimized: 115432
+// gas irOptimized: 114958
+// gas legacy: 118210
+// gas legacyOptimized: 115324
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 6a97c0bf7e..f283aaeaa3 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,12 +14,12 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 70873
-// gas irOptimized code: 102400
-// gas legacy: 82796
-// gas legacy code: 159000
-// gas legacyOptimized: 69870
-// gas legacyOptimized code: 83800
+// gas irOptimized: 70351
+// gas irOptimized code: 95800
+// gas legacy: 82380
+// gas legacy code: 153800
+// gas legacyOptimized: 69496
+// gas legacyOptimized code: 79200
 // 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 2db42adebb..b8ec252095 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,10 +8,10 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 68378
-// gas irOptimized code: 77200
-// gas legacy: 78445
-// gas legacy code: 95400
-// gas legacyOptimized: 68677
-// gas legacyOptimized code: 69200
+// gas irOptimized: 67834
+// gas irOptimized code: 70400
+// gas legacy: 78029
+// gas legacy code: 90200
+// gas legacyOptimized: 68321
+// gas legacyOptimized code: 64600
 // s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
index 85c95be447..263da7133f 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
@@ -64,9 +64,12 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 455954
-// gas legacy: 375495
-// gas legacyOptimized: 507630
+// gas irOptimized: 67028
+// gas irOptimized code: 175400
+// gas legacy: 76163
+// gas legacy code: 297400
+// gas legacyOptimized: 66516
+// gas legacyOptimized code: 168000
 // exists() -> false
 // test_create_and_terminate() ->
 // exists() -> false
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
index 4bc65b7608..16797ee4c0 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
@@ -35,16 +35,30 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor(), 2 ether ->
+// gas irOptimized: 107718
+// gas irOptimized code: 116200
+// gas legacy: 120424
+// gas legacy code: 253600
+// gas legacyOptimized: 109015
+// gas legacyOptimized code: 130800
 // balance: 0x1111111111111111111111111111111111111111 -> 0
 // balance: 0x2222222222222222222222222222222222222222 -> 0
 // balance -> 2000000000000000000
 // exists() -> false
 // test_deploy_and_terminate_twice() ->
+// gas irOptimized: 121350
+// gas irOptimized code: 14000
+// gas legacy: 122384
+// gas legacy code: 43200
+// gas legacyOptimized: 121596
+// gas legacyOptimized code: 22800
 // exists() -> false
 // balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
 // balance: 0x2222222222222222222222222222222222222222 -> 0
 // balance -> 1000000000000000000
 // deploy() ->
+// gas legacy: 58491
+// gas legacy code: 43200
 // exists() -> true
 // balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
 // balance: 0x2222222222222222222222222222222222222222 -> 0
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
index 473571bf13..1b3022efed 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
@@ -82,14 +82,21 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 562058
-// gas legacy: 633310
-// gas legacyOptimized: 590051
+// gas irOptimized: 132874
+// gas irOptimized code: 292400
+// gas legacy: 151217
+// gas legacy code: 533400
+// gas legacyOptimized: 131436
+// gas legacyOptimized code: 276600
 // exists() -> false
 // test_deploy_and_terminate() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 118541
-// gas legacyOptimized: 118305
+// gas irOptimized: 96394
+// gas irOptimized code: 20800
+// gas legacy: 97788
+// gas legacy code: 20800
+// gas legacyOptimized: 96044
+// gas legacyOptimized code: 20800
 // exists() -> false
 // deploy_create2() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
@@ -99,3 +106,6 @@ contract D {
 // test_balance_after_selfdestruct() ->
 // exists() -> true
 // deploy_create2() -> FAILURE
+// gas irOptimized: 96903654
+// gas legacy: 96903660
+// gas legacyOptimized: 96903641
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 ce8946c55c..ef53a4e478 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: 178475
-// gas legacy: 180839
-// gas legacyOptimized: 179374
+// gas irOptimized: 178263
+// gas legacy: 180657
+// gas legacyOptimized: 179156
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol
index c0284b330e..8f58c77ce6 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol
@@ -6,7 +6,7 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <=shanghai
+// EVMVersion: =shanghai
 // ----
-// DeclarationError 4619: (106-114): Function "blobhash" not found.
+// TypeError 8314: (106-114): The "blobhash" instruction is only available for Cancun-compatible VMs (you are currently compiling for "shanghai").
 // 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/mcopy_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
index 090e2f6286..96be578948 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <cancun
+// EVMVersion: =shanghai
 // ----
-// DeclarationError 4619: (75-80): Function "mcopy" not found.
+// TypeError 7755: (75-80): The "mcopy" instruction is only available for Cancun-compatible VMs (you are currently compiling for "shanghai").
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
index 25ae9e9d17..dc3a94ce19 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
@@ -7,7 +7,7 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <cancun
+// EVMVersion: =shanghai
 // ----
-// DeclarationError 4619: (70-76): Function "tstore" not found.
-// DeclarationError 4619: (96-101): Function "tload" not found.
+// TypeError 6243: (70-76): The "tstore" instruction is only available for Cancun-compatible VMs (you are currently compiling for "shanghai").
+// TypeError 6243: (96-101): The "tload" instruction is only available for Cancun-compatible VMs (you are currently compiling for "shanghai").
diff --git a/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
index 11a5bd991a..1546ea7c9f 100644
--- a/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
+++ b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
@@ -12,5 +12,5 @@ contract C {
 // EVMVersion: =shanghai
 // ----
 // TypeError 1006: (74-91): "blobbasefee" is not supported by the VM version.
-// DeclarationError 4619: (187-198): Function "blobbasefee" not found.
+// TypeError 6679: (187-198): The "blobbasefee" instruction is only available for Cancun-compatible VMs (you are currently compiling for "shanghai").
 // DeclarationError 8678: (180-200): Variable count for assignment to "ret" does not match number of values (1 vs. 0)

From b0ffcccf5c7b1b86b924aa27f7157cbc49f0d9da Mon Sep 17 00:00:00 2001
From: r0qs <deepmarolaest@gmail.com>
Date: Thu, 14 Mar 2024 07:40:36 +0100
Subject: [PATCH 0758/1140] Use specific hardhat version on openzeppelin and
 gp2 external tests (#14938)

---
 .circleci/config.yml           | 12 ++++--------
 test/externalTests/gp2.sh      |  9 +++++++++
 test/externalTests/zeppelin.sh |  6 ++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc4cec2019..13f0c499f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1913,8 +1913,7 @@ workflows:
       - t_ext: *job_ems_compile_ext_colony
 
       - t_ext: *job_native_compile_ext_gnosis
-      # TODO: Re-enable once bumped to use Cancun supported hardhat version
-      # - t_ext: *job_native_test_ext_zeppelin
+      - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
       - t_ext: *job_native_test_ext_perpetual_pools
@@ -1922,8 +1921,7 @@ workflows:
       - t_ext: *job_native_test_ext_prb_math
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
-      # TODO: Re-enable once bumped to use Cancun supported hardhat version
-      # - t_ext: *job_native_compile_ext_gp2
+      - t_ext: *job_native_compile_ext_gp2
       - t_ext: *job_native_compile_ext_euler
       - t_ext: *job_native_compile_ext_pool_together
       # TODO: Dropping the external tests below since they are based on old forks and
@@ -1937,16 +1935,14 @@ workflows:
           requires:
             - t_ems_compile_ext_colony
             - t_native_compile_ext_gnosis
-            # TODO: Re-enable once bumped to use Cancun supported hardhat version
-            # - t_native_test_ext_zeppelin
+            - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator
             - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
-            # TODO: Re-enable once bumped to use Cancun supported hardhat version
-            # - t_native_compile_ext_gp2
+            - t_native_compile_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
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index af77f99aa8..20ea586f5f 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -66,6 +66,15 @@ function gp2_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn
+    # We require to install hardhat 2.20.0 due to support for evm version cancun, otherwise we get the following error:
+    # Invalid value {"blockGasLimit":12500000,"hardfork":"cancun","allowUnlimitedContractSize":true} for HardhatConfig.networks.hardhat - Expected a value of type HardhatNetworkConfig.
+    # See: https://github.com/NomicFoundation/hardhat/issues/4176
+    yarn add hardhat@2.20.0
+
+    # Ignore bench directory which fails to compile with current hardhat and ethers versions.
+    # bench/trace/gas.ts:123:19 - error TS2339: Property 'equals' does not exist on type 'Uint8Array'.
+    jq '. + {"exclude": ["bench"]}' tsconfig.json > temp.json
+    mv temp.json tsconfig.json
 
     # Remove the config section that requires an Etherscan key. We don't need it just to run tests.
     sed -i '/^  etherscan: {$/,/^  },$/d' hardhat.config.ts
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 655e4814f7..64c901f614 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -95,6 +95,8 @@ function zeppelin_test
     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
+    sed -i "s|it(\('rejects overflow'\)|it.skip(\1|g" test/token/ERC20/ERC20.test.js
+    sed -i "s|it(\('decimals overflow'\)|it.skip(\1|g" 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
@@ -103,6 +105,10 @@ function zeppelin_test
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     npm install
+    # We require to install hardhat 2.20.0 due to support for evm version cancun, otherwise we get the following error:
+    # Invalid value {"blockGasLimit":10000000,"allowUnlimitedContractSize":true,"hardfork":"cancun"} for HardhatConfig.networks.hardhat - Expected a value of type HardhatNetworkConfig.
+    # See: https://github.com/NomicFoundation/hardhat/issues/4176
+    npm install hardhat@2.20.0
 
     replace_version_pragmas
     for preset in $SELECTED_PRESETS; do

From b61c2a91b3a478bd53fb831b0e8811668bc0dd05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Thu, 14 Mar 2024 11:29:02 +0100
Subject: [PATCH 0759/1140] Sort changelog and add release date for 0.8.25
 (#14939)

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

diff --git a/Changelog.md b/Changelog.md
index ba5dff6787..6a2e25fa2d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,12 +1,9 @@
-### 0.8.25 (unreleased)
-
-Language Features:
-
+### 0.8.25 (2023-03-14)
 
 Compiler Features:
  * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
- * Yul Analyzer: Emit transient storage warning only for the first occurrence of ``tstore``.
  * EVM: Set default EVM version to ``cancun``.
+ * Yul Analyzer: Emit transient storage warning only for the first occurrence of ``tstore``.
 
 
 Bugfixes:
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 156b846d01..7022635fde 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1890,6 +1890,10 @@
         "bugs": [],
         "released": "2024-01-25"
     },
+    "0.8.25": {
+        "bugs": [],
+        "released": "2023-03-14"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 4b748854d76b095ebec51c518ffca63b2494b123 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 14 Mar 2024 11:35:19 +0100
Subject: [PATCH 0760/1140] Set version to 0.8.26

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18af34d26b..5e2a2b4a32 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.25")
+set(PROJECT_VERSION "0.8.26")
 # 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 6a2e25fa2d..21a58478a6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.26 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.25 (2023-03-14)
 
 Compiler Features:

From 655a9d806ee7259658f47f3ff29f690cf175c13c Mon Sep 17 00:00:00 2001
From: Zuri Obozuwa <zf.obozuwa@gmail.com>
Date: Fri, 15 Mar 2024 01:59:46 +0000
Subject: [PATCH 0761/1140] Fix passing of string input parameter to Enable
 method of DebugInfoSelection struct

Use const ref to input string instead of incurring the cost of copying the input string
---
 liblangutil/DebugInfoSelection.cpp | 2 +-
 liblangutil/DebugInfoSelection.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/liblangutil/DebugInfoSelection.cpp b/liblangutil/DebugInfoSelection.cpp
index 88e09cdb7a..ad0b615c1c 100644
--- a/liblangutil/DebugInfoSelection.cpp
+++ b/liblangutil/DebugInfoSelection.cpp
@@ -83,7 +83,7 @@ std::optional<DebugInfoSelection> DebugInfoSelection::fromComponents(
 	return selection;
 }
 
-bool DebugInfoSelection::enable(std::string _component)
+bool DebugInfoSelection::enable(std::string const& _component)
 {
 	auto memberIt = componentMap().find(boost::trim_copy(_component));
 	if (memberIt == componentMap().end())
diff --git a/liblangutil/DebugInfoSelection.h b/liblangutil/DebugInfoSelection.h
index 40ba3d6b25..3a9432de6d 100644
--- a/liblangutil/DebugInfoSelection.h
+++ b/liblangutil/DebugInfoSelection.h
@@ -49,7 +49,7 @@ struct DebugInfoSelection
 		std::vector<std::string> const& _componentNames,
 		bool _acceptWildcards = false
 	);
-	bool enable(std::string _component);
+	bool enable(std::string const& _component);
 
 	bool all() const noexcept;
 	bool any() const noexcept;

From 905c8ae15217a2853dd9378f1445e875b822505a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Mar 2024 17:32:25 +0100
Subject: [PATCH 0762/1140] PPA scripts: Don't use tabs for alignment

---
 scripts/deps-ppa/static_z3.sh |  8 ++++----
 scripts/release_ppa.sh        | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 67cb15ce8a..1061199177 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -9,10 +9,10 @@
 ## This requires the following entries in /etc/dput.cf:
 ##
 ##  [cpp-build-deps]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/cpp-build-deps
-##  login			= anonymous
+##  fqdn            = ppa.launchpad.net
+##  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
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 252fd4c49c..e134ed1614 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -23,22 +23,22 @@
 ## Additionally the following entries in /etc/dput.cf are required:
 ##
 ##  [ethereum-dev]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum-dev
-##  login			= anonymous
+##  fqdn            = ppa.launchpad.net
+##  method          = ftp
+##  incoming        = ~ethereum/ethereum-dev
+##  login           = anonymous
 ##
 ##  [ethereum]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum
-##  login			= anonymous
+##  fqdn            = ppa.launchpad.net
+##  method          = ftp
+##  incoming        = ~ethereum/ethereum
+##  login           = anonymous
 ##
 ##  [ethereum-static]
-##  fqdn			= ppa.launchpad.net
-##  method			= ftp
-##  incoming		= ~ethereum/ethereum-static
-##  login			= anonymous
+##  fqdn            = ppa.launchpad.net
+##  method          = ftp
+##  incoming        = ~ethereum/ethereum-static
+##  login           = anonymous
 ##
 ##############################################################################
 

From b74203030ff8a09fa546c1d0c7ccb19fbbbf1a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Mar 2024 17:33:15 +0100
Subject: [PATCH 0763/1140] PPA scripts: Drop lunar from the distribution list

---
 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 1061199177..be45f44526 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 lunar mantic"
+DISTRIBUTIONS="focal jammy mantic"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index e134ed1614..6a6fa8f0e5 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 lunar mantic"
+DISTRIBUTIONS="focal jammy mantic"
 
 if is_release
 then

From d19991c34910e2c18788d3df78b633af71be80c9 Mon Sep 17 00:00:00 2001
From: Snoppy <michaleli@foxmail.com>
Date: Tue, 26 Mar 2024 16:32:36 +0800
Subject: [PATCH 0764/1140] fix typos (#14940)

---
 test/compilationTests/corion/premium.sol   | 2 +-
 test/compilationTests/corion/schelling.sol | 2 +-
 test/compilationTests/corion/token.sol     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/compilationTests/corion/premium.sol b/test/compilationTests/corion/premium.sol
index 8dbe76212b..646ab00e15 100644
--- a/test/compilationTests/corion/premium.sol
+++ b/test/compilationTests/corion/premium.sol
@@ -310,7 +310,7 @@ contract premium is module, safeMath {
 
             @addr       The address which is needed to be checked.
 
-            @success    Is the address crontact or not
+            @success    Is the address contract or not
         */
         uint256 _codeLength;
         assembly {
diff --git a/test/compilationTests/corion/schelling.sol b/test/compilationTests/corion/schelling.sol
index 2503748b8b..96b530d26e 100644
--- a/test/compilationTests/corion/schelling.sol
+++ b/test/compilationTests/corion/schelling.sol
@@ -521,7 +521,7 @@ contract schelling is module, announcementTypes, schellingVars {
 
             @aboveW     Weight of votes: ABOVE
             @belowW     Weight of votes: BELOW
-            @uint256    Calculatet weight
+            @uint256    Calculate weight
         */
         if ( aboveW == belowW ) {
             return aboveW + belowW;
diff --git a/test/compilationTests/corion/token.sol b/test/compilationTests/corion/token.sol
index 51c93f120b..377e8b68f2 100644
--- a/test/compilationTests/corion/token.sol
+++ b/test/compilationTests/corion/token.sol
@@ -464,7 +464,7 @@ contract token is safeMath, module, announcementTypes {
 
             @addr       Address to be checked
 
-            @success    Is the address crontact or not
+            @success    Is the address contract or not
         */
         uint256 _codeLength;
         assembly {

From 06fc835c8383c8ec0a69d9131bc2a552334cccb9 Mon Sep 17 00:00:00 2001
From: InventiveCoder <163831412+InventiveCoder@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:35:10 +0800
Subject: [PATCH 0765/1140] Remove redundant word (#14952)

Signed-off-by: InventiveCoder <liucongcong@outlook.com>
---
 libsolidity/codegen/ir/Common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/codegen/ir/Common.h b/libsolidity/codegen/ir/Common.h
index 2484ad8091..cf5bc69c7b 100644
--- a/libsolidity/codegen/ir/Common.h
+++ b/libsolidity/codegen/ir/Common.h
@@ -81,7 +81,7 @@ std::string dispenseLocationComment(ASTNode const& _node, IRGenerationContext& _
 }
 
 // Overloading std::less() makes it possible to use YulArity as a map key. We could define operator<
-// instead but such an operator would be a bit ambiguous (e.g. YulArity{2, 2} would be be greater than
+// instead but such an operator would be a bit ambiguous (e.g. YulArity{2, 2} would be greater than
 // YulArity{1, 10} in lexicographical order but the latter has greater total number of inputs and outputs).
 template<>
 struct std::less<solidity::frontend::YulArity>

From f82f0a1abc29996643c2e2b932fab933d5fa8bf3 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 25 Mar 2024 12:19:05 +0100
Subject: [PATCH 0766/1140] Install latest eldarica release on base ubuntu
 image

---
 .../buildpack-deps/Dockerfile.ubuntu2004      | 25 +++++++++++++++----
 .../buildpack-deps/Dockerfile.ubuntu2204      | 25 +++++++++++++++----
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 6ff8d1bd43..45490291a9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,14 +22,14 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="21"
+LABEL version="22"
 
 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 ; \
+	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 sudo \
@@ -40,7 +40,20 @@ RUN set -ex; \
 		libcvc4-dev libz3-static-dev z3-static jq \
 		; \
 	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov; \
+	pip3 install codecov;
+
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qy unzip openjdk-11-jre; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
+# Cleanup
+RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 FROM base AS libraries
@@ -57,3 +70,5 @@ FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
 COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 6908811f92..d7b9254486 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,14 +22,14 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="6"
+LABEL version="7"
 
 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 ; \
+	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 sudo \
@@ -40,7 +40,20 @@ RUN set -ex; \
 		libcvc4-dev libz3-static-dev z3-static jq \
 		libcln-dev zip locales-all; \
 	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov; \
+	pip3 install codecov;
+
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qy unzip openjdk-11-jre; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
+# Cleanup
+RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 FROM base AS libraries
@@ -61,3 +74,5 @@ FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
 COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"

From 9b0134b9539c4e731d701e29740880792a3cd400 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 25 Mar 2024 17:17:33 +0100
Subject: [PATCH 0767/1140] Install eldarica on OSX machines

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

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 4ca4a31d50..87383ba8f5 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -55,6 +55,9 @@ then
   brew install coreutils
   brew install diffutils
   brew install grep
+  # JRE is required to run eldarica solver
+  brew install openjdk@11
+  brew install unzip
 
   # writing to /usr/local/lib need administrative privileges.
   sudo ./scripts/install_obsolete_jsoncpp_1_7_4.sh
@@ -73,6 +76,14 @@ then
   cd ..
   sudo rm -rf "$boost_dir"
 
+  # eldarica
+  eldarica_version="2.1"
+  wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /tmp/eld_binaries.zip
+  validate_checksum /tmp/eld_binaries.zip 0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c
+  unzip /tmp/eld_binaries.zip -d /tmp
+  sudo mv /tmp/eldarica/{eld,eld-client,target,eldEnv} /usr/local/bin
+  rm -rf /tmp/{eldarica,eld_binaries.zip}
+
   # z3
   z3_version="4.12.1"
   z3_dir="z3-z3-$z3_version"

From 77b8ca51d649201be80e17fbc539cf2378f69c1a Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 25 Mar 2024 17:22:27 +0100
Subject: [PATCH 0768/1140] Update `actions/checkout` version to v4

---
 .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 6a261bd2eb..2cd6e5048c 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -26,7 +26,7 @@ jobs:
         image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

From 1fec659620b1e260679bc365a7580cb12c2dc955 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 25 Mar 2024 14:19:38 +0100
Subject: [PATCH 0769/1140] Bump CI docker images

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 13f0c499f5..5b6f023cc5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,12 +9,12 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-21
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:6f64c7b35aabddb416d28f621a3c4bbae768c257d6866f6a7f05f8225acc94f0"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-22
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:212b4d79a89c6e2d9b58ddea2d6296c5618f4ae0b016694a3b159d2b11cbbacc"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-6
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:6eee10420382588b274374c6a18cb2e5d4f8a9fef5cf440b3a1acfc32bf52837"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-7
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ecbeec36b12fd953bfb6fb3e7ced474bb73945d7ed615e6538960c32bae8126c"
   ubuntu-2204-clang-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-5

From 9ea88304f2658cbe771dc7ce29dfc15e98d3d604 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 5 Mar 2024 20:13:32 +0100
Subject: [PATCH 0770/1140] SMTChecker: Add command-line test for Eldarica

---
 test/cmdlineTests/model_checker_solvers_eld/args      | 1 +
 test/cmdlineTests/model_checker_solvers_eld/err       | 5 +++++
 test/cmdlineTests/model_checker_solvers_eld/input.sol | 7 +++++++
 3 files changed, 13 insertions(+)
 create mode 100644 test/cmdlineTests/model_checker_solvers_eld/args
 create mode 100644 test/cmdlineTests/model_checker_solvers_eld/err
 create mode 100644 test/cmdlineTests/model_checker_solvers_eld/input.sol

diff --git a/test/cmdlineTests/model_checker_solvers_eld/args b/test/cmdlineTests/model_checker_solvers_eld/args
new file mode 100644
index 0000000000..e4acd0b46b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_eld/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-solvers eld
diff --git a/test/cmdlineTests/model_checker_solvers_eld/err b/test/cmdlineTests/model_checker_solvers_eld/err
new file mode 100644
index 0000000000..ff7ad37b31
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_eld/err
@@ -0,0 +1,5 @@
+Warning: CHC: Assertion violation happens here.
+ --> model_checker_solvers_eld/input.sol:5:3:
+  |
+5 | 		assert(x > 0);
+  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_eld/input.sol b/test/cmdlineTests/model_checker_solvers_eld/input.sol
new file mode 100644
index 0000000000..7d05ef6e5f
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_eld/input.sol
@@ -0,0 +1,7 @@
+// 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

From 1d9ae8703405310b7b2c1c7b4ed551f6deadda54 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 3 Apr 2024 10:53:10 +0200
Subject: [PATCH 0771/1140] Install Eldarica on Ubuntu Clang images

---
 .../Dockerfile.ubuntu.clang.ossfuzz           | 18 +++++++++++++++++-
 .../Dockerfile.ubuntu2204.clang               | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index fd98de73e0..0b2a99b1a2 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="4"
+LABEL version="5"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -73,6 +73,16 @@ RUN set -ex; \
     make install; \
     rm -rf /usr/src/z3
 
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qy unzip openjdk-11-jre; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
 # OSSFUZZ: libprotobuf-mutator
 RUN set -ex; \
 	git clone https://github.com/google/libprotobuf-mutator.git \
@@ -137,7 +147,13 @@ RUN set -ex; \
     cp abicoder.hpp /usr/include; \
     rm -rf /usr/src/Yul-Isabelle
 
+# Cleanup
+RUN set -ex; \
+	rm -rf /var/lib/apt/lists/*
+
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
 COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index a14bdc1138..60d5a599c3 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="5"
+LABEL version="6"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -39,7 +39,20 @@ RUN set -ex; \
 		libboost-program-options-dev \
 		clang \
 		libz3-static-dev z3-static jq \
-		libcln-dev; \
+		libcln-dev;
+
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qy unzip openjdk-11-jre; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
+# Cleanup
+RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 FROM base AS libraries
@@ -63,3 +76,5 @@ FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
 COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"

From f6dd9b0005b00e7a30772b767df223eee82059b8 Mon Sep 17 00:00:00 2001
From: zo9999 <99550525+zo9999@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:05:05 +0100
Subject: [PATCH 0772/1140] Make KnowledgeBase object constructors explicit in
 order to avoid (#14958)

unexpected implicit conversions
---
 libyul/optimiser/KnowledgeBase.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 258f85f5cd..f83c5ac661 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -62,11 +62,11 @@ 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):
+	explicit 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);
+	explicit KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues);
 
 	bool knownToBeDifferent(YulString _a, YulString _b);
 	std::optional<u256> differenceIfKnownConstant(YulString _a, YulString _b);

From c75e63aba9b63f31b608e92263ed8ba6ed40e492 Mon Sep 17 00:00:00 2001
From: Tamas Molnar <moltam89@gmail.com>
Date: Wed, 3 Apr 2024 12:01:21 +0200
Subject: [PATCH 0773/1140] docs: Replace outdated Scaffold-ETH link to
 Scaffold-ETH-2 (#14973)

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

diff --git a/docs/resources.rst b/docs/resources.rst
index 85b3cf9a39..1773859d4e 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -110,7 +110,7 @@ Solidity Tools
 * `leafleth <https://github.com/clemlak/leafleth>`_
     A documentation generator for Solidity smart-contracts.
 
-* `Scaffold-ETH <https://github.com/scaffold-eth/scaffold-eth>`_
+* `Scaffold-ETH 2 <https://github.com/scaffold-eth/scaffold-eth-2>`_
     Forkable Ethereum development stack focused on fast product iterations.
 
 * `sol2uml <https://www.npmjs.com/package/sol2uml>`_

From ad5eab88e3d66a98d47853bc0af0da1dfc2d2f70 Mon Sep 17 00:00:00 2001
From: Juliano Penna <julianopenna@gmail.com>
Date: Wed, 3 Apr 2024 07:04:12 -0300
Subject: [PATCH 0774/1140] Update reference-types.rst (#14949)

It isn't "the only possibility for public contract function arguments" since version 0.6.9, as mentioned in the second "Note" of https://docs.soliditylang.org/en/v0.8.24/types.html#data-location
---
 docs/types/reference-types.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index d2e9300e64..a6c48d2416 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -392,8 +392,7 @@ Array Members
         // Data location for all state variables is storage.
         bool[2][] pairsOfFlags;
 
-        // newPairs is stored in memory - the only possibility
-        // for public contract function arguments
+        // newPairs is stored in memory
         function setAllFlagPairs(bool[2][] memory newPairs) public {
             // assignment to a storage array performs a copy of ``newPairs`` and
             // replaces the complete array ``pairsOfFlags``.

From 10b1b3c8fc360efdcec7579398409b614c3caae9 Mon Sep 17 00:00:00 2001
From: Vc <vcvckw@gmail.com>
Date: Wed, 3 Apr 2024 18:17:52 +0800
Subject: [PATCH 0775/1140] Optimize the magicVariableToID function. (#14901)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 libsolidity/analysis/GlobalContext.cpp | 56 ++++++++++++++------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
index 628b903617..c4833689fe 100644
--- a/libsolidity/analysis/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -28,40 +28,46 @@
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/ast/Types.h>
 #include <memory>
+#include <unordered_map>
 
 namespace solidity::frontend
 {
 
 namespace
 {
+
 /// Magic variables get negative ids for easy differentiation
 int magicVariableToID(std::string const& _name)
 {
-	if (_name == "abi") return -1;
-	else if (_name == "addmod") return -2;
-	else if (_name == "assert") return -3;
-	else if (_name == "block") return -4;
-	else if (_name == "blockhash") return -5;
-	else if (_name == "ecrecover") return -6;
-	else if (_name == "gasleft") return -7;
-	else if (_name == "keccak256") return -8;
-	else if (_name == "msg") return -15;
-	else if (_name == "mulmod") return -16;
-	else if (_name == "now") return -17;
-	else if (_name == "require") return -18;
-	else if (_name == "revert") return -19;
-	else if (_name == "ripemd160") return -20;
-	else if (_name == "selfdestruct") return -21;
-	else if (_name == "sha256") return -22;
-	else if (_name == "sha3") return -23;
-	else if (_name == "suicide") return -24;
-	else if (_name == "super") return -25;
-	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 + "\".");
+	static std::unordered_map<std::string, int> const magicVariables = {
+		{"abi", -1},
+		{"addmod", -2},
+		{"assert", -3},
+		{"block", -4},
+		{"blockhash", -5},
+		{"ecrecover", -6},
+		{"gasleft", -7},
+		{"keccak256", -8},
+		{"msg", -15},
+		{"mulmod", -16},
+		{"now", -17},
+		{"require", -18},
+		{"revert", -19},
+		{"ripemd160", -20},
+		{"selfdestruct", -21},
+		{"sha256", -22},
+		{"sha3", -23},
+		{"suicide", -24},
+		{"super", -25},
+		{"tx", -26},
+		{"type", -27},
+		{"this", -28},
+		{"blobhash", -29}
+	};
+
+	if (auto id = magicVariables.find(_name); id != magicVariables.end())
+		return id->second;
+	solAssert(false, "Unknown magic variable: \"" + _name + "\".");
 }
 
 inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables(langutil::EVMVersion _evmVersion)

From d2cbe963cf50ef9b18f7239ebd27409ec00b7a50 Mon Sep 17 00:00:00 2001
From: wilsoncusack <cusackw@gmail.com>
Date: Wed, 3 Apr 2024 06:21:05 -0400
Subject: [PATCH 0776/1140] NatSpec: add error to context for notice, dev, and
 param tags. (#14970)

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

diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index f92958b90c..b187ea84c7 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -117,9 +117,9 @@ Tag
 =============== ====================================================================================== =============================
 ``@title``      A title that should describe the contract/interface                                    contract, library, interface, struct, enum
 ``@author``     The name of the author                                                                 contract, library, interface, struct, enum
-``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event, struct, enum
-``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event, struct, enum
-``@param``      Documents a parameter just like in Doxygen (must be followed by parameter name)        function, event
+``@notice``     Explain to an end user what this does                                                  contract, library, interface, function, public state variable, event, struct, enum, error
+``@dev``        Explain to a developer any extra details                                               contract, library, interface, function, state variable, event, struct, enum, error
+``@param``      Documents a parameter just like in Doxygen (must be followed by parameter name)        function, event, error
 ``@return``     Documents the return variables of a contract's function                                function, public state variable
 ``@inheritdoc`` Copies all missing tags from the base function (must be followed by the contract name) function, public state variable
 ``@custom:...`` Custom tag, semantics is application-defined                                           everywhere

From ab1f2b83e94515ac09feddeaec85334632801399 Mon Sep 17 00:00:00 2001
From: Ardis Lu <ArdisGLu@gmail.com>
Date: Wed, 3 Apr 2024 03:35:02 -0700
Subject: [PATCH 0777/1140] Update precompiled contract address range (#14950)

---
 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 a31b06616a..de06d684ec 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -603,7 +603,7 @@ Precompiled Contracts
 =====================
 
 There is a small set of contract addresses that are special:
-The address range between ``1`` and (including) ``8`` contains
+The address range between ``1`` and (including) ``0x0a`` contains
 "precompiled contracts" that can be called as any other contract
 but their behavior (and their gas consumption) is not defined
 by EVM code stored at that address (they do not contain code)

From 87bdfd6a70fd20b9fdcb269ab870c1ca09552873 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Thu, 15 Feb 2024 22:59:11 +0100
Subject: [PATCH 0778/1140] [buildsystem] Fix libstdlib to use
 CMAKE_CURRENT_SOURCE_DIR.

---
 libstdlib/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libstdlib/CMakeLists.txt b/libstdlib/CMakeLists.txt
index 65a3a1cda1..b6b22832d6 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 ${PROJECT_SOURCE_DIR}/stdlib/src/)
+set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/)
 
 set(STDLIB stub)
 set(GENERATED_STDLIB_HEADERS)
 foreach(src IN LISTS STDLIB)
-    set(STDLIB_FILE ${PROJECT_SOURCE_DIR}/libstdlib/src/${src}.sol)
+    set(STDLIB_FILE ${CMAKE_CURRENT_SOURCE_DIR}/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("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/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" ${PROJECT_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/stdlib.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)

From b60ed2b96a6b00b2d23a2dd9caf98173527fc38f Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 16 Feb 2024 18:00:41 +0100
Subject: [PATCH 0779/1140] [buildsystem] Add USE_SYSTEM_LIBRARIES option.

---
 CMakeLists.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e2a2b4a32..6609585a7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,16 +37,19 @@ option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libs
 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)
+option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 
 # Setup cccache.
 include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-include(fmtlib)
-include(jsoncpp)
-include(range-v3)
-include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+if (NOT USE_SYSTEM_LIBRARIES)
+  include(fmtlib)
+  include(jsoncpp)
+  include(range-v3)
+  include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+endif()
 
 find_package(Threads)
 

From d178c40102f024f17e64c777b37729aec544409e Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 16 Feb 2024 19:33:38 +0100
Subject: [PATCH 0780/1140] [buildsystem] Add ONLY_BUILD_SOLIDITY_LIBRARIES
 option.

---
 CMakeLists.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6609585a7b..142e884edd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ 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)
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
+option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
 
 # Setup cccache.
 include(EthCcache)
@@ -144,12 +145,16 @@ add_subdirectory(libyul)
 add_subdirectory(libsolidity)
 add_subdirectory(libsolc)
 add_subdirectory(libstdlib)
-add_subdirectory(tools)
 
-if (NOT EMSCRIPTEN)
-	add_subdirectory(solc)
-endif()
+if (NOT ONLY_BUILD_SOLIDITY_LIBRARIES)
+	add_subdirectory(tools)
+
+	if (NOT EMSCRIPTEN)
+		add_subdirectory(solc)
+	endif()
 
-if (TESTS AND NOT EMSCRIPTEN)
-	add_subdirectory(test)
+	if (TESTS AND NOT EMSCRIPTEN)
+		add_subdirectory(test)
+	endif()
 endif()
+

From 780018ad21656f04a6737b87965706e9dc4e8058 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 16 Feb 2024 19:40:56 +0100
Subject: [PATCH 0781/1140] [buildsystem] Add STRICT_JSONCPP_VERSION option.

---
 CMakeLists.txt      | 5 +++++
 libsolutil/JSON.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 142e884edd..b9f2ddc36c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warni
 option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
+option(STRICT_JSONCPP_VERSION "Strictly check installed jsoncpp version" ON)
 
 # Setup cccache.
 include(EthCcache)
@@ -62,6 +63,10 @@ if (PROFILE_OPTIMIZER_STEPS)
     add_definitions(-DPROFILE_OPTIMIZER_STEPS)
 endif()
 
+if (STRICT_JSONCPP_VERSION)
+	add_definitions(-DSTRICT_JSONCPP_VERSION_CHECK)
+endif()
+
 # Figure out what compiler and system are we using
 include(EthCompilerSettings)
 
diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index ea75ada0f7..3a2570d47e 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -30,10 +30,12 @@
 #include <map>
 #include <memory>
 
+#ifdef STRICT_JSONCPP_VERSION_CHECK
 static_assert(
 	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
 	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
 );
+#endif
 
 namespace solidity::util
 {

From 8b1b65f93f2b48a3d35316caeb9508f56e787f19 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 3 Apr 2024 12:40:44 +0200
Subject: [PATCH 0782/1140] Bump ubuntu-clang docker images

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b6f023cc5..21b596830b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,12 +17,12 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ecbeec36b12fd953bfb6fb3e7ced474bb73945d7ed615e6538960c32bae8126c"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-5
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e991421ce9f44d6476b29588fc355da1c3b3fedcc424fd12d844bbe310ad7851"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-6
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1818a56061f39ece4a92138948404214bf939c9deb68f4dc2c68cd82b39e8410"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-4
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b122ef9dca71a8f90b74f3ba13cda4453681506e4a4ff047e7bc2130c76b0d1e"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-5
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c21c4c2a591d0702c388d1944539f6498ed8e51c54c1a1cb34693079efd9ab77"
   emscripten-docker-image:
     type: string
     # NOTE: Please remember to update the `build_emscripten.sh` whenever the hash of this image changes.

From 95046121317ee9bfc65dbe88aa64ed296cc3e08e Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Thu, 4 Apr 2024 17:14:07 +0200
Subject: [PATCH 0783/1140] SMTChecker: Fix internal error when using bitwise
 operators with an array element as an argument

---
 Changelog.md                                    |  1 +
 libsmtutil/Z3Interface.cpp                      |  2 ++
 .../operators/bitwise_and_array.sol             | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/bitwise_and_array.sol

diff --git a/Changelog.md b/Changelog.md
index 21a58478a6..c915a1ecfe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
 
 
 ### 0.8.25 (2023-03-14)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index a16e75668e..1cfbc815f7 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -386,6 +386,8 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		kind == Z3_OP_RECURSIVE
 	)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
+	else if (kind == Z3_OP_CONCAT)
+		return Expression("concat", arguments, sort);
 
 	smtAssert(false);
 
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_array.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_array.sol
new file mode 100644
index 0000000000..96e1434909
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_array.sol
@@ -0,0 +1,17 @@
+contract C {
+	function bitwiseXor(int[10] memory p) public pure {
+        1 ^ p[0];
+	}
+
+	function bitwiseAnd(int[10] memory p) public pure {
+		1 & p[0];
+	}
+
+	function bitwiseOr(int[10] memory p) public pure {
+		1 | p[0];
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From bcb10f8111ae987ba711f62cdcc308896e7b3332 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 3 Apr 2024 13:47:18 +0200
Subject: [PATCH 0784/1140] Remove signature removal from macos universal
 binaries.

---
 .circleci/config.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21b596830b..0dd960e93d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,13 +249,6 @@ commands:
   # --------------------------------------------------------------------------
   # Artifact Commands
 
-  remove_signature_from_universal_binary:
-    description: Remove signature from universal binary
-    steps:
-      - run:
-          name: Remove signature from universal binary
-          command: codesign --remove-signature build/solc/solc
-
   store_artifacts_solc:
     description: Store compiled solc executable as artifact
     steps:
@@ -1196,7 +1189,6 @@ jobs:
       - checkout
       - install_dependencies_osx
       - run_build
-      - remove_signature_from_universal_binary
       - store_artifacts_solc
       - store_artifacts_yul_phaser
       - persist_executables_to_workspace_osx

From f6d5a4373e85067b5ba7f54fb6c45e7802c4c067 Mon Sep 17 00:00:00 2001
From: hanghuge <cmoman@outlook.com>
Date: Sat, 6 Apr 2024 21:01:34 +0800
Subject: [PATCH 0785/1140] chore: remove repetitive words

Signed-off-by: hanghuge <cmoman@outlook.com>
---
 libsolidity/interface/FileReader.cpp                            | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/for_continue.yul   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 4197780e65..158d4dd2c9 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -271,7 +271,7 @@ 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.
+	// when the working dir is an UNC path, / does not actually refer to the root of the UNC path.
 
 	boost::filesystem::path normalizedRootPath = normalizeCLIRootPathForVFS(normalizedPath, canonicalWorkDir);
 
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
index d3cfb0d84b..213ebcaea4 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
@@ -7,7 +7,7 @@
         x := 2 // Will not be removed as if-condition can be false.
         if callvalue() {
             // This can be removed because x is overwritten both after the
-            // loop at at the start of the next iteration.
+            // loop at the start of the next iteration.
             x := 3
             continue
         }

From 37f46544bd2e9eefe85624cd18ce5a2c7b963c77 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Sun, 18 Feb 2024 23:11:48 +0100
Subject: [PATCH 0786/1140] Rename some tests.

---
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../{asm_json_import_no_value => import_asm_json_no_value}/args   | 0
 .../{asm_json_import_no_value => import_asm_json_no_value}/err    | 0
 .../{asm_json_import_no_value => import_asm_json_no_value}/exit   | 0
 .../{asm_json_import_no_value => import_asm_json_no_value}/stdin  | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../err                                                           | 0
 .../exit                                                          | 0
 .../stdin                                                         | 0
 .../{asm_json_import_verbatim => import_asm_json_verbatim}/args   | 0
 .../{asm_json_import_verbatim => import_asm_json_verbatim}/output | 0
 .../{asm_json_import_verbatim => import_asm_json_verbatim}/stdin  | 0
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 .../args                                                          | 0
 .../output                                                        | 0
 .../stdin                                                         | 0
 65 files changed, 0 insertions(+), 0 deletions(-)
 rename test/cmdlineTests/{asm_json_import_all_valid_flags => import_asm_json_all_valid_flags}/args (100%)
 rename test/cmdlineTests/{asm_json_import_all_valid_flags => import_asm_json_all_valid_flags}/output (100%)
 rename test/cmdlineTests/{asm_json_import_all_valid_flags => import_asm_json_all_valid_flags}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_difficulty_prevrandao => import_asm_json_difficulty_prevrandao}/args (100%)
 rename test/cmdlineTests/{asm_json_import_difficulty_prevrandao => import_asm_json_difficulty_prevrandao}/output (100%)
 rename test/cmdlineTests/{asm_json_import_difficulty_prevrandao => import_asm_json_difficulty_prevrandao}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_hex_subassembly_indices => import_asm_json_hex_subassembly_indices}/args (100%)
 rename test/cmdlineTests/{asm_json_import_hex_subassembly_indices => import_asm_json_hex_subassembly_indices}/output (100%)
 rename test/cmdlineTests/{asm_json_import_hex_subassembly_indices => import_asm_json_hex_subassembly_indices}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_hex => import_asm_json_invalid_data_not_hex}/args (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_hex => import_asm_json_invalid_data_not_hex}/err (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_hex => import_asm_json_invalid_data_not_hex}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_hex => import_asm_json_invalid_data_not_hex}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_object => import_asm_json_invalid_data_not_object}/args (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_object => import_asm_json_invalid_data_not_object}/err (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_object => import_asm_json_invalid_data_not_object}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_data_not_object => import_asm_json_invalid_data_not_object}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_jumptype_instruction => import_asm_json_invalid_jumptype_instruction}/args (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_jumptype_instruction => import_asm_json_invalid_jumptype_instruction}/err (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_jumptype_instruction => import_asm_json_invalid_jumptype_instruction}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_jumptype_instruction => import_asm_json_invalid_jumptype_instruction}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_value => import_asm_json_invalid_value}/args (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_value => import_asm_json_invalid_value}/err (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_value => import_asm_json_invalid_value}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_invalid_value => import_asm_json_invalid_value}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_missing_subobject_indices => import_asm_json_missing_subobject_indices}/args (100%)
 rename test/cmdlineTests/{asm_json_import_missing_subobject_indices => import_asm_json_missing_subobject_indices}/err (100%)
 rename test/cmdlineTests/{asm_json_import_missing_subobject_indices => import_asm_json_missing_subobject_indices}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_missing_subobject_indices => import_asm_json_missing_subobject_indices}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_no_value => import_asm_json_no_value}/args (100%)
 rename test/cmdlineTests/{asm_json_import_no_value => import_asm_json_no_value}/err (100%)
 rename test/cmdlineTests/{asm_json_import_no_value => import_asm_json_no_value}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_no_value => import_asm_json_no_value}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_non_unique_sources => import_asm_json_non_unique_sources}/args (100%)
 rename test/cmdlineTests/{asm_json_import_non_unique_sources => import_asm_json_non_unique_sources}/err (100%)
 rename test/cmdlineTests/{asm_json_import_non_unique_sources => import_asm_json_non_unique_sources}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_non_unique_sources => import_asm_json_non_unique_sources}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_optimize_not_supported => import_asm_json_optimize_not_supported}/args (100%)
 rename test/cmdlineTests/{asm_json_import_optimize_not_supported => import_asm_json_optimize_not_supported}/err (100%)
 rename test/cmdlineTests/{asm_json_import_optimize_not_supported => import_asm_json_optimize_not_supported}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_optimize_not_supported => import_asm_json_optimize_not_supported}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_out_of_range_data_index => import_asm_json_out_of_range_data_index}/args (100%)
 rename test/cmdlineTests/{asm_json_import_out_of_range_data_index => import_asm_json_out_of_range_data_index}/err (100%)
 rename test/cmdlineTests/{asm_json_import_out_of_range_data_index => import_asm_json_out_of_range_data_index}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_out_of_range_data_index => import_asm_json_out_of_range_data_index}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_random_order_data_index => import_asm_json_random_order_data_index}/args (100%)
 rename test/cmdlineTests/{asm_json_import_random_order_data_index => import_asm_json_random_order_data_index}/output (100%)
 rename test/cmdlineTests/{asm_json_import_random_order_data_index => import_asm_json_random_order_data_index}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_unrecognized_field => import_asm_json_unrecognized_field}/args (100%)
 rename test/cmdlineTests/{asm_json_import_unrecognized_field => import_asm_json_unrecognized_field}/err (100%)
 rename test/cmdlineTests/{asm_json_import_unrecognized_field => import_asm_json_unrecognized_field}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_unrecognized_field => import_asm_json_unrecognized_field}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_untagged_jumpdest => import_asm_json_untagged_jumpdest}/args (100%)
 rename test/cmdlineTests/{asm_json_import_untagged_jumpdest => import_asm_json_untagged_jumpdest}/err (100%)
 rename test/cmdlineTests/{asm_json_import_untagged_jumpdest => import_asm_json_untagged_jumpdest}/exit (100%)
 rename test/cmdlineTests/{asm_json_import_untagged_jumpdest => import_asm_json_untagged_jumpdest}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_verbatim => import_asm_json_verbatim}/args (100%)
 rename test/cmdlineTests/{asm_json_import_verbatim => import_asm_json_verbatim}/output (100%)
 rename test/cmdlineTests/{asm_json_import_verbatim => import_asm_json_verbatim}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_yul_more_subobjects => import_asm_json_yul_more_subobjects}/args (100%)
 rename test/cmdlineTests/{asm_json_import_yul_more_subobjects => import_asm_json_yul_more_subobjects}/output (100%)
 rename test/cmdlineTests/{asm_json_import_yul_more_subobjects => import_asm_json_yul_more_subobjects}/stdin (100%)
 rename test/cmdlineTests/{asm_json_import_yul_subobjects => import_asm_json_yul_subobjects}/args (100%)
 rename test/cmdlineTests/{asm_json_import_yul_subobjects => import_asm_json_yul_subobjects}/output (100%)
 rename test/cmdlineTests/{asm_json_import_yul_subobjects => import_asm_json_yul_subobjects}/stdin (100%)

diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/args b/test/cmdlineTests/import_asm_json_all_valid_flags/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_all_valid_flags/args
rename to test/cmdlineTests/import_asm_json_all_valid_flags/args
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/output b/test/cmdlineTests/import_asm_json_all_valid_flags/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_all_valid_flags/output
rename to test/cmdlineTests/import_asm_json_all_valid_flags/output
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/stdin b/test/cmdlineTests/import_asm_json_all_valid_flags/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_all_valid_flags/stdin
rename to test/cmdlineTests/import_asm_json_all_valid_flags/stdin
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args b/test/cmdlineTests/import_asm_json_difficulty_prevrandao/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
rename to test/cmdlineTests/import_asm_json_difficulty_prevrandao/args
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output b/test/cmdlineTests/import_asm_json_difficulty_prevrandao/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
rename to test/cmdlineTests/import_asm_json_difficulty_prevrandao/output
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin b/test/cmdlineTests/import_asm_json_difficulty_prevrandao/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
rename to test/cmdlineTests/import_asm_json_difficulty_prevrandao/stdin
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args b/test/cmdlineTests/import_asm_json_hex_subassembly_indices/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
rename to test/cmdlineTests/import_asm_json_hex_subassembly_indices/args
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output b/test/cmdlineTests/import_asm_json_hex_subassembly_indices/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
rename to test/cmdlineTests/import_asm_json_hex_subassembly_indices/output
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin b/test/cmdlineTests/import_asm_json_hex_subassembly_indices/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
rename to test/cmdlineTests/import_asm_json_hex_subassembly_indices/stdin
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args b/test/cmdlineTests/import_asm_json_invalid_data_not_hex/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
rename to test/cmdlineTests/import_asm_json_invalid_data_not_hex/args
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err b/test/cmdlineTests/import_asm_json_invalid_data_not_hex/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
rename to test/cmdlineTests/import_asm_json_invalid_data_not_hex/err
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit b/test/cmdlineTests/import_asm_json_invalid_data_not_hex/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
rename to test/cmdlineTests/import_asm_json_invalid_data_not_hex/exit
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin b/test/cmdlineTests/import_asm_json_invalid_data_not_hex/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
rename to test/cmdlineTests/import_asm_json_invalid_data_not_hex/stdin
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/args b/test/cmdlineTests/import_asm_json_invalid_data_not_object/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_object/args
rename to test/cmdlineTests/import_asm_json_invalid_data_not_object/args
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/err b/test/cmdlineTests/import_asm_json_invalid_data_not_object/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_object/err
rename to test/cmdlineTests/import_asm_json_invalid_data_not_object/err
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit b/test/cmdlineTests/import_asm_json_invalid_data_not_object/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
rename to test/cmdlineTests/import_asm_json_invalid_data_not_object/exit
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin b/test/cmdlineTests/import_asm_json_invalid_data_not_object/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
rename to test/cmdlineTests/import_asm_json_invalid_data_not_object/stdin
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args b/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
rename to test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/args
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err b/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
rename to test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/err
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit b/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
rename to test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/exit
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin b/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
rename to test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/stdin
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/args b/test/cmdlineTests/import_asm_json_invalid_value/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_value/args
rename to test/cmdlineTests/import_asm_json_invalid_value/args
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/err b/test/cmdlineTests/import_asm_json_invalid_value/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_value/err
rename to test/cmdlineTests/import_asm_json_invalid_value/err
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/exit b/test/cmdlineTests/import_asm_json_invalid_value/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_value/exit
rename to test/cmdlineTests/import_asm_json_invalid_value/exit
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/stdin b/test/cmdlineTests/import_asm_json_invalid_value/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_invalid_value/stdin
rename to test/cmdlineTests/import_asm_json_invalid_value/stdin
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/args b/test/cmdlineTests/import_asm_json_missing_subobject_indices/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_missing_subobject_indices/args
rename to test/cmdlineTests/import_asm_json_missing_subobject_indices/args
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/err b/test/cmdlineTests/import_asm_json_missing_subobject_indices/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_missing_subobject_indices/err
rename to test/cmdlineTests/import_asm_json_missing_subobject_indices/err
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit b/test/cmdlineTests/import_asm_json_missing_subobject_indices/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
rename to test/cmdlineTests/import_asm_json_missing_subobject_indices/exit
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin b/test/cmdlineTests/import_asm_json_missing_subobject_indices/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
rename to test/cmdlineTests/import_asm_json_missing_subobject_indices/stdin
diff --git a/test/cmdlineTests/asm_json_import_no_value/args b/test/cmdlineTests/import_asm_json_no_value/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_no_value/args
rename to test/cmdlineTests/import_asm_json_no_value/args
diff --git a/test/cmdlineTests/asm_json_import_no_value/err b/test/cmdlineTests/import_asm_json_no_value/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_no_value/err
rename to test/cmdlineTests/import_asm_json_no_value/err
diff --git a/test/cmdlineTests/asm_json_import_no_value/exit b/test/cmdlineTests/import_asm_json_no_value/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_no_value/exit
rename to test/cmdlineTests/import_asm_json_no_value/exit
diff --git a/test/cmdlineTests/asm_json_import_no_value/stdin b/test/cmdlineTests/import_asm_json_no_value/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_no_value/stdin
rename to test/cmdlineTests/import_asm_json_no_value/stdin
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/args b/test/cmdlineTests/import_asm_json_non_unique_sources/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_non_unique_sources/args
rename to test/cmdlineTests/import_asm_json_non_unique_sources/args
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/err b/test/cmdlineTests/import_asm_json_non_unique_sources/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_non_unique_sources/err
rename to test/cmdlineTests/import_asm_json_non_unique_sources/err
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/exit b/test/cmdlineTests/import_asm_json_non_unique_sources/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_non_unique_sources/exit
rename to test/cmdlineTests/import_asm_json_non_unique_sources/exit
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/stdin b/test/cmdlineTests/import_asm_json_non_unique_sources/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_non_unique_sources/stdin
rename to test/cmdlineTests/import_asm_json_non_unique_sources/stdin
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/args b/test/cmdlineTests/import_asm_json_optimize_not_supported/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_optimize_not_supported/args
rename to test/cmdlineTests/import_asm_json_optimize_not_supported/args
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/err b/test/cmdlineTests/import_asm_json_optimize_not_supported/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_optimize_not_supported/err
rename to test/cmdlineTests/import_asm_json_optimize_not_supported/err
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/exit b/test/cmdlineTests/import_asm_json_optimize_not_supported/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_optimize_not_supported/exit
rename to test/cmdlineTests/import_asm_json_optimize_not_supported/exit
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin b/test/cmdlineTests/import_asm_json_optimize_not_supported/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
rename to test/cmdlineTests/import_asm_json_optimize_not_supported/stdin
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/args b/test/cmdlineTests/import_asm_json_out_of_range_data_index/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_out_of_range_data_index/args
rename to test/cmdlineTests/import_asm_json_out_of_range_data_index/args
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/err b/test/cmdlineTests/import_asm_json_out_of_range_data_index/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_out_of_range_data_index/err
rename to test/cmdlineTests/import_asm_json_out_of_range_data_index/err
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit b/test/cmdlineTests/import_asm_json_out_of_range_data_index/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
rename to test/cmdlineTests/import_asm_json_out_of_range_data_index/exit
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin b/test/cmdlineTests/import_asm_json_out_of_range_data_index/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
rename to test/cmdlineTests/import_asm_json_out_of_range_data_index/stdin
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/args b/test/cmdlineTests/import_asm_json_random_order_data_index/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_random_order_data_index/args
rename to test/cmdlineTests/import_asm_json_random_order_data_index/args
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/output b/test/cmdlineTests/import_asm_json_random_order_data_index/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_random_order_data_index/output
rename to test/cmdlineTests/import_asm_json_random_order_data_index/output
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/stdin b/test/cmdlineTests/import_asm_json_random_order_data_index/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_random_order_data_index/stdin
rename to test/cmdlineTests/import_asm_json_random_order_data_index/stdin
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/args b/test/cmdlineTests/import_asm_json_unrecognized_field/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_unrecognized_field/args
rename to test/cmdlineTests/import_asm_json_unrecognized_field/args
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/err b/test/cmdlineTests/import_asm_json_unrecognized_field/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_unrecognized_field/err
rename to test/cmdlineTests/import_asm_json_unrecognized_field/err
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/exit b/test/cmdlineTests/import_asm_json_unrecognized_field/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_unrecognized_field/exit
rename to test/cmdlineTests/import_asm_json_unrecognized_field/exit
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/stdin b/test/cmdlineTests/import_asm_json_unrecognized_field/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_unrecognized_field/stdin
rename to test/cmdlineTests/import_asm_json_unrecognized_field/stdin
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/args b/test/cmdlineTests/import_asm_json_untagged_jumpdest/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_untagged_jumpdest/args
rename to test/cmdlineTests/import_asm_json_untagged_jumpdest/args
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/err b/test/cmdlineTests/import_asm_json_untagged_jumpdest/err
similarity index 100%
rename from test/cmdlineTests/asm_json_import_untagged_jumpdest/err
rename to test/cmdlineTests/import_asm_json_untagged_jumpdest/err
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit b/test/cmdlineTests/import_asm_json_untagged_jumpdest/exit
similarity index 100%
rename from test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
rename to test/cmdlineTests/import_asm_json_untagged_jumpdest/exit
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin b/test/cmdlineTests/import_asm_json_untagged_jumpdest/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
rename to test/cmdlineTests/import_asm_json_untagged_jumpdest/stdin
diff --git a/test/cmdlineTests/asm_json_import_verbatim/args b/test/cmdlineTests/import_asm_json_verbatim/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_verbatim/args
rename to test/cmdlineTests/import_asm_json_verbatim/args
diff --git a/test/cmdlineTests/asm_json_import_verbatim/output b/test/cmdlineTests/import_asm_json_verbatim/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_verbatim/output
rename to test/cmdlineTests/import_asm_json_verbatim/output
diff --git a/test/cmdlineTests/asm_json_import_verbatim/stdin b/test/cmdlineTests/import_asm_json_verbatim/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_verbatim/stdin
rename to test/cmdlineTests/import_asm_json_verbatim/stdin
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/args b/test/cmdlineTests/import_asm_json_yul_more_subobjects/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_more_subobjects/args
rename to test/cmdlineTests/import_asm_json_yul_more_subobjects/args
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/output b/test/cmdlineTests/import_asm_json_yul_more_subobjects/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_more_subobjects/output
rename to test/cmdlineTests/import_asm_json_yul_more_subobjects/output
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin b/test/cmdlineTests/import_asm_json_yul_more_subobjects/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
rename to test/cmdlineTests/import_asm_json_yul_more_subobjects/stdin
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/args b/test/cmdlineTests/import_asm_json_yul_subobjects/args
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_subobjects/args
rename to test/cmdlineTests/import_asm_json_yul_subobjects/args
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/output b/test/cmdlineTests/import_asm_json_yul_subobjects/output
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_subobjects/output
rename to test/cmdlineTests/import_asm_json_yul_subobjects/output
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/stdin b/test/cmdlineTests/import_asm_json_yul_subobjects/stdin
similarity index 100%
rename from test/cmdlineTests/asm_json_import_yul_subobjects/stdin
rename to test/cmdlineTests/import_asm_json_yul_subobjects/stdin

From c5c0bc534ede889a836c6282f85a2d59d209b3d2 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 8 Apr 2024 11:21:44 +0200
Subject: [PATCH 0787/1140] Rename additional tests.

---
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename test/cmdlineTests/{standard_import_evmasm => standard_import_asm_json}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm => standard_import_asm_json}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_immutable_references => standard_import_asm_json_immutable_references}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_immutable_references => standard_import_asm_json_immutable_references}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_input_array => standard_import_asm_json_invalid_input_array}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_input_array => standard_import_asm_json_invalid_input_array}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_key_inside_source => standard_import_asm_json_invalid_key_inside_source}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_key_inside_source => standard_import_asm_json_invalid_key_inside_source}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_key_other_source => standard_import_asm_json_invalid_key_other_source}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_key_other_source => standard_import_asm_json_invalid_key_other_source}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_no_source => standard_import_asm_json_invalid_no_source}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_no_source => standard_import_asm_json_invalid_no_source}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_opcode => standard_import_asm_json_invalid_opcode}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_opcode => standard_import_asm_json_invalid_opcode}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_two_sources => standard_import_asm_json_invalid_two_sources}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_invalid_two_sources => standard_import_asm_json_invalid_two_sources}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_link_references => standard_import_asm_json_link_references}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_link_references => standard_import_asm_json_link_references}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_multiple_keys_inside_source => standard_import_asm_json_multiple_keys_inside_source}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_multiple_keys_inside_source => standard_import_asm_json_multiple_keys_inside_source}/output.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_no_output_selection => standard_import_asm_json_no_output_selection}/input.json (100%)
 rename test/cmdlineTests/{standard_import_evmasm_no_output_selection => standard_import_asm_json_no_output_selection}/output.json (100%)

diff --git a/test/cmdlineTests/standard_import_evmasm/input.json b/test/cmdlineTests/standard_import_asm_json/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm/input.json
rename to test/cmdlineTests/standard_import_asm_json/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm/output.json b/test/cmdlineTests/standard_import_asm_json/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm/output.json
rename to test/cmdlineTests/standard_import_asm_json/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_immutable_references/input.json b/test/cmdlineTests/standard_import_asm_json_immutable_references/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_immutable_references/input.json
rename to test/cmdlineTests/standard_import_asm_json_immutable_references/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_immutable_references/output.json b/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_immutable_references/output.json
rename to test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_input_array/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_input_array/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_no_source/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_no_source/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_opcode/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_opcode/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json b/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_two_sources/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json
rename to test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_link_references/input.json b/test/cmdlineTests/standard_import_asm_json_link_references/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_link_references/input.json
rename to test/cmdlineTests/standard_import_asm_json_link_references/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_link_references/output.json b/test/cmdlineTests/standard_import_asm_json_link_references/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_link_references/output.json
rename to test/cmdlineTests/standard_import_asm_json_link_references/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json b/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json
rename to test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json b/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json
rename to test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
diff --git a/test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json b/test/cmdlineTests/standard_import_asm_json_no_output_selection/input.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json
rename to test/cmdlineTests/standard_import_asm_json_no_output_selection/input.json
diff --git a/test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json b/test/cmdlineTests/standard_import_asm_json_no_output_selection/output.json
similarity index 100%
rename from test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json
rename to test/cmdlineTests/standard_import_asm_json_no_output_selection/output.json

From 0c32ddb0d6130b38b70180c4076fbc8123fb401f Mon Sep 17 00:00:00 2001
From: pcw109550 <pcw109550@gmail.com>
Date: Mon, 8 Apr 2024 11:48:53 -0600
Subject: [PATCH 0788/1140] Fix error msg for hex number combined with unit
 denomination

---
 libsolidity/analysis/TypeChecker.cpp                            | 2 +-
 .../denominations/combining_hex_and_denomination.sol            | 2 +-
 .../syntaxTests/denominations/invalid_denomination_address.sol  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5bef2803ac..0bcab65d93 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3874,7 +3874,7 @@ void TypeChecker::endVisit(Literal const& _literal)
 			5145_error,
 			_literal.location(),
 			"Hexadecimal numbers cannot be used with unit denominations. "
-			"You can use an expression of the form \"0x1234 * 1 day\" instead."
+			"You can use an expression of the form \"0x1234 * 1 days\" instead."
 		);
 
 	if (_literal.subDenomination() == Literal::SubDenomination::Year)
diff --git a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol b/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
index 994c0568a1..f200b13560 100644
--- a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
+++ b/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
@@ -2,4 +2,4 @@ contract C {
 	uint constant x = 0x01 wei;
 }
 // ----
-// TypeError 5145: (32-40): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
+// TypeError 5145: (32-40): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 days" instead.
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
index 8eec22dee3..7c1f1e270f 100644
--- a/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
+++ b/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
@@ -2,4 +2,4 @@ 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.
+// TypeError 5145: (26-73): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 days" instead.

From 8c320419775e8f207a305c85ee40e6d8717c051b Mon Sep 17 00:00:00 2001
From: looklose <shishuaiqun@yeah.net>
Date: Wed, 10 Apr 2024 20:42:50 +0800
Subject: [PATCH 0789/1140] chore: fix typo in comment

Signed-off-by: looklose <shishuaiqun@yeah.net>
---
 libsolc/libsolc.h                    | 2 +-
 libsolutil/Keccak256.cpp             | 2 +-
 test/libsolidity/AnalysisFramework.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolc/libsolc.h b/libsolc/libsolc.h
index c5b3b3db73..b259ed06a2 100644
--- a/libsolc/libsolc.h
+++ b/libsolc/libsolc.h
@@ -45,7 +45,7 @@ extern "C" {
 /// @param o_error A pointer to an error message, if there is one.
 ///
 /// The file (as well as error) contents that is to be allocated by the callback
-/// implementor must use the solidity_alloc() API to allocate its underlying
+/// implementer must use the solidity_alloc() API to allocate its underlying
 /// storage. Ownership is then transferred to the compiler which will take care
 /// of the deallocation.
 ///
diff --git a/libsolutil/Keccak256.cpp b/libsolutil/Keccak256.cpp
index c54dedabeb..9cf716354a 100644
--- a/libsolutil/Keccak256.cpp
+++ b/libsolutil/Keccak256.cpp
@@ -35,7 +35,7 @@ namespace
  *
  * A single-file implementation of SHA-3 and SHAKE.
  *
- * Implementor: David Leon Gil
+ * implementer: David Leon Gil
  * License: CC0, attribution kindly requested. Blame taken too,
  * but not liability.
  */
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index e7b2c03ec2..93581a5827 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -200,7 +200,7 @@ CHECK_ERROR_OR_WARNING(text, type, substrings, false, true)
 #define CHECK_WARNING(text, substring) \
 CHECK_ERROR_OR_WARNING(text, Warning, std::vector<std::string>{(substring)}, true, false)
 
-// [checkWarningAllowMulti(text, substring)] aserts that the compilation down to typechecking
+// [checkWarningAllowMulti(text, substring)] asserts that the compilation down to typechecking
 // emits a warning and with a message containing [substring].
 // Because of the limitations of the preprocessor, you cannot use {"abc", "def"} as arguments,
 // but have to replace them by (std::vector<std::string>{"abc", "def"}) (note the parentheses)

From c2d2143dad57319ecb737aa7033a555bafc618e3 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 3 Apr 2024 21:37:15 +0200
Subject: [PATCH 0790/1140] SMTChecker: Add helper method to check for
 compatibility of sorts

The helper method makes clear the intent clear and should be more
readable than if-then-else branches with smtAssertions.
Moreover, some of the if-conditions were not checking the right thing.
---
 libsmtutil/SolverInterface.h | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index 82f8111335..f9a61e2ec8 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -189,10 +189,7 @@ class Expression
 
 	static Expression ite(Expression _condition, Expression _trueValue, Expression _falseValue)
 	{
-		if (_trueValue.sort->kind == Kind::Int)
-			smtAssert(_trueValue.sort->kind == _falseValue.sort->kind, "");
-		else
-			smtAssert(*_trueValue.sort == *_falseValue.sort, "");
+		smtAssert(areCompatible(*_trueValue.sort, *_falseValue.sort));
 		SortPointer sort = _trueValue.sort;
 		return Expression("ite", std::vector<Expression>{
 			std::move(_condition), std::move(_trueValue), std::move(_falseValue)
@@ -216,10 +213,7 @@ class Expression
 		std::shared_ptr<ArraySort> arraySort = std::dynamic_pointer_cast<ArraySort>(_array.sort);
 		smtAssert(arraySort, "");
 		smtAssert(_index.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->domain->kind == _index.sort->kind, "");
-		else
-			smtAssert(*arraySort->domain == *_index.sort, "");
+		smtAssert(areCompatible(*arraySort->domain, *_index.sort));
 		return Expression(
 			"select",
 			std::vector<Expression>{std::move(_array), std::move(_index)},
@@ -236,10 +230,7 @@ class Expression
 		smtAssert(_index.sort, "");
 		smtAssert(_element.sort, "");
 		smtAssert(*arraySort->domain == *_index.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->range->kind == _element.sort->kind, "");
-		else
-			smtAssert(*arraySort->range == *_element.sort, "");
+		smtAssert(areCompatible(*arraySort->range, *_element.sort));
 		return Expression(
 			"store",
 			std::vector<Expression>{std::move(_array), std::move(_index), std::move(_element)},
@@ -254,10 +245,7 @@ class Expression
 		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
 		smtAssert(sortSort && arraySort, "");
 		smtAssert(_value.sort, "");
-		if (arraySort->domain->kind == Kind::Int)
-			smtAssert(arraySort->range->kind == _value.sort->kind, "");
-		else
-			smtAssert(*arraySort->range == *_value.sort, "");
+		smtAssert(areCompatible(*arraySort->range, *_value.sort));
 		return Expression(
 			"const_array",
 			std::vector<Expression>{std::move(_sort), std::move(_value)},
@@ -501,6 +489,12 @@ class Expression
 	SortPointer sort;
 
 private:
+	/// Helper method for checking sort compatibility when creating expressions
+	/// Signed and unsigned Int sorts are compatible even though they are not same
+	static bool areCompatible(Sort const& s1, Sort const& s2)
+	{
+		return s1.kind == Kind::Int ? s1.kind == s2.kind : s1 == s2;
+	}
 	/// Manual constructors, should only be used by SolverInterface and this class itself.
 	Expression(std::string _name, std::vector<Expression> _arguments, Kind _kind):
 		Expression(std::move(_name), std::move(_arguments), std::make_shared<Sort>(_kind)) {}

From 60240b489447824c16b54f893a9b76d0ee5678f3 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 3 Apr 2024 21:41:58 +0200
Subject: [PATCH 0791/1140] SMTChecker: Relax assertion for creating array
 store expression

---
 libsmtutil/SolverInterface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index f9a61e2ec8..13803de6e9 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -229,7 +229,7 @@ class Expression
 		smtAssert(arraySort, "");
 		smtAssert(_index.sort, "");
 		smtAssert(_element.sort, "");
-		smtAssert(*arraySort->domain == *_index.sort, "");
+		smtAssert(areCompatible(*arraySort->domain, *_index.sort));
 		smtAssert(areCompatible(*arraySort->range, *_element.sort));
 		return Expression(
 			"store",

From e74472c77d1b8a714c23df14175b0e95aabdfe43 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 3 Apr 2024 21:50:46 +0200
Subject: [PATCH 0792/1140] SMTChecker: Add regression test

---
 ...pping_integer_signedness_compatibility.sol | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/types/mapping_integer_signedness_compatibility.sol

diff --git a/test/libsolidity/smtCheckerTests/types/mapping_integer_signedness_compatibility.sol b/test/libsolidity/smtCheckerTests/types/mapping_integer_signedness_compatibility.sol
new file mode 100644
index 0000000000..a05c8d3e1b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/mapping_integer_signedness_compatibility.sol
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0
+
+
+// Regression for handling signedness, see issue #14792
+contract C {
+    mapping(int => int) v1;
+    mapping(int => uint) v2;
+    mapping(uint => int) v3;
+    mapping(uint => uint) v4;
+    mapping(bytes12 => int) v5;
+    uint[5] a1;
+    int[5] a2;
+
+    function f() public {
+        delete v1[0];
+        delete v2[0];
+        delete v3[0];
+        delete v4[0];
+        delete v5[0];
+        delete a1[0];
+        delete a2[0];
+    }
+}
+// ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 0c831e0995fde6aed98c77b8ea6f72c80c941867 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Fri, 12 Apr 2024 09:56:32 +0200
Subject: [PATCH 0793/1140] Add a changelog entry about a fixed ICE in
 SMTChecker

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

diff --git a/Changelog.md b/Changelog.md
index c915a1ecfe..ccc2de41a6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
 
 

From b958d80eaaebb697c962462e42f7769155211e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 14:27:53 +0200
Subject: [PATCH 0794/1140] gas_diff_stats: Use argparse and adjust description
 to work better with it

---
 scripts/gas_diff_stats.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index e593bb9a97..8736e21d78 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -1,26 +1,21 @@
 #!/usr/bin/env python3
-"""A script to collect gas statistics and print it.
+"""Summarizes gas differences from semantic test diff.
 
-Useful to summarize gas differences to semantic tests for a PR / branch.
+The script collects all gas differences present in git diff of semantic tests
+and summarizes them in the form of a table that's ready to post in a GitHub comment.
+The diff is calculated against the `origin/develop` branch.
+Only changes that are already committed are taken into account.
+Changes that are only staged or not staged or committed at all are ignored.
 
-Dependencies: Parsec (https://pypi.org/project/parsec/) and Tabulate
-(https://pypi.org/project/tabulate/)
-
-  pip install parsec tabulate
-
-Run from root project dir.
-
-  python3 scripts/gas_diff_stats.py
-
-Note that the changes to semantic tests have to be committed.
-
-Assumes that there is a remote named ``origin`` pointing to the Solidity github
-repository. The changes are compared against ``origin/develop``.
+Useful for reviewing the gas impact of a specific PR / branch.
+Instead of tediously going through each individual change, it's recommended to review the table.
 
+Dependencies: parsec, tabulate
 """
 
 import subprocess
 import sys
+from argparse import ArgumentParser, RawDescriptionHelpFormatter
 from pathlib import Path
 from enum import Enum
 from parsec import generate, ParseError, regex, string, optional
@@ -170,6 +165,9 @@ def stat(old, new):
         print("No differences found.")
 
 def main():
+    parser = ArgumentParser(description=__doc__, formatter_class=RawDescriptionHelpFormatter)
+    options = parser.parse_args()
+
     try:
         semantictest_statistics()
     except subprocess.CalledProcessError as exception:

From 42aa58aa36c3f2ef1dcde1e3e2d4d185b076e6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 15:29:11 +0200
Subject: [PATCH 0795/1140] gas_diff_stats: Base branch option

---
 scripts/gas_diff_stats.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 8736e21d78..ecb4cc912a 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -3,7 +3,6 @@
 
 The script collects all gas differences present in git diff of semantic tests
 and summarizes them in the form of a table that's ready to post in a GitHub comment.
-The diff is calculated against the `origin/develop` branch.
 Only changes that are already committed are taken into account.
 Changes that are only staged or not staged or committed at all are ignored.
 
@@ -100,11 +99,11 @@ def collect_statistics(lines) -> (int, int, int, int, int, int):
         for _codegen_kind in codegen_kinds
     )
 
-def semantictest_statistics():
+def semantictest_statistics(base_branch: str):
     """Prints the tabulated statistics that can be pasted in github."""
     def parse_git_diff(fname):
         diff_output = subprocess.check_output(
-            ["git", "diff", "--unified=0", "origin/develop", "HEAD", fname],
+            ["git", "diff", "--unified=0", base_branch, "HEAD", fname],
             universal_newlines=True
         ).splitlines()
         if len(diff_output) == 0:
@@ -166,10 +165,16 @@ def stat(old, new):
 
 def main():
     parser = ArgumentParser(description=__doc__, formatter_class=RawDescriptionHelpFormatter)
+    parser.add_argument(
+        '--base',
+        dest='base_branch',
+        default='origin/develop',
+        help='The base branch to diff against. default: origin/develop',
+    )
     options = parser.parse_args()
 
     try:
-        semantictest_statistics()
+        semantictest_statistics(options.base_branch)
     except subprocess.CalledProcessError as exception:
         sys.exit(f"Error in the git diff:\n{exception.output}")
     except ParseError as exception:

From 54e425236d47a0bbab658bb55d3bf5d3b4565a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 23:10:36 +0200
Subject: [PATCH 0796/1140] Clean up tab/space mix and tabs used for alignment

---
 CODING_STYLE.md                               |   2 +-
 cmake/EthCompilerSettings.cmake               |  34 +-
 cmake/EthDependencies.cmake                   |   6 +-
 docs/grammar/SolidityParser.g4                |   4 +-
 libevmasm/AssemblyItem.cpp                    |   2 +-
 libevmasm/Instruction.cpp                     | 300 ++++++++--------
 libevmasm/Instruction.h                       | 334 +++++++++---------
 liblangutil/Token.h                           |  16 +-
 libsmtutil/CHCSmtLib2Interface.cpp            |   2 +-
 libsolidity/analysis/TypeChecker.cpp          |   2 +-
 libsolidity/ast/ASTAnnotations.h              |   4 +-
 libsolidity/ast/Types.cpp                     |   2 +-
 libsolidity/codegen/ExpressionCompiler.cpp    |   2 +-
 .../experimental/codegen/IRGenerator.cpp      |  15 +-
 .../experimental/codegen/IRGenerator.h        |   4 +-
 libsolidity/formal/BMC.cpp                    |   4 +-
 libsolidity/formal/SMTEncoder.h               |   2 +-
 libsolutil/FixedHash.h                        |   2 +-
 libsolutil/Result.h                           |   6 +-
 libyul/YulString.h                            |   2 +-
 .../backends/evm/ControlFlowGraphBuilder.cpp  |   2 +-
 libyul/backends/evm/EVMDialect.cpp            |  36 +-
 libyul/backends/evm/StackLayoutGenerator.cpp  |   2 +-
 libyul/optimiser/ExpressionJoiner.h           |   6 +-
 libyul/optimiser/SSAReverser.h                |  34 +-
 scripts/release_ppa.sh                        |   4 +-
 test/EVMHost.cpp                              |   2 +-
 test/InteractiveTests.h                       |  42 +--
 .../model_checker_contracts_all/input.sol     |   6 +-
 .../input.json                                |   4 +-
 .../input.json                                |   4 +-
 .../input.json                                |  28 +-
 .../standard_wrong_key_metadata/input.json    |  14 +-
 .../standard_wrong_key_optimizer/input.json   |  14 +-
 .../standard_wrong_key_settings/input.json    |  40 +--
 test/libevmasm/Optimiser.cpp                  |   4 +-
 test/libsolidity/SemanticTest.cpp             |   2 +-
 test/libsolidity/SolidityEndToEndTest.cpp     |  36 +-
 test/libsolidity/SolidityOptimizer.cpp        |   4 +-
 test/libsolidity/StandardCompiler.cpp         |   2 +-
 .../dev_multiple_params_mixed_whitespace.sol  |   6 +-
 .../functions/functions_library_internal.sol  |   2 +-
 .../loops/do_while_bmc_iterations_break_6.sol |   2 +-
 .../loops/do_while_bmc_iterations_break_7.sol |   4 +-
 ..._while_bmc_iterations_break_continue_1.sol |   4 +-
 ..._while_bmc_iterations_break_continue_2.sol |   4 +-
 .../loops/for_loop_bmc_iterations_break_2.sol |   2 +-
 .../loops/for_loop_bmc_iterations_break_8.sol |   2 +-
 .../loops/for_loop_bmc_iterations_break_9.sol |   2 +-
 ...r_loop_bmc_iterations_break_continue_1.sol |   4 +-
 ...r_loop_bmc_iterations_break_continue_2.sol |   2 +-
 ...r_loop_bmc_iterations_break_continue_3.sol |   2 +-
 .../for_loop_bmc_iterations_continue_3.sol    |   2 +-
 .../loops/while_bmc_iterations_8.sol          |   2 +-
 .../loops/while_bmc_iterations_break_4.sol    |   2 +-
 .../loops/while_bmc_iterations_break_6.sol    |   2 +-
 .../loops/while_bmc_iterations_break_7.sol    |   4 +-
 .../while_bmc_iterations_break_continue_1.sol |   4 +-
 .../while_bmc_iterations_break_continue_2.sol |   4 +-
 .../while_bmc_iterations_semantics_2.sol      |   2 +-
 .../operators/delete_multid_array.sol         |   8 +-
 .../util/TestFunctionCallTests.cpp            |   2 +-
 test/libyul/Parser.cpp                        |   8 +-
 test/libyul/StackShufflingTest.cpp            |  24 +-
 test/libyul/YulOptimizerTestCommon.cpp        |   2 +-
 .../nested_different_names.yul                |   8 +-
 .../nested_same_name.yul                      |   8 +-
 .../expressionSimplifier/return_vars_zero.yul |   2 +-
 .../static_array_slot_computation.yul         |   8 +-
 test/tools/ossfuzz/protoToAbiV2.cpp           |   6 +-
 test/tools/ossfuzz/protoToAbiV2.h             | 200 +++++------
 test/tools/ossfuzz/protoToYul.h               |   8 +-
 72 files changed, 686 insertions(+), 687 deletions(-)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 5b9129fbd0..2305ae1ec7 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -20,7 +20,7 @@
 Yes:
 ```cpp
 if (a == b[i])
-    printf("Hello\n");	// NOTE spaces used instead of tab here for clarity - first byte should be '\t'.
+    printf("Hello\n"); // NOTE spaces used instead of tab here for clarity - first byte should be '\t'.
 foo->bar(
     someLongVariableName,
     anotherLongVariableName,
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 6cfa864c1d..5c2802d1fe 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -171,25 +171,25 @@ elseif (DEFINED MSVC)
 	# 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
-	add_compile_options(/EHsc)						# specify Exception Handling Model in msvc
+	add_compile_options(/MP)                              # enable parallel compilation
+	add_compile_options(/EHsc)                            # specify Exception Handling Model in msvc
 	if(PEDANTIC)
-		add_compile_options(/WX)					# enable warnings-as-errors
+		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)
-	add_compile_options(/wd4267)					# disable conversion from 'size_t' to 'type', possible loss of data (4267)
-	add_compile_options(/wd4180)					# disable qualifier applied to function type has no meaning; ignored (4180)
-	add_compile_options(/wd4290)					# disable C++ exception specification ignored except to indicate a function is not __declspec(nothrow) (4290)
-	add_compile_options(/wd4244)					# disable conversion from 'type1' to 'type2', possible loss of data (4244)
-	add_compile_options(/wd4800)					# disable forcing value to bool 'true' or 'false' (performance warning) (4800)
-	add_compile_options(-D_WIN32_WINNT=0x0600)		# declare Windows Vista API requirement
-	add_compile_options(-DNOMINMAX)					# undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
-	add_compile_options(/utf-8)						# enable utf-8 encoding (solves warning 4819)
-	add_compile_options(-DBOOST_REGEX_NO_LIB)		# disable automatic boost::regex library selection
-	add_compile_options(-D_REGEX_MAX_STACK_COUNT=200000L)	# increase std::regex recursion depth limit
-	add_compile_options(/permissive-)				# specify standards conformance mode to the compiler
+	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)
+	add_compile_options(/wd4267)                          # disable conversion from 'size_t' to 'type', possible loss of data (4267)
+	add_compile_options(/wd4180)                          # disable qualifier applied to function type has no meaning; ignored (4180)
+	add_compile_options(/wd4290)                          # disable C++ exception specification ignored except to indicate a function is not __declspec(nothrow) (4290)
+	add_compile_options(/wd4244)                          # disable conversion from 'type1' to 'type2', possible loss of data (4244)
+	add_compile_options(/wd4800)                          # disable forcing value to bool 'true' or 'false' (performance warning) (4800)
+	add_compile_options(-D_WIN32_WINNT=0x0600)            # declare Windows Vista API requirement
+	add_compile_options(-DNOMINMAX)                       # undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
+	add_compile_options(/utf-8)                           # enable utf-8 encoding (solves warning 4819)
+	add_compile_options(-DBOOST_REGEX_NO_LIB)             # disable automatic boost::regex library selection
+	add_compile_options(-D_REGEX_MAX_STACK_COUNT=200000L) # increase std::regex recursion depth limit
+	add_compile_options(/permissive-)                     # specify standards conformance mode to the compiler
 
 	# disable empty object file warning
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index 7a84a01d98..16f30a640d 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -10,9 +10,9 @@ if (DEFINED MSVC)
 	else()
 		get_filename_component(DEPS_DIR "${CMAKE_CURRENT_LIST_DIR}/../deps/install" ABSOLUTE)
 		set(ETH_DEPENDENCY_INSTALL_DIR
-			"${DEPS_DIR}/x64"					# Old location for deps.
-			"${DEPS_DIR}/win64"					# New location for deps.
-			"${DEPS_DIR}/win64/Release/share"	# LLVM shared cmake files.
+			"${DEPS_DIR}/x64"                 # Old location for deps.
+			"${DEPS_DIR}/win64"               # New location for deps.
+			"${DEPS_DIR}/win64/Release/share" # LLVM shared cmake files.
 		)
 	endif()
 	set (CMAKE_PREFIX_PATH ${ETH_DEPENDENCY_INSTALL_DIR} ${CMAKE_PREFIX_PATH})
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index c46cefd2fa..e6d3ed7cca 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -251,7 +251,7 @@ structMember: type=typeName name=identifier Semicolon;
 /**
  * Definition of an enum. Can occur at top-level within a source unit or within a contract, library or interface.
  */
-enumDefinition:	Enum name=identifier LBrace enumValues+=identifier (Comma enumValues+=identifier)* RBrace;
+enumDefinition: Enum name=identifier LBrace enumValues+=identifier (Comma enumValues+=identifier)* RBrace;
 /**
  * Definition of a user defined value type. Can occur at top-level within a source unit or within a contract, library or interface.
  */
@@ -400,7 +400,7 @@ expression:
 	| New typeName # NewExpr
 	| tupleExpression # Tuple
 	| inlineArrayExpression # InlineArray
- 	| (
+	| (
 		identifier
 		| literal
 		| literalWithSubDenomination
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index 2adaa023a1..c88a9663f3 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -127,7 +127,7 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 		return 1 + std::max<size_t>(1, numberEncodingSize(data()));
 	case PushSubSize:
 	case PushProgramSize:
-		return 1 + 4;		// worst case: a 16MB program
+		return 1 + 4; // worst case: a 16MB program
 	case PushTag:
 	case PushData:
 	case PushSub:
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index ca0dff185a..943f34ee4c 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -182,156 +182,156 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 
 /// @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 } },
-	{ Instruction::ADD,			{ "ADD",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SUB,			{ "SUB",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::MUL,			{ "MUL",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::DIV,			{ "DIV",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::SDIV,		{ "SDIV",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::MOD,			{ "MOD",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::SMOD,		{ "SMOD",			0, 2, 1, false, Tier::Low } },
-	{ Instruction::EXP,			{ "EXP",			0, 2, 1, false, Tier::Special } },
-	{ Instruction::NOT,			{ "NOT",			0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::LT,			{ "LT",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::GT,			{ "GT",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SLT,			{ "SLT",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SGT,			{ "SGT",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::EQ,			{ "EQ",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::ISZERO,		{ "ISZERO",			0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::AND,			{ "AND",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::OR,			{ "OR",				0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::XOR,			{ "XOR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::BYTE,		{ "BYTE",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SHL,		{ "SHL",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SHR,		{ "SHR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::SAR,		{ "SAR",			0, 2, 1, false, Tier::VeryLow } },
-	{ Instruction::ADDMOD,		{ "ADDMOD",			0, 3, 1, false, Tier::Mid } },
-	{ Instruction::MULMOD,		{ "MULMOD",			0, 3, 1, false, Tier::Mid } },
-	{ Instruction::SIGNEXTEND,	{ "SIGNEXTEND",		0, 2, 1, false, Tier::Low } },
-	{ Instruction::KECCAK256,	{ "KECCAK256",			0, 2, 1, true, Tier::Special } },
-	{ Instruction::ADDRESS,		{ "ADDRESS",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::BALANCE,     { "BALANCE",        0, 1, 1, false, Tier::Special } },
-	{ Instruction::ORIGIN,		{ "ORIGIN",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLER,		{ "CALLER",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLVALUE,	{ "CALLVALUE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLDATALOAD,{ "CALLDATALOAD",	0, 1, 1, false, Tier::VeryLow } },
-	{ Instruction::CALLDATASIZE,{ "CALLDATASIZE",	0, 0, 1, false, Tier::Base } },
-	{ Instruction::CALLDATACOPY,{ "CALLDATACOPY",	0, 3, 0, true, Tier::VeryLow } },
-	{ Instruction::CODESIZE,	{ "CODESIZE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::CODECOPY,	{ "CODECOPY",		0, 3, 0, true, Tier::VeryLow } },
-	{ Instruction::GASPRICE,	{ "GASPRICE",		0, 0, 1, false, Tier::Base } },
-	{ Instruction::EXTCODESIZE, { "EXTCODESIZE",    0, 1, 1, false, Tier::Special } },
-	{ Instruction::EXTCODECOPY, { "EXTCODECOPY",    0, 4, 0, true, Tier::Special } },
-	{ 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::Special } },
-	{ Instruction::BLOCKHASH,   { "BLOCKHASH",      0, 1, 1, false, Tier::BlockHash } },
-	{ 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 } },
-	{ 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 } },
-	{ 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 } },
-	{ 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 } },
-	{ 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 } },
-	{ Instruction::PUSH4,		{ "PUSH4",			4, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH5,		{ "PUSH5",			5, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH6,		{ "PUSH6",			6, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH7,		{ "PUSH7",			7, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH8,		{ "PUSH8",			8, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH9,		{ "PUSH9",			9, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH10,		{ "PUSH10",			10, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH11,		{ "PUSH11",			11, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH12,		{ "PUSH12",			12, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH13,		{ "PUSH13",			13, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH14,		{ "PUSH14",			14, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH15,		{ "PUSH15",			15, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH16,		{ "PUSH16",			16, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH17,		{ "PUSH17",			17, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH18,		{ "PUSH18",			18, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH19,		{ "PUSH19",			19, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH20,		{ "PUSH20",			20, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH21,		{ "PUSH21",			21, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH22,		{ "PUSH22",			22, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH23,		{ "PUSH23",			23, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH24,		{ "PUSH24",			24, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH25,		{ "PUSH25",			25, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH26,		{ "PUSH26",			26, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH27,		{ "PUSH27",			27, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH28,		{ "PUSH28",			28, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH29,		{ "PUSH29",			29, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH30,		{ "PUSH30",			30, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH31,		{ "PUSH31",			31, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::PUSH32,		{ "PUSH32",			32, 0, 1, false, Tier::VeryLow } },
-	{ Instruction::DUP1,		{ "DUP1",			0, 1, 2, false, Tier::VeryLow } },
-	{ Instruction::DUP2,		{ "DUP2",			0, 2, 3, false, Tier::VeryLow } },
-	{ Instruction::DUP3,		{ "DUP3",			0, 3, 4, false, Tier::VeryLow } },
-	{ Instruction::DUP4,		{ "DUP4",			0, 4, 5, false, Tier::VeryLow } },
-	{ Instruction::DUP5,		{ "DUP5",			0, 5, 6, false, Tier::VeryLow } },
-	{ Instruction::DUP6,		{ "DUP6",			0, 6, 7, false, Tier::VeryLow } },
-	{ Instruction::DUP7,		{ "DUP7",			0, 7, 8, false, Tier::VeryLow } },
-	{ Instruction::DUP8,		{ "DUP8",			0, 8, 9, false, Tier::VeryLow } },
-	{ Instruction::DUP9,		{ "DUP9",			0, 9, 10, false, Tier::VeryLow } },
-	{ Instruction::DUP10,		{ "DUP10",			0, 10, 11, false, Tier::VeryLow } },
-	{ Instruction::DUP11,		{ "DUP11",			0, 11, 12, false, Tier::VeryLow } },
-	{ Instruction::DUP12,		{ "DUP12",			0, 12, 13, false, Tier::VeryLow } },
-	{ Instruction::DUP13,		{ "DUP13",			0, 13, 14, false, Tier::VeryLow } },
-	{ Instruction::DUP14,		{ "DUP14",			0, 14, 15, false, Tier::VeryLow } },
-	{ Instruction::DUP15,		{ "DUP15",			0, 15, 16, false, Tier::VeryLow } },
-	{ Instruction::DUP16,		{ "DUP16",			0, 16, 17, false, Tier::VeryLow } },
-	{ Instruction::SWAP1,		{ "SWAP1",			0, 2, 2, false, Tier::VeryLow } },
-	{ Instruction::SWAP2,		{ "SWAP2",			0, 3, 3, false, Tier::VeryLow } },
-	{ Instruction::SWAP3,		{ "SWAP3",			0, 4, 4, false, Tier::VeryLow } },
-	{ Instruction::SWAP4,		{ "SWAP4",			0, 5, 5, false, Tier::VeryLow } },
-	{ Instruction::SWAP5,		{ "SWAP5",			0, 6, 6, false, Tier::VeryLow } },
-	{ Instruction::SWAP6,		{ "SWAP6",			0, 7, 7, false, Tier::VeryLow } },
-	{ Instruction::SWAP7,		{ "SWAP7",			0, 8, 8, false, Tier::VeryLow } },
-	{ Instruction::SWAP8,		{ "SWAP8",			0, 9, 9, false, Tier::VeryLow } },
-	{ Instruction::SWAP9,		{ "SWAP9",			0, 10, 10, false, Tier::VeryLow } },
-	{ Instruction::SWAP10,		{ "SWAP10",			0, 11, 11, false, Tier::VeryLow } },
-	{ Instruction::SWAP11,		{ "SWAP11",			0, 12, 12, false, Tier::VeryLow } },
-	{ Instruction::SWAP12,		{ "SWAP12",			0, 13, 13, false, Tier::VeryLow } },
-	{ Instruction::SWAP13,		{ "SWAP13",			0, 14, 14, false, Tier::VeryLow } },
-	{ Instruction::SWAP14,		{ "SWAP14",			0, 15, 15, false, Tier::VeryLow } },
-	{ Instruction::SWAP15,		{ "SWAP15",			0, 16, 16, false, Tier::VeryLow } },
-	{ Instruction::SWAP16,		{ "SWAP16",			0, 17, 17, false, Tier::VeryLow } },
-	{ Instruction::LOG0,		{ "LOG0",			0, 2, 0, true, Tier::Special } },
-	{ Instruction::LOG1,		{ "LOG1",			0, 3, 0, true, Tier::Special } },
-	{ Instruction::LOG2,		{ "LOG2",			0, 4, 0, true, Tier::Special } },
-	{ Instruction::LOG3,		{ "LOG3",			0, 5, 0, true, Tier::Special } },
-	{ Instruction::LOG4,		{ "LOG4",			0, 6, 0, true, Tier::Special } },
-	{ Instruction::CREATE,		{ "CREATE",			0, 3, 1, true, Tier::Special } },
-	{ Instruction::CALL,		{ "CALL",			0, 7, 1, true, Tier::Special } },
-	{ Instruction::CALLCODE,	{ "CALLCODE",		0, 7, 1, true, Tier::Special } },
-	{ Instruction::RETURN,		{ "RETURN",			0, 2, 0, true, Tier::Zero } },
-	{ Instruction::DELEGATECALL,	{ "DELEGATECALL",	0, 6, 1, true, Tier::Special } },
-	{ Instruction::STATICCALL,	{ "STATICCALL",		0, 6, 1, true, Tier::Special } },
-	{ Instruction::CREATE2,		{ "CREATE2",		0, 4, 1, true, Tier::Special } },
-	{ Instruction::REVERT,		{ "REVERT",		0, 2, 0, true, Tier::Zero } },
-	{ Instruction::INVALID,		{ "INVALID",		0, 0, 0, true, Tier::Zero } },
-	{ Instruction::SELFDESTRUCT,	{ "SELFDESTRUCT",		0, 1, 0, true, Tier::Special } }
+{   //                                                Add Args Ret SideEffects GasPriceTier
+	{Instruction::STOP,           {"STOP",            0,  0,   0,  true,       Tier::Zero}},
+	{Instruction::ADD,            {"ADD",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SUB,            {"SUB",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::MUL,            {"MUL",             0,  2,   1,  false,      Tier::Low}},
+	{Instruction::DIV,            {"DIV",             0,  2,   1,  false,      Tier::Low}},
+	{Instruction::SDIV,           {"SDIV",            0,  2,   1,  false,      Tier::Low}},
+	{Instruction::MOD,            {"MOD",             0,  2,   1,  false,      Tier::Low}},
+	{Instruction::SMOD,           {"SMOD",            0,  2,   1,  false,      Tier::Low}},
+	{Instruction::EXP,            {"EXP",             0,  2,   1,  false,      Tier::Special}},
+	{Instruction::NOT,            {"NOT",             0,  1,   1,  false,      Tier::VeryLow}},
+	{Instruction::LT,             {"LT",              0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::GT,             {"GT",              0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SLT,            {"SLT",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SGT,            {"SGT",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::EQ,             {"EQ",              0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::ISZERO,         {"ISZERO",          0,  1,   1,  false,      Tier::VeryLow}},
+	{Instruction::AND,            {"AND",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::OR,             {"OR",              0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::XOR,            {"XOR",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::BYTE,           {"BYTE",            0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SHL,            {"SHL",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SHR,            {"SHR",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::SAR,            {"SAR",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::ADDMOD,         {"ADDMOD",          0,  3,   1,  false,      Tier::Mid}},
+	{Instruction::MULMOD,         {"MULMOD",          0,  3,   1,  false,      Tier::Mid}},
+	{Instruction::SIGNEXTEND,     {"SIGNEXTEND",      0,  2,   1,  false,      Tier::Low}},
+	{Instruction::KECCAK256,      {"KECCAK256",       0,  2,   1,  true,       Tier::Special}},
+	{Instruction::ADDRESS,        {"ADDRESS",         0,  0,   1,  false,      Tier::Base}},
+	{Instruction::BALANCE,        {"BALANCE",         0,  1,   1,  false,      Tier::Special}},
+	{Instruction::ORIGIN,         {"ORIGIN",          0,  0,   1,  false,      Tier::Base}},
+	{Instruction::CALLER,         {"CALLER",          0,  0,   1,  false,      Tier::Base}},
+	{Instruction::CALLVALUE,      {"CALLVALUE",       0,  0,   1,  false,      Tier::Base}},
+	{Instruction::CALLDATALOAD,   {"CALLDATALOAD",    0,  1,   1,  false,      Tier::VeryLow}},
+	{Instruction::CALLDATASIZE,   {"CALLDATASIZE",    0,  0,   1,  false,      Tier::Base}},
+	{Instruction::CALLDATACOPY,   {"CALLDATACOPY",    0,  3,   0,  true,       Tier::VeryLow}},
+	{Instruction::CODESIZE,       {"CODESIZE",        0,  0,   1,  false,      Tier::Base}},
+	{Instruction::CODECOPY,       {"CODECOPY",        0,  3,   0,  true,       Tier::VeryLow}},
+	{Instruction::GASPRICE,       {"GASPRICE",        0,  0,   1,  false,      Tier::Base}},
+	{Instruction::EXTCODESIZE,    {"EXTCODESIZE",     0,  1,   1,  false,      Tier::Special}},
+	{Instruction::EXTCODECOPY,    {"EXTCODECOPY",     0,  4,   0,  true,       Tier::Special}},
+	{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::Special}},
+	{Instruction::BLOCKHASH,      {"BLOCKHASH",       0,  1,   1,  false,      Tier::BlockHash}},
+	{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}},
+	{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}},
+	{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}},
+	{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}},
+	{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}},
+	{Instruction::PUSH4,          {"PUSH4",           4,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH5,          {"PUSH5",           5,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH6,          {"PUSH6",           6,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH7,          {"PUSH7",           7,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH8,          {"PUSH8",           8,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH9,          {"PUSH9",           9,  0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH10,         {"PUSH10",          10, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH11,         {"PUSH11",          11, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH12,         {"PUSH12",          12, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH13,         {"PUSH13",          13, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH14,         {"PUSH14",          14, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH15,         {"PUSH15",          15, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH16,         {"PUSH16",          16, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH17,         {"PUSH17",          17, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH18,         {"PUSH18",          18, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH19,         {"PUSH19",          19, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH20,         {"PUSH20",          20, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH21,         {"PUSH21",          21, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH22,         {"PUSH22",          22, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH23,         {"PUSH23",          23, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH24,         {"PUSH24",          24, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH25,         {"PUSH25",          25, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH26,         {"PUSH26",          26, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH27,         {"PUSH27",          27, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH28,         {"PUSH28",          28, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH29,         {"PUSH29",          29, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH30,         {"PUSH30",          30, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH31,         {"PUSH31",          31, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::PUSH32,         {"PUSH32",          32, 0,   1,  false,      Tier::VeryLow}},
+	{Instruction::DUP1,           {"DUP1",            0,  1,   2,  false,      Tier::VeryLow}},
+	{Instruction::DUP2,           {"DUP2",            0,  2,   3,  false,      Tier::VeryLow}},
+	{Instruction::DUP3,           {"DUP3",            0,  3,   4,  false,      Tier::VeryLow}},
+	{Instruction::DUP4,           {"DUP4",            0,  4,   5,  false,      Tier::VeryLow}},
+	{Instruction::DUP5,           {"DUP5",            0,  5,   6,  false,      Tier::VeryLow}},
+	{Instruction::DUP6,           {"DUP6",            0,  6,   7,  false,      Tier::VeryLow}},
+	{Instruction::DUP7,           {"DUP7",            0,  7,   8,  false,      Tier::VeryLow}},
+	{Instruction::DUP8,           {"DUP8",            0,  8,   9,  false,      Tier::VeryLow}},
+	{Instruction::DUP9,           {"DUP9",            0,  9,   10, false,      Tier::VeryLow}},
+	{Instruction::DUP10,          {"DUP10",           0,  10,  11, false,      Tier::VeryLow}},
+	{Instruction::DUP11,          {"DUP11",           0,  11,  12, false,      Tier::VeryLow}},
+	{Instruction::DUP12,          {"DUP12",           0,  12,  13, false,      Tier::VeryLow}},
+	{Instruction::DUP13,          {"DUP13",           0,  13,  14, false,      Tier::VeryLow}},
+	{Instruction::DUP14,          {"DUP14",           0,  14,  15, false,      Tier::VeryLow}},
+	{Instruction::DUP15,          {"DUP15",           0,  15,  16, false,      Tier::VeryLow}},
+	{Instruction::DUP16,          {"DUP16",           0,  16,  17, false,      Tier::VeryLow}},
+	{Instruction::SWAP1,          {"SWAP1",           0,  2,   2,  false,      Tier::VeryLow}},
+	{Instruction::SWAP2,          {"SWAP2",           0,  3,   3,  false,      Tier::VeryLow}},
+	{Instruction::SWAP3,          {"SWAP3",           0,  4,   4,  false,      Tier::VeryLow}},
+	{Instruction::SWAP4,          {"SWAP4",           0,  5,   5,  false,      Tier::VeryLow}},
+	{Instruction::SWAP5,          {"SWAP5",           0,  6,   6,  false,      Tier::VeryLow}},
+	{Instruction::SWAP6,          {"SWAP6",           0,  7,   7,  false,      Tier::VeryLow}},
+	{Instruction::SWAP7,          {"SWAP7",           0,  8,   8,  false,      Tier::VeryLow}},
+	{Instruction::SWAP8,          {"SWAP8",           0,  9,   9,  false,      Tier::VeryLow}},
+	{Instruction::SWAP9,          {"SWAP9",           0,  10,  10, false,      Tier::VeryLow}},
+	{Instruction::SWAP10,         {"SWAP10",          0,  11,  11, false,      Tier::VeryLow}},
+	{Instruction::SWAP11,         {"SWAP11",          0,  12,  12, false,      Tier::VeryLow}},
+	{Instruction::SWAP12,         {"SWAP12",          0,  13,  13, false,      Tier::VeryLow}},
+	{Instruction::SWAP13,         {"SWAP13",          0,  14,  14, false,      Tier::VeryLow}},
+	{Instruction::SWAP14,         {"SWAP14",          0,  15,  15, false,      Tier::VeryLow}},
+	{Instruction::SWAP15,         {"SWAP15",          0,  16,  16, false,      Tier::VeryLow}},
+	{Instruction::SWAP16,         {"SWAP16",          0,  17,  17, false,      Tier::VeryLow}},
+	{Instruction::LOG0,           {"LOG0",            0,  2,   0,  true,       Tier::Special}},
+	{Instruction::LOG1,           {"LOG1",            0,  3,   0,  true,       Tier::Special}},
+	{Instruction::LOG2,           {"LOG2",            0,  4,   0,  true,       Tier::Special}},
+	{Instruction::LOG3,           {"LOG3",            0,  5,   0,  true,       Tier::Special}},
+	{Instruction::LOG4,           {"LOG4",            0,  6,   0,  true,       Tier::Special}},
+	{Instruction::CREATE,         {"CREATE",          0,  3,   1,  true,       Tier::Special}},
+	{Instruction::CALL,           {"CALL",            0,  7,   1,  true,       Tier::Special}},
+	{Instruction::CALLCODE,       {"CALLCODE",        0,  7,   1,  true,       Tier::Special}},
+	{Instruction::RETURN,         {"RETURN",          0,  2,   0,  true,       Tier::Zero}},
+	{Instruction::DELEGATECALL,   {"DELEGATECALL",    0,  6,   1,  true,       Tier::Special}},
+	{Instruction::STATICCALL,     {"STATICCALL",      0,  6,   1,  true,       Tier::Special}},
+	{Instruction::CREATE2,        {"CREATE2",         0,  4,   1,  true,       Tier::Special}},
+	{Instruction::REVERT,         {"REVERT",          0,  2,   0,  true,       Tier::Zero}},
+	{Instruction::INVALID,        {"INVALID",         0,  0,   0,  true,       Tier::Zero}},
+	{Instruction::SELFDESTRUCT,   {"SELFDESTRUCT",    0,  1,   0,  true,       Tier::Special}}
 };
 
 InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst, langutil::EVMVersion _evmVersion)
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 289469b5ef..f89c72c894 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -33,167 +33,167 @@ namespace solidity::evmasm
 /// Virtual machine bytecode instruction.
 enum class Instruction: uint8_t
 {
-	STOP = 0x00,		///< halts execution
-	ADD,				///< addition operation
-	MUL,				///< multiplication operation
-	SUB,				///< subtraction operation
-	DIV,				///< integer division operation
-	SDIV,				///< signed integer division operation
-	MOD,				///< modulo remainder operation
-	SMOD,				///< signed modulo remainder operation
-	ADDMOD,				///< unsigned modular addition
-	MULMOD,				///< unsigned modular multiplication
-	EXP,				///< exponential operation
-	SIGNEXTEND,			///< extend length of signed integer
-
-	LT = 0x10,			///< less-than comparison
-	GT,					///< greater-than comparison
-	SLT,				///< signed less-than comparison
-	SGT,				///< signed greater-than comparison
-	EQ,					///< equality comparison
-	ISZERO,				///< simple not operator
-	AND,				///< bitwise AND operation
-	OR,					///< bitwise OR operation
-	XOR,				///< bitwise XOR operation
-	NOT,				///< bitwise NOT operation
-	BYTE,				///< retrieve single byte from word
-	SHL,				///< bitwise SHL operation
-	SHR,				///< bitwise SHR operation
-	SAR,				///< bitwise SAR operation
-
-	KECCAK256 = 0x20,		///< compute KECCAK-256 hash
-
-	ADDRESS = 0x30,		///< get address of currently executing account
-	BALANCE,			///< get balance of the given account
-	ORIGIN,				///< get execution origination address
-	CALLER,				///< get caller address
-	CALLVALUE,			///< get deposited value by the instruction/transaction responsible for this execution
-	CALLDATALOAD,		///< get input data of current environment
-	CALLDATASIZE,		///< get size of input data in current environment
-	CALLDATACOPY,		///< copy input data in current environment to memory
-	CODESIZE,			///< get size of code running in current environment
-	CODECOPY,			///< copy code running in current environment to memory
-	GASPRICE,			///< get price of gas in current environment
-	EXTCODESIZE,		///< get external code size (from another contract)
-	EXTCODECOPY,		///< copy external code (from another contract)
-	RETURNDATASIZE = 0x3d,	///< get size of return data buffer
-	RETURNDATACOPY = 0x3e,	///< copy return data in current environment to memory
-	EXTCODEHASH = 0x3f,	///< get external code hash (from another contract)
-
-	BLOCKHASH = 0x40,	///< get hash of most recent complete block
-	COINBASE,			///< get the block's coinbase address
-	TIMESTAMP,			///< get the block's timestamp
-	NUMBER,				///< get the block's number
-	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
-	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
-	MLOAD,				///< load word from memory
-	MSTORE,				///< save word to memory
-	MSTORE8,			///< save byte to memory
-	SLOAD,				///< load word from storage
-	SSTORE,				///< save word to storage
-	JUMP,				///< alter the program counter
-	JUMPI,				///< conditionally alter the program counter
-	PC,					///< get the program counter
-	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
-
-	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
-	PUSH3,				///< place 3 byte item on stack
-	PUSH4,				///< place 4 byte item on stack
-	PUSH5,				///< place 5 byte item on stack
-	PUSH6,				///< place 6 byte item on stack
-	PUSH7,				///< place 7 byte item on stack
-	PUSH8,				///< place 8 byte item on stack
-	PUSH9,				///< place 9 byte item on stack
-	PUSH10,				///< place 10 byte item on stack
-	PUSH11,				///< place 11 byte item on stack
-	PUSH12,				///< place 12 byte item on stack
-	PUSH13,				///< place 13 byte item on stack
-	PUSH14,				///< place 14 byte item on stack
-	PUSH15,				///< place 15 byte item on stack
-	PUSH16,				///< place 16 byte item on stack
-	PUSH17,				///< place 17 byte item on stack
-	PUSH18,				///< place 18 byte item on stack
-	PUSH19,				///< place 19 byte item on stack
-	PUSH20,				///< place 20 byte item on stack
-	PUSH21,				///< place 21 byte item on stack
-	PUSH22,				///< place 22 byte item on stack
-	PUSH23,				///< place 23 byte item on stack
-	PUSH24,				///< place 24 byte item on stack
-	PUSH25,				///< place 25 byte item on stack
-	PUSH26,				///< place 26 byte item on stack
-	PUSH27,				///< place 27 byte item on stack
-	PUSH28,				///< place 28 byte item on stack
-	PUSH29,				///< place 29 byte item on stack
-	PUSH30,				///< place 30 byte item on stack
-	PUSH31,				///< place 31 byte item on stack
-	PUSH32,				///< place 32 byte item on stack
-
-	DUP1 = 0x80,		///< copies the highest item in the stack to the top of the stack
-	DUP2,				///< copies the second highest item in the stack to the top of the stack
-	DUP3,				///< copies the third highest item in the stack to the top of the stack
-	DUP4,				///< copies the 4th highest item in the stack to the top of the stack
-	DUP5,				///< copies the 5th highest item in the stack to the top of the stack
-	DUP6,				///< copies the 6th highest item in the stack to the top of the stack
-	DUP7,				///< copies the 7th highest item in the stack to the top of the stack
-	DUP8,				///< copies the 8th highest item in the stack to the top of the stack
-	DUP9,				///< copies the 9th highest item in the stack to the top of the stack
-	DUP10,				///< copies the 10th highest item in the stack to the top of the stack
-	DUP11,				///< copies the 11th highest item in the stack to the top of the stack
-	DUP12,				///< copies the 12th highest item in the stack to the top of the stack
-	DUP13,				///< copies the 13th highest item in the stack to the top of the stack
-	DUP14,				///< copies the 14th highest item in the stack to the top of the stack
-	DUP15,				///< copies the 15th highest item in the stack to the top of the stack
-	DUP16,				///< copies the 16th highest item in the stack to the top of the stack
-
-	SWAP1 = 0x90,		///< swaps the highest and second highest value on the stack
-	SWAP2,				///< swaps the highest and third highest value on the stack
-	SWAP3,				///< swaps the highest and 4th highest value on the stack
-	SWAP4,				///< swaps the highest and 5th highest value on the stack
-	SWAP5,				///< swaps the highest and 6th highest value on the stack
-	SWAP6,				///< swaps the highest and 7th highest value on the stack
-	SWAP7,				///< swaps the highest and 8th highest value on the stack
-	SWAP8,				///< swaps the highest and 9th highest value on the stack
-	SWAP9,				///< swaps the highest and 10th highest value on the stack
-	SWAP10,				///< swaps the highest and 11th highest value on the stack
-	SWAP11,				///< swaps the highest and 12th highest value on the stack
-	SWAP12,				///< swaps the highest and 13th highest value on the stack
-	SWAP13,				///< swaps the highest and 14th highest value on the stack
-	SWAP14,				///< swaps the highest and 15th highest value on the stack
-	SWAP15,				///< swaps the highest and 16th highest value on the stack
-	SWAP16,				///< swaps the highest and 17th highest value on the stack
-
-	LOG0 = 0xa0,		///< Makes a log entry; no topics.
-	LOG1,				///< Makes a log entry; 1 topic.
-	LOG2,				///< Makes a log entry; 2 topics.
-	LOG3,				///< Makes a log entry; 3 topics.
-	LOG4,				///< Makes a log entry; 4 topics.
-
-	CREATE = 0xf0,		///< create a new account with associated code
-	CALL,				///< message-call into an account
-	CALLCODE,			///< message-call with another account's code only
-	RETURN,				///< halt execution returning output data
-	DELEGATECALL,		///< like CALLCODE but keeps caller's value and sender
-	CREATE2 = 0xf5,		///< create new account with associated code at address `sha3(0xff + sender + salt + init code) % 2**160`
-	STATICCALL = 0xfa,	///< like CALL but disallow state modifications
-
-	REVERT = 0xfd,		///< halt execution, revert state and return output data
-	INVALID = 0xfe,		///< invalid instruction for expressing runtime errors (e.g., division-by-zero)
-	SELFDESTRUCT = 0xff	///< halt execution and register account for later deletion
+	STOP = 0x00,              ///< halts execution
+	ADD,                      ///< addition operation
+	MUL,                      ///< multiplication operation
+	SUB,                      ///< subtraction operation
+	DIV,                      ///< integer division operation
+	SDIV,                     ///< signed integer division operation
+	MOD,                      ///< modulo remainder operation
+	SMOD,                     ///< signed modulo remainder operation
+	ADDMOD,                   ///< unsigned modular addition
+	MULMOD,                   ///< unsigned modular multiplication
+	EXP,                      ///< exponential operation
+	SIGNEXTEND,               ///< extend length of signed integer
+
+	LT = 0x10,                ///< less-than comparison
+	GT,                       ///< greater-than comparison
+	SLT,                      ///< signed less-than comparison
+	SGT,                      ///< signed greater-than comparison
+	EQ,                       ///< equality comparison
+	ISZERO,                   ///< simple not operator
+	AND,                      ///< bitwise AND operation
+	OR,                       ///< bitwise OR operation
+	XOR,                      ///< bitwise XOR operation
+	NOT,                      ///< bitwise NOT operation
+	BYTE,                     ///< retrieve single byte from word
+	SHL,                      ///< bitwise SHL operation
+	SHR,                      ///< bitwise SHR operation
+	SAR,                      ///< bitwise SAR operation
+
+	KECCAK256 = 0x20,         ///< compute KECCAK-256 hash
+
+	ADDRESS = 0x30,           ///< get address of currently executing account
+	BALANCE,                  ///< get balance of the given account
+	ORIGIN,                   ///< get execution origination address
+	CALLER,                   ///< get caller address
+	CALLVALUE,                ///< get deposited value by the instruction/transaction responsible for this execution
+	CALLDATALOAD,             ///< get input data of current environment
+	CALLDATASIZE,             ///< get size of input data in current environment
+	CALLDATACOPY,             ///< copy input data in current environment to memory
+	CODESIZE,                 ///< get size of code running in current environment
+	CODECOPY,                 ///< copy code running in current environment to memory
+	GASPRICE,                 ///< get price of gas in current environment
+	EXTCODESIZE,              ///< get external code size (from another contract)
+	EXTCODECOPY,              ///< copy external code (from another contract)
+	RETURNDATASIZE = 0x3d,    ///< get size of return data buffer
+	RETURNDATACOPY = 0x3e,    ///< copy return data in current environment to memory
+	EXTCODEHASH = 0x3f,       ///< get external code hash (from another contract)
+
+	BLOCKHASH = 0x40,         ///< get hash of most recent complete block
+	COINBASE,                 ///< get the block's coinbase address
+	TIMESTAMP,                ///< get the block's timestamp
+	NUMBER,                   ///< get the block's number
+	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
+	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
+	MLOAD,                    ///< load word from memory
+	MSTORE,                   ///< save word to memory
+	MSTORE8,                  ///< save byte to memory
+	SLOAD,                    ///< load word from storage
+	SSTORE,                   ///< save word to storage
+	JUMP,                     ///< alter the program counter
+	JUMPI,                    ///< conditionally alter the program counter
+	PC,                       ///< get the program counter
+	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
+
+	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
+	PUSH3,                    ///< place 3 byte item on stack
+	PUSH4,                    ///< place 4 byte item on stack
+	PUSH5,                    ///< place 5 byte item on stack
+	PUSH6,                    ///< place 6 byte item on stack
+	PUSH7,                    ///< place 7 byte item on stack
+	PUSH8,                    ///< place 8 byte item on stack
+	PUSH9,                    ///< place 9 byte item on stack
+	PUSH10,                   ///< place 10 byte item on stack
+	PUSH11,                   ///< place 11 byte item on stack
+	PUSH12,                   ///< place 12 byte item on stack
+	PUSH13,                   ///< place 13 byte item on stack
+	PUSH14,                   ///< place 14 byte item on stack
+	PUSH15,                   ///< place 15 byte item on stack
+	PUSH16,                   ///< place 16 byte item on stack
+	PUSH17,                   ///< place 17 byte item on stack
+	PUSH18,                   ///< place 18 byte item on stack
+	PUSH19,                   ///< place 19 byte item on stack
+	PUSH20,                   ///< place 20 byte item on stack
+	PUSH21,                   ///< place 21 byte item on stack
+	PUSH22,                   ///< place 22 byte item on stack
+	PUSH23,                   ///< place 23 byte item on stack
+	PUSH24,                   ///< place 24 byte item on stack
+	PUSH25,                   ///< place 25 byte item on stack
+	PUSH26,                   ///< place 26 byte item on stack
+	PUSH27,                   ///< place 27 byte item on stack
+	PUSH28,                   ///< place 28 byte item on stack
+	PUSH29,                   ///< place 29 byte item on stack
+	PUSH30,                   ///< place 30 byte item on stack
+	PUSH31,                   ///< place 31 byte item on stack
+	PUSH32,                   ///< place 32 byte item on stack
+
+	DUP1 = 0x80,              ///< copies the highest item in the stack to the top of the stack
+	DUP2,                     ///< copies the second highest item in the stack to the top of the stack
+	DUP3,                     ///< copies the third highest item in the stack to the top of the stack
+	DUP4,                     ///< copies the 4th highest item in the stack to the top of the stack
+	DUP5,                     ///< copies the 5th highest item in the stack to the top of the stack
+	DUP6,                     ///< copies the 6th highest item in the stack to the top of the stack
+	DUP7,                     ///< copies the 7th highest item in the stack to the top of the stack
+	DUP8,                     ///< copies the 8th highest item in the stack to the top of the stack
+	DUP9,                     ///< copies the 9th highest item in the stack to the top of the stack
+	DUP10,                    ///< copies the 10th highest item in the stack to the top of the stack
+	DUP11,                    ///< copies the 11th highest item in the stack to the top of the stack
+	DUP12,                    ///< copies the 12th highest item in the stack to the top of the stack
+	DUP13,                    ///< copies the 13th highest item in the stack to the top of the stack
+	DUP14,                    ///< copies the 14th highest item in the stack to the top of the stack
+	DUP15,                    ///< copies the 15th highest item in the stack to the top of the stack
+	DUP16,                    ///< copies the 16th highest item in the stack to the top of the stack
+
+	SWAP1 = 0x90,             ///< swaps the highest and second highest value on the stack
+	SWAP2,                    ///< swaps the highest and third highest value on the stack
+	SWAP3,                    ///< swaps the highest and 4th highest value on the stack
+	SWAP4,                    ///< swaps the highest and 5th highest value on the stack
+	SWAP5,                    ///< swaps the highest and 6th highest value on the stack
+	SWAP6,                    ///< swaps the highest and 7th highest value on the stack
+	SWAP7,                    ///< swaps the highest and 8th highest value on the stack
+	SWAP8,                    ///< swaps the highest and 9th highest value on the stack
+	SWAP9,                    ///< swaps the highest and 10th highest value on the stack
+	SWAP10,                   ///< swaps the highest and 11th highest value on the stack
+	SWAP11,                   ///< swaps the highest and 12th highest value on the stack
+	SWAP12,                   ///< swaps the highest and 13th highest value on the stack
+	SWAP13,                   ///< swaps the highest and 14th highest value on the stack
+	SWAP14,                   ///< swaps the highest and 15th highest value on the stack
+	SWAP15,                   ///< swaps the highest and 16th highest value on the stack
+	SWAP16,                   ///< swaps the highest and 17th highest value on the stack
+
+	LOG0 = 0xa0,              ///< Makes a log entry; no topics.
+	LOG1,                     ///< Makes a log entry; 1 topic.
+	LOG2,                     ///< Makes a log entry; 2 topics.
+	LOG3,                     ///< Makes a log entry; 3 topics.
+	LOG4,                     ///< Makes a log entry; 4 topics.
+
+	CREATE = 0xf0,            ///< create a new account with associated code
+	CALL,                     ///< message-call into an account
+	CALLCODE,                 ///< message-call with another account's code only
+	RETURN,                   ///< halt execution returning output data
+	DELEGATECALL,             ///< like CALLCODE but keeps caller's value and sender
+	CREATE2 = 0xf5,           ///< create new account with associated code at address `sha3(0xff + sender + salt + init code) % 2**160`
+	STATICCALL = 0xfa,        ///< like CALL but disallow state modifications
+
+	REVERT = 0xfd,            ///< halt execution, revert state and return output data
+	INVALID = 0xfe,           ///< invalid instruction for expressing runtime errors (e.g., division-by-zero)
+	SELFDESTRUCT = 0xff       ///< halt execution and register account for later deletion
 };
 
 /// @returns true if the instruction is of the CALL opcode family
@@ -309,12 +309,12 @@ enum class Tier
 /// Information structure for a particular instruction.
 struct InstructionInfo
 {
-	std::string name;	///< The name of the instruction.
-	int additional;		///< Additional items required in memory for this instructions (only for PUSH).
-	int args;			///< Number of items required on the stack for this instruction (and, for the purposes of ret, the number taken from the stack).
-	int ret;			///< Number of items placed (back) on the stack by this instruction, assuming args items were removed.
-	bool sideEffects;	///< false if the only effect on the execution environment (apart from gas usage) is a change to a topmost segment of the stack
-	Tier gasPriceTier;	///< Tier for gas pricing.
+	std::string name;   ///< The name of the instruction.
+	int additional;     ///< Additional items required in memory for this instructions (only for PUSH).
+	int args;           ///< Number of items required on the stack for this instruction (and, for the purposes of ret, the number taken from the stack).
+	int ret;            ///< Number of items placed (back) on the stack by this instruction, assuming args items were removed.
+	bool sideEffects;   ///< false if the only effect on the execution environment (apart from gas usage) is a change to a topmost segment of the stack
+	Tier gasPriceTier;  ///< Tier for gas pricing.
 };
 
 /// Information on all the instructions.
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index 0f7c2df080..d1073a872b 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -64,11 +64,11 @@ namespace solidity::langutil
 
 #define IGNORE_TOKEN(name, string, precedence)
 
-#define TOKEN_LIST(T, K)												\
-	/* End of source indicator. */										\
-	T(EOS, "EOS", 0)													\
-																		\
-	/* Punctuators (ECMA-262, section 7.7, page 15). */				\
+#define TOKEN_LIST(T, K)                                                \
+	/* End of source indicator. */                                      \
+	T(EOS, "EOS", 0)                                                    \
+	\
+	/* Punctuators (ECMA-262, section 7.7, page 15). */                 \
 	T(LParen, "(", 0)                                                   \
 	T(RParen, ")", 0)                                                   \
 	T(LBrack, "[", 0)                                                   \
@@ -82,9 +82,9 @@ namespace solidity::langutil
 	T(DoubleArrow, "=>", 0)                                             \
 	T(RightArrow, "->", 0)                                              \
 	\
-	/* Assignment operators. */										\
-	/* IsAssignmentOp() relies on this block of enum values being */	\
-	/* contiguous and sorted in the same order!*/						\
+	/* Assignment operators. */                                         \
+	/* IsAssignmentOp() relies on this block of enum values being */    \
+	/* contiguous and sorted in the same order!*/                       \
 	T(Assign, "=", 2)                                                   \
 	/* The following have to be in exactly the same order as the simple binary operators*/ \
 	T(AssignBitOr, "|=", 2)                                           \
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index ef7c56ac0c..ac906e301a 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -221,5 +221,5 @@ std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
 }
 
 std::string CHCSmtLib2Interface::createQueryAssertion(std::string name) {
-	return "(assert\n(forall " + forall() + "\n" +	"(=> " + name + " false)))";
+	return "(assert\n(forall " + forall() + "\n" + "(=> " + name + " false)))";
 }
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 0bcab65d93..a7402ba40f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3413,7 +3413,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 			annotation.isPure = true;
 		else if (
 			magicType->kind() == MagicType::Kind::MetaType &&
-			(memberName == "min" ||	memberName == "max")
+			(memberName == "min" || memberName == "max")
 		)
 			annotation.isPure = true;
 		else if (magicType->kind() == MagicType::Kind::Block)
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index f7519250a3..81b3b83746 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -65,8 +65,8 @@ struct ASTAnnotation
 
 struct DocTag
 {
-	std::string content;	///< The text content of the tag.
-	std::string paramName;	///< Only used for @param, stores the parameter name.
+	std::string content;    ///< The text content of the tag.
+	std::string paramName;  ///< Only used for @param, stores the parameter name.
 };
 
 struct StructurallyDocumentedAnnotation
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 0af9f105fb..d09d03fbec 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1042,7 +1042,7 @@ BoolResult RationalNumberType::isExplicitlyConvertibleTo(Type const& _convertTo)
 	if (category == Category::FixedBytes)
 		return false;
 	else if (auto addressType = dynamic_cast<AddressType const*>(&_convertTo))
-		return	(m_value == 0) ||
+		return (m_value == 0) ||
 			((addressType->stateMutability() != StateMutability::Payable) &&
 			!isNegative() &&
 			!isFractional() &&
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 494d106c83..3824d54321 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -942,7 +942,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 					else
 					{
 						solAssert(paramTypes[arg - 1]->isValueType(), "");
-						if (auto functionType =	dynamic_cast<FunctionType const*>(paramTypes[arg - 1]))
+						if (auto functionType = dynamic_cast<FunctionType const*>(paramTypes[arg - 1]))
 						{
 							auto argumentType =
 								dynamic_cast<FunctionType const*>(arguments[arg-1]->annotation().type);
diff --git a/libsolidity/experimental/codegen/IRGenerator.cpp b/libsolidity/experimental/codegen/IRGenerator.cpp
index 257bd2be16..40deb38c39 100644
--- a/libsolidity/experimental/codegen/IRGenerator.cpp
+++ b/libsolidity/experimental/codegen/IRGenerator.cpp
@@ -52,14 +52,13 @@ IRGenerator::IRGenerator(
 	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, {}, {}}
+):
+	m_evmVersion(_evmVersion),
+	m_eofVersion(_eofVersion),
+	//m_debugInfoSelection(_debugInfoSelection),
+	//m_soliditySourceProvider(_soliditySourceProvider),
+	m_env(_analysis.typeSystem().env().clone()),
+	m_context{_analysis, &m_env, {}, {}}
 {
 }
 
diff --git a/libsolidity/experimental/codegen/IRGenerator.h b/libsolidity/experimental/codegen/IRGenerator.h
index cce8c73057..7d3baf8f95 100644
--- a/libsolidity/experimental/codegen/IRGenerator.h
+++ b/libsolidity/experimental/codegen/IRGenerator.h
@@ -63,8 +63,8 @@ class IRGenerator
 	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;
+	//langutil::DebugInfoSelection m_debugInfoSelection = {};
+	//langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
 	TypeEnvironment m_env;
 	IRGenerationContext m_context;
 };
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index b16182af8c..932a315a70 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -349,7 +349,7 @@ bool BMC::visit(WhileStatement const& _node)
 			_node.body().accept(*this);
 			popPathCondition();
 
-			auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
+			auto brokeInCurrentIteration = mergeVariablesFromLoopCheckpoints();
 
 			// merges indices modified when accepting loop condition that no longer holds
 			mergeVariables(
@@ -414,7 +414,7 @@ bool BMC::visit(ForStatement const& _node)
 		pushPathCondition(forCondition);
 		_node.body().accept(*this);
 
-		auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
+		auto brokeInCurrentIteration = mergeVariablesFromLoopCheckpoints();
 
 		// accept loop expression if there was no break
 		if (_node.loopExpression())
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index be676930ca..bea3a85ef9 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -277,7 +277,7 @@ class SMTEncoder: public ASTConstVisitor
 	/// @returns a pair of expressions representing _left / _right and _left mod _right, respectively.
 	/// Uses slack variables and additional constraints to express the results using only operations
 	/// more friendly to the SMT solver (multiplication, addition, subtraction and comparison).
-	std::pair<smtutil::Expression, smtutil::Expression>	divModWithSlacks(
+	std::pair<smtutil::Expression, smtutil::Expression> divModWithSlacks(
 		smtutil::Expression _left,
 		smtutil::Expression _right,
 		IntegerType const& _type
diff --git a/libsolutil/FixedHash.h b/libsolutil/FixedHash.h
index c4c72e9eb7..3aa2484808 100644
--- a/libsolutil/FixedHash.h
+++ b/libsolutil/FixedHash.h
@@ -159,7 +159,7 @@ class FixedHash
 	bytes asBytes() const { return bytes(data(), data() + N); }
 
 private:
-	std::array<uint8_t, N> m_data;		///< The binary data.
+	std::array<uint8_t, N> m_data; ///< The binary data.
 };
 
 /// Stream I/O for the FixedHash class.
diff --git a/libsolutil/Result.h b/libsolutil/Result.h
index ca95639477..bf6bde84b6 100644
--- a/libsolutil/Result.h
+++ b/libsolutil/Result.h
@@ -30,9 +30,9 @@ namespace solidity::util
 ///
 /// Result<bool> check()
 /// {
-///		if (false)
-///			return Result<bool>::err("Error message.")
-///		return true;
+///     if (false)
+///         return Result<bool>::err("Error message.")
+///     return true;
 /// }
 ///
 
diff --git a/libyul/YulString.h b/libyul/YulString.h
index 5522e34849..7dbaf1b84a 100644
--- a/libyul/YulString.h
+++ b/libyul/YulString.h
@@ -66,7 +66,7 @@ class YulStringRepository
 
 		return Handle{id, h};
 	}
-	std::string const& idToString(size_t _id) const	{ return *m_strings.at(_id); }
+	std::string const& idToString(size_t _id) const { return *m_strings.at(_id); }
 
 	static std::uint64_t hash(std::string const& v)
 	{
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 4b0da1e80d..f048e5717e 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -103,7 +103,7 @@ void markRecursiveCalls(CFG& _cfg)
 					_addChild(_conditionalJump.nonZero);
 				},
 				[&](CFG::BasicBlock::FunctionReturn const&) {},
-				[&](CFG::BasicBlock::Terminated const&)	{},
+				[&](CFG::BasicBlock::Terminated const&) {},
 			}, _block->exit);
 		});
 		return calls;
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index f3c529bb1a..6a3b34f977 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -287,15 +287,15 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			3,
 			0,
 			SideEffects{
-				false,				// movable
-				true,				// movableApartFromEffects
-				false,				// canBeRemoved
-				false,				// canBeRemovedIfNotMSize
-				true,				// cannotLoop
-				SideEffects::None,	// otherState
-				SideEffects::None,	// storage
-				SideEffects::Write,	// memory
-				SideEffects::None	// transientStorage
+				false,               // movable
+				true,                // movableApartFromEffects
+				false,               // canBeRemoved
+				false,               // canBeRemovedIfNotMSize
+				true,                // cannotLoop
+				SideEffects::None,   // otherState
+				SideEffects::None,   // storage
+				SideEffects::Write,  // memory
+				SideEffects::None    // transientStorage
 			},
 			{},
 			[](
@@ -311,15 +311,15 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			3,
 			0,
 			SideEffects{
-				false,				// movable
-				false,				// movableApartFromEffects
-				false,				// canBeRemoved
-				false,				// canBeRemovedIfNotMSize
-				true,				// cannotLoop
-				SideEffects::None,	// otherState
-				SideEffects::None,	// storage
-				SideEffects::Write,	// memory
-				SideEffects::None	// transientStorage
+				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},
 			[](
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 88190b45b3..51db3a14d5 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -539,7 +539,7 @@ void StackLayoutGenerator::stitchConditionalJumps(CFG::BasicBlock const& _block)
 				_addChild(_conditionalJump.zero);
 				_addChild(_conditionalJump.nonZero);
 			},
-			[&](CFG::BasicBlock::FunctionReturn const&)	{},
+			[&](CFG::BasicBlock::FunctionReturn const&) {},
 			[&](CFG::BasicBlock::Terminated const&) { },
 		}, _block->exit);
 	});
diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
index eb22ad79fb..3a1fdf7435 100644
--- a/libyul/optimiser/ExpressionJoiner.h
+++ b/libyul/optimiser/ExpressionJoiner.h
@@ -91,9 +91,9 @@ class ExpressionJoiner: public ASTModifier
 	bool isLatestStatementVarDeclJoinable(Identifier const& _identifier);
 
 private:
-	Block* m_currentBlock = nullptr;		///< Pointer to current block holding the statement being visited.
-	size_t m_latestStatementInBlock = 0;		///< Offset to m_currentBlock's statements of the last visited statement.
-	std::map<YulString, size_t> m_references;	///< Holds reference counts to all variable declarations in current block.
+	Block* m_currentBlock = nullptr;            ///< Pointer to current block holding the statement being visited.
+	size_t m_latestStatementInBlock = 0;        ///< Offset to m_currentBlock's statements of the last visited statement.
+	std::map<YulString, size_t> m_references;   ///< Holds reference counts to all variable declarations in current block.
 };
 
 }
diff --git a/libyul/optimiser/SSAReverser.h b/libyul/optimiser/SSAReverser.h
index bb6e98bc8d..675c5c4aff 100644
--- a/libyul/optimiser/SSAReverser.h
+++ b/libyul/optimiser/SSAReverser.h
@@ -30,42 +30,42 @@ class AssignmentCounter;
  *
  * In particular, the SSA transform will rewrite
  *
- * 		a := E
+ *     a := E
  *
  * to
  *
- * 		let a_1 := E
- * 		a := a_1
+ *     let a_1 := E
+ *     a := a_1
  *
  * To undo this kind of transformation, the SSAReverser changes this back to
  *
- * 		a := E
- * 		let a_1 := a
+ *     a := E
+ *     let a_1 := a
  *
- * 	In the special case
- * 		let a := E
- * 		a := a
+ * In the special case
+ *     let a := E
+ *     a := a
  *
- * 	the redundant assignment "a := a" is removed.
+ * the redundant assignment "a := a" is removed.
  *
  *
  * Secondly, the SSA transform will rewrite
  *
- * 		let a := E
+ *     let a := E
  * to
  *
- * 		let a_1 := E
- * 		let a := a_1
+ *     let a_1 := E
+ *     let a := a_1
  *
  * To undo this kind of transformation, the SSAReverser changes this back to
  *
- * 		let a := E
- * 		let a_1 := a
+ *     let a := E
+ *     let a_1 := a
  *
- * 	After that the CSE can replace references of a_1 by references to a,
- * 	after which the unused pruner can remove the declaration of a_1.
+ * After that the CSE can replace references of a_1 by references to a,
+ * after which the unused pruner can remove the declaration of a_1.
  *
- * 	Prerequisites: Disambiguator
+ * Prerequisites: Disambiguator
  *
  */
 class SSAReverser: public ASTModifier
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 6a6fa8f0e5..9a94fbcf2c 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -210,8 +210,8 @@ export DH_OPTIONS
 override_dh_auto_test:
 
 #override_dh_installdocs:
-#	make -C docs html
-#	dh_installdocs docs/_build/html
+#    make -C docs html
+#    dh_installdocs docs/_build/html
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 2243758356..4ab9b2b08d 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -191,7 +191,7 @@ void EVMHost::newTransactionFrame()
 		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
+			value.original = value.current;         // Clear EIP-2200 dirty slot
 		}
 
 		// Clear transient storage according to EIP 1153
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 2519fa86f4..42e20d7e39 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -61,27 +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},
-	{"Function Dependency Graph",   "libsolidity", "functionDependencyGraphTests",	false, false, &FunctionDependencyGraphTest::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/model_checker_contracts_all/input.sol b/test/cmdlineTests/model_checker_contracts_all/input.sol
index 52b71f2e5d..f47f2f31d6 100644
--- a/test/cmdlineTests/model_checker_contracts_all/input.sol
+++ b/test/cmdlineTests/model_checker_contracts_all/input.sol
@@ -2,11 +2,11 @@
 pragma solidity >=0.0;
 contract B {
     function f(uint x) public pure {
-		assert(x > 0);
+        assert(x > 0);
     }
 }
 contract A is B {
     function g(uint y) public pure {
-		assert(y > 0);
+        assert(y > 0);
     }
-}
\ No newline at end of file
+}
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json
index c1a7209b3e..6ff7662901 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/input.json
@@ -4,11 +4,11 @@
 	{
 		"C":
 		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n	int constant constVar = 41;\n	int immutable immutVar = 42;\n	int public stateVar;\n\n	constructor(int _init)\n	{\n		stateVar = _init;\n	}\n\n	function f() external pure returns (int)\n	{\n		return constVar + immutVar;\n	}\n	modifier m()\n	{\n		stateVar++;\n		_;\n	}\n	function f2() m public returns (int)\n	{\n		return stateVar + this.f() + immutVar;\n	}\n}\n"
+			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n    int constant constVar = 41;\n    int immutable immutVar = 42;\n    int public stateVar;\n\n    constructor(int _init)\n    {\n        stateVar = _init;\n    }\n\n    function f() external pure returns (int)\n    {\n        return constVar + immutVar;\n    }\n    modifier m()\n    {\n        stateVar++;\n        _;\n    }\n    function f2() m public returns (int)\n    {\n        return stateVar + this.f() + immutVar;\n    }\n}\n"
 		},
 		"D":
 		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n	constructor(int _init2)\n	{\n		stateVar += _init2;\n	}\n}\n"
+			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n    constructor(int _init2)\n    {\n        stateVar += _init2;\n    }\n}\n"
 		}
 	},
 	"settings":
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/input.json b/test/cmdlineTests/standard_debug_info_in_yul_location/input.json
index 8ba84239af..47dd4d234c 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/input.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/input.json
@@ -4,11 +4,11 @@
 	{
 		"C":
 		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n	int public constant constVar = 41;\n	int immutable immutVar = 42;\n	int public stateVar;\n\n	constructor(int _init)\n	{\n		stateVar = _init;\n	}\n\n	function f() external pure returns (int)\n	{\n		return constVar + immutVar;\n	}\n	modifier m()\n	{\n		stateVar++;\n		_;\n	}\n	function f2() m public returns (int)\n	{\n		return stateVar + this.f() + immutVar;\n	}\n}\n"
+			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\n\ncontract C\n{\n    int public constant constVar = 41;\n    int immutable immutVar = 42;\n    int public stateVar;\n\n    constructor(int _init)\n    {\n        stateVar = _init;\n    }\n\n    function f() external pure returns (int)\n    {\n        return constVar + immutVar;\n    }\n    modifier m()\n    {\n        stateVar++;\n        _;\n    }\n    function f2() m public returns (int)\n    {\n        return stateVar + this.f() + immutVar;\n    }\n}\n"
 		},
 		"D":
 		{
-			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n	constructor(int _init2)\n	{\n		stateVar += _init2;\n	}\n}\n"
+			"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\npragma abicoder v2;\nimport \"C\";\n\ncontract D is C(3)\n{\n    constructor(int _init2)\n    {\n        stateVar += _init2;\n    }\n}\n"
 		}
 	},
 	"settings":
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
index 9de7beea91..8e6add377c 100644
--- 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
@@ -1,16 +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": ":"
-				}
-	  		}
-		}
-  	}
+    "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_wrong_key_metadata/input.json b/test/cmdlineTests/standard_wrong_key_metadata/input.json
index a52d45004b..e0906d312e 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata/input.json
+++ b/test/cmdlineTests/standard_wrong_key_metadata/input.json
@@ -10,13 +10,13 @@
 	"settings":
 	{
 		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
+			"enabled": true,
+			"runs": 200
+		},
+		"evmVersion": "byzantium",
+		"metadata": {
 			"key1": "test",
-      		"useLiteralContent": true
-    	}
+			"useLiteralContent": true
+		}
 	}
 }
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/input.json b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
index 945c1e3460..2d54f09ebf 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer/input.json
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
@@ -11,12 +11,12 @@
 	{
 		"optimizer": {
 			"key1": "test",
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	}
+			"enabled": true,
+			"runs": 200
+		},
+		"evmVersion": "byzantium",
+		"metadata": {
+			"useLiteralContent": true
+		}
 	}
 }
diff --git a/test/cmdlineTests/standard_wrong_key_settings/input.json b/test/cmdlineTests/standard_wrong_key_settings/input.json
index 8f0e1d06b9..2ce8871f9e 100644
--- a/test/cmdlineTests/standard_wrong_key_settings/input.json
+++ b/test/cmdlineTests/standard_wrong_key_settings/input.json
@@ -1,22 +1,22 @@
 {
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	},
-		"key1": "test"
-	}
+    "language": "Solidity",
+    "sources":
+    {
+        "A":
+        {
+            "content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
+        }
+    },
+    "settings":
+    {
+        "optimizer": {
+            "enabled": true,
+            "runs": 200
+        },
+        "evmVersion": "byzantium",
+        "metadata": {
+            "useLiteralContent": true
+        },
+        "key1": "test"
+    }
 }
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index e1795d391c..04d41fffeb 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1358,11 +1358,11 @@ BOOST_AUTO_TEST_CASE(cse_verbatim_mload)
 	auto verbatim = AssemblyItem{bytes{1, 2, 3, 4, 5}, 0, 0};
 	AssemblyItems input{
 		u256(1000),
-		Instruction::MLOAD,	// Should not be removed
+		Instruction::MLOAD, // Should not be removed
 		Instruction::POP,
 		verbatim,
 		u256(1000),
-		Instruction::MLOAD,	// Should not be removed
+		Instruction::MLOAD, // Should not be removed
 		Instruction::POP,
 	};
 
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 381ec5bda5..63e8a924ab 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -157,7 +157,7 @@ std::map<std::string, Builtin> SemanticTest::makeBuiltins()
 			{
 				soltestAssert(_call.arguments.parameters.empty(), "No arguments expected.");
 				return toBigEndian(u256(storageEmpty(m_contractAddress) ? 1 : 0));
-		 	}
+			}
 		},
 		{
 			"account",
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index e34df0307c..e321a52986 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1680,29 +1680,29 @@ BOOST_AUTO_TEST_CASE(array_copy_storage_abi)
 
 //BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
 //{
-//	char const* sourceCode = R"(
-//		contract C {
-//			uint[3] constant x = [uint(1), 2, 3];
-//			uint constant y = x[0] + x[1] + x[2];
-//			function f() public returns (uint) { return y; }
-//		}
-//	)";
-//	compileAndRun(sourceCode);
-//	ABI_CHECK(callContractFunction("f()"), encodeArgs(1 + 2 + 3));
+//    char const* sourceCode = R"(
+//        contract C {
+//            uint[3] constant x = [uint(1), 2, 3];
+//            uint constant y = x[0] + x[1] + x[2];
+//            function f() public returns (uint) { return y; }
+//        }
+//    )";
+//    compileAndRun(sourceCode);
+//    ABI_CHECK(callContractFunction("f()"), encodeArgs(1 + 2 + 3));
 //}
 
 // Disabled until https://github.com/ethereum/solidity/issues/715 is implemented
 //BOOST_AUTO_TEST_CASE(constant_struct)
 //{
-//	char const* sourceCode = R"(
-//		contract C {
-//			struct S { uint x; uint[] y; }
-//			S constant x = S(5, new uint[](4));
-//			function f() public returns (uint) { return x.x; }
-//		}
-//	)";
-//	compileAndRun(sourceCode);
-//	ABI_CHECK(callContractFunction("f()"), encodeArgs(5));
+//    char const* sourceCode = R"(
+//        contract C {
+//            struct S { uint x; uint[] y; }
+//            S constant x = S(5, new uint[](4));
+//            function f() public returns (uint) { return x.x; }
+//        }
+//    )";
+//    compileAndRun(sourceCode);
+//    ABI_CHECK(callContractFunction("f()"), encodeArgs(5));
 //}
 
 BOOST_AUTO_TEST_CASE(evm_exceptions_in_constructor_out_of_baund)
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index 27f1a7e847..d52ad6b9c4 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -291,7 +291,7 @@ BOOST_AUTO_TEST_CASE(retain_information_in_branches)
 			numSHA3s++;
 	});
 // TEST DISABLED - OPTIMIZER IS NOT EFFECTIVE ON THIS ONE ANYMORE
-//	BOOST_CHECK_EQUAL(1, numSHA3s);
+// BOOST_CHECK_EQUAL(1, numSHA3s);
 }
 
 BOOST_AUTO_TEST_CASE(store_tags_as_unions)
@@ -334,7 +334,7 @@ BOOST_AUTO_TEST_CASE(store_tags_as_unions)
 			numSHA3s++;
 	});
 // TEST DISABLED UNTIL 93693404 IS IMPLEMENTED
-//	BOOST_CHECK_EQUAL(2, numSHA3s);
+// BOOST_CHECK_EQUAL(2, numSHA3s);
 }
 
 BOOST_AUTO_TEST_CASE(incorrect_storage_access_bug)
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 7fafa2a62e..22db222ea5 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1220,7 +1220,7 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 	BOOST_CHECK(
 		optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
 		OptimiserSettings::DefaultYulOptimiserSteps + ":"s + OptimiserSettings::DefaultYulOptimiserCleanupSteps
- 	);
+	);
 	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 10);
 	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
 }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
index 61f45aa620..fc3fd4d71f 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
@@ -1,7 +1,7 @@
 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
+  /// @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; }
 }
 
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
index 405c3f7150..d2f2d6923d 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
@@ -7,7 +7,7 @@ contract C {
 	function f() public {
 		function()internal x;
 		x.value(42);
- 	}
+	}
 }
 // ====
 // SMTEngine: all
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
index d0a917fa91..4880b3a0d5 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
@@ -4,7 +4,7 @@ contract C {
 		do {
 			++x;
 			if (x > 0) {
- 				x = 2;
+				x = 2;
 				break;
 			}
 			if (x > 1) {
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
index 52c3270ba7..5b4d6579bf 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
@@ -6,11 +6,11 @@ contract C {
 			if (x > 1) {
 				x = 3;
 				break;
- 			}
+			}
 			if (x > 0) {
 				x = 2;
 				break;
- 			}
+			}
 		} while (x < 3);
 		assert(x == 2);
 	}
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
index 53ce958fab..43a5f91f5a 100644
--- 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
@@ -4,11 +4,11 @@ contract C {
 		do {
 			if (x > 1) {
 				break;
- 			}
+			}
 			if (x >= 0) {
 				x = 10;
 				continue;
- 			}
+			}
 		} while (x < 3);
 		assert(x == 10);
 	}
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
index 12d6fff6f5..eed9101184 100644
--- 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
@@ -5,11 +5,11 @@ contract C {
 			if (x > 1) {
 				x = 3;
 				break;
- 			}
+			}
 			if (x >= 0) {
 				x = 2;
 				continue;
- 			}
+			}
 		} while (x < 4);
 		assert(x == 3);
 	}
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
index cada2d8519..e7ff49daed 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
@@ -4,7 +4,7 @@ contract C
 		uint x;
 		for (uint i = 0; i < 3; ++i) {
 			++x;
- 			break;
+			break;
 		}
 		assert(x == 1);
 	}
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
index a88a031e75..de32378389 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
@@ -3,7 +3,7 @@ contract C
 	function f() public pure {
 		uint x;
 		for (;;) {
- 			break;
+			break;
 			++x;
 		}
 		assert(x == 0);
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
index 4ce3d9268e..8106ba30f9 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
@@ -4,7 +4,7 @@ contract C
 		uint x;
 		for (;x < 2;) {
 			++x;
- 			break;
+			break;
 		}
 		assert(x == 1);
 	}
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
index b999f9cf61..1dbe81a969 100644
--- 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
@@ -5,11 +5,11 @@ contract C
 		for (uint i = 0; i < 3; ++i) {
 			if (i > 1) {
 				break;
- 			}
+			}
 			if (i >= 0) {
 				x = 10;
 				continue;
- 			}
+			}
 		}
 		assert(x == 10);
 	}
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
index 0da0f5d994..1781f77ce7 100644
--- 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
@@ -6,7 +6,7 @@ contract C
 			if (i > 0) {
 				x = 1;
 				break;
- 			}
+			}
 			if (i >= 0) {
 				x = 2;
 				continue;
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
index 9f762bb436..9336127581 100644
--- 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
@@ -6,7 +6,7 @@ contract C
 			if (i > 0) {
 				x = 1;
 				break;
- 			} else {
+			} else {
 				x = 2;
 				continue;
 			}
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
index b74709e484..6f999a14cf 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
@@ -7,7 +7,7 @@ contract C
 				x = 10;
 				continue;
 			}
- 			if (x > 0) {
+			if (x > 0) {
 				x = 11;
 				continue;
 			}
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
index b7ad4e2ecb..69c49d8f89 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
@@ -3,7 +3,7 @@ contract C
 	uint256[] y;
 
 	function f() public view {
- 		uint256 x = 0;
+		uint256 x = 0;
 		while (x < y.length) {
 			x = 1;
 		}
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
index d1939871bf..989130a138 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
@@ -4,7 +4,7 @@ contract C {
 		while (x < 3) {
 			++x;
 			if (x > 0) {
- 				++x;
+				++x;
 				break;
 			}
 		}
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
index 0546e48c0d..9f2bdd1aa2 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
@@ -4,7 +4,7 @@ contract C {
 		while (x < 3) {
 			++x;
 			if (x > 0) {
- 				x = 2;
+				x = 2;
 				break;
 			}
 			if (x > 1) {
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
index 8e4d3b6261..c1aca1bcc3 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
@@ -6,11 +6,11 @@ contract C {
 			if (x > 1) {
 				x = 3;
 				break;
- 			}
+			}
 			if (x > 0) {
 				x = 2;
 				break;
- 			}
+			}
 		}
 		assert(x == 2);
 	}
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
index bb95545234..6332d20e3e 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
@@ -4,11 +4,11 @@ contract C {
 		while (x < 3) {
 			if (x > 1) {
 				break;
- 			}
+			}
 			if (x >= 0) {
 				x = 10;
 				continue;
- 			}
+			}
 		}
 		assert(x == 10);
 	}
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
index b65404e22f..c4e47d5289 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
@@ -5,11 +5,11 @@ contract C {
 			if (x > 1) {
 				x = 3;
 				break;
- 			}
+			}
 			if (x >= 0) {
 				x = 2;
 				continue;
- 			}
+			}
 		}
 		assert(x == 3);
 	}
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 a50acf4d2b..5b22ca9426 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
@@ -7,7 +7,7 @@ contract C {
 				y = 1;
 			++x;
 		}
- 		// BMC loop iteration setting is just enough to leave the loop
+		// BMC loop iteration setting is just enough to leave the loop
 		assert(x == 3);
 		assert(y == 1); // should fail
 		assert(y == 0);
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
index 53a1a253e0..ea6eb3a9aa 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
@@ -9,21 +9,21 @@ contract C {
 		delete a;
 		assert(a.length == 0);
 	}
- 	function g(uint x, uint y, uint v) public {
+	function g(uint x, uint y, uint v) public {
 		require(x < b.length);
 		require(y < b[x].length);
 		b[x][y] = v;
 		delete b;
 		assert(b.length == 0);
 	}
- 	function h(uint x, uint y, uint v) public {
+	function h(uint x, uint y, uint v) public {
 		require(x < b.length);
 		require(y < b[x].length);
 		b[x][y] = v;
 		delete b[x];
 		assert(b[x].length == 0);
 	}
- 	function i(uint x, uint y, uint v) public {
+	function i(uint x, uint y, uint v) public {
 		require(x < b.length);
 		require(y < b[x].length);
 		b[x][y] = v;
@@ -31,7 +31,7 @@ contract C {
 		delete b[y];
 		assert(b[y].length == 0);
 	}
- 	function j(uint x, uint y, uint z, uint v) public {
+	function j(uint x, uint y, uint z, uint v) public {
 		require(x < b.length);
 		require(y < b[x].length);
 		b[x][y] = v;
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
index 5741ccd0de..72e5c7393f 100644
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ b/test/libsolidity/util/TestFunctionCallTests.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(format_unsigned_multiline)
 	call.displayMode = FunctionCall::DisplayMode::MultiLine;
 	TestFunctionCall test{call};
 
-	BOOST_REQUIRE_EQUAL(test.format(),	"// f(uint8)\n// -> 1");
+	BOOST_REQUIRE_EQUAL(test.format(), "// f(uint8)\n// -> 1");
 }
 
 BOOST_AUTO_TEST_CASE(format_multiple_unsigned_singleline)
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index c9b9ec0727..69314abee1 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -450,12 +450,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 	ErrorReporter reporter(errorList);
 	auto const sourceText = R"(
 		/// @src 1:23:45
-		{								// Block
-			{							// Block
-				sstore(0, 1)			// FunctionCall
+		{                               // Block
+			{                           // Block
+				sstore(0, 1)            // FunctionCall
 				/// @src 0:420:680
 			}
-			mstore(1, 2)				// FunctionCall
+			mstore(1, 2)                // FunctionCall
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
index 7c85a931e2..e53eeafbb0 100644
--- a/test/libyul/StackShufflingTest.cpp
+++ b/test/libyul/StackShufflingTest.cpp
@@ -56,12 +56,12 @@ bool StackShufflingTest::parse(std::string const& _source)
 					scanner.next();
 					std::string functionName = scanner.currentLiteral();
 					auto call = yul::FunctionCall{
-						{},	yul::Identifier{{}, YulString(functionName)}, {}
+						{}, yul::Identifier{{}, YulString(functionName)}, {}
 					};
 					stack.emplace_back(FunctionCallReturnLabelSlot{
-							m_functions.insert(
-								make_pair(functionName, call)
-							).first->second
+						m_functions.insert(
+							make_pair(functionName, call)
+						).first->second
 					});
 					expectToken(Token::RBrack);
 				}
@@ -78,14 +78,14 @@ bool StackShufflingTest::parse(std::string const& _source)
 				scanner.next();
 				std::string functionName = scanner.currentLiteral();
 				auto call = yul::FunctionCall{
-				    {},	yul::Identifier{{}, YulString(functionName)}, {}
-			    };
+					{}, 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
+					m_functions.insert(make_pair(functionName, call)).first->second,
+					index
 				});
 				expectToken(Token::RBrack);
 			}
@@ -104,7 +104,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 				std::string ghostVariableId = scanner.currentLiteral();
 				Scope::Variable ghostVar = Scope::Variable{""_yulstring, YulString(literal + "[" + ghostVariableId + "]")};
 				stack.emplace_back(VariableSlot{
-						m_variables.insert(std::make_pair(ghostVar.name, ghostVar)).first->second
+					m_variables.insert(std::make_pair(ghostVar.name, ghostVar)).first->second
 				});
 				expectToken(Token::RBrack);
 			}
@@ -112,9 +112,9 @@ bool StackShufflingTest::parse(std::string const& _source)
 			{
 				Scope::Variable var = Scope::Variable{""_yulstring, YulString(literal)};
 				stack.emplace_back(VariableSlot{
-						m_variables.insert(
-							make_pair(literal, var)
-						).first->second
+					m_variables.insert(
+						make_pair(literal, var)
+					).first->second
 				});
 			}
 			scanner.next();
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index e529f1d95d..ea68f8dcd4 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -422,7 +422,7 @@ std::string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 			// Do not fuzz reasoning based simplifier because
 			// it can sometimes drain memory.
 			if (
-				optimiserStep == "mainFunction"	||
+				optimiserStep == "mainFunction" ||
 				optimiserStep == "wordSizeTransform"
 			)
 				// "Fullsuite" is fuzzed roughly four times more frequently than
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
index f78b9fb992..2cde783c1a 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
@@ -1,11 +1,11 @@
 {
     {
-    	function a() -> x { x := b() }
-    	function b() -> y { y := a() }
+        function a() -> x { x := b() }
+        function b() -> y { y := a() }
     }
     {
-    	function c() -> z { z := d() }
-    	function d() -> w { w := c() }
+        function c() -> z { z := d() }
+        function d() -> w { w := c() }
     }
 }
 // ----
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
index 858a48d85b..112f9fdccd 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
@@ -1,11 +1,11 @@
 {
     {
-    	function z() -> x { x := y() }
-    	function y() -> x { x := z() }
+        function z() -> x { x := y() }
+        function y() -> x { x := z() }
     }
     {
-    	function z() -> x { x := y() }
-    	function y() -> x { x := z() }
+        function z() -> x { x := y() }
+        function y() -> x { x := z() }
     }
 }
 // ----
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
index 73a79410df..f9191afb6b 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
@@ -1,7 +1,7 @@
 // return variables are assumed to be zero initially.
 {
     function f() -> c, d {
-    	let y := add(d, add(c, 7))
+        let y := add(d, add(c, 7))
         sstore(0, y)
     }
     let t, v := f()
diff --git a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
index bf74af6f47..6dc1d8c94b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
@@ -1,8 +1,8 @@
 // The yul code for the following contract
-//  contract C {
-//	  uint256[] x;
-//	  function f() public { x[10] = 5; }
-//  }
+// contract C {
+//     uint256[] x;
+//     function f() public { x[10] = 5; }
+// }
 
 {
     let _1 := 0
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
index 98de7dd359..af2e5ede1b 100644
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ b/test/tools/ossfuzz/protoToAbiV2.cpp
@@ -53,8 +53,8 @@ BOOST_PP_REPEAT(32, USINGDECL, 0)
 	ostringstream stream;                                                      \
 	switch (_intWidth)                                                         \
 	{                                                                          \
-	BOOST_PP_REPEAT(32, CASEIMPL, sign)	                                       \
-	}	                                                                       \
+	BOOST_PP_REPEAT(32, CASEIMPL, sign)                                        \
+	}                                                                          \
 	return stream.str();
 
 using namespace std;
@@ -103,7 +103,7 @@ string ProtoConverter::getVarDecl(
 	// One level of indentation for state variable declarations
 	// Two levels of indentation for local variable declarations
 	return Whiskers(R"(
-	<?isLocalVar>	</isLocalVar><type><?qual> <qualifier></qual> <varName>;)"
+	<?isLocalVar> </isLocalVar><type><?qual> <qualifier></qual> <varName>;)"
 		)
 		("isLocalVar", !m_isStateVar)
 		("type", _type)
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index be583d4971..803c0e7b34 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -19,116 +19,116 @@
 /**
  * Template of the solidity test program generated by this converter is as follows:
  *
- *	pragma solidity >=0.0;
- *	pragma experimental ABIEncoderV2;
+ *    pragma solidity >=0.0;
+ *    pragma experimental ABIEncoderV2;
  *
- *	contract C {
- *		// State variable
- *		string sv_0;
- *		// Test function that is called by the VM.
- *		// There are 2 variations of this function: one returns
- *		// the output of test_calldata_coding() and the other
- *		// returns the output of test_returndata_coding(). The
- *		// proto field called Test decides which one of the two
- *		// are chosen for creating a test case.
- *		function test() public returns (uint) {
- *			// The protobuf field "Contract.test" decides which of
- *			// the two internal functions "test_calldata_coding()"
- *			// and "test_returndata_coding()" are called. Here,
- *			// we assume that the protobuf field equals "CALLDATA_CODER"
- *			return this.test_calldata_coding()
- *		}
+ *    contract C {
+ *        // State variable
+ *        string sv_0;
+ *        // Test function that is called by the VM.
+ *        // There are 2 variations of this function: one returns
+ *        // the output of test_calldata_coding() and the other
+ *        // returns the output of test_returndata_coding(). The
+ *        // proto field called Test decides which one of the two
+ *        // are chosen for creating a test case.
+ *        function test() public returns (uint) {
+ *            // The protobuf field "Contract.test" decides which of
+ *            // the two internal functions "test_calldata_coding()"
+ *            // and "test_returndata_coding()" are called. Here,
+ *            // we assume that the protobuf field equals "CALLDATA_CODER"
+ *            return this.test_calldata_coding()
+ *        }
  *
- *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "RETURNDATA_CODER".
- *		function test_returndata_coding() internal returns (uint) {
- *			string memory lv_0, bytes memory lv_1 = test_returndata_external();
- *			if (lv_0 != 044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d)
- *				return 1;
- *			if (lv_1 != "1")
- *				return 2;
- *			return 0;
- *		}
+ *        // The following function is generated if the protobuf field
+ *        // "Contract.test" is equal to "RETURNDATA_CODER".
+ *        function test_returndata_coding() internal returns (uint) {
+ *            string memory lv_0, bytes memory lv_1 = test_returndata_external();
+ *            if (lv_0 != 044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d)
+ *                return 1;
+ *            if (lv_1 != "1")
+ *                return 2;
+ *            return 0;
+ *        }
  *
- *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "RETURNDATA_CODER".
- *		function test_returndata_external() external returns (string memory, bytes memory)
- *		{
- *			sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
- *			bytes memory lv_0 = "1";
- *			return (sv_0, lv_0);
- *		}
+ *        // The following function is generated if the protobuf field
+ *        // "Contract.test" is equal to "RETURNDATA_CODER".
+ *        function test_returndata_external() external returns (string memory, bytes memory)
+ *        {
+ *            sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
+ *            bytes memory lv_0 = "1";
+ *            return (sv_0, lv_0);
+ *        }
  *
-  *		// The following function is generated if the protobuf field
- *		// "Contract.test" is equal to "CALLDATA_CODER".
- *		function test_calldata_coding() internal returns (uint) {
- *			// Local variable
- *			bytes lv_1 = "1";
- *			sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
- *			uint returnVal = this.coder_public(sv_0, lv_1);
- *			if (returnVal != 0)
- *				return returnVal;
- *			// Since the return codes in the public and external coder functions are identical
- *			// we offset error code by a fixed amount (200000) for differentiation.
- *			returnVal = this.coder_external(sv_0, lv_1);
- *			if (returnVal != 0)
- *				return 200000 + returnVal;
- *			// Encode parameters
- *			bytes memory argumentEncoding = abi.encode(<parameter_names>);
- *			returnVal = checkEncodedCall(this.coder_public.selector, argumentEncoding, <invalidLengthFuzz>);
- *			// Check if calls to coder_public meet expectations for correctly/incorrectly encoded data.
- *			if (returnVal != 0)
- *				return returnVal;
+ *        // The following function is generated if the protobuf field
+ *        // "Contract.test" is equal to "CALLDATA_CODER".
+ *        function test_calldata_coding() internal returns (uint) {
+ *            // Local variable
+ *            bytes lv_1 = "1";
+ *            sv_0 = "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d";
+ *            uint returnVal = this.coder_public(sv_0, lv_1);
+ *            if (returnVal != 0)
+ *                return returnVal;
+ *            // Since the return codes in the public and external coder functions are identical
+ *            // we offset error code by a fixed amount (200000) for differentiation.
+ *            returnVal = this.coder_external(sv_0, lv_1);
+ *            if (returnVal != 0)
+ *                return 200000 + returnVal;
+ *            // Encode parameters
+ *            bytes memory argumentEncoding = abi.encode(<parameter_names>);
+ *            returnVal = checkEncodedCall(this.coder_public.selector, argumentEncoding, <invalidLengthFuzz>);
+ *            // Check if calls to coder_public meet expectations for correctly/incorrectly encoded data.
+ *            if (returnVal != 0)
+ *                return returnVal;
  *
- *			returnVal = checkEncodedCall(this.coder_external.selector, argumentEncoding, <invalidLengthFuzz>);
- *			// Check if calls to coder_external meet expectations for correctly/incorrectly encoded data.
- *			// Offset return value to distinguish between failures originating from coder_public and coder_external.
- *			if (returnVal != 0)
- *				return uint(200000) + returnVal;
- *			// Return zero if all checks pass.
- *			return 0;
- *		}
+ *            returnVal = checkEncodedCall(this.coder_external.selector, argumentEncoding, <invalidLengthFuzz>);
+ *            // Check if calls to coder_external meet expectations for correctly/incorrectly encoded data.
+ *            // Offset return value to distinguish between failures originating from coder_public and coder_external.
+ *            if (returnVal != 0)
+ *                return uint(200000) + returnVal;
+ *            // Return zero if all checks pass.
+ *            return 0;
+ *        }
  *
- *		/// Accepts function selector, correct argument encoding, and an invalid encoding length as input.
- *		/// Returns a non-zero value if either call with correct encoding fails or call with incorrect encoding
- *		/// succeeds. Returns zero if both calls meet expectation.
- *		function checkEncodedCall(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
- *			public returns (uint) {
- *			...
- *		}
+ *        /// Accepts function selector, correct argument encoding, and an invalid encoding length as input.
+ *        /// Returns a non-zero value if either call with correct encoding fails or call with incorrect encoding
+ *        /// succeeds. Returns zero if both calls meet expectation.
+ *        function checkEncodedCall(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
+ *            public returns (uint) {
+ *            ...
+ *        }
  *
- *		/// Accepts function selector, correct argument encoding, and length of invalid encoding and returns
- *		/// the correct and incorrect abi encoding for calling the function specified by the function selector.
- *		function createEncoding(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
- *			internal pure returns (bytes memory, bytes memory) {
- *			...
- *		}
+ *        /// Accepts function selector, correct argument encoding, and length of invalid encoding and returns
+ *        /// the correct and incorrect abi encoding for calling the function specified by the function selector.
+ *        function createEncoding(bytes4 funcSelector, bytes memory argumentEncoding, uint invalidLengthFuzz)
+ *            internal pure returns (bytes memory, bytes memory) {
+ *            ...
+ *        }
  *
- *		/// Compares two dynamically sized bytes arrays for equality.
- *		function bytesCompare(bytes memory a, bytes memory b) internal pure returns (bool) {
- *			...
- *		}
+ *        /// Compares two dynamically sized bytes arrays for equality.
+ *        function bytesCompare(bytes memory a, bytes memory b) internal pure returns (bool) {
+ *            ...
+ *        }
  *
- *		// Public function that is called by test() function. Accepts one or more arguments and returns
- *		// a uint value (zero if abi en/decoding was successful, non-zero otherwise)
- *		function coder_public(string memory c_0, bytes memory c_1) public pure returns (uint) {
- *			if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
- *				return 1;
- *			if (!bytesCompare(c_1, "1"))
- *				return 2;
- *			return 0;
- *		}
+ *        // Public function that is called by test() function. Accepts one or more arguments and returns
+ *        // a uint value (zero if abi en/decoding was successful, non-zero otherwise)
+ *        function coder_public(string memory c_0, bytes memory c_1) public pure returns (uint) {
+ *            if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
+ *                return 1;
+ *            if (!bytesCompare(c_1, "1"))
+ *                return 2;
+ *            return 0;
+ *        }
  *
- *		// External function that is called by test() function. Accepts one or more arguments and returns
- *		// a uint value (zero if abi en/decoding was successful, non-zero otherwise)
- *		function coder_external(string calldata c_0, bytes calldata c_1) external pure returns (uint) {
- *			if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
- *				return 1;
- *			if (!bytesCompare(c_1, "1"))
- *				return 2;
- *			return 0;
- *		}
- *	}
+ *        // External function that is called by test() function. Accepts one or more arguments and returns
+ *        // a uint value (zero if abi en/decoding was successful, non-zero otherwise)
+ *        function coder_external(string calldata c_0, bytes calldata c_1) external pure returns (uint) {
+ *            if (!bytesCompare(bytes(c_0), "044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"))
+ *                return 1;
+ *            if (!bytesCompare(c_1, "1"))
+ *                return 2;
+ *            return 0;
+ *        }
+ *    }
  */
 
 namespace solidity::test::abiv2fuzzer
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
index c264dd51af..2ae54f68a0 100644
--- a/test/tools/ossfuzz/protoToYul.h
+++ b/test/tools/ossfuzz/protoToYul.h
@@ -199,9 +199,9 @@ class ProtoConverter
 	/// Prints a Yul formatted variable declaration statement to the output
 	/// stream.
 	/// Example 1: createVarDecls(0, 1, true) returns {"x_0"} and prints
-	///		let x_0 :=
+	///     let x_0 :=
 	/// Example 2: createVarDecls(0, 2, false) returns {"x_0", "x_1"} and prints
-	///		let x_0, x_1
+	///     let x_0, x_1
 	/// @param _start Start index of variable (inclusive)
 	/// @param _end End index of variable (exclusive)
 	/// @param _isAssignment Flag indicating if variable declaration is also
@@ -215,7 +215,7 @@ class ProtoConverter
 	/// Prints comma separated variable names to output stream and
 	/// returns a vector containing the printed variable names.
 	/// Example: createVars(0, 2) returns {"x_0", "x_1"} and prints
-	///		x_0, x_1
+	///     x_0, x_1
 	/// @param _startIdx Start index of variable (inclusive)
 	/// @param _endIdx End index of variable (exclusive)
 	/// @return A vector of strings containing the printed variable names.
@@ -264,7 +264,7 @@ class ProtoConverter
 	/// @param _p Enum that decides if the returned token is hex prefixed ("0x") or not
 	/// @return Dictionary token at the index computed using a
 	/// monotonically increasing counter as follows:
-	///		index = (m_inputSize * m_inputSize + counter) % dictionarySize
+	///     index = (m_inputSize * m_inputSize + counter) % dictionarySize
 	/// where m_inputSize is the size of the protobuf input and
 	/// dictionarySize is the total number of entries in the dictionary.
 	std::string dictionaryToken(util::HexPrefix _p = util::HexPrefix::Add);

From 5cd92b57080bf6aa328c1527ea0fb1213afb0068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 23:33:16 +0200
Subject: [PATCH 0797/1140] Update text expectations

---
 .../model_checker_contracts_all/err           |  12 +-
 .../output.json                               | 194 +++++------
 .../output.json                               | 312 +++++++++---------
 .../loops/for_loop_bmc_iterations_break_8.sol |   2 +-
 .../while_bmc_iterations_semantics_2.sol      |   2 +-
 5 files changed, 261 insertions(+), 261 deletions(-)

diff --git a/test/cmdlineTests/model_checker_contracts_all/err b/test/cmdlineTests/model_checker_contracts_all/err
index 57b620b49b..9135483d5f 100644
--- a/test/cmdlineTests/model_checker_contracts_all/err
+++ b/test/cmdlineTests/model_checker_contracts_all/err
@@ -6,10 +6,10 @@ x = 0
 Transaction trace:
 B.constructor()
 B.f(0)
- --> model_checker_contracts_all/input.sol:5:3:
+ --> model_checker_contracts_all/input.sol:5:9:
   |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
+5 |         assert(x > 0);
+  |         ^^^^^^^^^^^^^
 
 Warning: CHC: Assertion violation happens here.
 Counterexample:
@@ -19,7 +19,7 @@ y = 0
 Transaction trace:
 A.constructor()
 A.g(0)
-  --> model_checker_contracts_all/input.sol:10:3:
+  --> model_checker_contracts_all/input.sol:10:9:
    |
-10 | 		assert(y > 0);
-   | 		^^^^^^^^^^^^^
+10 |         assert(y > 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 143ad92c30..97041b2380 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
@@ -7,7 +7,7 @@
             {
                 "evm":
                 {
-                    "assembly": "    /* \"C\":79:428  contract C... */
+                    "assembly": "    /* \"C\":79:503  contract C... */
   0xa0
   jumpi(tag_5, callvalue)
   0x1f
@@ -49,10 +49,10 @@
   tag_5
   jumpi
   mload
-    /* \"C\":147:149  42 */
+    /* \"C\":153:155  42 */
   mstore(0x80, 0x2a)
   0x00
-    /* \"C\":79:428  contract C... */
+    /* \"C\":79:503  contract C... */
   sstore
   mload(0x40)
   dataSize(sub_0)
@@ -61,9 +61,9 @@
   dataOffset(sub_0)
   dup3
   codecopy
-    /* \"C\":147:149  42 */
+    /* \"C\":153:155  42 */
   0x80
-    /* \"C\":79:428  contract C... */
+    /* \"C\":79:503  contract C... */
   mload
   dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
@@ -79,7 +79,7 @@ tag_3:
 stop
 
 sub_0: assembly {
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x80
       0x40
       swap1
@@ -129,21 +129,21 @@ sub_0: assembly {
       dup2
       mload
       shl(0xe4, 0x026121ff)
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       dup2
       mstore
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       swap2
       swap1
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       dup4
       0x04
       dup2
-        /* \"C\":403:407  this */
+        /* \"C\":475:479  this */
       address
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       gas
       staticcall
       swap3
@@ -151,50 +151,50 @@ sub_0: assembly {
       iszero
       tag_16
       jumpi
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x00
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       swap4
       tag_18
       jumpi
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
     tag_19:
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       pop
       tag_20
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       swap4
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":464:494  stateVar + this.f() + immutVar */
       tag_21
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       swap3
       tag_1
       jump\t// in
     tag_20:
-        /* \"C\":414:422  immutVar */
+        /* \"C\":486:494  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":464:494  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
     tag_21:
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       swap1
       mload
       swap1
       dup2
       mstore
       return
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
     tag_18:
       swap3
       pop
       0x20
       jumpi(tag_22, gt(0x20, returndatasize))
     tag_23:
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x1f
       dup2
       add
@@ -211,18 +211,18 @@ sub_0: assembly {
       or
       tag_24
       jumpi
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       swap2
       dup6
       swap2
       dup6
       mstore
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       dup2
       add
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       sub
       slt
       tag_26
@@ -230,30 +230,30 @@ sub_0: assembly {
       swap2
       mload
       swap2
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       tag_20
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       jump(tag_19)
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
     tag_26:
       0x00
       dup1
       revert
     tag_24:
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       shl(0xe0, 0x4e487b71)
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x00
       mstore
       mstore(0x04, 0x41)
       revert(0x00, 0x24)
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
     tag_22:
       pop
       returndatasize
       jump(tag_23)
     tag_16:
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       dup3
       mload
       returndatasize
@@ -264,23 +264,23 @@ sub_0: assembly {
       swap1
       revert
     tag_14:
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       shl(0xe0, 0x4e487b71)
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x00
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       mstore
       0x11
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x04
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       mstore
       0x24
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x00
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       revert
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
     tag_6:
       pop
       jumpi(tag_26, callvalue)
@@ -297,9 +297,9 @@ sub_0: assembly {
     tag_4:
       jumpi(tag_26, callvalue)
       jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-        /* \"C\":290:298  immutVar */
+        /* \"C\":326:334  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       swap1
       dup2
       0x29
@@ -311,13 +311,13 @@ sub_0: assembly {
       and
       tag_14
       jumpi
-        /* \"C\":79:428  contract C... */
+        /* \"C\":79:503  contract C... */
       0x20
       swap2
       dup2
       mstore
       return
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
     tag_1:
       swap2
       swap1
@@ -356,7 +356,7 @@ sub_0: assembly {
             {
                 "evm":
                 {
-                    "assembly": "    /* \"D\":91:166  contract D is C(3)... */
+                    "assembly": "    /* \"D\":91:181  contract D is C(3)... */
   0xa0
   jumpi(tag_5, callvalue)
   0x1f
@@ -398,13 +398,13 @@ sub_0: assembly {
   tag_5
   jumpi
   mload
-    /* \"C\":147:149  42 */
+    /* \"C\":153:155  42 */
   mstore(0x80, 0x2a)
-    /* \"D\":91:166  contract D is C(3)... */
+    /* \"D\":91:181  contract D is C(3)... */
   dup1
     /* \"D\":107:108  3 */
   0x03
-    /* \"D\":91:166  contract D is C(3)... */
+    /* \"D\":91:181  contract D is C(3)... */
   add
   swap1
   dup2
@@ -422,9 +422,9 @@ sub_0: assembly {
   dataOffset(sub_0)
   dup3
   codecopy
-    /* \"C\":147:149  42 */
+    /* \"C\":153:155  42 */
   0x80
-    /* \"D\":91:166  contract D is C(3)... */
+    /* \"D\":91:181  contract D is C(3)... */
   mload
   dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
@@ -444,7 +444,7 @@ tag_3:
 stop
 
 sub_0: assembly {
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x80
       0x40
       swap1
@@ -494,21 +494,21 @@ sub_0: assembly {
       dup2
       mload
       shl(0xe4, 0x026121ff)
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       dup2
       mstore
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       swap2
       swap1
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       dup4
       0x04
       dup2
-        /* \"C\":403:407  this */
+        /* \"C\":475:479  this */
       address
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       gas
       staticcall
       swap3
@@ -516,50 +516,50 @@ sub_0: assembly {
       iszero
       tag_16
       jumpi
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x00
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       swap4
       tag_18
       jumpi
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
     tag_19:
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       pop
       tag_20
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       swap4
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":464:494  stateVar + this.f() + immutVar */
       tag_21
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       swap3
       tag_1
       jump\t// in
     tag_20:
-        /* \"C\":414:422  immutVar */
+        /* \"C\":486:494  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":464:494  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
     tag_21:
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       swap1
       mload
       swap1
       dup2
       mstore
       return
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
     tag_18:
       swap3
       pop
       0x20
       jumpi(tag_22, gt(0x20, returndatasize))
     tag_23:
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x1f
       dup2
       add
@@ -576,18 +576,18 @@ sub_0: assembly {
       or
       tag_24
       jumpi
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       0x20
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       swap2
       dup6
       swap2
       dup6
       mstore
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       dup2
       add
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       sub
       slt
       tag_26
@@ -595,30 +595,30 @@ sub_0: assembly {
       swap2
       mload
       swap2
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":464:483  stateVar + this.f() */
       tag_20
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
       jump(tag_19)
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
     tag_26:
       0x00
       dup1
       revert
     tag_24:
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       shl(0xe0, 0x4e487b71)
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x00
       mstore
       mstore(0x04, 0x41)
       revert(0x00, 0x24)
-        /* \"C\":403:411  this.f() */
+        /* \"C\":475:483  this.f() */
     tag_22:
       pop
       returndatasize
       jump(tag_23)
     tag_16:
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       dup3
       mload
       returndatasize
@@ -629,23 +629,23 @@ sub_0: assembly {
       swap1
       revert
     tag_14:
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       shl(0xe0, 0x4e487b71)
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x00
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       mstore
       0x11
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x04
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       mstore
       0x24
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x00
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       revert
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
     tag_6:
       pop
       jumpi(tag_26, callvalue)
@@ -662,9 +662,9 @@ sub_0: assembly {
     tag_4:
       jumpi(tag_26, callvalue)
       jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
-        /* \"C\":290:298  immutVar */
+        /* \"C\":326:334  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
       swap1
       dup2
       0x29
@@ -676,13 +676,13 @@ sub_0: assembly {
       and
       tag_14
       jumpi
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"D\":91:181  contract D is C(3)... */
       0x20
       swap2
       dup2
       mstore
       return
-        /* \"C\":117:119  41 */
+        /* \"C\":120:122  41 */
     tag_1:
       swap2
       swap1
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 2671162722..54748658fd 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -9,7 +9,7 @@
 /// @use-src 0:\"C\"
 object \"C_54\" {
     code {
-        /// @src 0:79:435  \"contract C...\"
+        /// @src 0:79:510  \"contract C...\"
         mstore(64, memoryguard(160))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
@@ -136,31 +136,31 @@ object \"C_54\" {
         }
 
         /// @ast-id 20
-        /// @src 0:182:230  \"constructor(int _init)...\"
+        /// @src 0:194:254  \"constructor(int _init)...\"
         function constructor_C_54(var__init_12) {
 
-            /// @src 0:182:230  \"constructor(int _init)...\"
+            /// @src 0:194:254  \"constructor(int _init)...\"
 
-            /// @src 0:154:156  \"42\"
+            /// @src 0:160:162  \"42\"
             let expr_7 := 0x2a
             let _3 := convert_t_rational_42_by_1_to_t_int256(expr_7)
             mstore(128, _3)
 
-            /// @src 0:221:226  \"_init\"
+            /// @src 0:242:247  \"_init\"
             let _4 := var__init_12
             let expr_16 := _4
-            /// @src 0:210:226  \"stateVar = _init\"
+            /// @src 0:231:247  \"stateVar = _init\"
             update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
             let expr_17 := expr_16
 
         }
-        /// @src 0:79:435  \"contract C...\"
+        /// @src 0:79:510  \"contract C...\"
 
     }
     /// @use-src 0:\"C\"
     object \"C_54_deployed\" {
         code {
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
             mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
@@ -272,7 +272,7 @@ object \"C_54\" {
             }
 
             /// @ast-id 10
-            /// @src 0:159:178  \"int public stateVar\"
+            /// @src 0:168:187  \"int public stateVar\"
             function getter_fun_stateVar_10() -> ret {
 
                 let slot := 0
@@ -281,7 +281,7 @@ object \"C_54\" {
                 ret := read_from_storage_split_dynamic_t_int256(slot, offset)
 
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
             function external_fun_stateVar_10() {
 
@@ -317,9 +317,9 @@ object \"C_54\" {
                 converted := cleanup_t_int256(identity(cleanup_t_rational_41_by_1(value)))
             }
 
-            /// @src 0:93:126  \"int public constant constVar = 41\"
+            /// @src 0:96:129  \"int public constant constVar = 41\"
             function constant_constVar_5() -> ret {
-                /// @src 0:124:126  \"41\"
+                /// @src 0:127:129  \"41\"
                 let expr_4 := 0x29
                 let _1 := convert_t_rational_41_by_1_to_t_int256(expr_4)
 
@@ -327,11 +327,11 @@ object \"C_54\" {
             }
 
             /// @ast-id 5
-            /// @src 0:93:126  \"int public constant constVar = 41\"
+            /// @src 0:96:129  \"int public constant constVar = 41\"
             function getter_fun_constVar_5() -> ret_0 {
                 ret_0 := constant_constVar_5()
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
             function external_fun_constVar_5() {
 
@@ -373,26 +373,26 @@ object \"C_54\" {
             }
 
             /// @ast-id 30
-            /// @src 0:233:309  \"function f() external pure returns (int)...\"
+            /// @src 0:260:348  \"function f() external pure returns (int)...\"
             function fun_f_30() -> var__23 {
-                /// @src 0:269:272  \"int\"
+                /// @src 0:296:299  \"int\"
                 let zero_t_int256_2 := zero_value_for_split_t_int256()
                 var__23 := zero_t_int256_2
 
-                /// @src 0:286:294  \"constVar\"
+                /// @src 0:322:330  \"constVar\"
                 let expr_25 := constant_constVar_5()
-                /// @src 0:297:305  \"immutVar\"
+                /// @src 0:333:341  \"immutVar\"
                 let _3 := loadimmutable(\"8\")
                 let expr_26 := _3
-                /// @src 0:286:305  \"constVar + immutVar\"
+                /// @src 0:322:341  \"constVar + immutVar\"
                 let expr_27 := checked_add_t_int256(expr_25, expr_26)
 
-                /// @src 0:279:305  \"return constVar + immutVar\"
+                /// @src 0:315:341  \"return constVar + immutVar\"
                 var__23 := expr_27
                 leave
 
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
             function shift_right_0_unsigned(value) -> newValue {
                 newValue :=
@@ -444,20 +444,20 @@ object \"C_54\" {
             }
 
             /// @ast-id 37
-            /// @src 0:311:348  \"modifier m()...\"
+            /// @src 0:353:408  \"modifier m()...\"
             function modifier_m_40(var__42) -> _5 {
                 _5 := var__42
 
-                /// @src 0:329:339  \"stateVar++\"
+                /// @src 0:380:390  \"stateVar++\"
                 let _7 := read_from_storage_split_offset_0_t_int256(0x00)
                 let _6 := increment_t_int256(_7)
                 update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
                 let expr_33 := _7
-                /// @src 0:343:344  \"_\"
+                /// @src 0:400:401  \"_\"
                 _5 := fun_f2_53_inner(var__42)
 
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
             function cleanup_t_uint160(value) -> cleaned {
                 cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
@@ -539,19 +539,19 @@ object \"C_54\" {
                 revert(pos, returndatasize())
             }
 
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
+            /// @src 0:413:508  \"function f2() m public returns (int)...\"
             function fun_f2_53_inner(_8) -> var__42 {
                 var__42 := _8
 
-                /// @src 0:399:407  \"stateVar\"
+                /// @src 0:471:479  \"stateVar\"
                 let _9 := read_from_storage_split_offset_0_t_int256(0x00)
                 let expr_44 := _9
-                /// @src 0:410:414  \"this\"
+                /// @src 0:482:486  \"this\"
                 let expr_45_address := address()
-                /// @src 0:410:416  \"this.f\"
+                /// @src 0:482:488  \"this.f\"
                 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()\"
+                /// @src 0:482:490  \"this.f()\"
 
                 // storage for arguments and returned data
                 let _10 := allocate_unbounded()
@@ -577,32 +577,32 @@ object \"C_54\" {
                     // decode return parameters from external try-call into retVars
                     expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
                 }
-                /// @src 0:399:418  \"stateVar + this.f()\"
+                /// @src 0:471:490  \"stateVar + this.f()\"
                 let expr_48 := checked_add_t_int256(expr_44, expr_47)
 
-                /// @src 0:421:429  \"immutVar\"
+                /// @src 0:493:501  \"immutVar\"
                 let _14 := loadimmutable(\"8\")
                 let expr_49 := _14
-                /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
+                /// @src 0:471:501  \"stateVar + this.f() + immutVar\"
                 let expr_50 := checked_add_t_int256(expr_48, expr_49)
 
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
                 var__42 := expr_50
                 leave
 
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
             /// @ast-id 53
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
+            /// @src 0:413:508  \"function f2() m public returns (int)...\"
             function fun_f2_53() -> var__42 {
-                /// @src 0:382:385  \"int\"
+                /// @src 0:445:448  \"int\"
                 let zero_t_int256_4 := zero_value_for_split_t_int256()
                 var__42 := zero_t_int256_4
 
                 var__42 := modifier_m_40(var__42)
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
 
         }
 
@@ -616,7 +616,7 @@ object \"C_54\" {
 object \"C_54\" {
     code {
         {
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
             let _1 := memoryguard(0xa0)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"C_54\")
@@ -624,9 +624,9 @@ object \"C_54\" {
             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(/** @src -1:-1:-1 */ 0, /** @src 0:79:510  \"contract C...\" */ shl(224, 0x4e487b71))
                 mstore(4, 0x41)
-                revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ 0x24)
+                revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:510  \"contract C...\" */ 0x24)
             }
             mstore(64, newFreePtr)
             codecopy(_1, programSize, argSize)
@@ -634,17 +634,17 @@ object \"C_54\" {
             {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
-            /// @src 0:79:435  \"contract C...\"
+            /// @src 0:79:510  \"contract C...\"
             let value := mload(_1)
-            /// @src 0:154:156  \"42\"
+            /// @src 0:160:162  \"42\"
             mstore(128, 0x2a)
-            /// @src 0:79:435  \"contract C...\"
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ value)
+            /// @src 0:79:510  \"contract C...\"
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:510  \"contract C...\" */ value)
             let _2 := mload(64)
             let _3 := datasize(\"C_54_deployed\")
             codecopy(_2, dataoffset(\"C_54_deployed\"), _3)
-            setimmutable(_2, \"8\", mload(/** @src 0:154:156  \"42\" */ 128))
-            /// @src 0:79:435  \"contract C...\"
+            setimmutable(_2, \"8\", mload(/** @src 0:160:162  \"42\" */ 128))
+            /// @src 0:79:510  \"contract C...\"
             return(_2, _3)
         }
     }
@@ -652,7 +652,7 @@ object \"C_54\" {
     object \"C_54_deployed\" {
         code {
             {
-                /// @src 0:79:435  \"contract C...\"
+                /// @src 0:79:510  \"contract C...\"
                 let _1 := memoryguard(0x80)
                 let _2 := 64
                 mstore(_2, _1)
@@ -662,10 +662,10 @@ object \"C_54\" {
                     case 0x26121ff0 {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:297:305  \"immutVar\"
+                        /// @src 0:333:341  \"immutVar\"
                         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...\" */ _3)
+                        /// @src 0:79:510  \"contract C...\"
+                        let sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 0:79:510  \"contract C...\" */ _3)
                         if and(1, slt(sum, _3))
                         {
                             mstore(0, shl(224, 0x4e487b71))
@@ -695,27 +695,27 @@ object \"C_54\" {
                         }
                         let ret := add(_5, 1)
                         sstore(0, ret)
-                        /// @src 0:410:418  \"this.f()\"
-                        let _6 := /** @src 0:79:435  \"contract C...\" */ mload(_2)
-                        /// @src 0:410:418  \"this.f()\"
-                        mstore(_6, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
-                        /// @src 0:410:418  \"this.f()\"
-                        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)
+                        /// @src 0:482:490  \"this.f()\"
+                        let _6 := /** @src 0:79:510  \"contract C...\" */ mload(_2)
+                        /// @src 0:482:490  \"this.f()\"
+                        mstore(_6, /** @src 0:79:510  \"contract C...\" */ shl(228, 0x026121ff))
+                        /// @src 0:482:490  \"this.f()\"
+                        let _7 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _6, /** @src 0:79:510  \"contract C...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _6, 32)
                         if iszero(_7)
                         {
-                            /// @src 0:79:435  \"contract C...\"
+                            /// @src 0:79:510  \"contract C...\"
                             let pos := mload(_2)
                             returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 0:79:435  \"contract C...\" */ 0
-                        /// @src 0:410:418  \"this.f()\"
+                        /// @src 0:482:490  \"this.f()\"
+                        let expr := /** @src 0:79:510  \"contract C...\" */ 0
+                        /// @src 0:482:490  \"this.f()\"
                         if _7
                         {
                             let _8 := 32
                             if gt(32, returndatasize()) { _8 := returndatasize() }
-                            /// @src 0:79:435  \"contract C...\"
+                            /// @src 0:79:510  \"contract C...\"
                             let newFreePtr := add(_6, and(add(_8, 31), not(31)))
                             if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
@@ -724,27 +724,27 @@ object \"C_54\" {
                                 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...\"
+                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_6, _8), /** @src 0:79:510  \"contract C...\" */ _6), /** @src 0:482:490  \"this.f()\" */ 32)
+                            /// @src 0:79:510  \"contract C...\"
                             { revert(0, 0) }
-                            /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 0:79:435  \"contract C...\" */ mload(_6)
+                            /// @src 0:482:490  \"this.f()\"
+                            expr := /** @src 0:79:510  \"contract C...\" */ mload(_6)
                         }
-                        /// @src 0:399:418  \"stateVar + this.f()\"
+                        /// @src 0:471:490  \"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...\"
+                        /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
+                        let var := /** @src 0:471:501  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:493:501  \"immutVar\" */ loadimmutable(\"8\"))
+                        /// @src 0:79:510  \"contract C...\"
                         let memPos_1 := mload(_2)
                         mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
+                        return(memPos_1, /** @src 0:482:490  \"this.f()\" */ 32)
                     }
-                    case /** @src 0:79:435  \"contract C...\" */ 0xa00b982b {
+                    case /** @src 0:79:510  \"contract C...\" */ 0xa00b982b {
                         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...\"
+                        mstore(memPos_2, /** @src 0:127:129  \"41\" */ 0x29)
+                        /// @src 0:79:510  \"contract C...\"
                         return(memPos_2, 32)
                     }
                 }
@@ -777,7 +777,7 @@ object \"C_54\" {
 /// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
     code {
-        /// @src 1:91:166  \"contract D is C(3)...\"
+        /// @src 1:91:181  \"contract D is C(3)...\"
         mstore(64, memoryguard(160))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
@@ -944,26 +944,26 @@ object \"D_72\" {
         }
 
         /// @ast-id 71
-        /// @src 1:113:164  \"constructor(int _init2)...\"
+        /// @src 1:116:179  \"constructor(int _init2)...\"
         function constructor_D_72(var__init2_63) {
             /// @src 1:107:108  \"3\"
             let expr_60 := 0x03
             let _3 := convert_t_rational_3_by_1_to_t_int256(expr_60)
 
-            /// @src 1:113:164  \"constructor(int _init2)...\"
+            /// @src 1:116:179  \"constructor(int _init2)...\"
             constructor_C_54(_3)
 
-            /// @src 1:154:160  \"_init2\"
+            /// @src 1:166:172  \"_init2\"
             let _4 := var__init2_63
             let expr_67 := _4
-            /// @src 1:142:160  \"stateVar += _init2\"
+            /// @src 1:154:172  \"stateVar += _init2\"
             let _5 := read_from_storage_split_offset_0_t_int256(0x00)
             let expr_68 := checked_add_t_int256(_5, expr_67)
 
             update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_68)
 
         }
-        /// @src 1:91:166  \"contract D is C(3)...\"
+        /// @src 1:91:181  \"contract D is C(3)...\"
 
         function cleanup_t_rational_42_by_1(value) -> cleaned {
             cleaned := value
@@ -974,31 +974,31 @@ object \"D_72\" {
         }
 
         /// @ast-id 20
-        /// @src 0:182:230  \"constructor(int _init)...\"
+        /// @src 0:194:254  \"constructor(int _init)...\"
         function constructor_C_54(var__init_12) {
 
-            /// @src 0:182:230  \"constructor(int _init)...\"
+            /// @src 0:194:254  \"constructor(int _init)...\"
 
-            /// @src 0:154:156  \"42\"
+            /// @src 0:160:162  \"42\"
             let expr_7 := 0x2a
             let _6 := convert_t_rational_42_by_1_to_t_int256(expr_7)
             mstore(128, _6)
 
-            /// @src 0:221:226  \"_init\"
+            /// @src 0:242:247  \"_init\"
             let _7 := var__init_12
             let expr_16 := _7
-            /// @src 0:210:226  \"stateVar = _init\"
+            /// @src 0:231:247  \"stateVar = _init\"
             update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
             let expr_17 := expr_16
 
         }
-        /// @src 1:91:166  \"contract D is C(3)...\"
+        /// @src 1:91:181  \"contract D is C(3)...\"
 
     }
     /// @use-src 0:\"C\", 1:\"D\"
     object \"D_72_deployed\" {
         code {
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
             mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
@@ -1110,7 +1110,7 @@ object \"D_72\" {
             }
 
             /// @ast-id 10
-            /// @src 0:159:178  \"int public stateVar\"
+            /// @src 0:168:187  \"int public stateVar\"
             function getter_fun_stateVar_10() -> ret {
 
                 let slot := 0
@@ -1119,7 +1119,7 @@ object \"D_72\" {
                 ret := read_from_storage_split_dynamic_t_int256(slot, offset)
 
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
             function external_fun_stateVar_10() {
 
@@ -1155,9 +1155,9 @@ object \"D_72\" {
                 converted := cleanup_t_int256(identity(cleanup_t_rational_41_by_1(value)))
             }
 
-            /// @src 0:93:126  \"int public constant constVar = 41\"
+            /// @src 0:96:129  \"int public constant constVar = 41\"
             function constant_constVar_5() -> ret {
-                /// @src 0:124:126  \"41\"
+                /// @src 0:127:129  \"41\"
                 let expr_4 := 0x29
                 let _1 := convert_t_rational_41_by_1_to_t_int256(expr_4)
 
@@ -1165,11 +1165,11 @@ object \"D_72\" {
             }
 
             /// @ast-id 5
-            /// @src 0:93:126  \"int public constant constVar = 41\"
+            /// @src 0:96:129  \"int public constant constVar = 41\"
             function getter_fun_constVar_5() -> ret_0 {
                 ret_0 := constant_constVar_5()
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
             function external_fun_constVar_5() {
 
@@ -1211,26 +1211,26 @@ object \"D_72\" {
             }
 
             /// @ast-id 30
-            /// @src 0:233:309  \"function f() external pure returns (int)...\"
+            /// @src 0:260:348  \"function f() external pure returns (int)...\"
             function fun_f_30() -> var__23 {
-                /// @src 0:269:272  \"int\"
+                /// @src 0:296:299  \"int\"
                 let zero_t_int256_2 := zero_value_for_split_t_int256()
                 var__23 := zero_t_int256_2
 
-                /// @src 0:286:294  \"constVar\"
+                /// @src 0:322:330  \"constVar\"
                 let expr_25 := constant_constVar_5()
-                /// @src 0:297:305  \"immutVar\"
+                /// @src 0:333:341  \"immutVar\"
                 let _3 := loadimmutable(\"8\")
                 let expr_26 := _3
-                /// @src 0:286:305  \"constVar + immutVar\"
+                /// @src 0:322:341  \"constVar + immutVar\"
                 let expr_27 := checked_add_t_int256(expr_25, expr_26)
 
-                /// @src 0:279:305  \"return constVar + immutVar\"
+                /// @src 0:315:341  \"return constVar + immutVar\"
                 var__23 := expr_27
                 leave
 
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
             function shift_right_0_unsigned(value) -> newValue {
                 newValue :=
@@ -1282,20 +1282,20 @@ object \"D_72\" {
             }
 
             /// @ast-id 37
-            /// @src 0:311:348  \"modifier m()...\"
+            /// @src 0:353:408  \"modifier m()...\"
             function modifier_m_40(var__42) -> _5 {
                 _5 := var__42
 
-                /// @src 0:329:339  \"stateVar++\"
+                /// @src 0:380:390  \"stateVar++\"
                 let _7 := read_from_storage_split_offset_0_t_int256(0x00)
                 let _6 := increment_t_int256(_7)
                 update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
                 let expr_33 := _7
-                /// @src 0:343:344  \"_\"
+                /// @src 0:400:401  \"_\"
                 _5 := fun_f2_53_inner(var__42)
 
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
             function cleanup_t_uint160(value) -> cleaned {
                 cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
@@ -1377,19 +1377,19 @@ object \"D_72\" {
                 revert(pos, returndatasize())
             }
 
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
+            /// @src 0:413:508  \"function f2() m public returns (int)...\"
             function fun_f2_53_inner(_8) -> var__42 {
                 var__42 := _8
 
-                /// @src 0:399:407  \"stateVar\"
+                /// @src 0:471:479  \"stateVar\"
                 let _9 := read_from_storage_split_offset_0_t_int256(0x00)
                 let expr_44 := _9
-                /// @src 0:410:414  \"this\"
+                /// @src 0:482:486  \"this\"
                 let expr_45_address := address()
-                /// @src 0:410:416  \"this.f\"
+                /// @src 0:482:488  \"this.f\"
                 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()\"
+                /// @src 0:482:490  \"this.f()\"
 
                 // storage for arguments and returned data
                 let _10 := allocate_unbounded()
@@ -1415,32 +1415,32 @@ object \"D_72\" {
                     // decode return parameters from external try-call into retVars
                     expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
                 }
-                /// @src 0:399:418  \"stateVar + this.f()\"
+                /// @src 0:471:490  \"stateVar + this.f()\"
                 let expr_48 := checked_add_t_int256(expr_44, expr_47)
 
-                /// @src 0:421:429  \"immutVar\"
+                /// @src 0:493:501  \"immutVar\"
                 let _14 := loadimmutable(\"8\")
                 let expr_49 := _14
-                /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
+                /// @src 0:471:501  \"stateVar + this.f() + immutVar\"
                 let expr_50 := checked_add_t_int256(expr_48, expr_49)
 
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
                 var__42 := expr_50
                 leave
 
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
             /// @ast-id 53
-            /// @src 0:350:433  \"function f2() m public returns (int)...\"
+            /// @src 0:413:508  \"function f2() m public returns (int)...\"
             function fun_f2_53() -> var__42 {
-                /// @src 0:382:385  \"int\"
+                /// @src 0:445:448  \"int\"
                 let zero_t_int256_4 := zero_value_for_split_t_int256()
                 var__42 := zero_t_int256_4
 
                 var__42 := modifier_m_40(var__42)
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
 
         }
 
@@ -1454,7 +1454,7 @@ object \"D_72\" {
 object \"D_72\" {
     code {
         {
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
             let _1 := memoryguard(0xa0)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"D_72\")
@@ -1462,9 +1462,9 @@ object \"D_72\" {
             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(/** @src -1:-1:-1 */ 0, /** @src 1:91:181  \"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)
+                revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:181  \"contract D is C(3)...\" */ 0x24)
             }
             mstore(64, newFreePtr)
             codecopy(_1, programSize, argSize)
@@ -1472,24 +1472,24 @@ object \"D_72\" {
             {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
+            /// @src 1:91:181  \"contract D is C(3)...\"
             let value := mload(_1)
-            /// @src 0:154:156  \"42\"
+            /// @src 0:160:162  \"42\"
             mstore(128, 0x2a)
-            /// @src 1:91:166  \"contract D is C(3)...\"
-            let sum := add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ value)
+            /// @src 1:91:181  \"contract D is C(3)...\"
+            let sum := add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:181  \"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(/** @src -1:-1:-1 */ 0, /** @src 1:91:181  \"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)
+                revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:181  \"contract D is C(3)...\" */ 0x24)
             }
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ sum)
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:181  \"contract D is C(3)...\" */ sum)
             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)...\"
+            setimmutable(_2, \"8\", mload(/** @src 0:160:162  \"42\" */ 128))
+            /// @src 1:91:181  \"contract D is C(3)...\"
             return(_2, _3)
         }
     }
@@ -1497,7 +1497,7 @@ object \"D_72\" {
     object \"D_72_deployed\" {
         code {
             {
-                /// @src 1:91:166  \"contract D is C(3)...\"
+                /// @src 1:91:181  \"contract D is C(3)...\"
                 let _1 := memoryguard(0x80)
                 let _2 := 64
                 mstore(_2, _1)
@@ -1507,10 +1507,10 @@ object \"D_72\" {
                     case 0x26121ff0 {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        /// @src 0:297:305  \"immutVar\"
+                        /// @src 0:333:341  \"immutVar\"
                         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)...\" */ _3)
+                        /// @src 1:91:181  \"contract D is C(3)...\"
+                        let sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 1:91:181  \"contract D is C(3)...\" */ _3)
                         if and(1, slt(sum, _3))
                         {
                             mstore(0, shl(224, 0x4e487b71))
@@ -1540,27 +1540,27 @@ object \"D_72\" {
                         }
                         let ret := add(_5, 1)
                         sstore(0, ret)
-                        /// @src 0:410:418  \"this.f()\"
-                        let _6 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_2)
-                        /// @src 0:410:418  \"this.f()\"
-                        mstore(_6, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
-                        /// @src 0:410:418  \"this.f()\"
-                        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)
+                        /// @src 0:482:490  \"this.f()\"
+                        let _6 := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(_2)
+                        /// @src 0:482:490  \"this.f()\"
+                        mstore(_6, /** @src 1:91:181  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
+                        /// @src 0:482:490  \"this.f()\"
+                        let _7 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _6, /** @src 1:91:181  \"contract D is C(3)...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _6, 32)
                         if iszero(_7)
                         {
-                            /// @src 1:91:166  \"contract D is C(3)...\"
+                            /// @src 1:91:181  \"contract D is C(3)...\"
                             let pos := mload(_2)
                             returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ 0
-                        /// @src 0:410:418  \"this.f()\"
+                        /// @src 0:482:490  \"this.f()\"
+                        let expr := /** @src 1:91:181  \"contract D is C(3)...\" */ 0
+                        /// @src 0:482:490  \"this.f()\"
                         if _7
                         {
                             let _8 := 32
                             if gt(32, returndatasize()) { _8 := returndatasize() }
-                            /// @src 1:91:166  \"contract D is C(3)...\"
+                            /// @src 1:91:181  \"contract D is C(3)...\"
                             let newFreePtr := add(_6, and(add(_8, 31), not(31)))
                             if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
@@ -1569,27 +1569,27 @@ object \"D_72\" {
                                 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)...\"
+                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_6, _8), /** @src 1:91:181  \"contract D is C(3)...\" */ _6), /** @src 0:482:490  \"this.f()\" */ 32)
+                            /// @src 1:91:181  \"contract D is C(3)...\"
                             { revert(0, 0) }
-                            /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_6)
+                            /// @src 0:482:490  \"this.f()\"
+                            expr := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(_6)
                         }
-                        /// @src 0:399:418  \"stateVar + this.f()\"
+                        /// @src 0:471:490  \"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)...\"
+                        /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
+                        let var := /** @src 0:471:501  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:493:501  \"immutVar\" */ loadimmutable(\"8\"))
+                        /// @src 1:91:181  \"contract D is C(3)...\"
                         let memPos_1 := mload(_2)
                         mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
+                        return(memPos_1, /** @src 0:482:490  \"this.f()\" */ 32)
                     }
-                    case /** @src 1:91:166  \"contract D is C(3)...\" */ 0xa00b982b {
+                    case /** @src 1:91:181  \"contract D is C(3)...\" */ 0xa00b982b {
                         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)...\"
+                        mstore(memPos_2, /** @src 0:127:129  \"41\" */ 0x29)
+                        /// @src 1:91:181  \"contract D is C(3)...\"
                         return(memPos_2, 32)
                     }
                 }
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
index de32378389..1778e22d5a 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
@@ -14,5 +14,5 @@ contract C
 // SMTSolvers: z3
 // BMCLoopIterations: 4
 // ----
-// Warning 5740: (78-81): Unreachable code.
+// Warning 5740: (77-80): 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/while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
index 5b22ca9426..157cc61b65 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
@@ -18,5 +18,5 @@ contract C {
 // SMTSolvers: z3
 // BMCLoopIterations: 3
 // ----
-// Warning 4661: (220-234): BMC: Assertion violation happens here.
+// Warning 4661: (219-233): 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.

From 019d45e039b613dddd8edf7771809bcb88c3f838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 16:40:54 +0200
Subject: [PATCH 0798/1140] External tests: Include timing information in the
 JSON report

---
 scripts/common.sh               | 22 ++++++++++++++++++++++
 scripts/externalTests/common.sh | 14 +++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index d149253bf7..81dd2ec491 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -324,3 +324,25 @@ function gnu_grep
         grep "$@"
     fi
 }
+
+function time_to_json_file
+{
+    local output_file="$1"
+    local cmd=("${@:2}")
+    (( $# >= 2 )) || assertFail
+
+    # $TIMEFORMAT is the format used by built-in `time`. Description is in `man bash`.
+    local original_timeformat="$TIMEFORMAT"
+    TIMEFORMAT='{"real": %R, "user": %U, "sys": %S}'
+
+    # We temporarily use descriptors 3 and 4 to preserve stdout and stderr of the original command.
+    # This allows us to store `time`'s own stderr in a file. Then we restore initial descriptors.
+    {
+        {
+            time { "${cmd[@]}" 1>&3 2>&4; }
+        } 2> "$output_file"
+    } 3>&1 4>&2
+
+    # Restore original format so that it does not spill outside of the function.
+    TIMEFORMAT="$original_timeformat"
+}
diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
index 8bc9bdf7bd..2983b30c29 100644
--- a/scripts/externalTests/common.sh
+++ b/scripts/externalTests/common.sh
@@ -505,14 +505,14 @@ function compile_and_run_test
     [[ $preset != *" "* ]] || assertFail "Preset names must not contain spaces."
 
     printLog "Running compile function..."
-    time $compile_fn
-    $verify_fn "$SOLCVERSION_SHORT" "$SOLCVERSION"
+    time_to_json_file "$(compilation_time_report_path "$preset")" "$compile_fn"
+    "$verify_fn" "$SOLCVERSION_SHORT" "$SOLCVERSION"
 
     if [[ "$COMPILE_ONLY" == 1 || " $compile_only_presets " == *" $preset "* ]]; then
         printLog "Skipping test function..."
     else
         printLog "Running test function..."
-        $test_fn
+        "$test_fn"
     fi
 }
 
@@ -572,6 +572,13 @@ function gas_report_path
     echo "${DIR}/gas-report-${preset}.rst"
 }
 
+function compilation_time_report_path
+{
+    local preset="$1"
+
+    echo "${DIR}/compilation-time-report-${preset}.json"
+}
+
 function gas_report_to_json
 {
     cat - | "${REPO_ROOT}/scripts/externalTests/parse_eth_gas_report.py" | jq '{gas: .}'
@@ -679,5 +686,6 @@ function store_benchmark_report
 
         "bytecode_size_json_from_${framework}_artifacts" | combine_artifact_json
         project_info_json "$project_url"
+        echo "{\"compilation_time\": $(cat "$(compilation_time_report_path "$preset")")}"
     } | jq --slurp "{\"${project_name}\": {\"${preset}\": add}}" --indent 4 --sort-keys > "$output_file"
 }

From d96043f2d33ac4c30cbe0230b5737465ff1668d5 Mon Sep 17 00:00:00 2001
From: Vijay Raj Panchal <42858378+vijayrajpanchall@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:32:57 +0530
Subject: [PATCH 0799/1140] Update Changelog.md

Refactor: Update date to reflect current year in version 0.8.25 (2024-03-14) entry
---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ccc2de41a6..029f1944dd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ Bugfixes:
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
 
 
-### 0.8.25 (2023-03-14)
+### 0.8.25 (2024-03-14)
 
 Compiler Features:
  * Code Generator: Use ``MCOPY`` instead of ``MLOAD``/``MSTORE`` loop when copying byte arrays.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 7022635fde..52b6c9f48b 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1892,7 +1892,7 @@
     },
     "0.8.25": {
         "bugs": [],
-        "released": "2023-03-14"
+        "released": "2024-03-14"
     },
     "0.8.3": {
         "bugs": [

From 581d81434fa548f0425862d7a3fc68cb3fac9bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 13:04:05 +0200
Subject: [PATCH 0800/1140] time benchmarks: Actually ignore errors from legacy
 compilation

---
 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 ef1c146f00..251e5dc3f4 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -51,7 +51,7 @@ do
     solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
 
     # 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_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null 2>>"${warnings_and_errors_file}" || true
     "${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}")

From d6198ee819f82e8956de55d0c0aa3eb7bb117578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 13:06:49 +0200
Subject: [PATCH 0801/1140] time benchmarks: Add bytecode size measurement

---
 test/benchmarks/run.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index 251e5dc3f4..d97c532524 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -26,6 +26,9 @@ set -euo pipefail
 REPO_ROOT=$(cd "$(dirname "$0")/../../" && pwd)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
 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"
@@ -38,6 +41,12 @@ function cleanup() {
 
 trap cleanup SIGINT SIGTERM
 
+function bytecode_size {
+    local bytecode_chars
+    bytecode_chars=$(stripCLIDecorations | stripEmptyLines | wc --chars)
+    echo $(( bytecode_chars / 2 ))
+}
+
 solc="${SOLIDITY_BUILD_DIR}/solc/solc"
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
 benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
@@ -51,17 +60,20 @@ do
     solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
 
     # Legacy can fail.
-    "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null 2>>"${warnings_and_errors_file}" || true
-    "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null 2>>"${warnings_and_errors_file}"
+    "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >"${output_dir}/bytecode-legacy.bin" 2>>"${warnings_and_errors_file}" || true
+    "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >"${output_dir}/bytecode-via-ir.bin" 2>>"${warnings_and_errors_file}"
 
     time_legacy=$(<"${result_legacy_file}")
     time_via_ir=$(<"${result_via_ir_file}")
+    bytecode_size_legacy=$(bytecode_size <"${output_dir}/bytecode-legacy.bin")
+    bytecode_size_via_ir=$(bytecode_size <"${output_dir}/bytecode-via-ir.bin")
+
 
     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 "legacy pipeline took ${time_legacy} seconds to execute. Bytecode size is ${bytecode_size_legacy} bytes."
+    echo "via-ir pipeline took ${time_via_ir} seconds to execute. Bytecode size is ${bytecode_size_viar_ir} bytes."
     echo "======================================================="
 done
 

From 1317bcc9baa707fd6edd942b2d9f62322ea89eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 13:13:23 +0200
Subject: [PATCH 0802/1140] time benchmarks: Accept solc binary as argument and
 add minimal validations

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

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index d97c532524..8c4a660f8e 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -26,9 +26,16 @@ set -euo pipefail
 REPO_ROOT=$(cd "$(dirname "$0")/../../" && pwd)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
+(( $# <= 1 )) || fail "Too many arguments. Usage: run.sh [<solc-path>]"
+
+solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
+command_available "$solc" --version
+
 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"
@@ -47,7 +54,6 @@ function bytecode_size {
     echo $(( bytecode_chars / 2 ))
 }
 
-solc="${SOLIDITY_BUILD_DIR}/solc/solc"
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
 benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
 time_bin_path=$(type -P time)

From 50433df2f1f32cf6577718fc45f4ffae2cddf167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 13:40:22 +0200
Subject: [PATCH 0803/1140] time benchmarks: Format results as a markdown table

---
 test/benchmarks/run.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index 8c4a660f8e..8bfd32d435 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -58,6 +58,9 @@ benchmarks_dir="${REPO_ROOT}/test/benchmarks"
 benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
 time_bin_path=$(type -P time)
 
+echo "| File                 | Pipeline | Bytecode size | Time     | Exit code |"
+echo "|----------------------|----------|--------------:|---------:|----------:|"
+
 for input_file in "${benchmarks[@]}"
 do
     input_path="${benchmarks_dir}/${input_file}"
@@ -66,21 +69,16 @@ do
     solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
 
     # Legacy can fail.
-    "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >"${output_dir}/bytecode-legacy.bin" 2>>"${warnings_and_errors_file}" || true
-    "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >"${output_dir}/bytecode-via-ir.bin" 2>>"${warnings_and_errors_file}"
+    "${time_bin_path}" --output "${result_legacy_file}" --quiet --format "%e s |         %x" "${solc_command_legacy[@]}" >"${output_dir}/bytecode-legacy.bin" 2>>"${warnings_and_errors_file}" || true
+    "${time_bin_path}" --output "${result_via_ir_file}" --quiet --format "%e s |         %x" "${solc_command_via_ir[@]}" >"${output_dir}/bytecode-via-ir.bin" 2>>"${warnings_and_errors_file}"
 
-    time_legacy=$(<"${result_legacy_file}")
-    time_via_ir=$(<"${result_via_ir_file}")
+    time_and_status_legacy=$(<"${result_legacy_file}")
+    time_and_status_via_ir=$(<"${result_via_ir_file}")
     bytecode_size_legacy=$(bytecode_size <"${output_dir}/bytecode-legacy.bin")
     bytecode_size_via_ir=$(bytecode_size <"${output_dir}/bytecode-via-ir.bin")
 
-
-    echo "======================================================="
-    echo "            ${input_file}"
-    echo "-------------------------------------------------------"
-    echo "legacy pipeline took ${time_legacy} seconds to execute. Bytecode size is ${bytecode_size_legacy} bytes."
-    echo "via-ir pipeline took ${time_via_ir} seconds to execute. Bytecode size is ${bytecode_size_viar_ir} bytes."
-    echo "======================================================="
+    printf '| %-20s | legacy   | %7d bytes | %20s |\n' '`'"$input_file"'`' "$bytecode_size_legacy" "$time_and_status_legacy"
+    printf '| %-20s | via-ir   | %7d bytes | %20s |\n' '`'"$input_file"'`' "$bytecode_size_via_ir" "$time_and_status_via_ir"
 done
 
 echo

From e6bd63be525380a18c63890986c3c7c3def35c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 14:11:20 +0200
Subject: [PATCH 0804/1140] time benchmarks: Reorder input files from fastest
 to slowest

-
---
 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 8bfd32d435..8f873fde4b 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -55,7 +55,7 @@ function bytecode_size {
 }
 
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
-benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
+benchmarks=("verifier.sol" "OptimizorClub.sol" "chains.sol")
 time_bin_path=$(type -P time)
 
 echo "| File                 | Pipeline | Bytecode size | Time     | Exit code |"

From 6b83a43ea0b6c0d631f17544b4b889e07b4b18b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 12 Apr 2024 14:14:04 +0200
Subject: [PATCH 0805/1140] time benchmarks: Refactor to reduce repetitiion

---
 test/benchmarks/run.sh | 47 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index 8f873fde4b..1784b3700b 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -37,9 +37,6 @@ solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
 command_available "$solc" --version
 
 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 -r "${output_dir}"
@@ -54,7 +51,28 @@ function bytecode_size {
     echo $(( bytecode_chars / 2 ))
 }
 
-benchmarks_dir="${REPO_ROOT}/test/benchmarks"
+function benchmark_contract {
+    local pipeline="$1"
+    local input_path="$2"
+
+    local solc_command=("${solc}" --optimize --bin --color "${input_path}")
+    [[ $pipeline == via-ir ]] && solc_command+=(--via-ir)
+    local time_args=(--output "${output_dir}/time-and-status-${pipeline}.txt" --quiet --format '%e s |         %x')
+
+    # NOTE: Legacy pipeline may fail with "Stack too deep" in some cases. That's fine.
+    "$time_bin_path" \
+        "${time_args[@]}" \
+        "${solc_command[@]}" \
+        > "${output_dir}/bytecode-${pipeline}.bin" \
+        2>> "${output_dir}/benchmark-warn-err.txt" || [[ $pipeline == legacy ]]
+
+    printf '| %-20s | %s   | %7d bytes | %20s |\n' \
+        '`'"$input_file"'`' \
+        "$pipeline" \
+        "$(bytecode_size < "${output_dir}/bytecode-${pipeline}.bin")" \
+        "$(< "${output_dir}/time-and-status-${pipeline}.txt")"
+}
+
 benchmarks=("verifier.sol" "OptimizorClub.sol" "chains.sol")
 time_bin_path=$(type -P time)
 
@@ -63,29 +81,14 @@ echo "|----------------------|----------|--------------:|---------:|----------:|
 
 for input_file in "${benchmarks[@]}"
 do
-    input_path="${benchmarks_dir}/${input_file}"
-
-    solc_command_legacy=("${solc}" --optimize --bin --color "${input_path}")
-    solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
-
-    # Legacy can fail.
-    "${time_bin_path}" --output "${result_legacy_file}" --quiet --format "%e s |         %x" "${solc_command_legacy[@]}" >"${output_dir}/bytecode-legacy.bin" 2>>"${warnings_and_errors_file}" || true
-    "${time_bin_path}" --output "${result_via_ir_file}" --quiet --format "%e s |         %x" "${solc_command_via_ir[@]}" >"${output_dir}/bytecode-via-ir.bin" 2>>"${warnings_and_errors_file}"
-
-    time_and_status_legacy=$(<"${result_legacy_file}")
-    time_and_status_via_ir=$(<"${result_via_ir_file}")
-    bytecode_size_legacy=$(bytecode_size <"${output_dir}/bytecode-legacy.bin")
-    bytecode_size_via_ir=$(bytecode_size <"${output_dir}/bytecode-via-ir.bin")
-
-    printf '| %-20s | legacy   | %7d bytes | %20s |\n' '`'"$input_file"'`' "$bytecode_size_legacy" "$time_and_status_legacy"
-    printf '| %-20s | via-ir   | %7d bytes | %20s |\n' '`'"$input_file"'`' "$bytecode_size_via_ir" "$time_and_status_via_ir"
+    benchmark_contract legacy "${REPO_ROOT}/test/benchmarks/${input_file}"
+    benchmark_contract via-ir "${REPO_ROOT}/test/benchmarks/${input_file}"
 done
 
 echo
 echo "======================================================="
 echo "Warnings and errors generated during run:"
 echo "======================================================="
-echo "$(<"${warnings_and_errors_file}")"
+echo "$(< "${output_dir}/benchmark-warn-err.txt")"
 
 cleanup
-

From ac76c40ebc4a7ddea4cb545d5ed7e02a014095d1 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 16 Apr 2024 19:05:39 +0200
Subject: [PATCH 0806/1140] Prevent pnpm frozen lockfile

---
 .circleci/config.yml           | 2 +-
 test/externalTests/prb-math.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0dd960e93d..8b588740fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1452,7 +1452,7 @@ jobs:
           name: Install dependencies
           command: |
             cd hardhat
-            pnpm install
+            pnpm install --no-frozen-lockfile
       - run:
           name: Run hardhat-core test suite
           command: |
diff --git a/test/externalTests/prb-math.py b/test/externalTests/prb-math.py
index 2d1469fc90..0cfefb843f 100755
--- a/test/externalTests/prb-math.py
+++ b/test/externalTests/prb-math.py
@@ -43,7 +43,7 @@ def configure(self):
         # Starting from version v4.0.2, the default installation method for PRBMath dependencies
         # has transitioned from Foundry to Node.js.
         subprocess.run(
-            ["pnpm", "install"],
+            ["pnpm", "install", "--no-frozen-lockfile"],
             env=self.env,
             check=True
         )

From 7f882ef57fc47c5b8d821a7eba8900149362b96b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 4 Mar 2024 10:13:53 +0100
Subject: [PATCH 0807/1140] Bytecode difference caused by SSA transform

Changelog

Review comments

Unique vector

Repro test
---
 Changelog.md                                  |  1 +
 libsolutil/CommonData.h                       | 43 ++++++++++++
 libyul/optimiser/SSATransform.cpp             | 37 ++++++-----
 scripts/common/cmdline_helpers.py             | 46 +++++++++----
 .../inputs.sol                                | 13 ++++
 .../test.py                                   | 65 +++++++++++++++++++
 .../ssaTransform/function.yul                 |  8 +--
 7 files changed, 177 insertions(+), 36 deletions(-)
 create mode 100644 test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/inputs.sol
 create mode 100755 test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/test.py

diff --git a/Changelog.md b/Changelog.md
index 029f1944dd..a54afa62cf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 Bugfixes:
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
+ * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 
 ### 0.8.25 (2024-03-14)
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index f3c168e651..de6873845d 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -343,6 +343,49 @@ void joinMap(std::map<K, V>& _a, std::map<K, V>&& _b, F _conflictSolver)
 	}
 }
 
+template<typename T>
+class UniqueVector
+{
+public:
+	std::vector<T> const& contents() const { return m_contents; }
+	size_t size() const { return m_contents.size(); }
+	bool empty() const { return m_contents.empty(); }
+	auto begin() const { return m_contents.begin(); }
+	auto end() const { return m_contents.end(); }
+	void clear() { m_contents.clear(); }
+	bool contains(T const& _value) const
+	{
+		return std::find(m_contents.begin(), m_contents.end(), _value) != m_contents.end();
+	}
+
+	void pushBack(T _value)
+	{
+		if (!contains(_value))
+			m_contents.emplace_back(std::move(_value));
+	}
+
+	void pushBack(UniqueVector<T> const& _values)
+	{
+		for (auto&& value: _values)
+			pushBack(value);
+	}
+
+	void removeAll(std::vector<T> const& _values)
+	{
+		for (auto const& value: _values)
+			m_contents.erase(std::find(m_contents.begin(), m_contents.end(), value));
+	}
+
+private:
+	std::vector<T> m_contents;
+};
+
+template<typename T>
+void swap(UniqueVector<T>& _lhs, UniqueVector<T>& _rhs)
+{
+	std::swap(_lhs.contents(), _rhs.contents());
+}
+
 namespace detail
 {
 
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index 675d21acc3..dba2f6f046 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -166,8 +166,8 @@ class IntroduceControlFlowSSA: public ASTModifier
 	std::set<YulString> const& m_variablesToReplace;
 	/// Variables (that are to be replaced) currently in scope.
 	std::set<YulString> m_variablesInScope;
-	/// Set of variables that do not have a specific value.
-	std::set<YulString> m_variablesToReassign;
+	/// Variables that do not have a specific value.
+	util::UniqueVector<YulString> m_variablesToReassign;
 	TypeInfo const& m_typeInfo;
 };
 
@@ -175,14 +175,14 @@ void IntroduceControlFlowSSA::operator()(FunctionDefinition& _function)
 {
 	std::set<YulString> varsInScope;
 	std::swap(varsInScope, m_variablesInScope);
-	std::set<YulString> toReassign;
+	util::UniqueVector<YulString> toReassign;
 	std::swap(toReassign, m_variablesToReassign);
 
 	for (auto const& param: _function.parameters)
 		if (m_variablesToReplace.count(param.name))
 		{
 			m_variablesInScope.insert(param.name);
-			m_variablesToReassign.insert(param.name);
+			m_variablesToReassign.pushBack(param.name);
 		}
 
 	ASTModifier::operator()(_function);
@@ -196,8 +196,8 @@ void IntroduceControlFlowSSA::operator()(ForLoop& _for)
 	yulAssert(_for.pre.statements.empty(), "For loop init rewriter not run.");
 
 	for (auto const& var: assignedVariableNames(_for.body) + assignedVariableNames(_for.post))
-		if (m_variablesInScope.count(var))
-			m_variablesToReassign.insert(var);
+		if (util::contains(m_variablesInScope,var))
+			m_variablesToReassign.pushBack(var);
 
 	(*this)(_for.body);
 	(*this)(_for.post);
@@ -207,26 +207,26 @@ void IntroduceControlFlowSSA::operator()(Switch& _switch)
 {
 	yulAssert(m_variablesToReassign.empty(), "");
 
-	std::set<YulString> toReassign;
+	util::UniqueVector<YulString> toReassign;
 	for (auto& c: _switch.cases)
 	{
 		(*this)(c.body);
-		toReassign += m_variablesToReassign;
+		toReassign.pushBack(m_variablesToReassign);
 	}
 
-	m_variablesToReassign += toReassign;
+	m_variablesToReassign.pushBack(toReassign);
 }
 
 void IntroduceControlFlowSSA::operator()(Block& _block)
 {
-	std::set<YulString> variablesDeclaredHere;
-	std::set<YulString> assignedVariables;
+	util::UniqueVector<YulString> variablesDeclaredHere;
+	util::UniqueVector<YulString> assignedVariables;
 
 	util::iterateReplacing(
 		_block.statements,
 		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
-		std::vector<Statement> toPrepend;
+			std::vector<Statement> toPrepend;
 			for (YulString toReassign: m_variablesToReassign)
 			{
 				YulString newName = m_nameDispenser.newName(toReassign);
@@ -235,7 +235,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 					{TypedName{debugDataOf(_s), newName, m_typeInfo.typeOfVariable(toReassign)}},
 					std::make_unique<Expression>(Identifier{debugDataOf(_s), toReassign})
 				});
-				assignedVariables.insert(toReassign);
+				assignedVariables.pushBack(toReassign);
 			}
 			m_variablesToReassign.clear();
 
@@ -245,7 +245,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 				for (auto const& var: varDecl.variables)
 					if (m_variablesToReplace.count(var.name))
 					{
-						variablesDeclaredHere.insert(var.name);
+						variablesDeclaredHere.pushBack(var.name);
 						m_variablesInScope.insert(var.name);
 					}
 			}
@@ -254,7 +254,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 				Assignment& assignment = std::get<Assignment>(_s);
 				for (auto const& var: assignment.variableNames)
 					if (m_variablesToReplace.count(var.name))
-						assignedVariables.insert(var.name);
+						assignedVariables.pushBack(var.name);
 			}
 			else
 				visit(_s);
@@ -268,9 +268,10 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 			}
 		}
 	);
-	m_variablesToReassign += assignedVariables;
-	m_variablesInScope -= variablesDeclaredHere;
-	m_variablesToReassign -= variablesDeclaredHere;
+
+	m_variablesToReassign.pushBack(assignedVariables);
+	m_variablesInScope -= variablesDeclaredHere.contents();
+	m_variablesToReassign.removeAll(variablesDeclaredHere.contents());
 }
 
 /**
diff --git a/scripts/common/cmdline_helpers.py b/scripts/common/cmdline_helpers.py
index ede9f93855..822cf7f858 100644
--- a/scripts/common/cmdline_helpers.py
+++ b/scripts/common/cmdline_helpers.py
@@ -11,10 +11,12 @@
 from bytecodecompare.prepare_report import parse_cli_output
 
 
-DEFAULT_PREAMBLE = dedent("""
+DEFAULT_PREAMBLE = dedent(
+    """
     // SPDX-License-Identifier: UNLICENSED
     pragma solidity >=0.0;
-""")
+"""
+)
 
 
 def inside_temporary_dir(prefix):
@@ -22,8 +24,10 @@ 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)
@@ -33,35 +37,49 @@ def f(*args, **kwargs):
                 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:
+def solc_bin_report(
+    solc_binary: str,
+    input_files: List[Path],
+    via_ir: bool,
+    optimize: bool = False,
+    yul_optimizations: Optional[str] = None,
+) -> FileReport:
     """
     Runs the solidity compiler binary
     """
 
     output = subprocess.check_output(
-        [solc_binary, '--bin'] +
-        input_files +
-        (['--via-ir'] if via_ir else []),
-        encoding='utf8',
+        [solc_binary, "--bin"]
+        + input_files
+        + (["--via-ir"] if via_ir else [])
+        + (["--optimize"] if optimize else [])
+        + (["--yul-optimizations", yul_optimizations] if yul_optimizations else []),
+        encoding="utf8",
     )
-    return parse_cli_output('', output, 0)
+    return parse_cli_output("", output, 0)
 
 
-def save_bytecode(bytecode_path: Path, reports: FileReport, contract: Optional[str] = None):
-    with open(bytecode_path, 'w', encoding='utf8') as f:
+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')
+                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:
+    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/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/inputs.sol b/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/inputs.sol
new file mode 100644
index 0000000000..ff982c56d4
--- /dev/null
+++ b/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/inputs.sol
@@ -0,0 +1,13 @@
+==== Source: A.sol ====
+contract DummyContract1 {}
+contract DummyContract2 {}
+contract DummyContract3 {}
+
+==== Source: B.sol ====
+contract B {
+    function f(uint8 a_0, uint8 a_1, uint8 a_2) public pure {
+        a_1 = 1;
+        a_2 = 2;
+        a_0;
+    }
+}
diff --git a/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/test.py b/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/test.py
new file mode 100755
index 0000000000..e15293b8ea
--- /dev/null
+++ b/test/cmdlineTests/~bytecode_equivalence_with_unused_contracts/test.py
@@ -0,0 +1,65 @@
+#!/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.
+        """
+            )
+        )
+
+    # Repro for https://github.com/ethereum/solidity/issues/14829
+    save_bytecode(
+        Path("B.bin"),
+        solc_bin_report(
+            solc_binary,
+            [Path("B.sol")],
+            via_ir=True,
+            optimize=True,
+            yul_optimizations="a:",
+        ),
+        contract="B",
+    )
+    save_bytecode(
+        Path("AB.bin"),
+        solc_bin_report(
+            solc_binary,
+            [Path("A.sol"), Path("B.sol")],
+            via_ir=True,
+            optimize=True,
+            yul_optimizations="a:",
+        ),
+        contract="B",
+    )
+    return git_diff(Path("B.bin"), Path("AB.bin"))
+
+
+if __name__ == "__main__":
+    sys.exit(test_bytecode_equivalence())
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/function.yul b/test/libyul/yulOptimizerTests/ssaTransform/function.yul
index d41c18b04c..341d18cc12 100644
--- a/test/libyul/yulOptimizerTests/ssaTransform/function.yul
+++ b/test/libyul/yulOptimizerTests/ssaTransform/function.yul
@@ -12,15 +12,15 @@
 // {
 //     function f(a, b) -> c, d
 //     {
-//         let b_5 := b
-//         let a_6 := a
-//         let b_1 := add(b_5, a_6)
+//         let a_5 := a
+//         let b_6 := b
+//         let b_1 := add(b_6, a_5)
 //         b := b_1
 //         let c_2 := add(c, b_1)
 //         c := c_2
 //         let d_3 := add(d, c_2)
 //         d := d_3
-//         let a_4 := add(a_6, d_3)
+//         let a_4 := add(a_5, d_3)
 //         a := a_4
 //     }
 // }

From 04b220da0dc5b82a8db213adc60128b5f696906c Mon Sep 17 00:00:00 2001
From: pcw109550 <pcw109550@gmail.com>
Date: Wed, 17 Apr 2024 09:17:38 -0600
Subject: [PATCH 0808/1140] Fix string/hex string literal implicit conversion
 to bytesNN

---
 docs/types/conversion.rst                     |  9 ++++-----
 ...ing_to_bytesNN_different_size_implicit.sol | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_implicit.sol

diff --git a/docs/types/conversion.rst b/docs/types/conversion.rst
index dafb336bd0..92f0e19dc3 100644
--- a/docs/types/conversion.rst
+++ b/docs/types/conversion.rst
@@ -174,15 +174,14 @@ converted to any fixed-size bytes type:
     bytes4 g = 0x0; // fine
 
 String literals and hex string literals can be implicitly converted to fixed-size byte arrays,
-if their number of characters matches the size of the bytes type:
+if their number of characters is less than or equal to the size of the bytes type:
 
 .. code-block:: solidity
 
     bytes2 a = hex"1234"; // fine
     bytes2 b = "xy"; // fine
-    bytes2 c = hex"12"; // not allowed
-    bytes2 d = hex"123"; // not allowed
-    bytes2 e = "x"; // not allowed
+    bytes2 c = hex"12"; // fine
+    bytes2 e = "x"; // fine
     bytes2 f = "xyz"; // not allowed
 
 .. index:: literal;address
@@ -199,4 +198,4 @@ An ``address a`` can be converted explicitly to ``address payable`` via ``payabl
 
 .. 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
+    Starting with 0.8.0 only conversion from ``uint160`` is allowed.
diff --git a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_implicit.sol b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_implicit.sol
new file mode 100644
index 0000000000..177694af1a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_implicit.sol
@@ -0,0 +1,20 @@
+contract C {
+   function f() public pure {
+     bytes1 b1 = hex"";
+     bytes1 b2 = hex"1234";
+     bytes2 b3 = hex"12";
+     bytes2 b4 = hex"1234";
+     bytes2 b5 = hex"123456";
+     bytes3 b6 = hex"1234";
+     bytes3 b7 = hex"123456";
+     bytes3 b8 = hex"12345678";
+     bytes4 b9 = hex"123456";
+     bytes4 b10 = hex"12345678";
+     bytes4 b11 = hex"1234567890";
+   }
+}
+// ----
+// TypeError 9574: (72-93): Type literal_string hex"1234" is not implicitly convertible to expected type bytes1. Literal is larger than the type.
+// TypeError 9574: (154-177): Type literal_string hex"123456" is not implicitly convertible to expected type bytes2. Literal is larger than the type.
+// TypeError 9574: (242-267): Type literal_string hex"12345678" is not implicitly convertible to expected type bytes3. Literal is larger than the type.
+// TypeError 9574: (337-365): Type literal_string hex"1234567890" is not implicitly convertible to expected type bytes4. Literal is larger than the type.

From a0e1a3e2eacb925a291aa416bae9f130b5d3f893 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 26 Mar 2024 16:26:57 -0300
Subject: [PATCH 0809/1140] fix uncaught ICE when --yul-optimizations is
 empty/blank

---
 Changelog.md                                  |  2 ++
 docs/internals/optimizer.rst                  |  2 +-
 libsolidity/interface/CompilerStack.cpp       |  5 +---
 libsolidity/interface/StandardCompiler.cpp    |  7 ++++-
 libyul/optimiser/Suite.cpp                    | 20 ++++---------
 solc/CommandLineParser.cpp                    | 11 +++++--
 .../input.json                                | 25 ++++++++++++++++
 .../output.json                               | 19 ++++++++++++
 .../input.json                                | 25 ++++++++++++++++
 .../output.json                               | 19 ++++++++++++
 .../output.json                               |  4 +--
 .../input.json                                | 19 ++++++++++++
 .../output.json                               | 12 ++++++++
 .../input.json                                | 19 ++++++++++++
 .../output.json                               | 12 ++++++++
 .../args                                      |  1 +
 .../input.sol                                 |  3 ++
 .../output                                    |  4 +++
 .../yul_optimizer_steps_disabled/err          |  2 +-
 test/solc/CommandLineInterface.cpp            | 23 +++++++++++++++
 test/solc/CommandLineParser.cpp               | 29 ++++++++++++++++---
 21 files changed, 233 insertions(+), 30 deletions(-)
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
 create mode 100644 test/cmdlineTests/yul_optimizer_disabled_sequence_empty/args
 create mode 100644 test/cmdlineTests/yul_optimizer_disabled_sequence_empty/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_disabled_sequence_empty/output

diff --git a/Changelog.md b/Changelog.md
index a54afa62cf..3a7f3ec9a2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,8 +7,10 @@ Compiler Features:
 
 
 Bugfixes:
+ * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
+ * Standard JSON Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``optimizerSteps`` sequence.
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 4588cb4835..c1b959a8ab 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -46,7 +46,7 @@ for a stand-alone Yul mode.
     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
+    An empty optimizer sequence, i.e ``:``, 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.
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index baba57d1d5..514f3a5547 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1722,10 +1722,7 @@ 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)
-		)
+		else if (OptimiserSuite::isEmptyOptimizerSequence(m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps))
 		{
 			solAssert(m_optimiserSettings.optimizeStackAllocation == false);
 			details["yulDetails"] = Json::objectValue;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 85a5a5d232..1f7b3fa758 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -465,7 +465,12 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 		{
 			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.");
+			{
+				std::string errorMessage =
+					"If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted."
+					" Note that the empty optimizer sequence is properly denoted by \":\".";
+				return formatFatalError(Error::Type::JSONError, errorMessage);
+			}
 
 			try
 			{
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 545ae4de06..d35cdc256c 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -77,6 +77,8 @@
 
 #include <range/v3/view/map.hpp>
 #include <range/v3/action/remove.hpp>
+#include <range/v3/algorithm/count.hpp>
+#include <range/v3/algorithm/none_of.hpp>
 
 #include <limits>
 #include <tuple>
@@ -385,21 +387,9 @@ void OptimiserSuite::validateSequence(std::string_view _stepAbbreviations)
 
 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;
+	return
+		ranges::count(_sequence, ':') == 1 &&
+		ranges::none_of(_sequence, [](auto _step) { return _step != ':' && _step != ' ' && _step != '\n'; });
 }
 
 void OptimiserSuite::runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable)
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 6216af4a01..824c899110 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -1229,8 +1229,15 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strYulOptimizations))
 	{
 		OptimiserSettings optimiserSettings = m_options.optimiserSettings();
-		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.");
+		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."
+				" Note that the empty optimizer sequence is properly denoted by \":\"."
+			);
 
 		try
 		{
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/input.json
new file mode 100644
index 0000000000..e229656ea2
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/input.json
@@ -0,0 +1,25 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"content": "
+            // SPDX-License-Identifier: GPL-3.0
+            pragma solidity >=0.0;
+            contract C { }
+        "}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                "yulDetails": {
+                    "optimizerSteps": ":"
+                }
+            }
+        },
+        "outputSelection": {
+            "*": {
+              "*": ["metadata"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
new file mode 100644
index 0000000000..725822763a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
@@ -0,0 +1,19 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"A\":\"C\"},\"evmVersion\":\"cancun\",\"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\":{\"A\":{\"keccak256\":\"0xb284c39999cb85b80be315a6e9e322adf67a783c66e91ba4439168694580a66d\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://098cee915fad095b8a996813768bd7d5e8c9e40c405e8c43d0572bb7bbc17334\",\"dweb:/ipfs/QmZmUzvSryrrD7pJ9S32iQnEWn4QBL4J1NdbQqL2Xc3yTr\"]}},\"version\":1}"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/input.json
new file mode 100644
index 0000000000..ddf2d963ff
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/input.json
@@ -0,0 +1,25 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"content": "
+            // SPDX-License-Identifier: GPL-3.0
+            pragma solidity >=0.0;
+            contract C { }
+        "}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                "yulDetails": {
+                    "optimizerSteps": " :  "
+                }
+            }
+        },
+        "outputSelection": {
+            "*": {
+              "*": ["metadata"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
new file mode 100644
index 0000000000..725822763a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
@@ -0,0 +1,19 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"A\":\"C\"},\"evmVersion\":\"cancun\",\"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\":{\"A\":{\"keccak256\":\"0xb284c39999cb85b80be315a6e9e322adf67a783c66e91ba4439168694580a66d\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://098cee915fad095b8a996813768bd7d5e8c9e40c405e8c43d0572bb7bbc17334\",\"dweb:/ipfs/QmZmUzvSryrrD7pJ9S32iQnEWn4QBL4J1NdbQqL2Xc3yTr\"]}},\"version\":1}"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
index fa3c9d93ed..e0b6a26c1b 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
@@ -3,8 +3,8 @@
     [
         {
             "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.",
+            "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
+            "message": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
             "severity": "error",
             "type": "JSONError"
         }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/input.json
new file mode 100644
index 0000000000..ad7d7ff14b
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/input.json
@@ -0,0 +1,19 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"content": "
+            // SPDX-License-Identifier: GPL-3.0
+            pragma solidity >=0.0;
+        "}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                "yulDetails": {
+                    "optimizerSteps": ""
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
new file mode 100644
index 0000000000..e0b6a26c1b
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
+            "message": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/input.json
new file mode 100644
index 0000000000..85a53fce77
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/input.json
@@ -0,0 +1,19 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"content": "
+            // SPDX-License-Identifier: GPL-3.0
+            pragma solidity >=0.0;
+        "}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                "yulDetails": {
+                    "optimizerSteps": " "
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
new file mode 100644
index 0000000000..e0b6a26c1b
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
+            "message": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/args b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/args
new file mode 100644
index 0000000000..da9301b32f
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/args
@@ -0,0 +1 @@
+--metadata --yul-optimizations :
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/input.sol b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/input.sol
new file mode 100644
index 0000000000..37cd85bffa
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/input.sol
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C { }
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/output b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/output
new file mode 100644
index 0000000000..7b948303ee
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_disabled_sequence_empty/output
@@ -0,0 +1,4 @@
+
+======= yul_optimizer_disabled_sequence_empty/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":{"yul_optimizer_disabled_sequence_empty/input.sol":"C"},"evmVersion":"cancun","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_disabled_sequence_empty/input.sol":{"keccak256":"0xc2db3500808896ce1e69de2fe20cecab7ae2ffbb47cdf6ba8321296d95f49fc5","license":"GPL-3.0","urls":["bzz-raw://fde21393c068cd9f2d2b10ba4782db54f6f1c9a725074b17fa742531076be8a4","dweb:/ipfs/QmeTD6mR7YrWNyRowKRS7xs6cJNeMF3T49GAHzGM1bquyM"]}},"version":1}
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/err b/test/cmdlineTests/yul_optimizer_steps_disabled/err
index 1abbab8bde..c5a2e506d7 100644
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/err
+++ b/test/cmdlineTests/yul_optimizer_steps_disabled/err
@@ -1 +1 @@
-Error: --yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled.
+Error: --yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled. Note that the empty optimizer sequence is properly denoted by ":".
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 7a4f625c15..73ebb2c540 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -241,6 +241,29 @@ BOOST_AUTO_TEST_CASE(cli_input)
 	BOOST_CHECK_EQUAL(result.reader.allowedDirectories(), expectedAllowedPaths);
 }
 
+BOOST_AUTO_TEST_CASE(cli_optimizer_disabled_yul_optimization_input_whitespaces_or_empty)
+{
+	TemporaryDirectory tempDir(TEST_CASE_NAME);
+	createFilesWithParentDirs({tempDir.path() / "input.sol"});
+	createFilesWithParentDirs({tempDir.path() / "input.yul"});
+
+	std::string const expectedMessage =
+		"--yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled."
+		" Note that the empty optimizer sequence is properly denoted by \":\".";
+	std::vector<std::vector<std::string>> const commandVariations = {
+		{"solc", "--strict-assembly", "--yul-optimizations", "", (tempDir.path() / "input.yul").string()},
+		{"solc", "--strict-assembly", "--yul-optimizations", "   ", (tempDir.path() / "input.yul").string()},
+		{"solc", "--yul-optimizations", "", (tempDir.path() / "input.sol").string()},
+		{"solc", "--yul-optimizations", "   ", (tempDir.path() / "input.sol").string()},
+	};
+	for (auto const& command: commandVariations)
+		BOOST_CHECK_EXCEPTION(
+			parseCommandLineAndReadInputFiles(command),
+			CommandLineValidationError,
+			[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+		);
+}
+
 BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
 {
 	TemporaryDirectory tempDir1(TEST_CASE_NAME);
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index e0592da5d1..9fe24bcc66 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -498,6 +498,9 @@ BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 {
 	std::vector<std::string> validSequenceInputs {
 		":",                         // Empty optimization sequence and empty cleanup sequence
+		" : ",                       // whitespaces only optimization sequence and whitespaces only cleanup sequence
+		": ",                        // Empty optimization sequence and whitespaces only cleanup sequence
+		" :",                        // whitespaces only 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
@@ -509,6 +512,9 @@ BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 
 	std::vector<std::tuple<std::string, std::string>> const expectedParsedSequences {
 		{"", ""},
+		{" ", " "},
+		{"", " "},
+		{" ", ""},
 		{"", "fDn"},
 		{"dhfoDgvulfnTUtnIf", ""},
 		{"dhfoDgvulfnTUtnIf", "fDn"},
@@ -600,11 +606,26 @@ BOOST_AUTO_TEST_CASE(valid_empty_optimizer_sequences_without_optimize)
 
 BOOST_AUTO_TEST_CASE(invalid_optimizer_sequence_without_optimize)
 {
-	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};
+	std::vector<std::string> const invalidSequenceInputs {
+		{" "},
+		{"u: "},
+		{"u:"},
+		{":f"},
+		{" :f"}
+	};
+
+	std::string const expectedErrorMessage{
+		"--yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled."
+		" Note that the empty optimizer sequence is properly denoted by \":\"."
+	};
+
 	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
-	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
+
+	for (auto const& invalidSequence: invalidSequenceInputs)
+	{
+		std::vector<std::string> commandLineOptions{"solc", "contract.sol", "--yul-optimizations=" + invalidSequence};
+		BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
+	}
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 00b2e54e1e0d54795adf904186e23dd08329a70f Mon Sep 17 00:00:00 2001
From: pgebal <pawel.gebal@imapp.pl>
Date: Thu, 18 Apr 2024 18:24:28 +0200
Subject: [PATCH 0810/1140] Fix internal error when using an empty tuple with a
 ternary operator (#15025)

---
 Changelog.md                                   |  1 +
 libsmtutil/Z3Interface.cpp                     |  6 ++++++
 .../ternary_operator_with_functions.sol        | 11 +++++++++++
 .../operators/ternary_operator_with_tuple.sol  | 18 ++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_with_functions.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_with_tuple.sol

diff --git a/Changelog.md b/Changelog.md
index a54afa62cf..3fdd337aa5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 Bugfixes:
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
+ * SMTChecker: Fix internal error when using an empty tuple in a conditional operator.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 1cfbc815f7..4e1d1cec12 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -169,6 +169,12 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 				smtAssert(sortSort, "");
 				return m_context.constant(n.c_str(), z3Sort(*sortSort->inner));
 			}
+			else if (n == "tuple_constructor")
+			{
+				auto constructor = z3::func_decl(m_context, Z3_get_tuple_sort_mk_decl(m_context, z3Sort(*_expr.sort)));
+				smtAssert(constructor.arity() == arguments.size());
+				return constructor();
+			}
 			else
 				try
 				{
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_functions.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_functions.sol
new file mode 100644
index 0000000000..8214862e7c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_functions.sol
@@ -0,0 +1,11 @@
+contract C {
+	function f() public {}
+	function g() public {}
+
+	function test() public {
+		true ? f() : g();
+	}
+}
+// ====
+// SMTEngine: all
+// ----
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_tuple.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_tuple.sol
new file mode 100644
index 0000000000..d05d699c33
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_with_tuple.sol
@@ -0,0 +1,18 @@
+contract C {
+	function empty_tuple() public pure {
+		true ? () : (); // bug fix test, proper handling of empty tuples
+	}
+
+	function non_empty_tuple() public pure {
+		true ? (1, 2) : (3, 4);
+	}
+
+	function return_empty_tuple() public pure {
+		return true ? () : ();
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6133: (53-67): Statement has no effect.
+// Warning 6133: (166-188): Statement has no effect.

From cc27468bd6eca8fdb1d2a11af15307a57598c271 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 22 Apr 2024 12:27:36 +0200
Subject: [PATCH 0811/1140] Remove wordSizeTransform.

---
 test/libyul/YulOptimizerTest.cpp       | 3 +--
 test/libyul/YulOptimizerTestCommon.cpp | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 9fc6712db3..82e2549809 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -81,8 +81,7 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 	auto const printed = (m_object->subObjects.empty() ? AsmPrinter{ *m_dialect }(*m_object->code) : m_object->toString(m_dialect));
 
 	// Re-parse new code for compilability
-	// TODO: support for wordSizeTransform which needs different input and output dialects
-	if (m_optimizerStep != "wordSizeTransform" && !std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
+	if (!std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
 	{
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
 			<< _linePrefix << "Result after the optimiser:" << std::endl;
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index ea68f8dcd4..091a9a0b6c 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -417,13 +417,12 @@ std::string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 		if (count == idx)
 		{
 			std::string optimiserStep = step.first;
-			// Do not fuzz mainFunction and wordSizeTransform
-			// because they do not preserve yul code semantics.
+			// Do not fuzz mainFunction
+			// because it does not preserve yul code semantics.
 			// Do not fuzz reasoning based simplifier because
 			// it can sometimes drain memory.
 			if (
-				optimiserStep == "mainFunction" ||
-				optimiserStep == "wordSizeTransform"
+				optimiserStep == "mainFunction"
 			)
 				// "Fullsuite" is fuzzed roughly four times more frequently than
 				// other steps because of the filtering in place above.

From df01dcc7b759f53ba45811979d3286562eab7846 Mon Sep 17 00:00:00 2001
From: pcw109550 <pcw109550@gmail.com>
Date: Tue, 23 Apr 2024 00:20:34 -0600
Subject: [PATCH 0812/1140] Better error message when consecutive underscores

---
 libsolidity/analysis/SyntaxChecker.cpp                          | 2 +-
 .../parsing/lexer_numbers_with_underscores_decimal_fail.sol     | 2 +-
 .../parsing/lexer_numbers_with_underscores_fixed_fail.sol       | 2 +-
 .../parsing/lexer_numbers_with_underscores_hex_fail.sol         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index ac23ca36a8..b083690cce 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -300,7 +300,7 @@ bool SyntaxChecker::visit(Literal const& _literal)
 
 	if (value.find("__") != ASTString::npos)
 	{
-		m_errorReporter.syntaxError(2990_error, _literal.location(), "Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.");
+		m_errorReporter.syntaxError(2990_error, _literal.location(), "Invalid use of underscores in number literal. Only one consecutive underscore between digits is allowed.");
 		return true;
 	}
 
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
index 6cbeb217c7..279a67ade0 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
@@ -8,6 +8,6 @@ contract C {
 }
 // ----
 // SyntaxError 2090: (56-61): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (77-83): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 2990: (77-83): Invalid use of underscores in number literal. Only one consecutive underscore between digits is allowed.
 // SyntaxError 6415: (99-105): Invalid use of underscores in number literal. No underscore at the end of the mantissa allowed.
 // SyntaxError 6165: (121-127): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
index 49bf042cda..43f0aa9482 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
@@ -10,7 +10,7 @@ contract C {
 }
 // ----
 // SyntaxError 2090: (57-64): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (81-91): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 2990: (81-91): Invalid use of underscores in number literal. Only one consecutive underscore between digits is allowed.
 // SyntaxError 1023: (108-112): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
 // SyntaxError 3891: (129-133): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
 // SyntaxError 6165: (150-157): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
index 5a2e2f5c1f..50cfda8e29 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// SyntaxError 2990: (56-79): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 2990: (56-79): Invalid use of underscores in number literal. Only one consecutive underscore between digits is allowed.

From f4534b19bd84d4526557e5cb44cfe242f8794040 Mon Sep 17 00:00:00 2001
From: edurivara <edurivara@gmail.com>
Date: Fri, 15 Mar 2024 01:11:20 +0100
Subject: [PATCH 0813/1140] Reduce default font weight for readability

---
 docs/_static/css/toggle.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/_static/css/toggle.css b/docs/_static/css/toggle.css
index 6f03e6fb6a..c0265bfcb6 100644
--- a/docs/_static/css/toggle.css
+++ b/docs/_static/css/toggle.css
@@ -85,4 +85,8 @@ html.transition *:after {
 
 .wy-menu-vertical a:hover {
     background-color: #0002;
+}
+
+body {
+    font-weight: 200;
 }
\ No newline at end of file

From fb11553a650f6e07299354a867fc80e1c1ba3c0b Mon Sep 17 00:00:00 2001
From: edurivara <edurivara@gmail.com>
Date: Tue, 2 Apr 2024 17:13:45 +0200
Subject: [PATCH 0814/1140] Font weight to 200px and letter spacing 0.5px for
 readability

---
 docs/_static/css/toggle.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_static/css/toggle.css b/docs/_static/css/toggle.css
index c0265bfcb6..d525ab62a7 100644
--- a/docs/_static/css/toggle.css
+++ b/docs/_static/css/toggle.css
@@ -88,5 +88,6 @@ html.transition *:after {
 }
 
 body {
-    font-weight: 200;
+    font-weight: 300;
+    letter-spacing: 0.5px;
 }
\ No newline at end of file

From 0711fa3f17f827319c7081312d60cce3c4902199 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 6 Mar 2024 14:17:54 +0100
Subject: [PATCH 0815/1140] Require with custom error

Disallow require with error in legacy

More tests

Docs

Use AST ID in generated Yul helper function names

Changelog

Review comments
---
 Changelog.md                                  |   1 +
 docs/contracts/errors.rst                     |  37 ++-
 docs/control-structures.rst                   |  29 +-
 docs/introduction-to-smart-contracts.rst      |  14 +-
 libsolidity/analysis/GlobalContext.cpp        |   1 +
 libsolidity/analysis/PostTypeChecker.cpp      |  27 +-
 libsolidity/analysis/PostTypeChecker.h        |   1 +
 libsolidity/ast/TypeProvider.cpp              |   5 +-
 libsolidity/ast/TypeProvider.h                |   2 +-
 libsolidity/ast/Types.cpp                     |  12 +-
 libsolidity/ast/Types.h                       |   3 +
 libsolidity/codegen/ExpressionCompiler.cpp    |   6 +
 libsolidity/codegen/YulUtilFunctions.cpp      |  62 ++++
 libsolidity/codegen/YulUtilFunctions.h        |   4 +
 .../codegen/ir/IRGeneratorForStatements.cpp   |  52 ++--
 .../codegen/ir/IRGeneratorForStatements.h     |   1 +
 test/cmdlineTests/require_overload/err        |   1 +
 test/cmdlineTests/require_with_error_ir/args  |   1 +
 .../require_with_error_ir/input.sol           |  17 ++
 .../cmdlineTests/require_with_error_ir/output | 265 ++++++++++++++++++
 .../~documentation_examples/test.sh           |   4 +
 test/libsolidity/ASTJSON/used_errors.json     |   8 +-
 ...quire_different_errors_same_parameters.sol |  21 ++
 ...quire_error_function_pointer_parameter.sol |  20 ++
 .../require_error_multiple_arguments.sol      |  20 ++
 .../errors/require_error_string_literal.sol   |  20 ++
 .../errors/require_error_string_memory.sol    |  22 ++
 .../errors/require_error_uint256.sol          |  20 ++
 .../errors/require_evaluation_order.sol       |  28 ++
 .../errors/require_inherited_error.sol        |  17 ++
 .../abi_encodeCall_tuple_from_error_event.sol |   2 +-
 ...encodeCall_tuple_from_invalid_operator.sol |   2 +-
 .../errors/abi_decode_error_constructor.sol   |   9 +
 .../errors/abi_encode_error_constructor.sol   |   8 +
 .../syntaxTests/errors/assert_with_error.sol  |   2 +-
 .../syntaxTests/errors/require_custom.sol     |   3 +-
 .../errors/require_custom_legacy.sol          |   8 +
 .../syntaxTests/errors/require_nested.sol     |  15 +
 .../errors/selector_on_instance.sol           |   2 +-
 .../revertStatement/error_used_elsewhere.sol  |   2 +-
 .../revertStatement/require_nested.sol        |  13 +
 41 files changed, 718 insertions(+), 69 deletions(-)
 create mode 100644 test/cmdlineTests/require_with_error_ir/args
 create mode 100644 test/cmdlineTests/require_with_error_ir/input.sol
 create mode 100644 test/cmdlineTests/require_with_error_ir/output
 create mode 100644 test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_string_literal.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_string_memory.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_uint256.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_evaluation_order.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_inherited_error.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/abi_decode_error_constructor.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/abi_encode_error_constructor.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/require_nested.sol
 create mode 100644 test/libsolidity/syntaxTests/revertStatement/require_nested.sol

diff --git a/Changelog.md b/Changelog.md
index c8b448c93c..c118e9f248 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.26 (unreleased)
 
 Language Features:
+ * Introduce a new overload ``require(bool, Error)`` that allows usage of ``require`` functions with custom errors. This feature is available in the ``via-ir`` pipeline only.
 
 
 Compiler Features:
diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index 19577a3872..e4955ddae1 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -1,22 +1,25 @@
-.. index:: ! error, revert, ! selector; of an error
+.. index:: ! error, revert, require, ! selector; of an error
 .. _errors:
 
-*******************************
-Errors and the Revert Statement
-*******************************
+*************
+Custom Errors
+*************
 
 Errors in Solidity provide a convenient and gas-efficient way to explain to the
 user why an operation failed. They can be defined inside and outside of contracts (including interfaces and libraries).
 
 They have to be used together with the :ref:`revert statement <revert-statement>`
-which causes
-all changes in the current call to be reverted and passes the error data back to the
-caller.
+or the :ref:`require function <assert-and-require-statements>`.
+In the case of ``revert`` statements, or ``require`` calls where the condition is evaluated to be false,
+all changes in the current call are reverted, and the error data passed back to the caller.
+
+The example below shows custom error usage with the ``revert`` statement in function ``transferWithRevertError``,
+as well as the newer approach with ``require`` in function ``transferWithRequireError``.
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity ^0.8.4;
+    pragma solidity ^0.8.26;
 
     /// Insufficient balance for transfer. Needed `required` but only
     /// `available` available.
@@ -24,9 +27,10 @@ caller.
     /// @param required requested amount to transfer.
     error InsufficientBalance(uint256 available, uint256 required);
 
+    // This will only compile via IR
     contract TestToken {
         mapping(address => uint) balance;
-        function transfer(address to, uint256 amount) public {
+        function transferWithRevertError(address to, uint256 amount) public {
             if (amount > balance[msg.sender])
                 revert InsufficientBalance({
                     available: balance[msg.sender],
@@ -35,12 +39,22 @@ caller.
             balance[msg.sender] -= amount;
             balance[to] += amount;
         }
+        function transferWithRequireError(address to, uint256 amount) public {
+            require(amount > balance[msg.sender], InsufficientBalance(balance[msg.sender], amount));
+            balance[msg.sender] -= amount;
+            balance[to] += amount;
+        }
         // ...
     }
 
+Another important detail to mention when it comes to using ``require`` with custom errors, is that memory
+allocation for the error-based revert reason will only happen in the reverting case, which, along with
+optimization of constants and string literals makes this about as gas-efficient as the
+``if (!condition) revert CustomError(args)`` pattern.
+
 Errors cannot be overloaded or overridden but are inherited.
 The same error can be defined in multiple places as long as the scopes are distinct.
-Instances of errors can only be created using ``revert`` statements.
+Instances of errors can only be created using ``revert`` statements, or as the second argument to ``require`` functions.
 
 The error creates data that is then passed to the caller with the revert operation
 to either return to the off-chain component or catch it in a :ref:`try/catch statement <try-catch>`.
@@ -65,8 +79,7 @@ The selector consists of the first four bytes of the keccak256-hash of the signa
     only the name of the error is relevant, not the contract or file where it is defined.
 
 The statement ``require(condition, "description");`` would be equivalent to
-``if (!condition) revert Error("description")`` if you could define
-``error Error(string)``.
+``if (!condition) revert Error("description")`` if you could define ``error Error(string)``.
 Note, however, that ``Error`` is a built-in type and cannot be defined in user-supplied code.
 
 Similarly, a failing ``assert`` or similar conditions will revert with an error
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index ea8a9c569d..81e62ec57b 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -594,6 +594,8 @@ The built-in errors ``Error(string)`` and ``Panic(uint256)`` are
 used by special functions, as explained below. ``Error`` is used for "regular" error conditions
 while ``Panic`` is used for errors that should not be present in bug-free code.
 
+.. _assert-and-require-statements:
+
 Panic via ``assert`` and Error via ``require``
 ----------------------------------------------
 
@@ -625,21 +627,24 @@ The error code supplied with the error data indicates the kind of panic.
 #. 0x41: If you allocate too much memory or create an array that is too large.
 #. 0x51: If you call a zero-initialized variable of internal function type.
 
-The ``require`` function either creates an error without any data or
-an error of type ``Error(string)``. It
-should be used to ensure valid conditions
-that cannot be detected until execution time.
-This includes conditions on inputs
-or return values from calls to external contracts.
+The ``require`` function provides three overloads:
+
+1. ``require(bool)`` which will revert without any data (not even an error selector).
+2. ``require(bool, string)`` which will revert with an ``Error(string)``.
+3. ``require(bool, error)`` which will revert with the custom, user supplied error provided as the second argument.
 
 .. note::
+    ``require`` arguments are evaluated unconditionally, so take special care to make sure that
+    they are not expressions with unexpected side-effects.
+    For example, in ``require(condition, CustomError(f()));`` and ``require(condition, f());``,
+    function ``f()`` will be called regardless of whether the supplied condition is ``true`` or ``false``.
 
-    It is currently not possible to use custom errors in combination
-    with ``require``. Please use ``if (!condition) revert CustomError();`` instead.
+.. note::
+    Using custom errors with ``require`` is only supported by the via IR pipeline, i.e. compilation via Yul.
+    For the legacy pipeline, please use ``if (!condition) revert CustomError();`` instead.
 
 An ``Error(string)`` exception (or an exception without data) is generated
-by the compiler
-in the following situations:
+by the compiler in the following situations:
 
 #. Calling ``require(x)`` where ``x`` evaluates to ``false``.
 #. If you use ``revert()`` or ``revert("description")``.
@@ -662,10 +667,10 @@ an ``Error`` or a ``Panic`` (or whatever else was given):
 #. If you create a contract using the ``new`` keyword but the contract
    creation :ref:`does not finish properly<creating-contracts>`.
 
-You can optionally provide a message string for ``require``, but not for ``assert``.
+You can optionally provide a message string or a custom error to ``require``, but not to ``assert``.
 
 .. note::
-    If you do not provide a string argument to ``require``, it will revert
+    If you do not provide a string or custom error argument to ``require``, it will revert
     with empty error data, not even including the error selector.
 
 
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index de06d684ec..1c5b873732 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -85,8 +85,9 @@ registering with a username and password, all you need is an Ethereum keypair.
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity ^0.8.4;
+    pragma solidity ^0.8.26;
 
+    // This will only compile via IR
     contract Coin {
         // The keyword "public" makes variables
         // accessible from other contracts
@@ -118,12 +119,7 @@ registering with a username and password, all you need is an Ethereum keypair.
         // Sends an amount of existing coins
         // from any caller to an address
         function send(address receiver, uint amount) public {
-            if (amount > balances[msg.sender])
-                revert InsufficientBalance({
-                    requested: amount,
-                    available: balances[msg.sender]
-                });
-
+            require(amount > balances[msg.sender], InsufficientBalance(amount, balances[msg.sender]));
             balances[msg.sender] -= amount;
             balances[receiver] += amount;
             emit Sent(msg.sender, receiver, amount);
@@ -225,8 +221,8 @@ 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
-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
+aborts and reverts all changes, much like the :ref:`require function <assert-and-require-statements>`.
+Both approaches allow 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
 a failure can more easily be debugged or reacted upon.
 
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
index c4833689fe..0c265d2451 100644
--- a/libsolidity/analysis/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -90,6 +90,7 @@ inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMag
 		magicVarDecl("now", TypeProvider::uint256()),
 		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("require", TypeProvider::function(TypePointers{TypeProvider::boolean(), TypeProvider::magic(MagicType::Kind::Error)}, TypePointers{}, strings{2, ""}, 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)),
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index fe3a59d0cc..9731ef3cc6 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -103,6 +103,11 @@ bool PostTypeChecker::visit(FunctionCall const& _functionCall)
 	return callVisit(_functionCall);
 }
 
+void PostTypeChecker::endVisit(FunctionCall const& _functionCall)
+{
+	callEndVisit(_functionCall);
+}
+
 bool PostTypeChecker::visit(Identifier const& _identifier)
 {
 	return callVisit(_identifier);
@@ -304,6 +309,7 @@ struct ModifierContextChecker: public PostTypeChecker::Checker
 	bool m_insideModifierInvocation = false;
 };
 
+// TODO: this should either be split into separate emit and error checkers, or at least renamed to include require
 struct EventOutsideEmitErrorOutsideRevertChecker: public PostTypeChecker::Checker
 {
 	EventOutsideEmitErrorOutsideRevertChecker(ErrorReporter& _errorReporter):
@@ -336,6 +342,11 @@ struct EventOutsideEmitErrorOutsideRevertChecker: public PostTypeChecker::Checke
 		if (*_functionCall.annotation().kind == FunctionCallKind::FunctionCall)
 			if (auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type))
 			{
+				if (functionType->kind() == FunctionType::Kind::Require)
+				{
+					solAssert(!m_inRequire);
+					m_inRequire = true;
+				}
 				// Check for event outside of emit statement
 				if (!dynamic_cast<EmitStatement const*>(m_currentStatement) && functionType->kind() == FunctionType::Kind::Event)
 					m_errorReporter.typeError(
@@ -343,11 +354,11 @@ struct EventOutsideEmitErrorOutsideRevertChecker: public PostTypeChecker::Checke
 						_functionCall.location(),
 						"Event invocations have to be prefixed by \"emit\"."
 					);
-				else if (!dynamic_cast<RevertStatement const*>(m_currentStatement) && functionType->kind() == FunctionType::Kind::Error)
+				else if (!dynamic_cast<RevertStatement const*>(m_currentStatement) && !m_inRequire && functionType->kind() == FunctionType::Kind::Error)
 					m_errorReporter.typeError(
 						7757_error,
 						_functionCall.location(),
-						"Errors can only be used with revert statements: \"revert MyError();\"."
+						"Errors can only be used with revert statements: \"revert MyError(args);\", or require functions: \"require(condition, MyError(args))\"."
 					);
 			}
 		m_currentStatement = nullptr;
@@ -355,8 +366,20 @@ struct EventOutsideEmitErrorOutsideRevertChecker: public PostTypeChecker::Checke
 		return true;
 	}
 
+	void endVisit(FunctionCall const& _functionCall) override
+	{
+		if (*_functionCall.annotation().kind == FunctionCallKind::FunctionCall)
+			if (auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type))
+				if (functionType->kind() == FunctionType::Kind::Require)
+				{
+					solAssert(m_inRequire);
+					m_inRequire = false;
+				}
+	}
+
 private:
 	Statement const* m_currentStatement = nullptr;
+	bool m_inRequire = false;
 };
 
 struct NoVariablesInInterfaceChecker: public PostTypeChecker::Checker
diff --git a/libsolidity/analysis/PostTypeChecker.h b/libsolidity/analysis/PostTypeChecker.h
index 178130a356..347f464eda 100644
--- a/libsolidity/analysis/PostTypeChecker.h
+++ b/libsolidity/analysis/PostTypeChecker.h
@@ -87,6 +87,7 @@ class PostTypeChecker: private ASTConstVisitor
 	void endVisit(RevertStatement const& _revert) override;
 
 	bool visit(FunctionCall const& _functionCall) override;
+	void endVisit(FunctionCall const& _functionCall) override;
 
 	bool visit(Identifier const& _identifier) override;
 	bool visit(MemberAccess const& _identifier) override;
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index da50875568..41e103edf9 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -145,11 +145,12 @@ std::array<std::unique_ptr<FixedBytesType>, 32> const TypeProvider::m_bytesM{{
 	{std::make_unique<FixedBytesType>(32)}
 }};
 
-std::array<std::unique_ptr<MagicType>, 4> const TypeProvider::m_magics{{
+std::array<std::unique_ptr<MagicType>, 5> 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)}
+	{std::make_unique<MagicType>(MagicType::Kind::ABI)},
+	{std::make_unique<MagicType>(MagicType::Kind::Error)}
 	// MetaType is stored separately
 }};
 
diff --git a/libsolidity/ast/TypeProvider.h b/libsolidity/ast/TypeProvider.h
index 02b9eb35d2..67b1fc0f29 100644
--- a/libsolidity/ast/TypeProvider.h
+++ b/libsolidity/ast/TypeProvider.h
@@ -226,7 +226,7 @@ class TypeProvider
 	static std::array<std::unique_ptr<IntegerType>, 32> const m_intM;
 	static std::array<std::unique_ptr<IntegerType>, 32> const m_uintM;
 	static std::array<std::unique_ptr<FixedBytesType>, 32> const m_bytesM;
-	static std::array<std::unique_ptr<MagicType>, 4> const m_magics;        ///< MagicType's except MetaType
+	static std::array<std::unique_ptr<MagicType>, 5> const m_magics;        ///< MagicType's except MetaType
 
 	std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_ufixedMxN{};
 	std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_fixedMxN{};
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index d09d03fbec..028b766732 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2919,13 +2919,15 @@ FunctionType::FunctionType(ErrorDefinition const& _error):
 		m_parameterTypes.push_back(var->annotation().type);
 	}
 
+	m_returnParameterNames.push_back("");
+	m_returnParameterTypes.push_back(TypeProvider::magic(MagicType::Kind::Error));
+
 	solAssert(
 		m_parameterNames.size() == m_parameterTypes.size(),
 		"Parameter names list must match parameter types list!"
 	);
 	solAssert(
-		m_returnParameterNames.size() == 0 &&
-		m_returnParameterTypes.size() == 0,
+		m_returnParameterNames.size() == m_returnParameterTypes.size(),
 		""
 	);
 }
@@ -4091,6 +4093,8 @@ std::string MagicType::richIdentifier() const
 	case Kind::MetaType:
 		solAssert(m_typeArgument, "");
 		return "t_magic_meta_type_" + m_typeArgument->richIdentifier();
+	case Kind::Error:
+		return "t_error";
 	}
 	return "";
 }
@@ -4196,6 +4200,8 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				FunctionType::Options::withArbitraryParameters()
 			)}
 		});
+	case Kind::Error:
+		return {};
 	case Kind::MetaType:
 	{
 		solAssert(
@@ -4259,6 +4265,8 @@ std::string MagicType::toString(bool _withoutDataLocation) const
 	case Kind::MetaType:
 		solAssert(m_typeArgument, "");
 		return "type(" + m_typeArgument->toString(_withoutDataLocation) + ")";
+	case Kind::Error:
+		return "error";
 	}
 	solAssert(false, "Unknown kind of magic.");
 	return {};
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 7bbd2f0758..3ab4a1d97e 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1661,6 +1661,8 @@ class ModuleType: public Type
 
 /**
  * Special type for magic variables (block, msg, tx, type(...)), similar to a struct but without any reference.
+ *
+ * It is also the type shared by all instances of all custom error types.
  */
 class MagicType: public Type
 {
@@ -1670,6 +1672,7 @@ class MagicType: public Type
 		Message, ///< "msg"
 		Transaction, ///< "tx"
 		ABI, ///< "abi"
+		Error, ///< custom error instance
 		MetaType ///< "type(...)"
 	};
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 3824d54321..54090f9604 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1259,6 +1259,12 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				// function call.
 				solAssert(arguments.size() == 2, "");
 				solAssert(function.kind() == FunctionType::Kind::Require, "");
+				// Check if the function call matches ``require(bool, error)``, and throw an unimplemented error,
+				// as require with custom errors is not supported in legacy codegen.
+				auto const* magicType = dynamic_cast<MagicType const*>(arguments[1]->annotation().type);
+				if (magicType && magicType->kind() == MagicType::Kind::Error)
+					solUnimplemented("Require with a custom error is only available using the via-ir pipeline.");
+
 				if (m_context.revertStrings() == RevertStrings::Strip)
 				{
 					if (!*arguments.at(1)->annotation().isPure)
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 0dabc8a369..5a135acb7b 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -24,6 +24,7 @@
 #include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/CompilerUtils.h>
+#include <libsolidity/codegen/ir/IRVariable.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/FunctionSelector.h>
@@ -266,6 +267,67 @@ std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const*
 	});
 }
 
+std::string YulUtilFunctions::requireWithErrorFunction(FunctionCall const& errorConstructorCall)
+{
+	ErrorDefinition const* errorDefinition = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(errorConstructorCall.expression()));
+	solAssert(errorDefinition);
+
+	std::string const errorSignature = errorDefinition->functionType(true)->externalSignature();
+	std::string const signatureHash = formatNumber(util::selectorFromSignatureU256(errorSignature));
+	std::string const functionName = [&]() {
+		// Note that in most cases we'll always generate one function per error definition,
+		// because types in the constructor call will match the ones in the definition. The only
+		// exception are calls with types, where each instance has its own type (e.g. literals).
+		std::string name = "require_helper_t_error_" + std::to_string(errorDefinition->id()) + "_" + errorDefinition->name();
+		for (ASTPointer<Expression const> const& argument: errorConstructorCall.sortedArguments())
+		{
+			solAssert(argument->annotation().type);
+			name += ("_" + argument->annotation().type->identifier());
+		}
+		return name;
+	}();
+
+	auto errorArgumentVarsAndTypes = [&]() -> std::tuple<std::vector<std::string>, std::vector<Type const*>> {
+		std::vector<std::string> errorArgumentVars;
+		std::vector<Type const*> errorArgumentTypes;
+		for (ASTPointer<Expression const> const& arg: errorConstructorCall.sortedArguments())
+		{
+			solAssert(arg->annotation().type);
+			if (arg->annotation().type->sizeOnStack() > 0)
+				errorArgumentVars += IRVariable(*arg).stackSlots();
+			errorArgumentTypes.push_back(arg->annotation().type);
+		}
+		return std::make_tuple(std::move(errorArgumentVars), std::move(errorArgumentTypes));
+	}();
+
+	return m_functionCollector.createFunction(functionName, [&]() {
+		auto [errorArgumentVars, errorArgumentTypes] = errorArgumentVarsAndTypes;
+		std::string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
+			.tupleEncoder(
+				errorArgumentTypes,
+				errorDefinition->functionType(true)->parameterTypes()
+			);
+
+		return Whiskers(R"(
+			function <functionName>(condition <errorArguments>) {
+				if iszero(condition) {
+					let memPtr := <allocateUnbounded>()
+					mstore(memPtr, <errorHash>)
+					let end := <abiEncodeFunc>(add(memPtr, <hashHeaderSize>) <errorArguments>)
+					revert(memPtr, sub(end, memPtr))
+				}
+			}
+		)")
+		("functionName", functionName)
+		("allocateUnbounded", allocateUnboundedFunction())
+		("errorHash", signatureHash)
+		("abiEncodeFunc", encodeFunc)
+		("hashHeaderSize", std::to_string(4))
+		("errorArguments", joinHumanReadablePrefixed(errorArgumentVars))
+		.render();
+	});
+}
+
 std::string YulUtilFunctions::leftAlignFunction(Type const& _type)
 {
 	std::string functionName = std::string("leftAlign_") + _type.identifier();
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index 7d736df5b3..db4c26725d 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -94,6 +94,10 @@ class YulUtilFunctions
 	// `assert` or `require` call.
 	std::string requireOrAssertFunction(bool _assert, Type const* _messageType = nullptr);
 
+	// @returns function that has equivalent logic of a require function, but with a custom
+	// error constructor parameter.
+	std::string requireWithErrorFunction(FunctionCall const& errorConstructorCall);
+
 	/// @returns the name of a function that takes a (cleaned) value of the given value type and
 	/// left-aligns it, usually for use in non-padded encoding.
 	std::string leftAlignFunction(Type const& _type);
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 57414da93b..bf028fce51 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -796,6 +796,17 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 	return false;
 }
 
+void IRGeneratorForStatements::endVisit(RevertStatement const& _revertStatement)
+{
+	ErrorDefinition const* error = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(_revertStatement.errorCall().expression()));
+	solAssert(error);
+	revertWithError(
+		error->functionType(true)->externalSignature(),
+		error->functionType(true)->parameterTypes(),
+		_revertStatement.errorCall().sortedArguments()
+	);
+}
+
 bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 {
 	setLocation(_binOp);
@@ -1114,17 +1125,6 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		appendCode() << templ.render();
 		break;
 	}
-	case FunctionType::Kind::Error:
-	{
-		ErrorDefinition const* error = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(_functionCall.expression()));
-		solAssert(error);
-		revertWithError(
-			error->functionType(true)->externalSignature(),
-			error->functionType(true)->parameterTypes(),
-			_functionCall.sortedArguments()
-		);
-		break;
-	}
 	case FunctionType::Kind::Wrap:
 	case FunctionType::Kind::Unwrap:
 	{
@@ -1153,15 +1153,28 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			arguments.size() > 1 && m_context.revertStrings() != RevertStrings::Strip ?
 			arguments[1]->annotation().type :
 			nullptr;
-		std::string requireOrAssertFunction = m_utils.requireOrAssertFunction(
-			functionType->kind() == FunctionType::Kind::Assert,
-			messageArgumentType
-		);
 
-		appendCode() << std::move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
-		if (messageArgumentType && messageArgumentType->sizeOnStack() > 0)
-			appendCode() << ", " << IRVariable(*arguments[1]).commaSeparatedList();
-		appendCode() << ")\n";
+		auto const* magicType = dynamic_cast<MagicType const*>(messageArgumentType);
+		if (magicType && magicType->kind() == MagicType::Kind::Error)
+		{
+			auto const& errorConstructorCall = dynamic_cast<FunctionCall const&>(*arguments[1]);
+			appendCode() << m_utils.requireWithErrorFunction(errorConstructorCall) << "(" <<IRVariable(*arguments[0]).name();
+			for (auto argument: errorConstructorCall.arguments())
+				if (argument->annotation().type->sizeOnStack() > 0)
+					appendCode() << ", " << IRVariable(*argument).commaSeparatedList();
+			appendCode() << ")\n";
+		}
+		else
+		{
+			std::string requireOrAssertFunction = m_utils.requireOrAssertFunction(
+				functionType->kind() == FunctionType::Kind::Assert,
+				messageArgumentType
+			);
+			appendCode() << std::move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
+			if (messageArgumentType && messageArgumentType->sizeOnStack() > 0)
+				appendCode() << ", " << IRVariable(*arguments[1]).commaSeparatedList();
+			appendCode() << ")\n";
+		}
 
 		break;
 	}
@@ -1467,6 +1480,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			")\n";
 		break;
 	}
+	case FunctionType::Kind::Error:
 	case FunctionType::Kind::MetaType:
 	{
 		break;
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
index f4ce2a7d00..15ef71f138 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.h
@@ -132,6 +132,7 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	void endVisit(IndexRangeAccess const& _indexRangeAccess) override;
 	void endVisit(Identifier const& _identifier) override;
 	bool visit(Literal const& _literal) override;
+	void endVisit(RevertStatement const& _revertStatement) override;
 
 	bool visit(TryStatement const& _tryStatement) override;
 	bool visit(TryCatchClause const& _tryCatchClause) override;
diff --git a/test/cmdlineTests/require_overload/err b/test/cmdlineTests/require_overload/err
index 4c33672d4a..184c8c22bd 100644
--- a/test/cmdlineTests/require_overload/err
+++ b/test/cmdlineTests/require_overload/err
@@ -5,3 +5,4 @@ Error: No matching declaration found after argument-dependent lookup.
   |         ^^^^^^^
 Note: Candidate: function require(bool)
 Note: Candidate: function require(bool, string memory)
+Note: Candidate: function require(bool, error)
diff --git a/test/cmdlineTests/require_with_error_ir/args b/test/cmdlineTests/require_with_error_ir/args
new file mode 100644
index 0000000000..be08aefb41
--- /dev/null
+++ b/test/cmdlineTests/require_with_error_ir/args
@@ -0,0 +1 @@
+--ir --debug-info none
diff --git a/test/cmdlineTests/require_with_error_ir/input.sol b/test/cmdlineTests/require_with_error_ir/input.sol
new file mode 100644
index 0000000000..f041b27b7d
--- /dev/null
+++ b/test/cmdlineTests/require_with_error_ir/input.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+error CustomError(uint256, string);
+
+contract C
+{
+    function f(bool condition) external pure
+    {
+        require(condition, CustomError(1, "two"));
+    }
+
+    function g(bool condition) external pure
+    {
+        require(condition, CustomError(2, "three"));
+    }
+}
diff --git a/test/cmdlineTests/require_with_error_ir/output b/test/cmdlineTests/require_with_error_ir/output
new file mode 100644
index 0000000000..dacc9fc910
--- /dev/null
+++ b/test/cmdlineTests/require_with_error_ir/output
@@ -0,0 +1,265 @@
+IR:
+
+/// @use-src 0:"require_with_error_ir/input.sol"
+object "C_36" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_36()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset("C_36_deployed"), datasize("C_36_deployed"))
+
+        return(_1, datasize("C_36_deployed"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_36() {
+
+        }
+
+    }
+    /// @use-src 0:"require_with_error_ir/input.sol"
+    object "C_36_deployed" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := shift_right_224_unsigned(calldataload(0))
+                switch selector
+
+                case 0x98c3a6c1
+                {
+                    // f(bool)
+
+                    external_fun_f_21()
+                }
+
+                case 0xd48092f7
+                {
+                    // g(bool)
+
+                    external_fun_g_35()
+                }
+
+                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 revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
+                revert(0, 0)
+            }
+
+            function cleanup_t_bool(value) -> cleaned {
+                cleaned := iszero(iszero(value))
+            }
+
+            function validator_revert_t_bool(value) {
+                if iszero(eq(value, cleanup_t_bool(value))) { revert(0, 0) }
+            }
+
+            function abi_decode_t_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_revert_t_bool(value)
+            }
+
+            function abi_decode_tuple_t_bool(headStart, dataEnd) -> value0 {
+                if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
+
+                {
+
+                    let offset := 0
+
+                    value0 := abi_decode_t_bool(add(headStart, offset), dataEnd)
+                }
+
+            }
+
+            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
+                tail := add(headStart, 0)
+
+            }
+
+            function external_fun_f_21() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0 :=  abi_decode_tuple_t_bool(4, calldatasize())
+                fun_f_21(param_0)
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
+            function external_fun_g_35() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0 :=  abi_decode_tuple_t_bool(4, calldatasize())
+                fun_g_35(param_0)
+                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 cleanup_t_rational_1_by_1(value) -> cleaned {
+                cleaned := value
+            }
+
+            function cleanup_t_uint256(value) -> cleaned {
+                cleaned := value
+            }
+
+            function identity(value) -> ret {
+                ret := value
+            }
+
+            function convert_t_rational_1_by_1_to_t_uint256(value) -> converted {
+                converted := cleanup_t_uint256(identity(cleanup_t_rational_1_by_1(value)))
+            }
+
+            function abi_encode_t_rational_1_by_1_to_t_uint256_fromStack(value, pos) {
+                mstore(pos, convert_t_rational_1_by_1_to_t_uint256(value))
+            }
+
+            function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {
+                mstore(pos, length)
+                updated_pos := add(pos, 0x20)
+            }
+
+            function store_literal_in_memory_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(memPtr) {
+
+                mstore(add(memPtr, 0), "two")
+
+            }
+
+            function abi_encode_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720_to_t_string_memory_ptr_fromStack(pos) -> end {
+                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, 3)
+                store_literal_in_memory_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(pos)
+                end := add(pos, 32)
+            }
+
+            function abi_encode_tuple_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720__to_t_uint256_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
+                tail := add(headStart, 64)
+
+                abi_encode_t_rational_1_by_1_to_t_uint256_fromStack(value0,  add(headStart, 0))
+
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720_to_t_string_memory_ptr_fromStack( tail)
+
+            }
+
+            function require_helper_t_error_7_CustomError_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(condition , expr_15) {
+                if iszero(condition) {
+                    let memPtr := allocate_unbounded()
+                    mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
+                    let end := abi_encode_tuple_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_15)
+                    revert(memPtr, sub(end, memPtr))
+                }
+            }
+
+            function fun_f_21(var_condition_9) {
+
+                let _1 := var_condition_9
+                let expr_13 := _1
+
+                let expr_15 := 0x01
+
+                require_helper_t_error_7_CustomError_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(expr_13, expr_15)
+
+            }
+
+            function cleanup_t_rational_2_by_1(value) -> cleaned {
+                cleaned := value
+            }
+
+            function convert_t_rational_2_by_1_to_t_uint256(value) -> converted {
+                converted := cleanup_t_uint256(identity(cleanup_t_rational_2_by_1(value)))
+            }
+
+            function abi_encode_t_rational_2_by_1_to_t_uint256_fromStack(value, pos) {
+                mstore(pos, convert_t_rational_2_by_1_to_t_uint256(value))
+            }
+
+            function store_literal_in_memory_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(memPtr) {
+
+                mstore(add(memPtr, 0), "three")
+
+            }
+
+            function abi_encode_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5_to_t_string_memory_ptr_fromStack(pos) -> end {
+                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, 5)
+                store_literal_in_memory_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(pos)
+                end := add(pos, 32)
+            }
+
+            function abi_encode_tuple_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5__to_t_uint256_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
+                tail := add(headStart, 64)
+
+                abi_encode_t_rational_2_by_1_to_t_uint256_fromStack(value0,  add(headStart, 0))
+
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5_to_t_string_memory_ptr_fromStack( tail)
+
+            }
+
+            function require_helper_t_error_7_CustomError_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(condition , expr_29) {
+                if iszero(condition) {
+                    let memPtr := allocate_unbounded()
+                    mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
+                    let end := abi_encode_tuple_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_29)
+                    revert(memPtr, sub(end, memPtr))
+                }
+            }
+
+            function fun_g_35(var_condition_23) {
+
+                let _2 := var_condition_23
+                let expr_27 := _2
+
+                let expr_29 := 0x02
+
+                require_helper_t_error_7_CustomError_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(expr_27, expr_29)
+
+            }
+
+        }
+
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+
+}
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
index 1acf5e8a7a..636f9600d2 100755
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -39,6 +39,10 @@ do
     then
         opts+=(--ignore-warnings)
     fi
+    if grep "// This will only compile via IR" "$f" >/dev/null
+    then
+        opts+=(--via-ir)
+    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.
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index 12a59f9cbf..cff59a5efc 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -57,8 +57,8 @@
                 "src": "38:1:1",
                 "typeDescriptions":
                 {
-                  "typeIdentifier": "t_function_error_pure$__$returns$__$",
-                  "typeString": "function () pure"
+                  "typeIdentifier": "t_function_error_pure$__$returns$_t_error_$",
+                  "typeString": "function () pure returns (error)"
                 }
               },
               "id": 6,
@@ -74,8 +74,8 @@
               "tryCall": false,
               "typeDescriptions":
               {
-                "typeIdentifier": "t_tuple$__$",
-                "typeString": "tuple()"
+                "typeIdentifier": "t_error",
+                "typeString": "error"
               }
             },
             "id": 7,
diff --git a/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol b/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
new file mode 100644
index 0000000000..37cbb207da
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
@@ -0,0 +1,21 @@
+error AnError(uint256, string, uint256);
+error AnotherError(uint256, string, uint256);
+
+contract C
+{
+    function f() external pure
+    {
+        require(false, AnError(1, "two", 3));
+    }
+
+    function g() external pure
+    {
+        require(false, AnotherError(4, "five", 6));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"f55fefe3", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
+// g() -> FAILURE, hex"44a06798", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol b/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
new file mode 100644
index 0000000000..2e1dcdd588
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
@@ -0,0 +1,20 @@
+error CustomError(function(uint256) external pure returns (uint256));
+
+contract C
+{
+    function e(uint256 x) external pure returns (uint256)
+    {
+        return x;
+    }
+
+    function f() external view
+    {
+        // more than one stack slot
+        require(false, CustomError(this.e));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"271b1dfa", hex"c06afe3a8444fc0004668591e8306bfb9968e79ef37cdc8e0000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol b/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
new file mode 100644
index 0000000000..6c8521f9d2
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
@@ -0,0 +1,20 @@
+error CustomError(uint256, string, uint256);
+
+contract C
+{
+    function f() external pure
+    {
+        require(false, CustomError(1, "two", 3));
+    }
+
+    function g() external pure
+    {
+        require(false, CustomError(4, "five", 6));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
+// g() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_literal.sol b/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
new file mode 100644
index 0000000000..5a3a140d0b
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
@@ -0,0 +1,20 @@
+error CustomError(string);
+
+contract C
+{
+    function f() external pure
+    {
+        require(false, CustomError("errorReason"));
+    }
+
+    function g() external pure
+    {
+        require(false, CustomError("anotherReason"));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
+// g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_memory.sol b/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
new file mode 100644
index 0000000000..13947d3990
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
@@ -0,0 +1,22 @@
+error CustomError(string);
+
+contract C
+{
+    function f() external pure
+    {
+        string memory reason = "errorReason";
+        require(false, CustomError(reason));
+    }
+
+    function g() external pure
+    {
+        string memory reason = "anotherReason";
+        require(false, CustomError(reason));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
+// g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_uint256.sol b/test/libsolidity/semanticTests/errors/require_error_uint256.sol
new file mode 100644
index 0000000000..d400e5fa7c
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_uint256.sol
@@ -0,0 +1,20 @@
+error CustomError(uint256);
+
+contract C
+{
+    function f() external pure
+    {
+        require(false, CustomError(1));
+    }
+
+    function g() external pure
+    {
+        require(false, CustomError(2));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000001"
+// g() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/errors/require_evaluation_order.sol b/test/libsolidity/semanticTests/errors/require_evaluation_order.sol
new file mode 100644
index 0000000000..4733b3aee7
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_evaluation_order.sol
@@ -0,0 +1,28 @@
+contract C
+{
+    error E(uint);
+
+    function r() internal returns (uint)
+    {
+        assembly { mstore(0, 7) return (0, 32) }
+        return 42;
+    }
+
+    function f() public returns (uint)
+    {
+        require(false, E(r()));
+        return 42;
+    }
+
+    function g() public returns (uint)
+    {
+        require(true, E(r()));
+        return 42;
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> 7
+// g() -> 7
diff --git a/test/libsolidity/semanticTests/errors/require_inherited_error.sol b/test/libsolidity/semanticTests/errors/require_inherited_error.sol
new file mode 100644
index 0000000000..24b544b73c
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_inherited_error.sol
@@ -0,0 +1,17 @@
+contract Base
+{
+    error CustomError(uint256, string, uint256);
+}
+
+contract C is Base
+{
+    function f() external pure
+    {
+        require(false, CustomError(1, "two", 3));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
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
index c96b829099..c309d4c227 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
@@ -12,5 +12,5 @@ contract C {
 }
 // ----
 // 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 7515: (153-182): Expected a tuple with 0 components instead of a single non-tuple parameter.
 // 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
index f6035dd0af..9646acf483 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
@@ -17,7 +17,7 @@ contract C {
 // ----
 // 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): Built-in binary operator / cannot be applied to types tuple() and tuple().
+// TypeError 2271: (334-345): Built-in binary operator / cannot be applied to types tuple() and error.
 // TypeError 9062: (334-345): Expected an inline tuple, not an expression of a tuple type.
 // 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/errors/abi_decode_error_constructor.sol b/test/libsolidity/syntaxTests/errors/abi_decode_error_constructor.sol
new file mode 100644
index 0000000000..d3d26e6ccb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/abi_decode_error_constructor.sol
@@ -0,0 +1,9 @@
+error E(uint);
+contract C {
+    function f() public pure returns (bytes memory) {
+        return abi.decode(msg.data, (E(1)));
+    }
+}
+// ----
+// TypeError 1039: (119-123): Argument has to be a type name.
+// TypeError 5132: (90-125): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/errors/abi_encode_error_constructor.sol b/test/libsolidity/syntaxTests/errors/abi_encode_error_constructor.sol
new file mode 100644
index 0000000000..e8a22b08e2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/abi_encode_error_constructor.sol
@@ -0,0 +1,8 @@
+error E(uint);
+contract C {
+    function f() public pure returns (bytes memory) {
+        return abi.encode(E(1));
+    }
+}
+// ----
+// TypeError 2056: (108-112): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/errors/assert_with_error.sol b/test/libsolidity/syntaxTests/errors/assert_with_error.sol
index 90f79b40ee..16972baaff 100644
--- a/test/libsolidity/syntaxTests/errors/assert_with_error.sol
+++ b/test/libsolidity/syntaxTests/errors/assert_with_error.sol
@@ -3,4 +3,4 @@ function f() pure {
     assert(E());
 }
 // ----
-// TypeError 9553: (42-45): Invalid type for argument in function call. Invalid implicit conversion from tuple() to bool requested.
+// TypeError 9553: (42-45): Invalid type for argument in function call. Invalid implicit conversion from error to bool requested.
diff --git a/test/libsolidity/syntaxTests/errors/require_custom.sol b/test/libsolidity/syntaxTests/errors/require_custom.sol
index f139a4fe5a..f428390277 100644
--- a/test/libsolidity/syntaxTests/errors/require_custom.sol
+++ b/test/libsolidity/syntaxTests/errors/require_custom.sol
@@ -4,5 +4,6 @@ contract C {
         require(c, E(2, 7));
     }
 }
+// ====
+// compileViaYul: true
 // ----
-// TypeError 9322: (83-90): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol b/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
new file mode 100644
index 0000000000..334b847393
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
@@ -0,0 +1,8 @@
+error E(uint a, uint b);
+contract C {
+    function f(bool c) public pure {
+        require(c, E(2, 7));
+    }
+}
+// ----
+// UnimplementedFeatureError: Require with a custom error is only available using the via-ir pipeline.
diff --git a/test/libsolidity/syntaxTests/errors/require_nested.sol b/test/libsolidity/syntaxTests/errors/require_nested.sol
new file mode 100644
index 0000000000..c5dc018242
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/require_nested.sol
@@ -0,0 +1,15 @@
+error CustomError(uint256);
+
+contract C
+{
+    function f() public pure returns (uint256)
+    {
+        require(false, require(CustomError(1)));
+        return 2;
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// TypeError 9322: (118-125): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol b/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
index 3eac5984f3..008a94c027 100644
--- a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
+++ b/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
@@ -4,4 +4,4 @@ contract C {
     bytes4 t = E().selector;
 }
 // ----
-// TypeError 9582: (40-52): Member "selector" not found or not visible after argument-dependent lookup in tuple().
+// TypeError 9582: (40-52): Member "selector" not found or not visible after argument-dependent lookup in error.
diff --git a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol b/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
index 208a7326be..bad026154d 100644
--- a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
@@ -3,4 +3,4 @@ function f() pure {
     E();
 }
 // ----
-// TypeError 7757: (35-38): Errors can only be used with revert statements: "revert MyError();".
+// TypeError 7757: (35-38): Errors can only be used with revert statements: "revert MyError(args);", or require functions: "require(condition, MyError(args))".
diff --git a/test/libsolidity/syntaxTests/revertStatement/require_nested.sol b/test/libsolidity/syntaxTests/revertStatement/require_nested.sol
new file mode 100644
index 0000000000..721c37c254
--- /dev/null
+++ b/test/libsolidity/syntaxTests/revertStatement/require_nested.sol
@@ -0,0 +1,13 @@
+error Error(uint256);
+
+contract C
+{
+    error OtherError(uint256);
+
+    function f() external pure
+    {
+        revert Error(require(false, OtherError(1)));
+    }
+}
+// ----
+// TypeError 9553: (126-155): Invalid type for argument in function call. Invalid implicit conversion from tuple() to uint256 requested.

From 1bf0f386a0fca48cc509f5ea51ad0356d28dd86d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 19 Apr 2024 12:57:09 +0200
Subject: [PATCH 0816/1140] Refactor revertWithError usage

---
 libsolidity/codegen/YulUtilFunctions.cpp      | 104 ++++++++++--------
 libsolidity/codegen/YulUtilFunctions.h        |  12 ++
 .../codegen/ir/IRGeneratorForStatements.cpp   |  31 ++----
 .../cmdlineTests/require_with_error_ir/output |   6 +-
 4 files changed, 83 insertions(+), 70 deletions(-)

diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 5a135acb7b..94c2cf8c6a 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -216,6 +216,42 @@ std::string YulUtilFunctions::copyLiteralToStorageFunction(std::string const& _l
 	});
 }
 
+std::string YulUtilFunctions::revertWithError(
+	std::string const& _signature,
+	std::vector<Type const*> const& _parameterTypes,
+	std::vector<ASTPointer<Expression const>> const& _errorArguments,
+	std::string const& _posVar,
+	std::string const& _endVar
+)
+{
+	solAssert((!_posVar.empty() && !_endVar.empty()) || (_posVar.empty() && _endVar.empty()));
+	bool const needsNewVariable = !_posVar.empty() && !_endVar.empty();
+
+	Whiskers templ(R"({
+		let <pos> := <allocateUnbounded>()
+		mstore(<pos>, <hash>)
+		let <end> := <encode>(add(<pos>, 4) <argumentVars>)
+		revert(<pos>, sub(<end>, <pos>))
+	})");
+	templ("pos", needsNewVariable ? _posVar : "memPtr");
+	templ("end", needsNewVariable ? _endVar : "end");
+	templ("hash", formatNumber(util::selectorFromSignatureU256(_signature)));
+	templ("allocateUnbounded", allocateUnboundedFunction());
+
+	std::vector<std::string> errorArgumentVars;
+	std::vector<Type const*> errorArgumentTypes;
+	for (ASTPointer<Expression const> const& arg: _errorArguments)
+	{
+		errorArgumentVars += IRVariable(*arg).stackSlots();
+		solAssert(arg->annotation().type);
+		errorArgumentTypes.push_back(arg->annotation().type);
+	}
+	templ("argumentVars", joinHumanReadablePrefixed(errorArgumentVars));
+	templ("encode", ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector).tupleEncoder(errorArgumentTypes, _parameterTypes));
+
+	return templ.render();
+}
+
 std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType)
 {
 	std::string functionName =
@@ -273,57 +309,37 @@ std::string YulUtilFunctions::requireWithErrorFunction(FunctionCall const& error
 	solAssert(errorDefinition);
 
 	std::string const errorSignature = errorDefinition->functionType(true)->externalSignature();
-	std::string const signatureHash = formatNumber(util::selectorFromSignatureU256(errorSignature));
-	std::string const functionName = [&]() {
-		// Note that in most cases we'll always generate one function per error definition,
-		// because types in the constructor call will match the ones in the definition. The only
-		// exception are calls with types, where each instance has its own type (e.g. literals).
-		std::string name = "require_helper_t_error_" + std::to_string(errorDefinition->id()) + "_" + errorDefinition->name();
-		for (ASTPointer<Expression const> const& argument: errorConstructorCall.sortedArguments())
-		{
-			solAssert(argument->annotation().type);
-			name += ("_" + argument->annotation().type->identifier());
-		}
-		return name;
-	}();
+	// Note that in most cases we'll always generate one function per error definition,
+	// because types in the constructor call will match the ones in the definition. The only
+	// exception are calls with types, where each instance has its own type (e.g. literals).
+	std::string functionName = "require_helper_t_error_" + std::to_string(errorDefinition->id()) + "_" + errorDefinition->name();
+	for (ASTPointer<Expression const> const& argument: errorConstructorCall.sortedArguments())
+	{
+		solAssert(argument->annotation().type);
+		functionName += ("_" + argument->annotation().type->identifier());
+	}
 
-	auto errorArgumentVarsAndTypes = [&]() -> std::tuple<std::vector<std::string>, std::vector<Type const*>> {
-		std::vector<std::string> errorArgumentVars;
-		std::vector<Type const*> errorArgumentTypes;
-		for (ASTPointer<Expression const> const& arg: errorConstructorCall.sortedArguments())
-		{
-			solAssert(arg->annotation().type);
-			if (arg->annotation().type->sizeOnStack() > 0)
-				errorArgumentVars += IRVariable(*arg).stackSlots();
-			errorArgumentTypes.push_back(arg->annotation().type);
-		}
-		return std::make_tuple(std::move(errorArgumentVars), std::move(errorArgumentTypes));
-	}();
+	std::vector<std::string> functionParameterNames;
+	for (ASTPointer<Expression const> const& arg: errorConstructorCall.sortedArguments())
+	{
+		solAssert(arg->annotation().type);
+		if (arg->annotation().type->sizeOnStack() > 0)
+			functionParameterNames += IRVariable(*arg).stackSlots();
+	}
 
 	return m_functionCollector.createFunction(functionName, [&]() {
-		auto [errorArgumentVars, errorArgumentTypes] = errorArgumentVarsAndTypes;
-		std::string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
-			.tupleEncoder(
-				errorArgumentTypes,
-				errorDefinition->functionType(true)->parameterTypes()
-			);
-
 		return Whiskers(R"(
-			function <functionName>(condition <errorArguments>) {
-				if iszero(condition) {
-					let memPtr := <allocateUnbounded>()
-					mstore(memPtr, <errorHash>)
-					let end := <abiEncodeFunc>(add(memPtr, <hashHeaderSize>) <errorArguments>)
-					revert(memPtr, sub(end, memPtr))
-				}
+			function <functionName>(condition <functionParameterNames>) {
+				if iszero(condition)
+					<revertWithError>
 			}
 		)")
 		("functionName", functionName)
-		("allocateUnbounded", allocateUnboundedFunction())
-		("errorHash", signatureHash)
-		("abiEncodeFunc", encodeFunc)
-		("hashHeaderSize", std::to_string(4))
-		("errorArguments", joinHumanReadablePrefixed(errorArgumentVars))
+		("functionParameterNames", joinHumanReadablePrefixed(functionParameterNames))
+		// We're creating parameter names from the expressions passed into the constructor call,
+		// which will result in odd names like `expr_29` that would normally be used for locals.
+		// Note that this is the naming expected by `revertWithError()`.
+		("revertWithError", revertWithError(errorSignature, errorDefinition->functionType(true)->parameterTypes(), errorConstructorCall.sortedArguments()))
 		.render();
 	});
 }
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index db4c26725d..58d20dcbf4 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -90,6 +90,18 @@ class YulUtilFunctions
 	/// signature: (slot) ->
 	std::string copyLiteralToStorageFunction(std::string const& _literal);
 
+	/// @returns statements to revert with an error.
+	/// Generates code to revert with an error. The error arguments are assumed to
+	/// be already evaluated and available in local IRVariables, but not yet
+	/// converted.
+	std::string revertWithError(
+		std::string const& _signature,
+		std::vector<Type const*> const& _parameterTypes,
+		std::vector<ASTPointer<Expression const>> const& _errorArguments,
+		std::string const& _posVar = {},
+		std::string const& _endVar = {}
+	);
+
 	// @returns the name of a function that has the equivalent logic of an
 	// `assert` or `require` call.
 	std::string requireOrAssertFunction(bool _assert, Type const* _messageType = nullptr);
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index bf028fce51..bffd4de682 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -3389,32 +3389,15 @@ void IRGeneratorForStatements::revertWithError(
 	std::vector<ASTPointer<Expression const>> const& _errorArguments
 )
 {
-	Whiskers templ(R"({
-		let <pos> := <allocateUnbounded>()
-		mstore(<pos>, <hash>)
-		let <end> := <encode>(add(<pos>, 4) <argumentVars>)
-		revert(<pos>, sub(<end>, <pos>))
-	})");
-	templ("pos", m_context.newYulVariable());
-	templ("end", m_context.newYulVariable());
-	templ("hash", util::selectorFromSignatureU256(_signature).str());
-	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
-
-	std::vector<std::string> errorArgumentVars;
-	std::vector<Type const*> errorArgumentTypes;
-	for (ASTPointer<Expression const> const& arg: _errorArguments)
-	{
-		errorArgumentVars += IRVariable(*arg).stackSlots();
-		solAssert(arg->annotation().type);
-		errorArgumentTypes.push_back(arg->annotation().type);
-	}
-	templ("argumentVars", joinHumanReadablePrefixed(errorArgumentVars));
-	templ("encode", m_context.abiFunctions().tupleEncoder(errorArgumentTypes, _parameterTypes));
-
-	appendCode() << templ.render();
+	appendCode() << m_utils.revertWithError(
+		_signature,
+		_parameterTypes,
+		_errorArguments,
+		m_context.newYulVariable(),
+		m_context.newYulVariable()
+	);
 }
 
-
 bool IRGeneratorForStatements::visit(TryCatchClause const& _clause)
 {
 	_clause.block().accept(*this);
diff --git a/test/cmdlineTests/require_with_error_ir/output b/test/cmdlineTests/require_with_error_ir/output
index dacc9fc910..232f0d76fc 100644
--- a/test/cmdlineTests/require_with_error_ir/output
+++ b/test/cmdlineTests/require_with_error_ir/output
@@ -184,7 +184,8 @@ object "C_36" {
             }
 
             function require_helper_t_error_7_CustomError_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(condition , expr_15) {
-                if iszero(condition) {
+                if iszero(condition)
+                {
                     let memPtr := allocate_unbounded()
                     mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_15)
@@ -238,7 +239,8 @@ object "C_36" {
             }
 
             function require_helper_t_error_7_CustomError_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(condition , expr_29) {
-                if iszero(condition) {
+                if iszero(condition)
+                {
                     let memPtr := allocate_unbounded()
                     mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_29)

From ceabc540b65cfff875407d04c179122fd7e02096 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 26 Apr 2024 07:01:18 +0200
Subject: [PATCH 0817/1140] Fix mistake in require condition in docs

---
 docs/contracts/errors.rst                | 2 +-
 docs/introduction-to-smart-contracts.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index e4955ddae1..8c57586e96 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -40,7 +40,7 @@ as well as the newer approach with ``require`` in function ``transferWithRequire
             balance[to] += amount;
         }
         function transferWithRequireError(address to, uint256 amount) public {
-            require(amount > balance[msg.sender], InsufficientBalance(balance[msg.sender], amount));
+            require(amount <= balance[msg.sender], InsufficientBalance(balance[msg.sender], amount));
             balance[msg.sender] -= amount;
             balance[to] += amount;
         }
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 1c5b873732..c860057945 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -119,7 +119,7 @@ registering with a username and password, all you need is an Ethereum keypair.
         // Sends an amount of existing coins
         // from any caller to an address
         function send(address receiver, uint amount) public {
-            require(amount > balances[msg.sender], InsufficientBalance(amount, balances[msg.sender]));
+            require(amount <= balances[msg.sender], InsufficientBalance(amount, balances[msg.sender]));
             balances[msg.sender] -= amount;
             balances[receiver] += amount;
             emit Sent(msg.sender, receiver, amount);

From 351a910b6d8d5642b16428ecde78461c800d5072 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 26 Apr 2024 14:17:41 +0200
Subject: [PATCH 0818/1140] Install python dependencies on buildpack-deps
 images

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten   |  5 +++--
 .../buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz    | 11 ++++++-----
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004   |  7 ++++---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204   |  7 ++++---
 .../docker/buildpack-deps/Dockerfile.ubuntu2204.clang |  8 +++++---
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index c29fc699ac..f72909a246 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,13 +33,14 @@
 # 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="16"
+LABEL version="17"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
 	\
 	apt-get update && \
-	apt-get install lz4 sudo --no-install-recommends && \
+	apt-get install lz4 sudo lsof python3 python3-pip --no-install-recommends && \
+	pip3 install requests && \
 	\
 	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 0b2a99b1a2..2775c5c4d1 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -22,19 +22,20 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="5"
+LABEL version="6"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update; \
 	apt-get -qqy install --no-install-recommends \
 		automake libtool bison texinfo \
-		build-essential sudo \
+		build-essential sudo lsof \
 		software-properties-common \
-		ninja-build git wget \
-		libbz2-dev zlib1g-dev git curl uuid-dev \
+		ninja-build git wget python3-pip \
+		libbz2-dev zlib1g-dev curl uuid-dev \
 		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
-    apt-get install -qy python3-pip;
+	pip3 install codecov parsec tabulate pylint z3-solver \
+	pygments-lexer-solidity deepdiff colorama requests;
 
 # Install cmake 3.21.2 (minimum requirement is cmake 3.10)
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 45490291a9..c2d038ee0a 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="22"
+LABEL version="23"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -34,13 +34,14 @@ RUN set -ex; \
 	apt-get install -qqy --no-install-recommends \
 		build-essential sudo \
 		software-properties-common \
-		cmake ninja-build \
+		cmake ninja-build lsof \
 		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;
+	pip3 install codecov parsec tabulate pylint z3-solver \
+	pygments-lexer-solidity deepdiff colorama requests;
 
 # Eldarica
 RUN set -ex; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index d7b9254486..957940914a 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="7"
+LABEL version="8"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -34,13 +34,14 @@ RUN set -ex; \
 	apt-get install -qqy --no-install-recommends \
 		build-essential sudo \
 		software-properties-common \
-		cmake ninja-build \
+		cmake ninja-build lsof \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libcvc4-dev libz3-static-dev z3-static jq \
 		libcln-dev zip locales-all; \
 	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov;
+	pip3 install codecov parsec tabulate pylint z3-solver \
+	pygments-lexer-solidity deepdiff colorama requests;
 
 # Eldarica
 RUN set -ex; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index 60d5a599c3..b26ce3ff5f 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="6"
+LABEL version="7"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -34,12 +34,14 @@ RUN set -ex; \
 	apt-get install -qqy --no-install-recommends \
 		build-essential sudo \
 		software-properties-common \
-		cmake ninja-build \
+		cmake ninja-build lsof \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		clang \
 		libz3-static-dev z3-static jq \
-		libcln-dev;
+		libcln-dev python3-pip; \
+	pip3 install codecov parsec tabulate pylint z3-solver \
+	pygments-lexer-solidity deepdiff colorama requests;
 
 # Eldarica
 RUN set -ex; \

From c5bfea2268fa70168f39be634c11b5b5b25876c9 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 26 Apr 2024 10:49:30 +0200
Subject: [PATCH 0819/1140] Refactor requireOrAssert to use revertWithError

---
 libsolidity/codegen/YulUtilFunctions.cpp      |  33 +-
 libsolidity/codegen/YulUtilFunctions.h        |   6 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |   4 +-
 .../require_with_error_ir/input.sol           |   9 +-
 test/cmdlineTests/require_with_string_ir/args |   1 +
 .../require_with_string_ir/input.sol          |  13 +
 .../require_with_string_ir/output             | 290 ++++++++++++++++++
 7 files changed, 324 insertions(+), 32 deletions(-)
 create mode 100644 test/cmdlineTests/require_with_string_ir/args
 create mode 100644 test/cmdlineTests/require_with_string_ir/input.sol
 create mode 100644 test/cmdlineTests/require_with_string_ir/output

diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 94c2cf8c6a..b71dfd566a 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -252,7 +252,7 @@ std::string YulUtilFunctions::revertWithError(
 	return templ.render();
 }
 
-std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType)
+std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType, ASTPointer<Expression const> _stringArgumentExpression)
 {
 	std::string functionName =
 		std::string(_assert ? "assert_helper" : "require_helper") +
@@ -271,34 +271,19 @@ std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const*
 			("functionName", functionName)
 			.render();
 
-		int const hashHeaderSize = 4;
-		u256 const errorHash = util::selectorFromSignatureU256("Error(string)");
-
-		std::string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
-			.tupleEncoder(
-				{_messageType},
-				{TypeProvider::stringMemory()}
-			);
+		solAssert(_stringArgumentExpression, "Require with string must have a string argument");
+		solAssert(_stringArgumentExpression->annotation().type);
+		std::vector<std::string> functionParameterNames = IRVariable(*_stringArgumentExpression).stackSlots();
 
 		return Whiskers(R"(
-			function <functionName>(condition <messageVars>) {
-				if iszero(condition) {
-					let memPtr := <allocateUnbounded>()
-					mstore(memPtr, <errorHash>)
-					let end := <abiEncodeFunc>(add(memPtr, <hashHeaderSize>) <messageVars>)
-					revert(memPtr, sub(end, memPtr))
-				}
+			function <functionName>(condition <functionParameterNames>) {
+				if iszero(condition)
+					<revertWithError>
 			}
 		)")
 		("functionName", functionName)
-		("allocateUnbounded", allocateUnboundedFunction())
-		("errorHash", formatNumber(errorHash))
-		("abiEncodeFunc", encodeFunc)
-		("hashHeaderSize", std::to_string(hashHeaderSize))
-		("messageVars",
-			(_messageType->sizeOnStack() > 0 ? ", " : "") +
-			suffixedVariableNameList("message_", 1, 1 + _messageType->sizeOnStack())
-		)
+		("revertWithError", revertWithError("Error(string)", {_messageType}, {_stringArgumentExpression}))
+		("functionParameterNames", joinHumanReadablePrefixed(functionParameterNames))
 		.render();
 	});
 }
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index 58d20dcbf4..a1b45b656f 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -104,7 +104,11 @@ class YulUtilFunctions
 
 	// @returns the name of a function that has the equivalent logic of an
 	// `assert` or `require` call.
-	std::string requireOrAssertFunction(bool _assert, Type const* _messageType = nullptr);
+	std::string requireOrAssertFunction(
+		bool _assert,
+		Type const* _messageType = nullptr,
+		ASTPointer<Expression const> _stringArgumentExpression = nullptr
+	);
 
 	// @returns function that has equivalent logic of a require function, but with a custom
 	// error constructor parameter.
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index bffd4de682..2464fefc43 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1166,9 +1166,11 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		}
 		else
 		{
+			ASTPointer<Expression const> stringArgumentExpression = messageArgumentType ? arguments[1] : nullptr;
 			std::string requireOrAssertFunction = m_utils.requireOrAssertFunction(
 				functionType->kind() == FunctionType::Kind::Assert,
-				messageArgumentType
+				messageArgumentType,
+				stringArgumentExpression
 			);
 			appendCode() << std::move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
 			if (messageArgumentType && messageArgumentType->sizeOnStack() > 0)
diff --git a/test/cmdlineTests/require_with_error_ir/input.sol b/test/cmdlineTests/require_with_error_ir/input.sol
index f041b27b7d..eb0787fcc1 100644
--- a/test/cmdlineTests/require_with_error_ir/input.sol
+++ b/test/cmdlineTests/require_with_error_ir/input.sol
@@ -3,15 +3,12 @@ pragma solidity >=0.0;
 
 error CustomError(uint256, string);
 
-contract C
-{
-    function f(bool condition) external pure
-    {
+contract C {
+    function f(bool condition) external pure {
         require(condition, CustomError(1, "two"));
     }
 
-    function g(bool condition) external pure
-    {
+    function g(bool condition) external pure {
         require(condition, CustomError(2, "three"));
     }
 }
diff --git a/test/cmdlineTests/require_with_string_ir/args b/test/cmdlineTests/require_with_string_ir/args
new file mode 100644
index 0000000000..be08aefb41
--- /dev/null
+++ b/test/cmdlineTests/require_with_string_ir/args
@@ -0,0 +1 @@
+--ir --debug-info none
diff --git a/test/cmdlineTests/require_with_string_ir/input.sol b/test/cmdlineTests/require_with_string_ir/input.sol
new file mode 100644
index 0000000000..c470451714
--- /dev/null
+++ b/test/cmdlineTests/require_with_string_ir/input.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f(bool condition) external pure {
+        string memory message = "Condition must be satisfied";
+        require(condition, message);
+    }
+
+    function g(bool condition) external pure {
+        require(condition, "Condition must be satisfied");
+    }
+}
diff --git a/test/cmdlineTests/require_with_string_ir/output b/test/cmdlineTests/require_with_string_ir/output
new file mode 100644
index 0000000000..21828ac2a5
--- /dev/null
+++ b/test/cmdlineTests/require_with_string_ir/output
@@ -0,0 +1,290 @@
+IR:
+
+/// @use-src 0:"require_with_string_ir/input.sol"
+object "C_28" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_28()
+
+        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)
+        }
+
+        function constructor_C_28() {
+
+        }
+
+    }
+    /// @use-src 0:"require_with_string_ir/input.sol"
+    object "C_28_deployed" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := shift_right_224_unsigned(calldataload(0))
+                switch selector
+
+                case 0x98c3a6c1
+                {
+                    // f(bool)
+
+                    external_fun_f_16()
+                }
+
+                case 0xd48092f7
+                {
+                    // g(bool)
+
+                    external_fun_g_27()
+                }
+
+                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 revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db() {
+                revert(0, 0)
+            }
+
+            function cleanup_t_bool(value) -> cleaned {
+                cleaned := iszero(iszero(value))
+            }
+
+            function validator_revert_t_bool(value) {
+                if iszero(eq(value, cleanup_t_bool(value))) { revert(0, 0) }
+            }
+
+            function abi_decode_t_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_revert_t_bool(value)
+            }
+
+            function abi_decode_tuple_t_bool(headStart, dataEnd) -> value0 {
+                if slt(sub(dataEnd, headStart), 32) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() }
+
+                {
+
+                    let offset := 0
+
+                    value0 := abi_decode_t_bool(add(headStart, offset), dataEnd)
+                }
+
+            }
+
+            function abi_encode_tuple__to__fromStack(headStart ) -> tail {
+                tail := add(headStart, 0)
+
+            }
+
+            function external_fun_f_16() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0 :=  abi_decode_tuple_t_bool(4, calldatasize())
+                fun_f_16(param_0)
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
+            function external_fun_g_27() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0 :=  abi_decode_tuple_t_bool(4, calldatasize())
+                fun_g_27(param_0)
+                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 round_up_to_mul_of_32(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+
+            function panic_error_0x41() {
+                mstore(0, 35408467139433450592217433187231851964531694900788300625387963629091585785856)
+                mstore(4, 0x41)
+                revert(0, 0x24)
+            }
+
+            function finalize_allocation(memPtr, size) {
+                let newFreePtr := add(memPtr, round_up_to_mul_of_32(size))
+                // protect against overflow
+                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
+                mstore(64, newFreePtr)
+            }
+
+            function allocate_memory(size) -> memPtr {
+                memPtr := allocate_unbounded()
+                finalize_allocation(memPtr, size)
+            }
+
+            function array_allocation_size_t_string_memory_ptr(length) -> size {
+                // Make sure we can allocate memory without overflow
+                if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
+
+                size := round_up_to_mul_of_32(length)
+
+                // add length slot
+                size := add(size, 0x20)
+
+            }
+
+            function allocate_memory_array_t_string_memory_ptr(length) -> memPtr {
+                let allocSize := array_allocation_size_t_string_memory_ptr(length)
+                memPtr := allocate_memory(allocSize)
+
+                mstore(memPtr, length)
+
+            }
+
+            function store_literal_in_memory_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(memPtr) {
+
+                mstore(add(memPtr, 0), "Condition must be satisfied")
+
+            }
+
+            function copy_literal_to_memory_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46() -> memPtr {
+                memPtr := allocate_memory_array_t_string_memory_ptr(27)
+                store_literal_in_memory_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(add(memPtr, 32))
+            }
+
+            function convert_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46_to_t_string_memory_ptr() -> converted {
+                converted := copy_literal_to_memory_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46()
+            }
+
+            function array_length_t_string_memory_ptr(value) -> length {
+
+                length := mload(value)
+
+            }
+
+            function array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length) -> updated_pos {
+                mstore(pos, length)
+                updated_pos := add(pos, 0x20)
+            }
+
+            function copy_memory_to_memory_with_cleanup(src, dst, length) {
+
+                mcopy(dst, src, length)
+                mstore(add(dst, length), 0)
+
+            }
+
+            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_with_cleanup(add(value, 0x20), pos, length)
+                end := add(pos, round_up_to_mul_of_32(length))
+            }
+
+            function abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(headStart , value0) -> tail {
+                tail := add(headStart, 32)
+
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value0,  tail)
+
+            }
+
+            function require_helper_t_string_memory_ptr(condition , expr_12_mpos) {
+                if iszero(condition)
+                {
+                    let memPtr := allocate_unbounded()
+                    mstore(memPtr, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    let end := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_12_mpos)
+                    revert(memPtr, sub(end, memPtr))
+                }
+            }
+
+            function fun_f_16(var_condition_3) {
+
+                let var_message_7_mpos := convert_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46_to_t_string_memory_ptr()
+
+                let _1 := var_condition_3
+                let expr_11 := _1
+
+                let _2_mpos := var_message_7_mpos
+                let expr_12_mpos := _2_mpos
+
+                require_helper_t_string_memory_ptr(expr_11, expr_12_mpos)
+
+            }
+
+            function abi_encode_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46_to_t_string_memory_ptr_fromStack(pos) -> end {
+                pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, 27)
+                store_literal_in_memory_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(pos)
+                end := add(pos, 32)
+            }
+
+            function abi_encode_tuple_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46__to_t_string_memory_ptr__fromStack(headStart ) -> tail {
+                tail := add(headStart, 32)
+
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46_to_t_string_memory_ptr_fromStack( tail)
+
+            }
+
+            function require_helper_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(condition ) {
+                if iszero(condition)
+                {
+                    let memPtr := allocate_unbounded()
+                    mstore(memPtr, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    let end := abi_encode_tuple_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46__to_t_string_memory_ptr__fromStack(add(memPtr, 4) )
+                    revert(memPtr, sub(end, memPtr))
+                }
+            }
+
+            function fun_g_27(var_condition_18) {
+
+                let _3 := var_condition_18
+                let expr_22 := _3
+
+                require_helper_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(expr_22)
+
+            }
+
+        }
+
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+
+}

From 700ba0b9b36d65280192a1b5d012c4ae34131276 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 26 Apr 2024 17:04:29 +0200
Subject: [PATCH 0820/1140] Sort packages in alphabetical order and split
 commands by line

---
 .../buildpack-deps/Dockerfile.emscripten      |  8 +++-
 .../Dockerfile.ubuntu.clang.ossfuzz           | 39 ++++++++++++++----
 .../buildpack-deps/Dockerfile.ubuntu2004      | 38 ++++++++++++-----
 .../buildpack-deps/Dockerfile.ubuntu2204      | 41 ++++++++++++++-----
 .../Dockerfile.ubuntu2204.clang               | 38 ++++++++++++-----
 5 files changed, 125 insertions(+), 39 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index f72909a246..961901f00b 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -37,9 +37,13 @@ LABEL version="17"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
-	\
 	apt-get update && \
-	apt-get install lz4 sudo lsof python3 python3-pip --no-install-recommends && \
+	apt-get install -qqy --no-install-recommends \
+		lsof \
+		lz4 \
+		python3 \
+		python3-pip \
+		sudo && \
 	pip3 install requests && \
 	\
 	cd /usr/src && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index 2775c5c4d1..94b6c247c6 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -28,14 +28,39 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update; \
 	apt-get -qqy install --no-install-recommends \
-		automake libtool bison texinfo \
-		build-essential sudo lsof \
+		automake \
+		bison \
+		build-essential \
+		curl \
+		git \
+		jq \
+		libbz2-dev \
+		liblzma-dev \
+		libtool \
+		lsof \
+		m4 \
+		mlton \
+		ninja-build \
+		openjdk-8-jdk \
+		pkg-config \
+		python3-pip \
 		software-properties-common \
-		ninja-build git wget python3-pip \
-		libbz2-dev zlib1g-dev curl uuid-dev \
-		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
-	pip3 install codecov parsec tabulate pylint z3-solver \
-	pygments-lexer-solidity deepdiff colorama requests;
+		sudo \
+		texinfo \
+		unzip \
+		uuid-dev \
+		wget \
+		zlib1g-dev; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Install cmake 3.21.2 (minimum requirement is cmake 3.10)
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index c2d038ee0a..4b5dbafac5 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -32,21 +32,39 @@ 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 sudo \
-		software-properties-common \
-		cmake ninja-build lsof \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		build-essential \
+		cmake \
+		jq \
+		libboost-filesystem-dev \
 		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static jq \
-		; \
-	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov parsec tabulate pylint z3-solver \
-	pygments-lexer-solidity deepdiff colorama requests;
+		libboost-system-dev \
+		libboost-test-dev \
+		libcvc4-dev \
+		libz3-static-dev \
+		lsof \
+		ninja-build \
+		python3-pip \
+		python3-sphinx \
+		software-properties-common \
+		sudo \
+		z3-static; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qqy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 957940914a..92cc20d43a 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -32,21 +32,42 @@ 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 sudo \
-		software-properties-common \
-		cmake ninja-build lsof \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		build-essential \
+		cmake \
+		jq \
+		libboost-filesystem-dev \
 		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static jq \
-		libcln-dev zip locales-all; \
-	apt-get install -qy python3-pip python3-sphinx; \
-	pip3 install codecov parsec tabulate pylint z3-solver \
-	pygments-lexer-solidity deepdiff colorama requests;
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libcvc4-dev \
+		libz3-static-dev \
+		locales-all \
+		lsof \
+		ninja-build \
+		python3-pip \
+		python3-sphinx \
+		software-properties-common \
+		sudo \
+		z3-static \
+		zip; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qqy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index b26ce3ff5f..b11f798e81 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -32,21 +32,39 @@ 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 sudo \
-		software-properties-common \
-		cmake ninja-build lsof \
-		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
-		libboost-program-options-dev \
+		build-essential \
 		clang \
-		libz3-static-dev z3-static jq \
-		libcln-dev python3-pip; \
-	pip3 install codecov parsec tabulate pylint z3-solver \
-	pygments-lexer-solidity deepdiff colorama requests;
+		cmake \
+		jq \
+		lsof \
+		libboost-filesystem-dev \
+		libboost-program-options-dev \
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libz3-static-dev \
+		ninja-build \
+		python3-pip \
+		software-properties-common \
+		sudo \
+		z3-static; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
 
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
-	apt-get install -qy unzip openjdk-11-jre; \
+	apt-get install -qy \
+		openjdk-11-jre \
+		unzip; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \

From 9cbd0a1046f4665a830dd402dee69585bba4a214 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 26 Apr 2024 17:06:32 +0200
Subject: [PATCH 0821/1140] Remove superfluous cleanup step

---
 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 ----
 4 files changed, 16 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index 94b6c247c6..f8a4c73ce9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -173,10 +173,6 @@ RUN set -ex; \
     cp abicoder.hpp /usr/include; \
     rm -rf /usr/src/Yul-Isabelle
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 4b5dbafac5..815c93ee84 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -71,10 +71,6 @@ RUN set -ex; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 # EVMONE
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 92cc20d43a..254e83b4cf 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -74,10 +74,6 @@ RUN set -ex; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 # EVMONE
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index b11f798e81..af6155b6e0 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -71,10 +71,6 @@ RUN set -ex; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
-# Cleanup
-RUN set -ex; \
-	rm -rf /var/lib/apt/lists/*
-
 FROM base AS libraries
 
 ENV CC clang

From 9b89c30c06fa20854737a5fee86cc7d3847d7095 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 26 Apr 2024 14:38:21 +0200
Subject: [PATCH 0822/1140] Move python dependencies to docker images

Co-authored-by: Tim-Tscheppe <timothy.tscheppe@marquette.edu>
---
 .circleci/config.yml | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b588740fe..9ca938b9b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -331,9 +331,6 @@ commands:
       - 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
@@ -925,19 +922,9 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   chk_pylint:
-    <<: *base_cimg_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
-      - install_python3:
-          packages: >
-            pylint
-            z3-solver
-            pygments-lexer-solidity
-            parsec
-            tabulate
-            deepdiff
-            colorama
-            requests
       - run: pylint --version
       - run:
           name: Linting Python Scripts
@@ -974,11 +961,9 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   chk_proofs:
-    <<: *base_cimg_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
-      - install_python3:
-          packages: z3-solver
       - run_proofs
       - matrix_notify_failure_unless_pr
 
@@ -993,10 +978,6 @@ jobs:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
-      - run:
-          # TODO: Add these to the base image
-          name: Install gas_diff_stats.py dependencies
-          command: python3 -m pip install --user parsec tabulate
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
@@ -1508,14 +1489,6 @@ jobs:
             if command -v npm &> /dev/null; then
               sudo npm install -g pnpm
             fi
-      - install_python3:
-          packages: requests
-      - run:
-          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:

From 21dbf834117aec2a8751a7b5abffb640a1cf9336 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 26 Apr 2024 17:59:01 +0200
Subject: [PATCH 0823/1140] Bump CI docker images

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ca938b9b8..b5b151c58a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,25 +9,25 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-22
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:212b4d79a89c6e2d9b58ddea2d6296c5618f4ae0b016694a3b159d2b11cbbacc"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-23
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:84a1fb8771236e8d9aa5c615a425b8929e56a6e4f150a60078c8d74a1ceaa6c2"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-7
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ecbeec36b12fd953bfb6fb3e7ced474bb73945d7ed615e6538960c32bae8126c"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-8
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1c3a4118218640b2bf632242979a63d48f3d9c70d48be9574332f2dbbd04b192"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-6
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1818a56061f39ece4a92138948404214bf939c9deb68f4dc2c68cd82b39e8410"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-7
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0f47e733e100080c4174381c262cfcf974bc8e7c3c41b8dff611b9641c82f714"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-5
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c21c4c2a591d0702c388d1944539f6498ed8e51c54c1a1cb34693079efd9ab77"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-6
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8883fa2845bbc1e0922af60439313666e4ba325f67a117e17d78cca3ea6589b3"
   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"
+    # NOTE: Please remember to update the `scripts/build_emscripten.sh` whenever the hash of this image changes.
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-17
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c57f2bfb8c15d70fe290629358dd1c73dc126e3760f443b54764797556b887d4"
   evm-version:
     type: string
     default: london
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 1b780a4276..dc862b1f7e 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-16
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-17
 # 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:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:c57f2bfb8c15d70fe290629358dd1c73dc126e3760f443b54764797556b887d4 \
     /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"

From 61ced0d9745233dbdb50a3603ceb3be1ddc4cac2 Mon Sep 17 00:00:00 2001
From: Patrick Collins <54278053+PatrickAlphaC@users.noreply.github.com>
Date: Sat, 27 Apr 2024 13:39:23 -0400
Subject: [PATCH 0824/1140] Update cheatsheet.rst

The documentation currently says:

````
``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, (...))``
````

However, this is not correct.

`abi.encodeWithSelector` does not take a tuple as a second argument, instead, it takes an unended list of arguments. Saying these two are identical, is then not correct:

- `abi.encodeCall(function functionPointer, (...)) `
- `abi.encodeWithSelector(functionPointer.selector, (...))`

It should be that these two are identical:

- `abi.encodeCall(function functionPointer, (...)) `
- `abi.encodeWithSelector(functionPointer.selector, ...)`

subtle, but maybe there is a clearly way to say that `encodeWithSelector` is the same as the unpacked tuple from `encodeCall`.
---
 docs/cheatsheet.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index bc678c647d..6b69b81be3 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -23,7 +23,7 @@ ABI Encoding and Decoding Functions
 - ``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, (...))``
+  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))), ...)``
 

From 2f5f6b9fb8e888a52c2f6042609df628824a1c96 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 29 Apr 2024 17:50:07 +0200
Subject: [PATCH 0825/1140] Replace yarn with pnpm in the external tests since
 yarn seems to be unable to resolve Hardhat dependencies

---
 test/externalTests/brink.sh   | 4 ++--
 test/externalTests/ens.sh     | 2 +-
 test/externalTests/uniswap.sh | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index d8ad001ac0..02e5fe971c 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -68,8 +68,8 @@ function brink_test
     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
+    pnpm install
+    pnpm install hardhat-gas-reporter
 
     replace_version_pragmas
     for preset in $SELECTED_PRESETS; do
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index a011dd2a72..b7a053f6f7 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -62,7 +62,7 @@ function ens_test
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
-    yarn install
+    pnpm install
 
     replace_version_pragmas
     neutralize_packaged_contracts
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 04f27ab3f7..f3d78e6e33 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -83,17 +83,17 @@ function uniswap_test
     # - Newer versions of ethereumjs/tx have an issue with 'gteHardfork()' method.
     neutralize_package_lock
 
-    yarn install
-    yarn add hardhat-gas-reporter
+    pnpm install
+    pnpm 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.
-    yarn add ethers@5.6.1
+    pnpm install ethers@5.6.1
 
     # We set hardhat version to 2.20.0 since version 2.21.0 has issues with solidity-coverage plugin
     # that often causes out-of-memory errors.
     # See hardhat note about the issue here: https://github.com/NomicFoundation/hardhat/releases/tag/hardhat@2.21.0
-    yarn add hardhat@2.20.0
+    pnpm install hardhat@2.20.0
 
     replace_version_pragmas
 

From 3794bc1825d51f5927b3d99305f3ea97232ec55b Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 29 Apr 2024 17:47:21 +0200
Subject: [PATCH 0826/1140] Remove perpetual-pools external test

---
 .circleci/config.yml                  |  9 ---
 test/externalTests/perpetual-pools.sh | 87 ---------------------------
 2 files changed, 96 deletions(-)
 delete mode 100755 test/externalTests/perpetual-pools.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b5b151c58a..34e2e33933 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -789,13 +789,6 @@ defaults:
       compile_only: 1
       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.16
-
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *requires_b_ubu_static
       name: t_native_test_ext_uniswap
@@ -1881,7 +1874,6 @@ workflows:
       - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
-      - 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
@@ -1903,7 +1895,6 @@ workflows:
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator
-            - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
deleted file mode 100755
index 1d7bb8f33b..0000000000
--- a/test/externalTests/perpetual-pools.sh
+++ /dev/null
@@ -1,87 +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 build; }
-function test_fn { yarn test; }
-
-function perpetual_pools_test
-{
-    local repo="https://github.com/solidity-external-tests/perpetual-pools-contracts"
-    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
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        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" "$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/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
-
-    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
-    # We set hardhat version to 2.20.0 since version 2.21.0 has issues with solidity-coverage plugin
-    # that often causes out-of-memory errors.
-    # See hardhat note about the issue here: https://github.com/NomicFoundation/hardhat/releases/tag/hardhat@2.21.0
-    yarn add hardhat@2.20.0
-
-    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 perpetual-pools "$repo" "$preset"
-    done
-}
-
-external_test Tracer-Perpetual-Pools perpetual_pools_test

From 007205a27493e11e3a49943f51f0bc3b30e43a2a Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 30 Apr 2024 10:14:30 +0200
Subject: [PATCH 0827/1140] Order `Instructions.h` by opcodes

TLOAD/TSTORE was out of order
---
 libevmasm/Instruction.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index f89c72c894..a3629eec2d 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -104,10 +104,9 @@ 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
-
 	TLOAD = 0x5c,             ///< load word from transient storage
 	TSTORE = 0x5d,            ///< save word to transient storage
+	MCOPY = 0x5e,             ///< copy between memory areas
 
 	PUSH0 = 0x5f,             ///< place the value 0 on stack
 	PUSH1 = 0x60,             ///< place 1 byte item on stack

From 7fb62227cf53bd44199efe80165f369cb22a7498 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 13 Mar 2024 14:12:25 +0100
Subject: [PATCH 0828/1140] SMTChecker: First version of SMTLIB2 parser

Parser code was originally written by @chriseth for solsmt, an SMT
solver developed internally for Solidity
---
 libsmtutil/CMakeLists.txt    |  2 +
 libsmtutil/SMTLib2Parser.cpp | 97 ++++++++++++++++++++++++++++++++++++
 libsmtutil/SMTLib2Parser.h   | 96 +++++++++++++++++++++++++++++++++++
 3 files changed, 195 insertions(+)
 create mode 100644 libsmtutil/SMTLib2Parser.cpp
 create mode 100644 libsmtutil/SMTLib2Parser.h

diff --git a/libsmtutil/CMakeLists.txt b/libsmtutil/CMakeLists.txt
index af7f47b60c..cb222e22c4 100644
--- a/libsmtutil/CMakeLists.txt
+++ b/libsmtutil/CMakeLists.txt
@@ -4,6 +4,8 @@ set(sources
 	Exceptions.h
 	SMTLib2Interface.cpp
 	SMTLib2Interface.h
+	SMTLib2Parser.cpp
+	SMTLib2Parser.h
 	SMTPortfolio.cpp
 	SMTPortfolio.h
 	SolverInterface.h
diff --git a/libsmtutil/SMTLib2Parser.cpp b/libsmtutil/SMTLib2Parser.cpp
new file mode 100644
index 0000000000..f3a3bd96a9
--- /dev/null
+++ b/libsmtutil/SMTLib2Parser.cpp
@@ -0,0 +1,97 @@
+/*
+	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 <libsmtutil/SMTLib2Parser.h>
+
+#include <liblangutil/Common.h>
+
+#include <libsolutil/Visitor.h>
+#include <libsolutil/StringUtils.h>
+
+
+using namespace solidity::langutil;
+using namespace solidity::smtutil;
+
+std::string SMTLib2Expression::toString() const {
+	return std::visit(solidity::util::GenericVisitor{
+			[](std::string const& _sv) { return _sv; },
+			[](std::vector<SMTLib2Expression> const& _subExpr) {
+				std::vector<std::string> formatted;
+				for (auto const& item: _subExpr)
+					formatted.emplace_back(item.toString());
+				return "(" + solidity::util::joinHumanReadable(formatted, " ") + ")";
+			}
+	}, data);
+}
+
+SMTLib2Expression SMTLib2Parser::parseExpression() {
+	skipWhitespace();
+	if (token() == '(')
+	{
+		advance();
+		skipWhitespace();
+		std::vector<SMTLib2Expression> subExpressions;
+		while (token() != 0 && token() != ')')
+		{
+			subExpressions.emplace_back(parseExpression());
+			skipWhitespace();
+		}
+		if (token() != ')')
+			throw ParsingException{};
+		// Simulate whitespace because we do not want to read the next token since it might block.
+		m_token = ' ';
+		return {std::move(subExpressions)};
+	} else
+		return {parseToken()};
+}
+
+std::string SMTLib2Parser::parseToken() {
+	std::string result;
+
+	skipWhitespace();
+	bool isPipe = token() == '|';
+	if (isPipe)
+		advance();
+	while (token() != 0)
+	{
+		char c = token();
+		if (isPipe && c == '|')
+		{
+			advance();
+			break;
+		} else if (!isPipe && (isWhiteSpace(c) || c == '(' || c == ')'))
+			break;
+		result.push_back(c);
+		advance();
+	}
+	return result;
+}
+
+void SMTLib2Parser::advance() {
+	if (!m_input.good())
+		throw ParsingException{};
+	m_token = static_cast<char>(m_input.get());
+	if (token() == ';')
+		while (token() != '\n' && token() != 0)
+			m_token = static_cast<char>(m_input.get());
+}
+
+void SMTLib2Parser::skipWhitespace() {
+	while (isWhiteSpace(token()))
+		advance();
+}
diff --git a/libsmtutil/SMTLib2Parser.h b/libsmtutil/SMTLib2Parser.h
new file mode 100644
index 0000000000..48eb76a137
--- /dev/null
+++ b/libsmtutil/SMTLib2Parser.h
@@ -0,0 +1,96 @@
+/*
+	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 <libsmtutil/Exceptions.h>
+
+#include <iostream>
+#include <string>
+#include <variant>
+#include <vector>
+
+/**
+ * The following is a parser for SMT-LIB2 expressions developed originally by @chriseth as part of solsmt.
+ */
+
+namespace solidity::smtutil
+{
+
+struct SMTLib2Expression {
+	using args_t = std::vector<SMTLib2Expression>;
+	std::variant<std::string, args_t> data;
+
+	[[nodiscard]] std::string toString() const;
+};
+
+inline bool isAtom(SMTLib2Expression const& expr)
+{
+	return std::holds_alternative<std::string>(expr.data);
+}
+
+inline std::string const& asAtom(SMTLib2Expression const& expr)
+{
+	smtAssert(isAtom(expr));
+	return std::get<std::string>(expr.data);
+}
+
+inline auto const& asSubExpressions(SMTLib2Expression const& expr)
+{
+	smtAssert(!isAtom(expr));
+	return std::get<SMTLib2Expression::args_t>(expr.data);
+}
+
+inline auto& asSubExpressions(SMTLib2Expression& expr)
+{
+	smtAssert(!isAtom(expr));
+	return std::get<SMTLib2Expression::args_t>(expr.data);
+}
+
+class SMTLib2Parser {
+public:
+	class ParsingException {};
+
+	explicit SMTLib2Parser(std::istream& _input) :
+			m_input(_input),
+			m_token(static_cast<char>(m_input.get())) {}
+
+	SMTLib2Expression parseExpression();
+
+	bool isEOF()
+	{
+		skipWhitespace();
+		return m_input.eof();
+	}
+
+private:
+	std::string parseToken();
+
+	void skipWhitespace();
+
+	[[nodiscard]] char token() const
+	{
+		return m_token;
+	}
+
+	void advance();
+
+	std::istream& m_input;
+	char m_token = 0;
+};
+}

From eb118198169796ea3c5b40999a72d7513942da3e Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 13 Mar 2024 19:37:46 +0100
Subject: [PATCH 0829/1140] SMTChecker: Instruct Eldarica to produce invariants
 if requested

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

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 514f3a5547..2d1fd10743 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -659,7 +659,7 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 			m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
 			if (auto* universalCallback = m_readFile.target<frontend::UniversalCallback>())
 				if (m_modelCheckerSettings.solvers.eld)
-					universalCallback->smtCommand().setEldarica(m_modelCheckerSettings.timeout);
+					universalCallback->smtCommand().setEldarica(m_modelCheckerSettings.timeout, m_modelCheckerSettings.invariants != ModelCheckerInvariants::None());
 		}
 
 		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 8ef36cb751..7d814cd9c3 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -37,7 +37,7 @@ using solidity::util::errinfo_comment;
 namespace solidity::frontend
 {
 
-void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMilliseconds)
+void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMilliseconds, bool computeInvariants)
 {
 	m_arguments.clear();
 	m_solverCmd = "eld";
@@ -47,6 +47,8 @@ void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMillisec
 		timeoutInSeconds = timeoutInSeconds == 0 ? 1 : timeoutInSeconds;
 		m_arguments.push_back("-t:" + std::to_string(timeoutInSeconds));
 	}
+	if (computeInvariants)
+		m_arguments.emplace_back("-ssol");
 }
 
 ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
index 1d1201e490..665c19c1b7 100644
--- a/libsolidity/interface/SMTSolverCommand.h
+++ b/libsolidity/interface/SMTSolverCommand.h
@@ -36,7 +36,7 @@ class SMTSolverCommand
 		return [this](std::string const& _kind, std::string const& _query) { return solve(_kind, _query); };
 	}
 
-	void setEldarica(std::optional<unsigned int> timeoutInMilliseconds);
+	void setEldarica(std::optional<unsigned int> timeoutInMilliseconds, bool computeInvariants);
 
 private:
 	/// The name of the solver's binary.

From 1fcaec5ddce3dc45fd62867a21cd9d97b7ff4db9 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 16 Apr 2024 13:24:19 +0200
Subject: [PATCH 0830/1140] SMTChecker: Remember sorts already in
 SMTLibInterface

---
 libsmtutil/CHCSmtLib2Interface.cpp | 20 +++++++-------------
 libsmtutil/CHCSmtLib2Interface.h   |  6 +++---
 libsmtutil/SMTLib2Interface.cpp    | 30 +++++++++++++++++++-----------
 libsmtutil/SMTLib2Interface.h      |  9 ++++++++-
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index ac906e301a..7e643abac8 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -56,7 +56,7 @@ void CHCSmtLib2Interface::reset()
 	m_accumulatedOutput.clear();
 	m_variables.clear();
 	m_unhandledQueries.clear();
-	m_sortNames.clear();
+	m_smtlib2->reset();
 }
 
 void CHCSmtLib2Interface::registerRelation(Expression const& _expr)
@@ -115,24 +115,18 @@ void CHCSmtLib2Interface::declareVariable(std::string const& _name, SortPointer
 	else if (!m_variables.count(_name))
 	{
 		m_variables.insert(_name);
-		write("(declare-var |" + _name + "| " + toSmtLibSort(*_sort) + ')');
+		write("(declare-var |" + _name + "| " + toSmtLibSort(_sort) + ')');
 	}
 }
 
-std::string CHCSmtLib2Interface::toSmtLibSort(Sort const& _sort)
+std::string CHCSmtLib2Interface::toSmtLibSort(SortPointer _sort)
 {
-	if (!m_sortNames.count(&_sort))
-		m_sortNames[&_sort] = m_smtlib2->toSmtLibSort(_sort);
-	return m_sortNames.at(&_sort);
+	return m_smtlib2->toSmtLibSort(_sort);
 }
 
 std::string CHCSmtLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
 {
-	std::string ssort("(");
-	for (auto const& sort: _sorts)
-		ssort += toSmtLibSort(*sort) + " ";
-	ssort += ")";
-	return ssort;
+	return m_smtlib2->toSmtLibSort(_sorts);
 }
 
 std::string CHCSmtLib2Interface::forall()
@@ -142,7 +136,7 @@ std::string CHCSmtLib2Interface::forall()
 	{
 		solAssert(sort, "");
 		if (sort->kind != Kind::Function)
-			vars += " (" + name + " " + toSmtLibSort(*sort) + ")";
+			vars += " (" + name + " " + toSmtLibSort(sort) + ")";
 	}
 	vars += ")";
 	return vars;
@@ -158,7 +152,7 @@ void CHCSmtLib2Interface::declareFunction(std::string const& _name, SortPointer
 		auto fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
 		smtAssert(fSort->codomain);
 		std::string domain = toSmtLibSort(fSort->domain);
-		std::string codomain = toSmtLibSort(*fSort->codomain);
+		std::string codomain = toSmtLibSort(fSort->codomain);
 		m_variables.insert(_name);
 		write(
 			"(declare-fun |" +
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index 0f3a68ee40..b133c485e0 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -57,8 +57,10 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	SMTLib2Interface* smtlib2Interface() const { return m_smtlib2.get(); }
 
+	auto const& sortNames() const { return m_smtlib2->sortNames(); }
+
 private:
-	std::string toSmtLibSort(Sort const& _sort);
+	std::string toSmtLibSort(SortPointer _sort);
 	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
 
 	void writeHeader();
@@ -85,8 +87,6 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	frontend::ReadCallback::Callback m_smtCallback;
 	SMTSolverChoice m_enabledSolvers;
-
-	std::map<Sort const*, std::string> m_sortNames;
 };
 
 }
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index ac5645bf12..12469a4ae0 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -56,6 +56,7 @@ void SMTLib2Interface::reset()
 	m_accumulatedOutput.emplace_back();
 	m_variables.clear();
 	m_userSorts.clear();
+	m_sortNames.clear();
 	write("(set-option :produce-models true)");
 	if (m_queryTimeout)
 		write("(set-option :timeout " + std::to_string(*m_queryTimeout) + ")");
@@ -81,7 +82,7 @@ void SMTLib2Interface::declareVariable(std::string const& _name, SortPointer con
 	else if (!m_variables.count(_name))
 	{
 		m_variables.emplace(_name, _sort);
-		write("(declare-fun |" + _name + "| () " + toSmtLibSort(*_sort) + ')');
+		write("(declare-fun |" + _name + "| () " + toSmtLibSort(_sort) + ')');
 	}
 }
 
@@ -94,7 +95,7 @@ void SMTLib2Interface::declareFunction(std::string const& _name, SortPointer con
 	{
 		auto const& fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
 		std::string domain = toSmtLibSort(fSort->domain);
-		std::string codomain = toSmtLibSort(*fSort->codomain);
+		std::string codomain = toSmtLibSort(fSort->codomain);
 		m_variables.emplace(_name, _sort);
 		write(
 			"(declare-fun |" +
@@ -183,7 +184,7 @@ std::string SMTLib2Interface::toSExpr(Expression const& _expr)
 		smtAssert(sortSort, "");
 		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
 		smtAssert(arraySort, "");
-		sexpr += "(as const " + toSmtLibSort(*arraySort) + ") ";
+		sexpr += "(as const " + toSmtLibSort(arraySort) + ") ";
 		sexpr += toSExpr(_expr.arguments.at(1));
 	}
 	else if (_expr.name == "tuple_get")
@@ -212,25 +213,32 @@ std::string SMTLib2Interface::toSExpr(Expression const& _expr)
 	return sexpr;
 }
 
-std::string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
+std::string SMTLib2Interface::toSmtLibSort(solidity::smtutil::SortPointer _sort)
 {
-	switch (_sort.kind)
+	if (!m_sortNames.count(_sort))
+		m_sortNames[_sort] = toSmtLibSortInternal(_sort);
+	return m_sortNames.at(_sort);
+}
+
+std::string SMTLib2Interface::toSmtLibSortInternal(SortPointer _sort)
+{
+	switch (_sort->kind)
 	{
 	case Kind::Int:
 		return "Int";
 	case Kind::Bool:
 		return "Bool";
 	case Kind::BitVector:
-		return "(_ BitVec " + std::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);
+		auto const& arraySort = dynamic_cast<ArraySort const&>(*_sort);
 		smtAssert(arraySort.domain && arraySort.range, "");
-		return "(Array " + toSmtLibSort(*arraySort.domain) + ' ' + toSmtLibSort(*arraySort.range) + ')';
+		return "(Array " + toSmtLibSort(arraySort.domain) + ' ' + toSmtLibSort(arraySort.range) + ')';
 	}
 	case Kind::Tuple:
 	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
+		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_sort);
 		std::string tupleName = "|" + tupleSort.name + "|";
 		auto isName = [&](auto entry) { return entry.first == tupleName; };
 		if (ranges::find_if(m_userSorts, isName) == m_userSorts.end())
@@ -238,7 +246,7 @@ std::string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
 			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)) + ")";
+				decl += " (|" + tupleSort.members.at(i) + "| " + toSmtLibSort(tupleSort.components.at(i)) + ")";
 			decl += "))))";
 			m_userSorts.emplace_back(tupleName, decl);
 			write(decl);
@@ -255,7 +263,7 @@ std::string SMTLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sort
 {
 	std::string ssort("(");
 	for (auto const& sort: _sorts)
-		ssort += toSmtLibSort(*sort) + " ";
+		ssort += toSmtLibSort(sort) + " ";
 	ssort += ")";
 	return ssort;
 }
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
index 9ef8e94a8c..fbfde664d5 100644
--- a/libsmtutil/SMTLib2Interface.h
+++ b/libsmtutil/SMTLib2Interface.h
@@ -61,12 +61,13 @@ class SMTLib2Interface: public SolverInterface
 
 	// Used by CHCSmtLib2Interface
 	std::string toSExpr(Expression const& _expr);
-	std::string toSmtLibSort(Sort const& _sort);
+	std::string toSmtLibSort(SortPointer _sort);
 	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
 
 	std::map<std::string, SortPointer> variables() { return m_variables; }
 
 	std::vector<std::pair<std::string, std::string>> const& userSorts() const { return m_userSorts; }
+	std::map<SortPointer, std::string> const& sortNames() const { return m_sortNames; }
 
 	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
 
@@ -81,6 +82,8 @@ class SMTLib2Interface: public SolverInterface
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
 	std::string querySolver(std::string const& _input);
 
+	std::string toSmtLibSortInternal(SortPointer _sort);
+
 	std::vector<std::string> m_accumulatedOutput;
 	std::map<std::string, SortPointer> m_variables;
 
@@ -90,6 +93,10 @@ class SMTLib2Interface: public SolverInterface
 	/// otherwise solvers cannot parse the queries.
 	std::vector<std::pair<std::string, std::string>> m_userSorts;
 
+	/// Maps a user sort to SMT-LIB2 sort.
+	/// Remembers all declared sorts and is used as a cache as well.
+	std::map<SortPointer, std::string> m_sortNames;
+
 	std::map<util::h256, std::string> m_queryResponses;
 	std::vector<std::string> m_unhandledQueries;
 

From 384f005071afe0da2e209246ee74bc20ed2cdc89 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 16 Apr 2024 13:52:22 +0200
Subject: [PATCH 0831/1140] SMTChecker: Support retrieving invariants from
 Eldarica

We add support for parsing CHC solver response containing a model, i.e.,
invariants. We utilise our SMT parser to build S-expression
representation which we then interpret using the context we remembered
while building the query.  We have to rememeber all predicates declared
to the solver, and, consequently, all sorts we have declared to the
solver.
---
 libsmtutil/CHCSmtLib2Interface.cpp | 284 ++++++++++++++++++++++++++++-
 libsmtutil/CHCSmtLib2Interface.h   |   3 +
 2 files changed, 286 insertions(+), 1 deletion(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 7e643abac8..671ec9b51d 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -18,11 +18,17 @@
 
 #include <libsmtutil/CHCSmtLib2Interface.h>
 
+#include <libsmtutil/SMTLib2Parser.h>
+
 #include <libsolutil/Keccak256.h>
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <range/v3/algorithm/find_if.hpp>
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view.hpp>
 
 #include <array>
@@ -96,7 +102,10 @@ std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Inte
 	CheckResult result;
 	// TODO proper parsing
 	if (boost::starts_with(response, "sat"))
-		result = CheckResult::UNSATISFIABLE;
+	{
+		auto maybeInvariants = invariantsFromSolverResponse(response);
+		return {CheckResult::UNSATISFIABLE, maybeInvariants.value_or(Expression(true)), {}};
+	}
 	else if (boost::starts_with(response, "unsat"))
 		result = CheckResult::SATISFIABLE;
 	else if (boost::starts_with(response, "unknown"))
@@ -217,3 +226,276 @@ std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
 std::string CHCSmtLib2Interface::createQueryAssertion(std::string name) {
 	return "(assert\n(forall " + forall() + "\n" + "(=> " + name + " false)))";
 }
+
+class SMTLibTranslationContext
+{
+	CHCSmtLib2Interface const& m_chcInterface;
+	std::map<std::string, SortPointer> m_knownVariables;
+
+	static bool isNumber(std::string const& _expr)
+	{
+		return ranges::all_of(_expr, [](char c) { return isDigit(c) || c == '.'; });
+	}
+
+
+public:
+	explicit SMTLibTranslationContext(CHCSmtLib2Interface const& _chcInterface) : m_chcInterface(_chcInterface)
+	{
+		// fill user defined sorts and constructors
+		auto const& userSorts = m_chcInterface.smtlib2Interface()->userSorts();
+		for (auto const& declaration: userSorts | ranges::views::values)
+		{
+			std::stringstream ss(declaration);
+			SMTLib2Parser parser(ss);
+			auto expr = parser.parseExpression();
+			smtAssert(parser.isEOF());
+			smtAssert(!isAtom(expr));
+			auto const& args = asSubExpressions(expr);
+			smtAssert(args.size() == 3);
+			smtAssert(isAtom(args[0]) && asAtom(args[0]) == "declare-datatypes");
+			// args[1] is the name of the type
+			// args[2] is the constructor with the members
+			smtAssert(!isAtom(args[2]) && asSubExpressions(args[2]).size() == 1 && !isAtom(asSubExpressions(args[2])[0]));
+			auto const& constructors = asSubExpressions(asSubExpressions(args[2])[0]);
+			smtAssert(constructors.size() == 1);
+			auto const& constructor = constructors[0];
+			// constructor is a list: name + members
+			smtAssert(!isAtom(constructor));
+			auto const& constructorArgs = asSubExpressions(constructor);
+			for (unsigned i = 1u; i < constructorArgs.size(); ++i)
+			{
+				auto const& carg = constructorArgs[i];
+				smtAssert(!isAtom(carg) && asSubExpressions(carg).size() == 2);
+				auto const& nameSortPair = asSubExpressions(carg);
+				m_knownVariables.emplace(asAtom(nameSortPair[0]), toSort(nameSortPair[1]));
+			}
+		}
+	}
+
+	void addVariableDeclaration(std::string name, SortPointer sort)
+	{
+		smtAssert(m_knownVariables.find(name) == m_knownVariables.end());
+		m_knownVariables.emplace(std::move(name), std::move(sort));
+	}
+
+	std::optional<SortPointer> lookupKnownTupleSort(std::string const& name) {
+		auto const& userSorts = m_chcInterface.sortNames();
+		std::string quotedName = "|" + name + "|";
+		auto it = ranges::find_if(userSorts, [&](auto const& entry) { return entry.second == quotedName; });
+		if (it != userSorts.end() && it->first->kind == Kind::Tuple)
+		{
+			auto tupleSort = std::dynamic_pointer_cast<TupleSort>(it->first);
+			smtAssert(tupleSort);
+			return tupleSort;
+		}
+		return {};
+	}
+
+	SortPointer toSort(SMTLib2Expression const& expr)
+	{
+		if (isAtom(expr))
+		{
+			auto const& name = asAtom(expr);
+			if (name == "Int")
+				return SortProvider::sintSort;
+			if (name == "Bool")
+				return SortProvider::boolSort;
+			auto tupleSort = lookupKnownTupleSort(name);
+			if (tupleSort)
+				return tupleSort.value();
+		} else {
+			auto const& args = asSubExpressions(expr);
+			if (asAtom(args[0]) == "Array")
+			{
+				smtAssert(args.size() == 3);
+				auto domainSort = toSort(args[1]);
+				auto codomainSort = toSort(args[2]);
+				return std::make_shared<ArraySort>(std::move(domainSort), std::move(codomainSort));
+			}
+			if (args.size() == 3 && isAtom(args[0]) && asAtom(args[0]) == "_" && isAtom(args[1]) && asAtom(args[1]) == "int2bv")
+				return std::make_shared<BitVectorSort>(std::stoul(asAtom(args[2])));
+		}
+		smtAssert(false, "Unknown sort encountered");
+	}
+
+	smtutil::Expression parseQuantifier(
+		std::string const& quantifierName,
+		std::vector<SMTLib2Expression> const& varList,
+		SMTLib2Expression const& coreExpression
+	)
+	{
+		std::vector<std::pair<std::string, SortPointer>> boundVariables;
+		for (auto const& sortedVar: varList)
+		{
+			smtAssert(!isAtom(sortedVar));
+			auto varSortPair = asSubExpressions(sortedVar);
+			smtAssert(varSortPair.size() == 2);
+			boundVariables.emplace_back(asAtom(varSortPair[0]), toSort(varSortPair[1]));
+		}
+		for (auto const& [var, sort] : boundVariables)
+		{
+			smtAssert(m_knownVariables.find(var) == m_knownVariables.end()); // TODO: deal with shadowing?
+			m_knownVariables.emplace(var, sort);
+		}
+		auto core = toSMTUtilExpression(coreExpression);
+		for (auto const& [var, sort] : boundVariables)
+		{
+			smtAssert(m_knownVariables.find(var) != m_knownVariables.end());
+			m_knownVariables.erase(var);
+		}
+		return Expression(quantifierName, {core}, SortProvider::boolSort); // TODO: what about the bound variables?
+
+	}
+
+	smtutil::Expression toSMTUtilExpression(SMTLib2Expression const& _expr)
+	{
+		return std::visit(
+			GenericVisitor{
+				[&](std::string const& _atom)
+				{
+					if (_atom == "true" || _atom == "false")
+						return smtutil::Expression(_atom == "true");
+					else if (isNumber(_atom))
+						return smtutil::Expression(_atom, {}, SortProvider::sintSort);
+					else if (auto it = m_knownVariables.find(_atom); it != m_knownVariables.end())
+						return smtutil::Expression(_atom, {}, it->second);
+					else // assume this is a predicate with sort bool; TODO: Context should be aware of predicates!
+						return smtutil::Expression(_atom, {}, SortProvider::boolSort);
+				},
+				[&](std::vector<SMTLib2Expression> const& _subExpr)
+				{
+					SortPointer sort;
+					std::vector<smtutil::Expression> arguments;
+					if (isAtom(_subExpr.front()))
+					{
+						std::string const& op = asAtom(_subExpr.front());
+						if (op == "!")
+						{
+							// named term, we ignore the name
+							smtAssert(_subExpr.size() > 2);
+							return toSMTUtilExpression(_subExpr[1]);
+						}
+						if (op == "exists" || op == "forall")
+						{
+							smtAssert(_subExpr.size() == 3);
+							smtAssert(!isAtom(_subExpr[1]));
+							return parseQuantifier(op, asSubExpressions(_subExpr[1]), _subExpr[2]);
+						}
+						for (size_t i = 1; i < _subExpr.size(); i++)
+							arguments.emplace_back(toSMTUtilExpression(_subExpr[i]));
+						if (auto tupleSort = lookupKnownTupleSort(op); tupleSort)
+						{
+							auto sortSort = std::make_shared<SortSort>(tupleSort.value());
+							return Expression::tuple_constructor(Expression(sortSort), arguments);
+						}
+						if (auto it = m_knownVariables.find(op); it != m_knownVariables.end())
+							return smtutil::Expression(op, std::move(arguments), it->second);
+						else
+						{
+							std::set<std::string>
+								boolOperators{"and", "or", "not", "=", "<", ">", "<=", ">=", "=>"};
+							sort = contains(boolOperators, op) ? SortProvider::boolSort : arguments.back().sort;
+							return smtutil::Expression(op, std::move(arguments), std::move(sort));
+						}
+						smtAssert(false, "Unhandled case in expression conversion");
+					}
+					else
+					{
+						// check for const array
+						if (_subExpr.size() == 2 and !isAtom(_subExpr[0]))
+						{
+							auto const& typeArgs = asSubExpressions(_subExpr.front());
+							if (typeArgs.size() == 3 && typeArgs[0].toString() == "as"
+								&& typeArgs[1].toString() == "const")
+							{
+								auto arraySort = toSort(typeArgs[2]);
+								auto sortSort = std::make_shared<SortSort>(arraySort);
+								return smtutil::Expression::
+									const_array(Expression(sortSort), toSMTUtilExpression(_subExpr[1]));
+							}
+							if (typeArgs.size() == 3 && typeArgs[0].toString() == "_"
+								&& typeArgs[1].toString() == "int2bv")
+							{
+								auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(toSort(_subExpr[0]));
+								smtAssert(bvSort);
+								return smtutil::Expression::int2bv(toSMTUtilExpression(_subExpr[1]), bvSort->size);
+							}
+							if (typeArgs.size() == 4 && typeArgs[0].toString() == "_"
+								&& typeArgs[1].toString() == "extract")
+								return smtutil::Expression(
+									"extract",
+									{toSMTUtilExpression(typeArgs[2]), toSMTUtilExpression(typeArgs[3])},
+									SortProvider::bitVectorSort // TODO: Compute bit size properly?
+								);
+						}
+						smtAssert(false, "Unhandled case in expression conversion");
+					}
+				}
+			},
+			_expr.data
+		);
+	}
+};
+
+
+#define precondition(CONDITION) if (!(CONDITION)) return {}
+std::optional<smtutil::Expression> CHCSmtLib2Interface::invariantsFromSolverResponse(std::string const& _response) const
+{
+	std::stringstream ss(_response);
+	std::string answer;
+	ss >> answer;
+	precondition(answer == "sat");
+	SMTLib2Parser parser(ss);
+	precondition(!parser.isEOF()); // There has to be a model
+	std::vector<SMTLib2Expression> parsedOutput;
+	try
+	{
+		while (!parser.isEOF())
+			parsedOutput.push_back(parser.parseExpression());
+	}
+	catch(SMTLib2Parser::ParsingException&)
+	{
+		return {};
+	}
+	smtAssert(parser.isEOF());
+	precondition(!parsedOutput.empty());
+	auto& commands = parsedOutput.size() == 1 ? asSubExpressions(parsedOutput[0]) : parsedOutput;
+	std::vector<Expression> definitions;
+	for (auto& command: commands)
+	{
+		auto& args = asSubExpressions(command);
+		precondition(args.size() == 5);
+		// args[0] = "define-fun"
+		// args[1] = predicate name
+		// args[2] = formal arguments of the predicate
+		// args[3] = return sort
+		// args[4] = body of the predicate's interpretation
+		precondition(isAtom(args[0]) && asAtom(args[0]) == "define-fun");
+		precondition(isAtom(args[1]));
+		precondition(!isAtom(args[2]));
+		precondition(isAtom(args[3]) && asAtom(args[3]) == "Bool");
+		auto& interpretation = args[4];
+//		inlineLetExpressions(interpretation);
+		SMTLibTranslationContext context(*this);
+		auto const& formalArguments = asSubExpressions(args[2]);
+		std::vector<Expression> predicateArgs;
+		for (auto const& formalArgument: formalArguments)
+		{
+			precondition(!isAtom(formalArgument));
+			auto const& nameSortPair = asSubExpressions(formalArgument);
+			precondition(nameSortPair.size() == 2);
+			precondition(isAtom(nameSortPair[0]));
+			SortPointer varSort = context.toSort(nameSortPair[1]);
+			context.addVariableDeclaration(asAtom(nameSortPair[0]), varSort);
+			Expression arg = context.toSMTUtilExpression(nameSortPair[0]);
+			predicateArgs.push_back(arg);
+		}
+
+		auto parsedInterpretation = context.toSMTUtilExpression(interpretation);
+
+		Expression predicate(asAtom(args[1]), predicateArgs, SortProvider::boolSort);
+		definitions.push_back(predicate == parsedInterpretation);
+	}
+	return Expression::mkAnd(std::move(definitions));
+}
+#undef precondition
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index b133c485e0..f7f656fd0b 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -76,6 +76,9 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
 	std::string querySolver(std::string const& _input);
 
+	/// Translates CHC solver response with a model to our representation of invariants. Returns None on error.
+	std::optional<smtutil::Expression> invariantsFromSolverResponse(std::string const& response) const;
+
 	/// Used to access toSmtLibSort, SExpr, and handle variables.
 	std::unique_ptr<SMTLib2Interface> m_smtlib2;
 

From 048ce0b19dc488ad10ac3eb1419f29edfb5e153b Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 16 Apr 2024 15:03:25 +0200
Subject: [PATCH 0832/1140] SMTChecker: Add command-line test for invariants
 from Eldarica

---
 .../model_checker_invariants_contract_eld/args            | 1 +
 .../model_checker_invariants_contract_eld/err             | 4 ++++
 .../model_checker_invariants_contract_eld/input.sol       | 8 ++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_eld/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_eld/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_eld/input.sol

diff --git a/test/cmdlineTests/model_checker_invariants_contract_eld/args b/test/cmdlineTests/model_checker_invariants_contract_eld/args
new file mode 100644
index 0000000000..7f2a13bfd8
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_eld/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants contract --model-checker-solvers eld
diff --git a/test/cmdlineTests/model_checker_invariants_contract_eld/err b/test/cmdlineTests/model_checker_invariants_contract_eld/err
new file mode 100644
index 0000000000..29c5a5bc8e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_eld/err
@@ -0,0 +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_eld/input.sol:test:
+(x = 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_eld/input.sol b/test/cmdlineTests/model_checker_invariants_contract_eld/input.sol
new file mode 100644
index 0000000000..4bee228bd6
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_eld/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);
+	}
+}

From 87d86bfba64d8b88537a4a85c1d71f521986b614 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 20 Feb 2024 14:23:58 +0100
Subject: [PATCH 0833/1140] Replace internal JSON library jsoncpp with
 nlohmann::json.

---
 CMakeLists.txt                                |  10 +-
 Changelog.md                                  |   2 +
 cmake/jsoncpp.cmake                           |  72 ---
 cmake/nlohmann-json.cmake                     |  21 +
 libevmasm/AbstractAssemblyStack.h             |   2 +-
 libevmasm/Assembly.cpp                        | 117 ++--
 libevmasm/Assembly.h                          |  11 +-
 libevmasm/EVMAssemblyStack.cpp                |   6 +-
 libevmasm/EVMAssemblyStack.h                  |   4 +-
 libsolidity/ast/AST.h                         |   3 +-
 libsolidity/ast/ASTJsonExporter.cpp           | 223 ++++---
 libsolidity/ast/ASTJsonExporter.h             |  46 +-
 libsolidity/ast/ASTJsonImporter.cpp           | 402 ++++++------
 libsolidity/ast/ASTJsonImporter.h             | 154 ++---
 libsolidity/codegen/ir/IRGenerationContext.h  |   1 +
 libsolidity/codegen/ir/IRGenerator.cpp        |   3 +-
 libsolidity/codegen/ir/IRGenerator.h          |   4 +-
 .../experimental/codegen/IRGenerator.h        |   2 +-
 libsolidity/formal/BMC.h                      |   1 +
 libsolidity/interface/ABI.cpp                 |  54 +-
 libsolidity/interface/ABI.h                   |   8 +-
 libsolidity/interface/CompilerStack.cpp       |  86 ++-
 libsolidity/interface/CompilerStack.h         |  49 +-
 libsolidity/interface/Natspec.cpp             |  64 +-
 libsolidity/interface/Natspec.h               |  14 +-
 libsolidity/interface/StandardCompiler.cpp    | 611 +++++++++---------
 libsolidity/interface/StandardCompiler.h      |  20 +-
 libsolidity/interface/StorageLayout.cpp       |  22 +-
 libsolidity/interface/StorageLayout.h         |   9 +-
 libsolidity/lsp/DocumentHoverHandler.cpp      |   6 +-
 libsolidity/lsp/DocumentHoverHandler.h        |   2 +-
 libsolidity/lsp/GotoDefinition.cpp            |   6 +-
 libsolidity/lsp/GotoDefinition.h              |   2 +-
 libsolidity/lsp/HandlerBase.cpp               |  11 +-
 libsolidity/lsp/HandlerBase.h                 |   6 +-
 libsolidity/lsp/LanguageServer.cpp            | 273 ++++----
 libsolidity/lsp/LanguageServer.h              |  32 +-
 libsolidity/lsp/RenameSymbol.cpp              |  18 +-
 libsolidity/lsp/RenameSymbol.h                |   2 +-
 libsolidity/lsp/SemanticTokensBuilder.cpp     |  16 +-
 libsolidity/lsp/SemanticTokensBuilder.h       |   6 +-
 libsolidity/lsp/Transport.cpp                 |  29 +-
 libsolidity/lsp/Transport.h                   |  15 +-
 libsolidity/lsp/Utils.cpp                     |  20 +-
 libsolidity/lsp/Utils.h                       |  10 +-
 libsolutil/CMakeLists.txt                     |   2 +-
 libsolutil/Exceptions.h                       |   1 +
 libsolutil/JSON.cpp                           | 248 ++++---
 libsolutil/JSON.h                             |  98 ++-
 libyul/AsmJsonConverter.cpp                   |  84 ++-
 libyul/AsmJsonConverter.h                     |  42 +-
 libyul/AsmJsonImporter.cpp                    |  98 +--
 libyul/AsmJsonImporter.h                      |  48 +-
 libyul/Object.cpp                             |  14 +-
 libyul/Object.h                               |   8 +-
 libyul/YulStack.cpp                           |   2 +-
 libyul/YulStack.h                             |   5 +-
 libyul/backends/evm/StackLayoutGenerator.cpp  |   2 +-
 solc/CommandLineInterface.cpp                 |  78 +--
 solc/CommandLineInterface.h                   |   2 +-
 test/Metadata.cpp                             |  28 +-
 test/Metadata.h                               |   2 +-
 .../standard_import_with_comments/input.json  |  95 +++
 .../standard_import_with_comments/output.json |  97 +++
 .../input.json                                |  85 +++
 .../output.json                               |  97 +++
 .../input.json                                |  29 +
 .../output.json                               |  12 +
 .../standard_non_utf8_filename/input.json     |  17 +
 .../standard_non_utf8_filename/output.json    |  12 +
 .../standard_non_utf8_filename2/input.json    |  17 +
 .../standard_non_utf8_filename2/output.json   |  12 +
 .../standard_raw_utf16_filename/input.json    | Bin 0 -> 297 bytes
 .../standard_raw_utf16_filename/output.json   |  12 +
 test/libevmasm/Assembler.cpp                  |   2 +-
 test/libsolidity/ASTPropertyTest.cpp          |  36 +-
 test/libsolidity/ASTPropertyTest.h            |   2 +-
 test/libsolidity/GasTest.cpp                  |  18 +-
 test/libsolidity/LibSolc.cpp                  |  32 +-
 test/libsolidity/Metadata.cpp                 |  56 +-
 test/libsolidity/NatspecJSONTest.cpp          |   4 +-
 test/libsolidity/NatspecJSONTest.h            |   2 +-
 test/libsolidity/SemanticTest.cpp             |   2 +-
 test/libsolidity/StandardCompiler.cpp         | 610 ++++++++---------
 test/libsolidity/util/ContractABIUtils.cpp    |  16 +-
 test/libsolidity/util/ContractABIUtils.h      |   7 +-
 test/libsolidity/util/TestFunctionCall.cpp    |   2 +-
 test/libsolidity/util/TestFunctionCall.h      |   6 +-
 test/libsolutil/JSON.cpp                      | 278 ++++----
 test/solc/CommandLineInterface.cpp            |  11 +-
 test/tools/fuzzer_common.cpp                  |  18 +-
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |   6 +-
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |   4 +-
 test/yulPhaser/Program.cpp                    |   2 +-
 tools/yulPhaser/Program.cpp                   |   2 +-
 95 files changed, 2734 insertions(+), 2104 deletions(-)
 delete mode 100644 cmake/jsoncpp.cmake
 create mode 100644 cmake/nlohmann-json.cmake
 create mode 100644 test/cmdlineTests/standard_import_with_comments/input.json
 create mode 100644 test/cmdlineTests/standard_import_with_comments/output.json
 create mode 100644 test/cmdlineTests/standard_import_with_comments_simple/input.json
 create mode 100644 test/cmdlineTests/standard_import_with_comments_simple/output.json
 create mode 100644 test/cmdlineTests/standard_import_with_invalid_utf8/input.json
 create mode 100644 test/cmdlineTests/standard_import_with_invalid_utf8/output.json
 create mode 100644 test/cmdlineTests/standard_non_utf8_filename/input.json
 create mode 100644 test/cmdlineTests/standard_non_utf8_filename/output.json
 create mode 100644 test/cmdlineTests/standard_non_utf8_filename2/input.json
 create mode 100644 test/cmdlineTests/standard_non_utf8_filename2/output.json
 create mode 100644 test/cmdlineTests/standard_raw_utf16_filename/input.json
 create mode 100644 test/cmdlineTests/standard_raw_utf16_filename/output.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9f2ddc36c..3e2332b922 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warni
 option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
-option(STRICT_JSONCPP_VERSION "Strictly check installed jsoncpp version" ON)
+option(STRICT_NLOHMANN_JSON_VERSION "Strictly check installed nlohmann json version" ON)
 
 # Setup cccache.
 include(EthCcache)
@@ -48,9 +48,8 @@ include(EthCcache)
 include(EthDependencies)
 if (NOT USE_SYSTEM_LIBRARIES)
   include(fmtlib)
-  include(jsoncpp)
+  include(nlohmann-json)
   include(range-v3)
-  include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
 endif()
 
 find_package(Threads)
@@ -63,8 +62,8 @@ if (PROFILE_OPTIMIZER_STEPS)
     add_definitions(-DPROFILE_OPTIMIZER_STEPS)
 endif()
 
-if (STRICT_JSONCPP_VERSION)
-	add_definitions(-DSTRICT_JSONCPP_VERSION_CHECK)
+if (STRICT_NLOHMANN_JSON_VERSION)
+	add_definitions(-DSTRICT_NLOHMANN_JSON_VERSION_CHECK)
 endif()
 
 # Figure out what compiler and system are we using
@@ -162,4 +161,3 @@ if (NOT ONLY_BUILD_SOLIDITY_LIBRARIES)
 		add_subdirectory(test)
 	endif()
 endif()
-
diff --git a/Changelog.md b/Changelog.md
index c118e9f248..0f26cacfc9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,6 +32,8 @@ Bugfixes:
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
  * SMTChecker: Run Eldarica only when explicitly requested with `--model-checker-solvers eld`, even when it is present on the system.
 
+Build System:
+ * Replace internal JSON library jsoncpp with nlohmann::json.
 
 ### 0.8.24 (2024-01-25)
 
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
deleted file mode 100644
index c47c2697a3..0000000000
--- a/cmake/jsoncpp.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-include(ExternalProject)
-
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-    set(JSONCPP_CMAKE_COMMAND emcmake cmake)
-else()
-    set(JSONCPP_CMAKE_COMMAND ${CMAKE_COMMAND})
-endif()
-
-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")
-
-# TODO: Investigate why this breaks some emscripten builds and
-# check whether this can be removed after updating the emscripten
-# versions used in the CI runs.
-if(EMSCRIPTEN)
-    # Do not include all flags in CMAKE_CXX_FLAGS for emscripten,
-    # but only use -std=c++17. Using all flags causes build failures
-    # at the moment.
-    set(JSONCPP_CXX_FLAGS -std=c++17)
-else()
-    # jsoncpp uses implicit casts for comparing integer and
-    # floating point numbers. This causes clang-10 (used by ossfuzz builder)
-    # to error on the implicit conversions. Here, we request jsoncpp
-    # to unconditionally use static casts for these conversions by defining the
-    # JSON_USE_INT64_DOUBLE_CONVERSION preprocessor macro. Doing so,
-    # not only gets rid of the implicit conversion error that clang-10 produces
-    # but also forces safer behavior in general.
-    set(JSONCPP_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSON_USE_INT64_DOUBLE_CONVERSION")
-endif()
-
-set(byproducts "")
-if(CMAKE_VERSION VERSION_GREATER 3.1)
-    set(byproducts BUILD_BYPRODUCTS "${JSONCPP_LIBRARY}")
-endif()
-
-# Propagate CMAKE_MSVC_RUNTIME_LIBRARY on Windows builds, if set.
-if (WIN32 AND POLICY CMP0091 AND CMAKE_MSVC_RUNTIME_LIBRARY)
-    list(APPEND JSONCPP_CMAKE_ARGS "-DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW")
-    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"
-    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
-    CMAKE_COMMAND ${JSONCPP_CMAKE_COMMAND}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-               -DCMAKE_INSTALL_LIBDIR=lib
-               # Build static lib but suitable to be included in a shared lib.
-               -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
-               -DJSONCPP_WITH_EXAMPLE=OFF
-               -DJSONCPP_WITH_TESTS=OFF
-               -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}
-)
-
-# Create jsoncpp imported library
-add_library(jsoncpp STATIC IMPORTED)
-file(MAKE_DIRECTORY ${JSONCPP_INCLUDE_DIR})  # Must exist.
-set_property(TARGET jsoncpp PROPERTY IMPORTED_LOCATION ${JSONCPP_LIBRARY})
-set_property(TARGET jsoncpp PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR})
-set_property(TARGET jsoncpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR})
-add_dependencies(jsoncpp jsoncpp-project)
diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake
new file mode 100644
index 0000000000..02891e6a7b
--- /dev/null
+++ b/cmake/nlohmann-json.cmake
@@ -0,0 +1,21 @@
+include(ExternalProject)
+
+ExternalProject_Add(nlohmann-json-project
+        DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/nlohmann/nlohmann"
+        DOWNLOAD_NAME json.hpp
+        DOWNLOAD_NO_EXTRACT 1
+        URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp
+        URL_HASH SHA256=9bea4c8066ef4a1c206b2be5a36302f8926f7fdc6087af5d20b417d0cf103ea6
+        CMAKE_COMMAND true
+        BUILD_COMMAND true
+        INSTALL_COMMAND true
+)
+
+# Create nlohmann-json imported library
+add_library(nlohmann-json INTERFACE IMPORTED)
+file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/deps/nlohmann)  # Must exist.
+set_target_properties(nlohmann-json PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
+        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES  ${CMAKE_SOURCE_DIR}/deps/nlohmann
+        INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/deps/nlohmann)
+add_dependencies(nlohmann-json nlohmann-json-project)
\ No newline at end of file
diff --git a/libevmasm/AbstractAssemblyStack.h b/libevmasm/AbstractAssemblyStack.h
index 6be78cbc7c..278edf5c27 100644
--- a/libevmasm/AbstractAssemblyStack.h
+++ b/libevmasm/AbstractAssemblyStack.h
@@ -40,7 +40,7 @@ class AbstractAssemblyStack
 	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 Json 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;
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 067e230343..356a2818a4 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -80,10 +80,10 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 	}
 }
 
-void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector<std::string> const& _sourceList)
+void Assembly::importAssemblyItemsFromJSON(Json const& _code, std::vector<std::string> const& _sourceList)
 {
 	solAssert(m_items.empty());
-	solRequire(_code.isArray(), AssemblyImportException, "Supplied JSON is not an array.");
+	solRequire(_code.is_array(), 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));
@@ -98,11 +98,11 @@ void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector
 	}
 }
 
-AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList)
+AssemblyItem Assembly::createAssemblyItemFromJSON(Json const& _json, std::vector<std::string> const& _sourceList)
 {
-	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
+	solRequire(_json.is_object(), 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())
+	for (auto const& [member, _]: _json.items())
 		solRequire(
 			validMembers.count(member),
 			AssemblyImportException,
@@ -124,14 +124,14 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
 
 	SourceLocation location;
-	if (_json.isMember("begin"))
+	if (_json.contains("begin"))
 		location.start = get<int>(_json["begin"]);
-	if (_json.isMember("end"))
+	if (_json.contains("end"))
 		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"], "");
+	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)
 	{
@@ -429,11 +429,11 @@ std::string Assembly::assemblyString(
 	return tmp.str();
 }
 
-Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList) const
+Json Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList) const
 {
-	Json::Value root;
-	root[".code"] = Json::arrayValue;
-	Json::Value& code = root[".code"];
+	Json root;
+	root[".code"] = Json::array();
+	Json& code = root[".code"];
 	for (AssemblyItem const& item: m_items)
 	{
 		int sourceIndex = -1;
@@ -445,7 +445,7 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 		}
 
 		auto [name, data] = item.nameAndData(m_evmVersion);
-		Json::Value jsonItem;
+		Json jsonItem;
 		jsonItem["name"] = name;
 		jsonItem["begin"] = item.location().start;
 		jsonItem["end"] = item.location().end;
@@ -461,32 +461,32 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 		if (!data.empty())
 			jsonItem["value"] = data;
 		jsonItem["source"] = sourceIndex;
-		code.append(std::move(jsonItem));
+		code.emplace_back(std::move(jsonItem));
 
 		if (item.type() == AssemblyItemType::Tag)
 		{
-			Json::Value jumpdest;
+			Json 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(std::move(jumpdest));
+			code.emplace_back(std::move(jumpdest));
 		}
 	}
 	if (_includeSourceList)
 	{
-		root["sourceList"] = Json::arrayValue;
-		Json::Value& jsonSourceList = root["sourceList"];
+		root["sourceList"] = Json::array();
+		Json& jsonSourceList = root["sourceList"];
 		for (auto const& [name, index]: _sourceIndices)
 			jsonSourceList[index] = name;
 	}
 
 	if (!m_data.empty() || !m_subs.empty())
 	{
-		root[".data"] = Json::objectValue;
-		Json::Value& data = root[".data"];
+		root[".data"] = Json::object();
+		Json& data = root[".data"];
 		for (auto const& i: m_data)
 			if (u256(i.first) >= m_subs.size())
 				data[util::toHex(toBigEndian((u256)i.first), util::HexPrefix::DontAdd, util::HexCase::Upper)] = util::toHex(i.second);
@@ -506,110 +506,107 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 }
 
 std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(
-	Json::Value const& _json,
+	Json const& _json,
 	std::vector<std::string> const& _sourceList,
 	size_t _level
 )
 {
-	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
+	solRequire(_json.is_object(), 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())
+	for (auto const& [attribute, _]: _json.items())
 		solRequire(validMembers.count(attribute), AssemblyImportException, "Unknown attribute '" + attribute + "'.");
 
 	if (_level == 0)
 	{
-		if (_json.isMember("sourceList"))
+		if (_json.contains("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.");
+			solRequire(_json["sourceList"].is_array(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
+			for (Json const& sourceName: _json["sourceList"])
+				solRequire(sourceName.is_string(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
 		}
 	}
 	else
 		solRequire(
-			!_json.isMember("sourceList"),
+			!_json.contains("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"))
+	if (_json.contains("sourceList"))
 	{
 		solAssert(_level == 0);
 		solAssert(_sourceList.empty());
-		for (Json::Value const& sourceName: _json["sourceList"])
+		for (Json const& sourceName: _json["sourceList"])
 		{
 			solRequire(
-				std::find(parsedSourceList.begin(), parsedSourceList.end(), sourceName.asString()) == parsedSourceList.end(),
+				std::find(parsedSourceList.begin(), parsedSourceList.end(), sourceName.get<std::string>()) == parsedSourceList.end(),
 				AssemblyImportException,
 				"Items in 'sourceList' array are not unique."
 			);
-			parsedSourceList.emplace_back(sourceName.asString());
+			parsedSourceList.emplace_back(sourceName.get<std::string>());
 		}
 	}
 
-	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.");
+	solRequire(_json.contains(".code"), AssemblyImportException, "Member '.code' is missing.");
+	solRequire(_json[".code"].is_array(), AssemblyImportException, "Member '.code' is not an array.");
+	for (Json const& codeItem: _json[".code"])
+		solRequire(codeItem.is_object(), AssemblyImportException, "The '.code' array contains an item that is not an object.");
 
 	result->importAssemblyItemsFromJSON(_json[".code"], _level == 0 ? parsedSourceList : _sourceList);
 
-	if (_json.isMember(".auxdata"))
+	if (_json.contains(".auxdata"))
 	{
-		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
-		result->m_auxiliaryData = fromHex(_json[".auxdata"].asString());
+		solRequire(_json[".auxdata"].is_string(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
+		result->m_auxiliaryData = fromHex(_json[".auxdata"].get<std::string>());
 		solRequire(!result->m_auxiliaryData.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
 	}
 
-	if (_json.isMember(".data"))
+	if (_json.contains(".data"))
 	{
-		solRequire(_json[".data"].isObject(), AssemblyImportException, "Optional member '.data' is not an object.");
-		Json::Value const& data = _json[".data"];
+		solRequire(_json[".data"].is_object(), AssemblyImportException, "Optional member '.data' is not an object.");
+		Json const& data = _json[".data"];
 		std::map<size_t, std::shared_ptr<Assembly>> subAssemblies;
-		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
+		for (auto const& [key, value] : data.items())
 		{
-			solAssert(dataIter.key().isString());
-			std::string dataItemID = dataIter.key().asString();
-			Json::Value const& dataItem = data[dataItemID];
-			if (dataItem.isString())
+			if (value.is_string())
 			{
 				solRequire(
-					dataItem.asString().empty() || !fromHex(dataItem.asString()).empty(),
+					value.get<std::string>().empty() || !fromHex(value.get<std::string>()).empty(),
 					AssemblyImportException,
-					"The value for key '" + dataItemID + "' inside '.data' is not a valid hexadecimal string."
+					"The value for key '" + key + "' inside '.data' is not a valid hexadecimal string."
 				);
-				result->m_data[h256(fromHex(dataItemID))] = fromHex(dataItem.asString());
+				result->m_data[h256(fromHex(key))] = fromHex(value.get<std::string>());
 			}
-			else if (dataItem.isObject())
+			else if (value.is_object())
 			{
 				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.");
+					int parsedDataItemID = std::stoi(key, nullptr, 16);
+					solRequire(parsedDataItemID >= 0, AssemblyImportException, "The key '" + key + "' 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.");
+					solThrow(AssemblyImportException, "The key '" + key + "' 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.");
+					solThrow(AssemblyImportException, "The key '" + key + "' inside '.data' is out of the supported integer range.");
 				}
 
-				auto [subAssembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
+				auto [subAssembly, emptySourceList] = Assembly::fromJSON(value, _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.");
+				solThrow(AssemblyImportException, "The value of key '" + key + "' inside '.data' is neither a hex string nor an object.");
 		}
 
 		if (!subAssemblies.empty())
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 6e90028256..123d7f3ddd 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -30,11 +30,10 @@
 #include <libsolutil/Common.h>
 #include <libsolutil/Assertions.h>
 #include <libsolutil/Keccak256.h>
+#include <libsolutil/JSON.h>
 
 #include <libsolidity/interface/OptimiserSettings.h>
 
-#include <json/json.h>
-
 #include <iostream>
 #include <sstream>
 #include <memory>
@@ -150,7 +149,7 @@ class Assembly
 	) const;
 
 	/// Create a JSON representation of the assembly.
-	Json::Value assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList = true) const;
+	Json 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().
@@ -163,7 +162,7 @@ class Assembly
 	/// @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,
+		Json const& _json,
 		std::vector<std::string> const& _sourceList = {},
 		size_t _level = 0
 	);
@@ -188,13 +187,13 @@ class Assembly
 	/// 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);
+	void importAssemblyItemsFromJSON(Json 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);
+	AssemblyItem createAssemblyItemFromJSON(Json const& _json, std::vector<std::string> const& _sourceList);
 
 private:
 	bool m_invalid = false;
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
index a06044256f..20605ee354 100644
--- a/libevmasm/EVMAssemblyStack.cpp
+++ b/libevmasm/EVMAssemblyStack.cpp
@@ -36,12 +36,12 @@ namespace solidity::evmasm
 
 void EVMAssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
 {
-	Json::Value assemblyJson;
+	Json assemblyJson;
 	solRequire(jsonParseStrict(_source, assemblyJson), AssemblyImportException, "Could not parse JSON file.");
 	analyze(_sourceName, assemblyJson);
 }
 
-void EVMAssemblyStack::analyze(std::string const& _sourceName, Json::Value const& _assemblyJson)
+void EVMAssemblyStack::analyze(std::string const& _sourceName, Json const& _assemblyJson)
 {
 	solAssert(!m_evmAssembly);
 	m_name = _sourceName;
@@ -99,7 +99,7 @@ std::string const* EVMAssemblyStack::runtimeSourceMapping(std::string const& _co
 	return &m_runtimeSourceMapping;
 }
 
-Json::Value EVMAssemblyStack::assemblyJSON(std::string const& _contractName) const
+Json EVMAssemblyStack::assemblyJSON(std::string const& _contractName) const
 {
 	solAssert(_contractName == m_name);
 	solAssert(m_evmAssembly);
diff --git a/libevmasm/EVMAssemblyStack.h b/libevmasm/EVMAssemblyStack.h
index 7fe77e7d20..f2516c0b8a 100644
--- a/libevmasm/EVMAssemblyStack.h
+++ b/libevmasm/EVMAssemblyStack.h
@@ -43,7 +43,7 @@ class EVMAssemblyStack: public AbstractAssemblyStack
 	/// 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 analyze(std::string const& _sourceName, Json const& _assemblyJson);
 
 	void assemble();
 
@@ -58,7 +58,7 @@ class EVMAssemblyStack: public AbstractAssemblyStack
 	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 Json 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;
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 27926721aa..d8b178377b 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -34,8 +34,7 @@
 #include <libsolutil/FixedHash.h>
 #include <libsolutil/LazyInit.h>
 #include <libsolutil/Visitor.h>
-
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <range/v3/view/subrange.hpp>
 #include <range/v3/view/map.hpp>
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index c54a2d013a..f94b91674b 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -46,12 +46,13 @@
 
 using namespace std::string_literals;
 using namespace solidity::langutil;
+using namespace solidity;
 
 namespace
 {
 
 template<typename V, template<typename> typename C>
-void addIfSet(std::vector<std::pair<std::string, Json::Value>>& _attributes, std::string const& _name, C<V> const& _value)
+void addIfSet(std::vector<std::pair<std::string, Json>>& _attributes, std::string const& _name, C<V> const& _value)
 {
 	if constexpr (std::is_same_v<C<V>, solidity::util::SetOnce<V>>)
 	{
@@ -82,23 +83,23 @@ ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, std::map<std:
 void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
 	std::string const& _nodeName,
-	std::initializer_list<std::pair<std::string, Json::Value>>&& _attributes
+	std::initializer_list<std::pair<std::string, Json>>&& _attributes
 )
 {
 	ASTJsonExporter::setJsonNode(
 		_node,
 		_nodeName,
-		std::vector<std::pair<std::string, Json::Value>>(std::move(_attributes))
+		std::vector<std::pair<std::string, Json>>(std::move(_attributes))
 	);
 }
 
 void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
 	std::string const& _nodeType,
-	std::vector<std::pair<std::string, Json::Value>>&& _attributes
+	std::vector<std::pair<std::string, Json>>&& _attributes
 )
 {
-	m_currentValue = Json::objectValue;
+	m_currentValue = Json::object();
 	m_currentValue["id"] = nodeId(_node);
 	m_currentValue["src"] = sourceLocationToString(_node.location());
 	if (auto const* documented = dynamic_cast<Documented const*>(&_node))
@@ -126,12 +127,12 @@ std::string ASTJsonExporter::sourceLocationToString(SourceLocation const& _locat
 	return std::to_string(_location.start) + ":" + std::to_string(length) + ":" + (sourceIndexOpt.has_value() ? std::to_string(sourceIndexOpt.value()) : "-1");
 }
 
-Json::Value ASTJsonExporter::sourceLocationsToJson(std::vector<SourceLocation> const& _sourceLocations) const
+Json ASTJsonExporter::sourceLocationsToJson(std::vector<SourceLocation> const& _sourceLocations) const
 {
-	Json::Value locations = Json::arrayValue;
+	Json locations = Json::array();
 
 	for (SourceLocation const& location: _sourceLocations)
-		locations.append(sourceLocationToString(location));
+		locations.emplace_back(sourceLocationToString(location));
 
 	return locations;
 }
@@ -141,33 +142,33 @@ std::string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _nam
 	return boost::algorithm::join(_namePath, "."s);
 }
 
-Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)
+Json ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)
 {
-	Json::Value typeDescriptions(Json::objectValue);
-	typeDescriptions["typeString"] = _tp ? Json::Value(_tp->toString(_withoutDataLocation)) : Json::nullValue;
-	typeDescriptions["typeIdentifier"] = _tp ? Json::Value(_tp->identifier()) : Json::nullValue;
+	Json typeDescriptions;
+	typeDescriptions["typeString"] = _tp ? Json(_tp->toString(_withoutDataLocation)) : Json();
+	typeDescriptions["typeIdentifier"] = _tp ? Json(_tp->identifier()) : Json();
 	return typeDescriptions;
 
 }
-Json::Value ASTJsonExporter::typePointerToJson(std::optional<FuncCallArguments> const& _tps)
+Json ASTJsonExporter::typePointerToJson(std::optional<FuncCallArguments> const& _tps)
 {
 	if (_tps)
 	{
-		Json::Value arguments(Json::arrayValue);
+		Json arguments = Json::array();
 		for (auto const& tp: _tps->types)
 			appendMove(arguments, typePointerToJson(tp));
 		return arguments;
 	}
 	else
-		return Json::nullValue;
+		return Json();
 }
 
 void ASTJsonExporter::appendExpressionAttributes(
-	std::vector<std::pair<std::string, Json::Value>>& _attributes,
+	std::vector<std::pair<std::string, Json>>& _attributes,
 	ExpressionAnnotation const& _annotation
 )
 {
-	std::vector<std::pair<std::string, Json::Value>> exprAttributes = {
+	std::vector<std::pair<std::string, Json>> exprAttributes = {
 		std::make_pair("typeDescriptions", typePointerToJson(_annotation.type)),
 		std::make_pair("argumentTypes", typePointerToJson(_annotation.arguments))
 	};
@@ -182,18 +183,18 @@ void ASTJsonExporter::appendExpressionAttributes(
 	_attributes += exprAttributes;
 }
 
-Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
+Json ASTJsonExporter::inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
 {
-	Json::Value tuple(Json::objectValue);
+	Json tuple;
 	tuple["src"] = sourceLocationToString(nativeLocationOf(*_info.first));
 	tuple["declaration"] = idOrNull(_info.second.declaration);
-	tuple["isSlot"] = Json::Value(_info.second.suffix == "slot");
-	tuple["isOffset"] = Json::Value(_info.second.suffix == "offset");
+	tuple["isSlot"] = Json(_info.second.suffix == "slot");
+	tuple["isOffset"] = Json(_info.second.suffix == "offset");
 
 	if (!_info.second.suffix.empty())
-		tuple["suffix"] = Json::Value(_info.second.suffix);
+		tuple["suffix"] = Json(_info.second.suffix);
 
-	tuple["valueSize"] = Json::Value(Json::LargestUInt(_info.second.valueSize));
+	tuple["valueSize"] = Json(static_cast<Json::number_integer_t>(_info.second.valueSize));
 
 	return tuple;
 }
@@ -203,7 +204,7 @@ void ASTJsonExporter::print(std::ostream& _stream, ASTNode const& _node, util::J
 	_stream << util::jsonPrint(toJson(_node), _format);
 }
 
-Json::Value ASTJsonExporter::toJson(ASTNode const& _node)
+Json ASTJsonExporter::toJson(ASTNode const& _node)
 {
 	_node.accept(*this);
 	return util::removeNullMembers(std::move(m_currentValue));
@@ -211,22 +212,22 @@ Json::Value ASTJsonExporter::toJson(ASTNode const& _node)
 
 bool ASTJsonExporter::visit(SourceUnit const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
+	std::vector<std::pair<std::string, Json>> attributes = {
+		std::make_pair("license", _node.licenseString() ? Json(*_node.licenseString()) : Json()),
 		std::make_pair("nodes", toJson(_node.nodes())),
 	};
 
 	if (_node.experimentalSolidity())
-		attributes.emplace_back("experimentalSolidity", Json::Value(_node.experimentalSolidity()));
+		attributes.emplace_back("experimentalSolidity", Json(_node.experimentalSolidity()));
 
 	if (_node.annotation().exportedSymbols.set())
 	{
-		Json::Value exportedSymbols = Json::objectValue;
+		Json exportedSymbols = Json::object();
 		for (auto const& sym: *_node.annotation().exportedSymbols)
 		{
-			exportedSymbols[sym.first] = Json::arrayValue;
+			exportedSymbols[sym.first] = Json::array();
 			for (Declaration const* overload: sym.second)
-				exportedSymbols[sym.first].append(nodeId(*overload));
+				exportedSymbols[sym.first].emplace_back(nodeId(*overload));
 		}
 
 		attributes.emplace_back("exportedSymbols", exportedSymbols);
@@ -241,9 +242,9 @@ bool ASTJsonExporter::visit(SourceUnit const& _node)
 
 bool ASTJsonExporter::visit(PragmaDirective const& _node)
 {
-	Json::Value literals(Json::arrayValue);
+	Json literals = Json::array();
 	for (auto const& literal: _node.literals())
-		literals.append(literal);
+		literals.emplace_back(literal);
 	setJsonNode(_node, "PragmaDirective", {
 		std::make_pair("literals", std::move(literals))
 	});
@@ -252,7 +253,7 @@ bool ASTJsonExporter::visit(PragmaDirective const& _node)
 
 bool ASTJsonExporter::visit(ImportDirective const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("file", _node.path()),
 		std::make_pair("sourceUnit", idOrNull(_node.annotation().sourceUnit)),
 		std::make_pair("scope", idOrNull(_node.scope()))
@@ -261,17 +262,17 @@ bool ASTJsonExporter::visit(ImportDirective const& _node)
 	addIfSet(attributes, "absolutePath", _node.annotation().absolutePath);
 
 	attributes.emplace_back("unitAlias", _node.name());
-	attributes.emplace_back("nameLocation", Json::Value(sourceLocationToString(_node.nameLocation())));
+	attributes.emplace_back("nameLocation", Json(sourceLocationToString(_node.nameLocation())));
 
-	Json::Value symbolAliases(Json::arrayValue);
+	Json symbolAliases = Json::array();
 	for (auto const& symbolAlias: _node.symbolAliases())
 	{
-		Json::Value tuple(Json::objectValue);
+		Json tuple;
 		solAssert(symbolAlias.symbol, "");
 		tuple["foreign"] = toJson(*symbolAlias.symbol);
-		tuple["local"] =  symbolAlias.alias ? Json::Value(*symbolAlias.alias) : Json::nullValue;
+		tuple["local"] =  symbolAlias.alias ? Json(*symbolAlias.alias) : Json();
 		tuple["nameLocation"] = sourceLocationToString(_node.nameLocation());
-		symbolAliases.append(tuple);
+		symbolAliases.emplace_back(tuple);
 	}
 	attributes.emplace_back("symbolAliases", std::move(symbolAliases));
 	setJsonNode(_node, "ImportDirective", std::move(attributes));
@@ -280,10 +281,10 @@ bool ASTJsonExporter::visit(ImportDirective const& _node)
 
 bool ASTJsonExporter::visit(ContractDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		std::make_pair("contractKind", contractKind(_node.contractKind())),
 		std::make_pair("abstract", _node.abstract()),
 		std::make_pair("baseContracts", toJson(_node.baseContracts())),
@@ -303,7 +304,7 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 
 	if (!_node.annotation().internalFunctionIDs.empty())
 	{
-		Json::Value internalFunctionIDs(Json::objectValue);
+		Json internalFunctionIDs;
 		for (auto const& [functionDefinition, internalFunctionID]: _node.annotation().internalFunctionIDs)
 			internalFunctionIDs[std::to_string(functionDefinition->id())] = internalFunctionID;
 		attributes.emplace_back("internalFunctionIDs", std::move(internalFunctionIDs));
@@ -315,10 +316,10 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 
 bool ASTJsonExporter::visit(IdentifierPath const& _node)
 {
-	Json::Value nameLocations = Json::arrayValue;
+	Json nameLocations = Json::array();
 
 	for (SourceLocation location: _node.pathLocations())
-		nameLocations.append(sourceLocationToString(location));
+		nameLocations.emplace_back(sourceLocationToString(location));
 
 	setJsonNode(_node, "IdentifierPath", {
 		std::make_pair("name", namePathToString(_node.path())),
@@ -332,23 +333,23 @@ bool ASTJsonExporter::visit(InheritanceSpecifier const& _node)
 {
 	setJsonNode(_node, "InheritanceSpecifier", {
 		std::make_pair("baseName", toJson(_node.name())),
-		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
+		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json())
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(UsingForDirective const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
+	std::vector<std::pair<std::string, Json>> attributes = {
+		std::make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json())
 	};
 
 	if (_node.usesBraces())
 	{
-		Json::Value functionList;
+		Json functionList = Json::array();
 		for (auto&& [function, op]: _node.functionsAndOperators())
 		{
-			Json::Value functionNode;
+			Json functionNode;
 			if (!op.has_value())
 				functionNode["function"] = toJson(*function);
 			else
@@ -356,7 +357,7 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 				functionNode["definition"] = toJson(*function);
 				functionNode["operator"] = std::string(TokenTraits::toString(*op));
 			}
-			functionList.append(std::move(functionNode));
+			functionList.emplace_back(std::move(functionNode));
 		}
 		attributes.emplace_back("functionList", std::move(functionList));
 	}
@@ -376,10 +377,10 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 
 bool ASTJsonExporter::visit(StructDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
 		std::make_pair("members", toJson(_node.members())),
 		std::make_pair("scope", idOrNull(_node.scope()))
@@ -394,10 +395,10 @@ bool ASTJsonExporter::visit(StructDefinition const& _node)
 
 bool ASTJsonExporter::visit(EnumDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		std::make_pair("members", toJson(_node.members()))
 	};
 
@@ -420,7 +421,7 @@ bool ASTJsonExporter::visit(EnumValue const& _node)
 bool ASTJsonExporter::visit(UserDefinedValueTypeDefinition const& _node)
 {
 	solAssert(_node.underlyingType(), "");
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("name", _node.name()),
 		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 		std::make_pair("underlyingType", toJson(*_node.underlyingType()))
@@ -450,18 +451,18 @@ bool ASTJsonExporter::visit(OverrideSpecifier const& _node)
 
 bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		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("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json()),
 		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("body", _node.isImplemented() ? toJson(_node.body()) : Json()),
 		std::make_pair("implemented", _node.isImplemented()),
 		std::make_pair("scope", idOrNull(_node.scope()))
 	};
@@ -489,7 +490,7 @@ bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 
 bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("name", _node.name()),
 		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 		std::make_pair("typeName", toJson(_node.typeName())),
@@ -497,9 +498,9 @@ bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 		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("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json()),
 		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		std::make_pair("value", _node.value() ? toJson(*_node.value()) : Json::nullValue),
+		std::make_pair("value", _node.value() ? toJson(*_node.value()) : Json()),
 		std::make_pair("scope", idOrNull(_node.scope())),
 		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	};
@@ -517,15 +518,15 @@ bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 
 bool ASTJsonExporter::visit(ModifierDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		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)
+		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json()),
+		std::make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json())
 	};
 	if (!_node.annotation().baseFunctions.empty())
 		attributes.emplace_back(std::make_pair("baseModifiers", getContainerIds(_node.annotation().baseFunctions, true)));
@@ -535,9 +536,9 @@ bool ASTJsonExporter::visit(ModifierDefinition const& _node)
 
 bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes{
+	std::vector<std::pair<std::string, Json>> attributes{
 		std::make_pair("modifierName", toJson(_node.name())),
-		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
+		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json())
 	};
 	if (Declaration const* declaration = _node.name().annotation().referencedDeclaration)
 	{
@@ -553,10 +554,10 @@ bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 bool ASTJsonExporter::visit(EventDefinition const& _node)
 {
 	m_inEvent = true;
-	std::vector<std::pair<std::string, Json::Value>> _attributes = {
+	std::vector<std::pair<std::string, Json>> _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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		std::make_pair("parameters", toJson(_node.parameterList())),
 		std::make_pair("anonymous", _node.isAnonymous())
 	};
@@ -573,10 +574,10 @@ bool ASTJsonExporter::visit(EventDefinition const& _node)
 
 bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> _attributes = {
+	std::vector<std::pair<std::string, Json>> _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("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json()),
 		std::make_pair("parameters", toJson(_node.parameterList()))
 	};
 	if (m_stackState >= CompilerStack::State::AnalysisSuccessful)
@@ -588,7 +589,7 @@ bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 
 bool ASTJsonExporter::visit(ElementaryTypeName const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("name", _node.typeName().toString()),
 		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	};
@@ -648,7 +649,7 @@ bool ASTJsonExporter::visit(ArrayTypeName const& _node)
 
 bool ASTJsonExporter::visit(InlineAssembly const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> externalReferences;
+	std::vector<std::pair<std::string, Json>> externalReferences;
 
 	for (auto const& it: _node.annotation().externalReferences)
 		if (it.first)
@@ -657,26 +658,26 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 				inlineAssemblyIdentifierToJson(it)
 			));
 
-	Json::Value externalReferencesJson = Json::arrayValue;
+	Json externalReferencesJson = Json::array();
 
 	std::sort(externalReferences.begin(), externalReferences.end());
-	for (Json::Value& it: externalReferences | ranges::views::values)
-		externalReferencesJson.append(std::move(it));
+	for (Json& it: externalReferences | ranges::views::values)
+		externalReferencesJson.emplace_back(std::move(it));
 
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("AST", Json::Value(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
+	std::vector<std::pair<std::string, Json>> attributes = {
+		std::make_pair("AST", Json(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())
 	{
-		Json::Value flags(Json::arrayValue);
+		Json flags = Json::array();
 		for (auto const& flag: *_node.flags())
 			if (flag)
-				flags.append(*flag);
+				flags.emplace_back(*flag);
 			else
-				flags.append(Json::nullValue);
+				flags.emplace_back(Json());
 		attributes.emplace_back(std::make_pair("flags", std::move(flags)));
 	}
 	setJsonNode(_node, "InlineAssembly", std::move(attributes));
@@ -743,7 +744,7 @@ bool ASTJsonExporter::visit(WhileStatement const& _node)
 bool ASTJsonExporter::visit(ForStatement const& _node)
 {
 
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
 		std::make_pair("condition", toJsonOrNull(_node.condition())),
 		std::make_pair("loopExpression", toJsonOrNull(_node.loopExpression())),
@@ -802,7 +803,7 @@ bool ASTJsonExporter::visit(RevertStatement const& _node)
 
 bool ASTJsonExporter::visit(VariableDeclarationStatement const& _node)
 {
-	Json::Value varDecs(Json::arrayValue);
+	Json varDecs = Json::array();
 	for (auto const& v: _node.declarations())
 		appendMove(varDecs, idOrNull(v.get()));
 	setJsonNode(_node, "VariableDeclarationStatement", {
@@ -823,7 +824,7 @@ bool ASTJsonExporter::visit(ExpressionStatement const& _node)
 
 bool ASTJsonExporter::visit(Conditional const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("condition", toJson(_node.condition())),
 		std::make_pair("trueExpression", toJson(_node.trueExpression())),
 		std::make_pair("falseExpression", toJson(_node.falseExpression()))
@@ -835,7 +836,7 @@ bool ASTJsonExporter::visit(Conditional const& _node)
 
 bool ASTJsonExporter::visit(Assignment const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("operator", TokenTraits::toString(_node.assignmentOperator())),
 		std::make_pair("leftHandSide", toJson(_node.leftHandSide())),
 		std::make_pair("rightHandSide", toJson(_node.rightHandSide()))
@@ -847,8 +848,8 @@ bool ASTJsonExporter::visit(Assignment const& _node)
 
 bool ASTJsonExporter::visit(TupleExpression const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
-		std::make_pair("isInlineArray", Json::Value(_node.isInlineArray())),
+	std::vector<std::pair<std::string, Json>> attributes = {
+		std::make_pair("isInlineArray", Json(_node.isInlineArray())),
 		std::make_pair("components", toJson(_node.components())),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
@@ -858,7 +859,7 @@ bool ASTJsonExporter::visit(TupleExpression const& _node)
 
 bool ASTJsonExporter::visit(UnaryOperation const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("prefix", _node.isPrefixOperation()),
 		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
 		std::make_pair("subExpression", toJson(_node.subExpression()))
@@ -873,7 +874,7 @@ bool ASTJsonExporter::visit(UnaryOperation const& _node)
 
 bool ASTJsonExporter::visit(BinaryOperation const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
 		std::make_pair("leftExpression", toJson(_node.leftExpression())),
 		std::make_pair("rightExpression", toJson(_node.rightExpression())),
@@ -889,10 +890,10 @@ bool ASTJsonExporter::visit(BinaryOperation const& _node)
 
 bool ASTJsonExporter::visit(FunctionCall const& _node)
 {
-	Json::Value names(Json::arrayValue);
+	Json names = Json::array();
 	for (auto const& name: _node.names())
-		names.append(Json::Value(*name));
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		names.push_back(Json(*name));
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("expression", toJson(_node.expression())),
 		std::make_pair("names", std::move(names)),
 		std::make_pair("nameLocations", sourceLocationsToJson(_node.nameLocations())),
@@ -913,11 +914,11 @@ bool ASTJsonExporter::visit(FunctionCall const& _node)
 
 bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
 {
-	Json::Value names(Json::arrayValue);
+	Json names = Json::array();
 	for (auto const& name: _node.names())
-		names.append(Json::Value(*name));
+		names.emplace_back(Json(*name));
 
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("expression", toJson(_node.expression())),
 		std::make_pair("names", std::move(names)),
 		std::make_pair("options", toJson(_node.options())),
@@ -930,7 +931,7 @@ bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
 
 bool ASTJsonExporter::visit(NewExpression const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("typeName", toJson(_node.typeName()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
@@ -940,9 +941,9 @@ bool ASTJsonExporter::visit(NewExpression const& _node)
 
 bool ASTJsonExporter::visit(MemberAccess const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("memberName", _node.memberName()),
-		std::make_pair("memberLocation", Json::Value(sourceLocationToString(_node.memberLocation()))),
+		std::make_pair("memberLocation", Json(sourceLocationToString(_node.memberLocation()))),
 		std::make_pair("expression", toJson(_node.expression())),
 		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
 	};
@@ -953,7 +954,7 @@ bool ASTJsonExporter::visit(MemberAccess const& _node)
 
 bool ASTJsonExporter::visit(IndexAccess const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("baseExpression", toJson(_node.baseExpression())),
 		std::make_pair("indexExpression", toJsonOrNull(_node.indexExpression())),
 	};
@@ -964,7 +965,7 @@ bool ASTJsonExporter::visit(IndexAccess const& _node)
 
 bool ASTJsonExporter::visit(IndexRangeAccess const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("baseExpression", toJson(_node.baseExpression())),
 		std::make_pair("startExpression", toJsonOrNull(_node.startExpression())),
 		std::make_pair("endExpression", toJsonOrNull(_node.endExpression())),
@@ -976,9 +977,9 @@ bool ASTJsonExporter::visit(IndexRangeAccess const& _node)
 
 bool ASTJsonExporter::visit(Identifier const& _node)
 {
-	Json::Value overloads(Json::arrayValue);
+	Json overloads = Json::array();
 	for (auto const& dec: _node.annotation().overloadedDeclarations)
-		overloads.append(nodeId(*dec));
+		overloads.emplace_back(nodeId(*dec));
 	setJsonNode(_node, "Identifier", {
 		std::make_pair("name", _node.name()),
 		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
@@ -991,7 +992,7 @@ bool ASTJsonExporter::visit(Identifier const& _node)
 
 bool ASTJsonExporter::visit(ElementaryTypeNameExpression const& _node)
 {
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("typeName", toJson(_node.type()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
@@ -1001,19 +1002,19 @@ bool ASTJsonExporter::visit(ElementaryTypeNameExpression const& _node)
 
 bool ASTJsonExporter::visit(Literal const& _node)
 {
-	Json::Value value{_node.value()};
+	Json value = _node.value();
 	if (!util::validateUTF8(_node.value()))
-		value = Json::nullValue;
+		value = Json();
 	Token subdenomination = Token(_node.subDenomination());
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	std::vector<std::pair<std::string, Json>> 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 :
-			Json::Value{TokenTraits::toString(subdenomination)}
+			Json() :
+			Json(TokenTraits::toString(subdenomination))
 		)
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
@@ -1023,16 +1024,14 @@ bool ASTJsonExporter::visit(Literal const& _node)
 
 bool ASTJsonExporter::visit(StructuredDocumentation const& _node)
 {
-	Json::Value text{*_node.text()};
-	std::vector<std::pair<std::string, Json::Value>> attributes = {
+	Json text = *_node.text();
+	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("text", text)
 	};
 	setJsonNode(_node, "StructuredDocumentation", std::move(attributes));
 	return false;
 }
 
-
-
 void ASTJsonExporter::endVisit(EventDefinition const&)
 {
 	m_inEvent = false;
diff --git a/libsolidity/ast/ASTJsonExporter.h b/libsolidity/ast/ASTJsonExporter.h
index ff3b94fa28..c7933120a9 100644
--- a/libsolidity/ast/ASTJsonExporter.h
+++ b/libsolidity/ast/ASTJsonExporter.h
@@ -28,7 +28,6 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <liblangutil/Exceptions.h>
 
-#include <json/json.h>
 #include <libsolutil/JSON.h>
 
 #include <algorithm>
@@ -60,16 +59,16 @@ class ASTJsonExporter: public ASTConstVisitor
 	);
 	/// Output the json representation of the AST to _stream.
 	void print(std::ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format);
-	Json::Value toJson(ASTNode const& _node);
+	Json toJson(ASTNode const& _node);
 	template <class T>
-	Json::Value toJson(std::vector<ASTPointer<T>> const& _nodes)
+	Json toJson(std::vector<ASTPointer<T>> const& _nodes)
 	{
-		Json::Value ret(Json::arrayValue);
+		Json ret = Json::array();
 		for (auto const& n: _nodes)
 			if (n)
 				appendMove(ret, toJson(*n));
 			else
-				ret.append(Json::nullValue);
+				ret.emplace_back(Json());
 		return ret;
 	}
 	bool visit(SourceUnit const& _node) override;
@@ -135,27 +134,27 @@ class ASTJsonExporter: public ASTConstVisitor
 	void setJsonNode(
 		ASTNode const& _node,
 		std::string const& _nodeName,
-		std::initializer_list<std::pair<std::string, Json::Value>>&& _attributes
+		std::initializer_list<std::pair<std::string, Json>>&& _attributes
 	);
 	void setJsonNode(
 		ASTNode const& _node,
 		std::string const& _nodeName,
-		std::vector<std::pair<std::string, Json::Value>>&& _attributes
+		std::vector<std::pair<std::string, Json>>&& _attributes
 	);
 	/// 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;
+	Json sourceLocationsToJson(std::vector<langutil::SourceLocation> const& _sourceLocations) const;
 	static std::string namePathToString(std::vector<ASTString> const& _namePath);
-	static Json::Value idOrNull(ASTNode const* _pt)
+	static Json idOrNull(ASTNode const* _pt)
 	{
-		return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue;
+		return _pt ? Json(nodeId(*_pt)) : Json();
 	}
-	Json::Value toJsonOrNull(ASTNode const* _node)
+	Json toJsonOrNull(ASTNode const* _node)
 	{
-		return _node ? toJson(*_node) : Json::nullValue;
+		return _node ? toJson(*_node) : Json();
 	}
-	Json::Value inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const;
+	Json inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const;
 	static std::string location(VariableDeclaration::Location _location);
 	static std::string contractKind(ContractKind _kind);
 	static std::string functionCallKind(FunctionCallKind _kind);
@@ -167,7 +166,7 @@ class ASTJsonExporter: public ASTConstVisitor
 		return _node.id();
 	}
 	template<class Container>
-	static Json::Value getContainerIds(Container const& _container, bool _order = false)
+	static Json getContainerIds(Container const& _container, bool _order = false)
 	{
 		std::vector<int64_t> tmp;
 
@@ -178,28 +177,27 @@ class ASTJsonExporter: public ASTConstVisitor
 		}
 		if (_order)
 			std::sort(tmp.begin(), tmp.end());
-		Json::Value json(Json::arrayValue);
 
+		Json json = Json::array();
 		for (int64_t val: tmp)
-			json.append(val);
-
+			json.emplace_back(val);
 		return json;
 	}
-	static Json::Value typePointerToJson(Type const* _tp, bool _withoutDataLocation = false);
-	static Json::Value typePointerToJson(std::optional<FuncCallArguments> const& _tps);
+	static Json typePointerToJson(Type const* _tp, bool _withoutDataLocation = false);
+	static Json typePointerToJson(std::optional<FuncCallArguments> const& _tps);
 	void appendExpressionAttributes(
-		std::vector<std::pair<std::string, Json::Value>> &_attributes,
+		std::vector<std::pair<std::string, Json>> &_attributes,
 		ExpressionAnnotation const& _annotation
 	);
-	static void appendMove(Json::Value& _array, Json::Value&& _value)
+	static void appendMove(Json& _array, Json&& _value)
 	{
-		solAssert(_array.isArray(), "");
-		_array.append(std::move(_value));
+		solAssert(_array.is_array(), "");
+		_array.emplace_back(std::move(_value));
 	}
 
 	CompilerStack::State m_stackState = CompilerStack::State::Empty; ///< Used to only access information that already exists
 	bool m_inEvent = false; ///< whether we are currently inside an event or not
-	Json::Value m_currentValue;
+	Json m_currentValue;
 	std::map<std::string, unsigned> m_sourceIndices;
 };
 
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 6e6dd9eb5e..5c1d4bdc0c 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -43,9 +43,9 @@ namespace solidity::frontend
 using SourceLocation = langutil::SourceLocation;
 
 template<class T>
-ASTPointer<T> ASTJsonImporter::nullOrCast(Json::Value const& _json)
+ASTPointer<T> ASTJsonImporter::nullOrCast(Json const& _json)
 {
-	if (_json.isNull())
+	if (_json.is_null())
 		return nullptr;
 	else
 		return std::dynamic_pointer_cast<T>(convertJsonToASTNode(_json));
@@ -54,13 +54,13 @@ ASTPointer<T> ASTJsonImporter::nullOrCast(Json::Value const& _json)
 
 // ============ public ===========================
 
-std::map<std::string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(std::map<std::string, Json::Value> const& _sourceList)
+std::map<std::string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(std::map<std::string, Json> const& _sourceList)
 {
 	for (auto const& src: _sourceList)
 		m_sourceNames.emplace_back(std::make_shared<std::string const>(src.first));
 	for (auto const& srcPair: _sourceList)
 	{
-		astAssert(!srcPair.second.isNull());
+		astAssert(!srcPair.second.is_null());
 		astAssert(member(srcPair.second,"nodeType") == "SourceUnit", "The 'nodeType' of the highest node must be 'SourceUnit'.");
 		m_sourceUnits[srcPair.first] = createSourceUnit(srcPair.second, srcPair.first);
 	}
@@ -71,11 +71,12 @@ std::map<std::string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(
 
 // =========== general creation functions ==============
 template <typename T, typename... Args>
-ASTPointer<T> ASTJsonImporter::createASTNode(Json::Value const& _node, Args&&... _args)
+ASTPointer<T> ASTJsonImporter::createASTNode(Json const& _node, Args&&... _args)
 {
-	astAssert(member(_node, "id").isInt64(), "'id'-field must be 64bit integer.");
+	static_assert(std::is_same_v<Json::number_unsigned_t, uint64_t>);
+	astAssert(member(_node, "id").is_number_integer(), "'id'-field must be 64bit integer.");
 
-	int64_t id = _node["id"].asInt64();
+	int64_t id = static_cast<Json::number_integer_t>(_node["id"]);
 
 	astAssert(m_usedIDs.insert(id).second, "Found duplicate node ID!");
 
@@ -87,50 +88,50 @@ ASTPointer<T> ASTJsonImporter::createASTNode(Json::Value const& _node, Args&&...
 	return n;
 }
 
-SourceLocation const ASTJsonImporter::createSourceLocation(Json::Value const& _node)
+SourceLocation const ASTJsonImporter::createSourceLocation(Json const& _node)
 {
-	astAssert(member(_node, "src").isString(), "'src' must be a string");
+	astAssert(member(_node, "src").is_string(), "'src' must be a string");
 
-	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
+	return solidity::langutil::parseSourceLocation(_node["src"].get<std::string>(), m_sourceNames);
 }
 
-std::optional<std::vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Value const& _node) const
+std::optional<std::vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json const& _node) const
 {
 	std::vector<SourceLocation> locations;
 
-	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
+	if (_node.contains("nameLocations") && _node["nameLocations"].is_array())
 	{
 		for (auto const& val: _node["nameLocations"])
-			locations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
+			locations.emplace_back(langutil::parseSourceLocation(val.get<std::string>(), m_sourceNames));
 		return locations;
 	}
 
 	return std::nullopt;
 }
 
-SourceLocation ASTJsonImporter::createNameSourceLocation(Json::Value const& _node)
+SourceLocation ASTJsonImporter::createNameSourceLocation(Json const& _node)
 {
-	astAssert(member(_node, "nameLocation").isString(), "'nameLocation' must be a string");
+	astAssert(member(_node, "nameLocation").is_string(), "'nameLocation' must be a string");
 
-	return solidity::langutil::parseSourceLocation(_node["nameLocation"].asString(), m_sourceNames);
+	return solidity::langutil::parseSourceLocation(_node["nameLocation"].get<std::string>(), m_sourceNames);
 }
 
-SourceLocation ASTJsonImporter::createKeyNameSourceLocation(Json::Value const& _node)
+SourceLocation ASTJsonImporter::createKeyNameSourceLocation(Json const& _node)
 {
-	astAssert(member(_node, "keyNameLocation").isString(), "'keyNameLocation' must be a string");
+	astAssert(member(_node, "keyNameLocation").is_string(), "'keyNameLocation' must be a string");
 
-	return solidity::langutil::parseSourceLocation(_node["keyNameLocation"].asString(), m_sourceNames);
+	return solidity::langutil::parseSourceLocation(_node["keyNameLocation"].get<std::string>(), m_sourceNames);
 }
 
-SourceLocation ASTJsonImporter::createValueNameSourceLocation(Json::Value const& _node)
+SourceLocation ASTJsonImporter::createValueNameSourceLocation(Json const& _node)
 {
-	astAssert(member(_node, "valueNameLocation").isString(), "'valueNameLocation' must be a string");
+	astAssert(member(_node, "valueNameLocation").is_string(), "'valueNameLocation' must be a string");
 
-	return solidity::langutil::parseSourceLocation(_node["valueNameLocation"].asString(), m_sourceNames);
+	return solidity::langutil::parseSourceLocation(_node["valueNameLocation"].get<std::string>(), m_sourceNames);
 }
 
 template<class T>
-ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
+ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json const& _node)
 {
 	ASTPointer<T> ret = std::dynamic_pointer_cast<T>(convertJsonToASTNode(_node));
 	astAssert(ret, "cast of converted json-node must not be nullptr");
@@ -138,10 +139,10 @@ ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
 }
 
 
-ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _json)
+ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json const& _json)
 {
-	astAssert(_json["nodeType"].isString() && _json.isMember("id"), "JSON-Node needs to have 'nodeType' and 'id' fields.");
-	std::string nodeType = _json["nodeType"].asString();
+	astAssert(_json["nodeType"].is_string() && _json.contains("id"), "JSON-Node needs to have 'nodeType' and 'id' fields.");
+	std::string nodeType = _json["nodeType"].get<std::string>();
 	if (nodeType == "PragmaDirective")
 		return createPragmaDirective(_json);
 	if (nodeType == "ImportDirective")
@@ -263,15 +264,15 @@ 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, std::string const& _srcName)
+ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json const& _node, std::string const& _srcName)
 {
 	std::optional<std::string> license;
-	if (_node.isMember("license") && !_node["license"].isNull())
-		license = _node["license"].asString();
+	if (_node.contains("license") && !_node["license"].is_null())
+		license = _node["license"].get<std::string>();
 
 	bool experimentalSolidity = false;
-	if (_node.isMember("experimentalSolidity") && !_node["experimentalSolidity"].isNull())
-		experimentalSolidity = _node["experimentalSolidity"].asBool();
+	if (_node.contains("experimentalSolidity") && !_node["experimentalSolidity"].is_null())
+		experimentalSolidity = _node["experimentalSolidity"].get<bool>();
 
 	std::vector<ASTPointer<ASTNode>> nodes;
 	for (auto& child: member(_node, "nodes"))
@@ -282,20 +283,20 @@ ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _nod
 	return tmp;
 }
 
-ASTPointer<PragmaDirective> ASTJsonImporter::createPragmaDirective(Json::Value const& _node)
+ASTPointer<PragmaDirective> ASTJsonImporter::createPragmaDirective(Json const& _node)
 {
 	std::vector<Token> tokens;
 	std::vector<ASTString> literals;
 	for (auto const& lit: member(_node, "literals"))
 	{
-		std::string l = lit.asString();
+		std::string l = lit.get<std::string>();
 		literals.push_back(l);
 		tokens.push_back(scanSingleToken(l));
 	}
 	return createASTNode<PragmaDirective>(_node, tokens, literals);
 }
 
-ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value const& _node)
+ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json const& _node)
 {
 	ASTPointer<ASTString> unitAlias = memberAsASTString(_node, "unitAlias");
 	ASTPointer<ASTString> path = memberAsASTString(_node, "file");
@@ -303,11 +304,11 @@ ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value c
 
 	for (auto& tuple: member(_node, "symbolAliases"))
 	{
-		astAssert(tuple["local"].isNull() || tuple["local"].isString(), "expected 'local' to be a string or null!");
+		astAssert(tuple["local"].is_null() || tuple["local"].is_string(), "expected 'local' to be a string or null!");
 
 		symbolAliases.push_back({
 			createIdentifier(tuple["foreign"]),
-			tuple["local"].isNull() ? nullptr : std::make_shared<ASTString>(tuple["local"].asString()),
+			tuple["local"].is_null() ? nullptr : std::make_shared<ASTString>(tuple["local"].get<std::string>()),
 			createSourceLocation(tuple["foreign"])}
 		);
 	}
@@ -319,15 +320,15 @@ ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value c
 		std::move(symbolAliases)
 	);
 
-	astAssert(_node["absolutePath"].isString(), "Expected 'absolutePath' to be a string!");
+	astAssert(_node["absolutePath"].is_string(), "Expected 'absolutePath' to be a string!");
 
-	tmp->annotation().absolutePath = _node["absolutePath"].asString();
+	tmp->annotation().absolutePath = _node["absolutePath"].get<std::string>();
 	return tmp;
 }
 
-ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json::Value const& _node)
+ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json const& _node)
 {
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
+	astAssert(_node["name"].is_string(), "Expected 'name' to be a string!");
 
 	std::vector<ASTPointer<InheritanceSpecifier>> baseContracts;
 
@@ -341,9 +342,9 @@ ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json::V
 
 	return createASTNode<ContractDefinition>(
 		_node,
-		std::make_shared<ASTString>(_node["name"].asString()),
+		std::make_shared<ASTString>(_node["name"].get<std::string>()),
 		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr,
 		baseContracts,
 		subNodes,
 		contractKind(_node),
@@ -351,14 +352,14 @@ ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json::V
 	);
 }
 
-ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value const& _node)
+ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json const& _node)
 {
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
+	astAssert(_node["name"].is_string(), "Expected 'name' to be a string!");
 
 	std::vector<ASTString> namePath;
 	std::vector<SourceLocation> namePathLocations;
 	std::vector<std::string> strs;
-	std::string nameString = member(_node, "name").asString();
+	std::string nameString = member(_node, "name").get<std::string>();
 	boost::algorithm::split(strs, nameString, boost::is_any_of("."));
 	astAssert(!strs.empty(), "Expected at least one element in IdentifierPath.");
 	for (std::string s: strs)
@@ -367,9 +368,9 @@ ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value con
 		namePath.emplace_back(s);
 	}
 
-	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
+	if (_node.contains("nameLocations") && _node["nameLocations"].is_array())
 		for (auto const& val: _node["nameLocations"])
-			namePathLocations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
+			namePathLocations.emplace_back(langutil::parseSourceLocation(val.get<std::string>(), m_sourceNames));
 	else
 		namePathLocations.resize(namePath.size());
 
@@ -385,7 +386,7 @@ ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value con
 	);
 }
 
-ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Json::Value const& _node)
+ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Json const& _node)
 {
 	std::vector<ASTPointer<Expression>> arguments;
 	for (auto& arg: member(_node, "arguments"))
@@ -393,36 +394,36 @@ ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Jso
 	return createASTNode<InheritanceSpecifier>(
 		_node,
 		createIdentifierPath(member(_node, "baseName")),
-		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
+		member(_node, "arguments").is_null() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
 	);
 }
 
-ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Value const& _node)
+ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json const& _node)
 {
 	std::vector<ASTPointer<IdentifierPath>> functions;
 	std::vector<std::optional<Token>> operators;
-	if (_node.isMember("libraryName"))
+	if (_node.contains("libraryName"))
 	{
-		astAssert(!_node["libraryName"].isArray());
-		astAssert(!_node["libraryName"]["operator"]);
+		astAssert(!_node["libraryName"].is_array());
+		astAssert(!_node["libraryName"].contains("operator"));
 		functions.emplace_back(createIdentifierPath(_node["libraryName"]));
 		operators.emplace_back(std::nullopt);
 	}
-	else if (_node.isMember("functionList"))
-		for (Json::Value const& function: _node["functionList"])
+	else if (_node.contains("functionList"))
+		for (Json const& function: _node["functionList"])
 		{
-			if (function.isMember("function"))
+			if (function.contains("function"))
 			{
-				astAssert(!function.isMember("operator"));
-				astAssert(!function.isMember("definition"));
+				astAssert(!function.contains("operator"));
+				astAssert(!function.contains("definition"));
 
 				functions.emplace_back(createIdentifierPath(function["function"]));
 				operators.emplace_back(std::nullopt);
 			}
 			else
 			{
-				astAssert(function.isMember("operator"));
-				astAssert(function.isMember("definition"));
+				astAssert(function.contains("operator"));
+				astAssert(function.contains("definition"));
 
 				Token const operatorName = scanSingleToken(function["operator"]);
 				astAssert(util::contains(frontend::userDefinableOperators, operatorName));
@@ -436,13 +437,13 @@ ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Val
 		_node,
 		std::move(functions),
 		std::move(operators),
-		!_node.isMember("libraryName"),
-		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
+		!_node.contains("libraryName"),
+		(_node.contains("typeName") && !_node["typeName"].is_null()) ? convertJsonToASTNode<TypeName>(_node["typeName"]) : nullptr,
 		memberAsBool(_node, "global")
 	);
 }
 
-ASTPointer<ASTNode> ASTJsonImporter::createStructDefinition(Json::Value const& _node)
+ASTPointer<ASTNode> ASTJsonImporter::createStructDefinition(Json const& _node)
 {
 	std::vector<ASTPointer<VariableDeclaration>> members;
 	for (auto& member: _node["members"])
@@ -452,11 +453,11 @@ ASTPointer<ASTNode> ASTJsonImporter::createStructDefinition(Json::Value const& _
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
 		members,
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr
 	);
 }
 
-ASTPointer<EnumDefinition> ASTJsonImporter::createEnumDefinition(Json::Value const& _node)
+ASTPointer<EnumDefinition> ASTJsonImporter::createEnumDefinition(Json const& _node)
 {
 	std::vector<ASTPointer<EnumValue>> members;
 	for (auto& member: _node["members"])
@@ -466,11 +467,11 @@ ASTPointer<EnumDefinition> ASTJsonImporter::createEnumDefinition(Json::Value con
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
 		members,
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr
 	);
 }
 
-ASTPointer<EnumValue> ASTJsonImporter::createEnumValue(Json::Value const& _node)
+ASTPointer<EnumValue> ASTJsonImporter::createEnumValue(Json const& _node)
 {
 	return createASTNode<EnumValue>(
 		_node,
@@ -478,7 +479,7 @@ ASTPointer<EnumValue> ASTJsonImporter::createEnumValue(Json::Value const& _node)
 	);
 }
 
-ASTPointer<UserDefinedValueTypeDefinition> ASTJsonImporter::createUserDefinedValueTypeDefinition(Json::Value const& _node)
+ASTPointer<UserDefinedValueTypeDefinition> ASTJsonImporter::createUserDefinedValueTypeDefinition(Json const& _node)
 {
 	return createASTNode<UserDefinedValueTypeDefinition>(
 		_node,
@@ -488,7 +489,7 @@ ASTPointer<UserDefinedValueTypeDefinition> ASTJsonImporter::createUserDefinedVal
 	);
 }
 
-ASTPointer<ParameterList> ASTJsonImporter::createParameterList(Json::Value const&  _node)
+ASTPointer<ParameterList> ASTJsonImporter::createParameterList(Json const&  _node)
 {
 	std::vector<ASTPointer<VariableDeclaration>> parameters;
 	for (auto& param: _node["parameters"])
@@ -499,12 +500,13 @@ ASTPointer<ParameterList> ASTJsonImporter::createParameterList(Json::Value const
 	);
 }
 
-ASTPointer<OverrideSpecifier> ASTJsonImporter::createOverrideSpecifier(Json::Value const&  _node)
+ASTPointer<OverrideSpecifier> ASTJsonImporter::createOverrideSpecifier(Json const&  _node)
 {
 	std::vector<ASTPointer<IdentifierPath>> overrides;
 
-	for (auto& param: _node["overrides"])
-		overrides.push_back(createIdentifierPath(param));
+	if ( _node.contains("overrides"))
+		for (auto& param: _node["overrides"])
+			overrides.push_back(createIdentifierPath(param));
 
 	return createASTNode<OverrideSpecifier>(
 		_node,
@@ -512,13 +514,13 @@ ASTPointer<OverrideSpecifier> ASTJsonImporter::createOverrideSpecifier(Json::Val
 	);
 }
 
-ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::Value const&  _node)
+ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json const&  _node)
 {
-	astAssert(_node["kind"].isString(), "Expected 'kind' to be a string!");
+	astAssert(_node["kind"].is_string(), "Expected 'kind' to be a string!");
 
 	Token kind;
 	bool freeFunction = false;
-	std::string kindStr = member(_node, "kind").asString();
+	std::string kindStr = member(_node, "kind").get<std::string>();
 
 	if (kindStr == "constructor")
 		kind = Token::Constructor;
@@ -555,8 +557,8 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 		freeFunction,
 		kind,
 		memberAsBool(_node, "virtual"),
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
+		(_node.contains("overrides") && !_node["overrides"].is_null()) ? createOverrideSpecifier(member(_node, "overrides")) : nullptr,
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ?  createDocumentation(member(_node, "documentation")) : nullptr,
 		createParameterList(member(_node, "parameters")),
 		modifiers,
 		createParameterList(member(_node, "returnParameters")),
@@ -564,13 +566,13 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 	);
 }
 
-ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json::Value const& _node)
+ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json const& _node)
 {
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
+	astAssert(_node["name"].is_string(), "Expected 'name' to be a string!");
 
 	VariableDeclaration::Mutability mutability{};
-	astAssert(member(_node, "mutability").isString(), "'mutability' expected to be string.");
-	std::string const mutabilityStr = member(_node, "mutability").asString();
+	astAssert(member(_node, "mutability").is_string(), "'mutability' expected to be string.");
+	std::string const mutabilityStr = member(_node, "mutability").get<std::string>();
 	if (mutabilityStr == "constant")
 	{
 		mutability = VariableDeclaration::Mutability::Constant;
@@ -590,33 +592,33 @@ ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json:
 	return createASTNode<VariableDeclaration>(
 		_node,
 		nullOrCast<TypeName>(member(_node, "typeName")),
-		std::make_shared<ASTString>(member(_node, "name").asString()),
+		std::make_shared<ASTString>(member(_node, "name").get<std::string>()),
 		createNameSourceLocation(_node),
 		nullOrCast<Expression>(member(_node, "value")),
 		visibility(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
-		_node.isMember("indexed") ? memberAsBool(_node, "indexed") : false,
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr,
+		(_node.contains("indexed") && !_node["indexed"].is_null()) ? memberAsBool(_node, "indexed") : false,
 		mutability,
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
+		(_node.contains("overrides") && !_node["overrides"].is_null()) ? createOverrideSpecifier(member(_node, "overrides")) : nullptr,
 		location(_node)
 	);
 }
 
-ASTPointer<ModifierDefinition> ASTJsonImporter::createModifierDefinition(Json::Value const&  _node)
+ASTPointer<ModifierDefinition> ASTJsonImporter::createModifierDefinition(Json const&  _node)
 {
 	return createASTNode<ModifierDefinition>(
 		_node,
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr,
 		createParameterList(member(_node, "parameters")),
 		memberAsBool(_node, "virtual"),
-		_node["overrides"].isNull() ? nullptr : createOverrideSpecifier(member(_node, "overrides")),
-		_node["body"].isNull() ? nullptr: createBlock(member(_node, "body"), false)
+		(_node.contains("overrides") && !_node["overrides"].is_null()) ? createOverrideSpecifier(member(_node, "overrides")) : nullptr,
+		(_node.contains("body") && !_node["body"].is_null()) ? createBlock(member(_node, "body"), false) : nullptr
 	);
 }
 
-ASTPointer<ModifierInvocation> ASTJsonImporter::createModifierInvocation(Json::Value const&  _node)
+ASTPointer<ModifierInvocation> ASTJsonImporter::createModifierInvocation(Json const&  _node)
 {
 	std::vector<ASTPointer<Expression>> arguments;
 	for (auto& arg: member(_node, "arguments"))
@@ -624,53 +626,53 @@ ASTPointer<ModifierInvocation> ASTJsonImporter::createModifierInvocation(Json::V
 	return createASTNode<ModifierInvocation>(
 		_node,
 		createIdentifierPath(member(_node, "modifierName")),
-		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
+		member(_node, "arguments").is_null() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
 	);
 }
 
-ASTPointer<EventDefinition> ASTJsonImporter::createEventDefinition(Json::Value const&  _node)
+ASTPointer<EventDefinition> ASTJsonImporter::createEventDefinition(Json const&  _node)
 {
 	return createASTNode<EventDefinition>(
 		_node,
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr,
 		createParameterList(member(_node, "parameters")),
 		memberAsBool(_node, "anonymous")
 	);
 }
 
-ASTPointer<ErrorDefinition> ASTJsonImporter::createErrorDefinition(Json::Value const&  _node)
+ASTPointer<ErrorDefinition> ASTJsonImporter::createErrorDefinition(Json const&  _node)
 {
 	return createASTNode<ErrorDefinition>(
 		_node,
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
-		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
+		(_node.contains("documentation") && !_node["documentation"].is_null()) ? createDocumentation(member(_node, "documentation")) : nullptr,
 		createParameterList(member(_node, "parameters"))
 	);
 }
 
-ASTPointer<ElementaryTypeName> ASTJsonImporter::createElementaryTypeName(Json::Value const& _node)
+ASTPointer<ElementaryTypeName> ASTJsonImporter::createElementaryTypeName(Json const& _node)
 {
 	unsigned short firstNum;
 	unsigned short secondNum;
 
-	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
+	astAssert(_node["name"].is_string(), "Expected 'name' to be a string!");
 
-	std::string name = member(_node, "name").asString();
+	std::string name = member(_node, "name").get<std::string>();
 	Token token;
 	std::tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(name);
 	ElementaryTypeNameToken elem(token, firstNum,  secondNum);
 
 	std::optional<StateMutability> mutability = {};
-	if (_node.isMember("stateMutability"))
+	if (_node.contains("stateMutability"))
 		mutability = stateMutability(_node);
 
 	return createASTNode<ElementaryTypeName>(_node, elem, mutability);
 }
 
-ASTPointer<UserDefinedTypeName> ASTJsonImporter::createUserDefinedTypeName(Json::Value const& _node)
+ASTPointer<UserDefinedTypeName> ASTJsonImporter::createUserDefinedTypeName(Json const& _node)
 {
 	return createASTNode<UserDefinedTypeName>(
 		_node,
@@ -678,7 +680,7 @@ ASTPointer<UserDefinedTypeName> ASTJsonImporter::createUserDefinedTypeName(Json:
 	);
 }
 
-ASTPointer<FunctionTypeName> ASTJsonImporter::createFunctionTypeName(Json::Value const&  _node)
+ASTPointer<FunctionTypeName> ASTJsonImporter::createFunctionTypeName(Json const&  _node)
 {
 	return createASTNode<FunctionTypeName>(
 		_node,
@@ -689,7 +691,7 @@ ASTPointer<FunctionTypeName> ASTJsonImporter::createFunctionTypeName(Json::Value
 	);
 }
 
-ASTPointer<Mapping> ASTJsonImporter::createMapping(Json::Value const&  _node)
+ASTPointer<Mapping> ASTJsonImporter::createMapping(Json const&  _node)
 {
 	return createASTNode<Mapping>(
 		_node,
@@ -702,7 +704,7 @@ ASTPointer<Mapping> ASTJsonImporter::createMapping(Json::Value const&  _node)
 	);
 }
 
-ASTPointer<ArrayTypeName> ASTJsonImporter::createArrayTypeName(Json::Value const&  _node)
+ASTPointer<ArrayTypeName> ASTJsonImporter::createArrayTypeName(Json const&  _node)
 {
 	return createASTNode<ArrayTypeName>(
 		_node,
@@ -711,24 +713,24 @@ ASTPointer<ArrayTypeName> ASTJsonImporter::createArrayTypeName(Json::Value const
 	);
 }
 
-ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value const& _node)
+ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json const& _node)
 {
-	astAssert(_node["evmVersion"].isString(), "Expected evmVersion to be a string!");
-	auto evmVersion = langutil::EVMVersion::fromString(_node["evmVersion"].asString());
+	astAssert(_node["evmVersion"].is_string(), "Expected evmVersion to be a string!");
+	auto evmVersion = langutil::EVMVersion::fromString(_node["evmVersion"].get<std::string>());
 	astAssert(evmVersion.has_value(), "Invalid EVM version!");
 	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
 
 	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
 	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
-	if (_node.isMember("flags"))
+	if (_node.contains("flags"))
 	{
 		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)
+		Json const& flagsNode = _node["flags"];
+		astAssert(flagsNode.is_array(), "Assembly flags must be an array.");
+		for (auto const& flag: flagsNode)
 		{
-			astAssert(flagsNode[i].isString(), "Assembly flag must be a string.");
-			flags->emplace_back(std::make_shared<ASTString>(flagsNode[i].asString()));
+			astAssert(flag.is_string(), "Assembly flag must be a string.");
+			flags->emplace_back(std::make_shared<ASTString>(flag.get<std::string>()));
 		}
 	}
 	std::shared_ptr<yul::Block> operations = std::make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
@@ -741,7 +743,7 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value con
 	);
 }
 
-ASTPointer<Block> ASTJsonImporter::createBlock(Json::Value const& _node, bool _unchecked)
+ASTPointer<Block> ASTJsonImporter::createBlock(Json const& _node, bool _unchecked)
 {
 	std::vector<ASTPointer<Statement>> statements;
 	for (auto& stat: member(_node, "statements"))
@@ -754,7 +756,7 @@ ASTPointer<Block> ASTJsonImporter::createBlock(Json::Value const& _node, bool _u
 	);
 }
 
-ASTPointer<PlaceholderStatement> ASTJsonImporter::createPlaceholderStatement(Json::Value const&  _node)
+ASTPointer<PlaceholderStatement> ASTJsonImporter::createPlaceholderStatement(Json const&  _node)
 {
 	return createASTNode<PlaceholderStatement>(
 		_node,
@@ -762,7 +764,7 @@ ASTPointer<PlaceholderStatement> ASTJsonImporter::createPlaceholderStatement(Jso
 	);
 }
 
-ASTPointer<IfStatement> ASTJsonImporter::createIfStatement(Json::Value const&  _node)
+ASTPointer<IfStatement> ASTJsonImporter::createIfStatement(Json const&  _node)
 {
 	return createASTNode<IfStatement>(
 		_node,
@@ -773,7 +775,7 @@ ASTPointer<IfStatement> ASTJsonImporter::createIfStatement(Json::Value const&  _
 	);
 }
 
-ASTPointer<TryCatchClause> ASTJsonImporter::createTryCatchClause(Json::Value const&  _node)
+ASTPointer<TryCatchClause> ASTJsonImporter::createTryCatchClause(Json const&  _node)
 {
 	return createASTNode<TryCatchClause>(
 		_node,
@@ -783,7 +785,7 @@ ASTPointer<TryCatchClause> ASTJsonImporter::createTryCatchClause(Json::Value con
 	);
 }
 
-ASTPointer<TryStatement> ASTJsonImporter::createTryStatement(Json::Value const&  _node)
+ASTPointer<TryStatement> ASTJsonImporter::createTryStatement(Json const&  _node)
 {
 	std::vector<ASTPointer<TryCatchClause>> clauses;
 
@@ -798,7 +800,7 @@ ASTPointer<TryStatement> ASTJsonImporter::createTryStatement(Json::Value const&
 	);
 }
 
-ASTPointer<WhileStatement> ASTJsonImporter::createWhileStatement(Json::Value const&  _node, bool _isDoWhile=false)
+ASTPointer<WhileStatement> ASTJsonImporter::createWhileStatement(Json const&  _node, bool _isDoWhile=false)
 {
 	return createASTNode<WhileStatement>(
 		_node,
@@ -809,7 +811,7 @@ ASTPointer<WhileStatement> ASTJsonImporter::createWhileStatement(Json::Value con
 	);
 }
 
-ASTPointer<ForStatement> ASTJsonImporter::createForStatement(Json::Value const&  _node)
+ASTPointer<ForStatement> ASTJsonImporter::createForStatement(Json const&  _node)
 {
 	return createASTNode<ForStatement>(
 		_node,
@@ -821,7 +823,7 @@ ASTPointer<ForStatement> ASTJsonImporter::createForStatement(Json::Value const&
 	);
 }
 
-ASTPointer<Continue> ASTJsonImporter::createContinue(Json::Value const&  _node)
+ASTPointer<Continue> ASTJsonImporter::createContinue(Json const&  _node)
 {
 	return createASTNode<Continue>(
 		_node,
@@ -829,7 +831,7 @@ ASTPointer<Continue> ASTJsonImporter::createContinue(Json::Value const&  _node)
 	);
 }
 
-ASTPointer<Break> ASTJsonImporter::createBreak(Json::Value const&  _node)
+ASTPointer<Break> ASTJsonImporter::createBreak(Json const&  _node)
 {
 	return createASTNode<Break>(
 		_node,
@@ -837,7 +839,7 @@ ASTPointer<Break> ASTJsonImporter::createBreak(Json::Value const&  _node)
 	);
 }
 
-ASTPointer<Return> ASTJsonImporter::createReturn(Json::Value const&  _node)
+ASTPointer<Return> ASTJsonImporter::createReturn(Json const&  _node)
 {
 	return createASTNode<Return>(
 		_node,
@@ -846,7 +848,7 @@ ASTPointer<Return> ASTJsonImporter::createReturn(Json::Value const&  _node)
 	);
 }
 
-ASTPointer<Throw> ASTJsonImporter::createThrow(Json::Value const&  _node)
+ASTPointer<Throw> ASTJsonImporter::createThrow(Json const&  _node)
 {
 	return createASTNode<Throw>(
 		_node,
@@ -854,7 +856,7 @@ ASTPointer<Throw> ASTJsonImporter::createThrow(Json::Value const&  _node)
 	);
 }
 
-ASTPointer<EmitStatement> ASTJsonImporter::createEmitStatement(Json::Value const&  _node)
+ASTPointer<EmitStatement> ASTJsonImporter::createEmitStatement(Json const&  _node)
 {
 	return createASTNode<EmitStatement>(
 		_node,
@@ -863,7 +865,7 @@ ASTPointer<EmitStatement> ASTJsonImporter::createEmitStatement(Json::Value const
 	);
 }
 
-ASTPointer<RevertStatement> ASTJsonImporter::createRevertStatement(Json::Value const&  _node)
+ASTPointer<RevertStatement> ASTJsonImporter::createRevertStatement(Json const&  _node)
 {
 	return createASTNode<RevertStatement>(
 		_node,
@@ -872,11 +874,11 @@ ASTPointer<RevertStatement> ASTJsonImporter::createRevertStatement(Json::Value c
 	);
 }
 
-ASTPointer<VariableDeclarationStatement> ASTJsonImporter::createVariableDeclarationStatement(Json::Value const& _node)
+ASTPointer<VariableDeclarationStatement> ASTJsonImporter::createVariableDeclarationStatement(Json const& _node)
 {
 	std::vector<ASTPointer<VariableDeclaration>> variables;
 	for (auto& var: member(_node, "declarations"))
-		variables.push_back(var.isNull() ? nullptr : createVariableDeclaration(var)); //unnamed components are empty pointers
+		variables.push_back(var.is_null() ? nullptr : createVariableDeclaration(var)); //unnamed components are empty pointers
 	return createASTNode<VariableDeclarationStatement>(
 		_node,
 		nullOrASTString(_node, "documentation"),
@@ -885,7 +887,7 @@ ASTPointer<VariableDeclarationStatement> ASTJsonImporter::createVariableDeclarat
 	);
 }
 
-ASTPointer<ExpressionStatement> ASTJsonImporter::createExpressionStatement(Json::Value const&  _node)
+ASTPointer<ExpressionStatement> ASTJsonImporter::createExpressionStatement(Json const&  _node)
 {
 	return createASTNode<ExpressionStatement>(
 		_node,
@@ -894,7 +896,7 @@ ASTPointer<ExpressionStatement> ASTJsonImporter::createExpressionStatement(Json:
 	);
 }
 
-ASTPointer<Conditional> ASTJsonImporter::createConditional(Json::Value const&  _node)
+ASTPointer<Conditional> ASTJsonImporter::createConditional(Json const&  _node)
 {
 	return createASTNode<Conditional>(
 		_node,
@@ -904,7 +906,7 @@ ASTPointer<Conditional> ASTJsonImporter::createConditional(Json::Value const&  _
 	);
 }
 
-ASTPointer<Assignment> ASTJsonImporter::createAssignment(Json::Value const&  _node)
+ASTPointer<Assignment> ASTJsonImporter::createAssignment(Json const&  _node)
 {
 	return createASTNode<Assignment>(
 		_node,
@@ -914,7 +916,7 @@ ASTPointer<Assignment> ASTJsonImporter::createAssignment(Json::Value const&  _no
 	);
 }
 
-ASTPointer<TupleExpression> ASTJsonImporter::createTupleExpression(Json::Value const&  _node)
+ASTPointer<TupleExpression> ASTJsonImporter::createTupleExpression(Json const&  _node)
 {
 	std::vector<ASTPointer<Expression>> components;
 	for (auto& comp: member(_node, "components"))
@@ -926,7 +928,7 @@ ASTPointer<TupleExpression> ASTJsonImporter::createTupleExpression(Json::Value c
 	);
 }
 
-ASTPointer<UnaryOperation> ASTJsonImporter::createUnaryOperation(Json::Value const&  _node)
+ASTPointer<UnaryOperation> ASTJsonImporter::createUnaryOperation(Json const&  _node)
 {
 	return createASTNode<UnaryOperation>(
 		_node,
@@ -936,7 +938,7 @@ ASTPointer<UnaryOperation> ASTJsonImporter::createUnaryOperation(Json::Value con
 	);
 }
 
-ASTPointer<BinaryOperation> ASTJsonImporter::createBinaryOperation(Json::Value const&  _node)
+ASTPointer<BinaryOperation> ASTJsonImporter::createBinaryOperation(Json const&  _node)
 {
 	return createASTNode<BinaryOperation>(
 		_node,
@@ -946,7 +948,7 @@ ASTPointer<BinaryOperation> ASTJsonImporter::createBinaryOperation(Json::Value c
 	);
 }
 
-ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&  _node)
+ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json const&  _node)
 {
 	std::vector<ASTPointer<Expression>> arguments;
 	for (auto& arg: member(_node, "arguments"))
@@ -954,8 +956,8 @@ ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&
 	std::vector<ASTPointer<ASTString>> names;
 	for (auto& name: member(_node, "names"))
 	{
-		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(std::make_shared<ASTString>(name.asString()));
+		astAssert(name.is_string(), "Expected 'names' members to be strings!");
+		names.push_back(std::make_shared<ASTString>(name.get<std::string>()));
 	}
 
 	std::optional<std::vector<SourceLocation>> sourceLocations = createSourceLocations(_node);
@@ -971,7 +973,7 @@ ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&
 	);
 }
 
-ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json::Value const&  _node)
+ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json const&  _node)
 {
 	std::vector<ASTPointer<Expression>> options;
 	for (auto& option: member(_node, "options"))
@@ -979,8 +981,8 @@ ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json:
 	std::vector<ASTPointer<ASTString>> names;
 	for (auto& name: member(_node, "names"))
 	{
-		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(std::make_shared<ASTString>(name.asString()));
+		astAssert(name.is_string(), "Expected 'names' members to be strings!");
+		names.push_back(std::make_shared<ASTString>(name.get<std::string>()));
 	}
 
 	return createASTNode<FunctionCallOptions>(
@@ -991,7 +993,7 @@ ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json:
 	);
 }
 
-ASTPointer<NewExpression> ASTJsonImporter::createNewExpression(Json::Value const&  _node)
+ASTPointer<NewExpression> ASTJsonImporter::createNewExpression(Json const&  _node)
 {
 	return createASTNode<NewExpression>(
 		_node,
@@ -999,11 +1001,11 @@ ASTPointer<NewExpression> ASTJsonImporter::createNewExpression(Json::Value const
 	);
 }
 
-ASTPointer<MemberAccess> ASTJsonImporter::createMemberAccess(Json::Value const&  _node)
+ASTPointer<MemberAccess> ASTJsonImporter::createMemberAccess(Json const&  _node)
 {
 	SourceLocation memberLocation;
-	if (member(_node, "memberLocation").isString())
-		memberLocation = solidity::langutil::parseSourceLocation(_node["memberLocation"].asString(), m_sourceNames);
+	if (member(_node, "memberLocation").is_string())
+		memberLocation = solidity::langutil::parseSourceLocation(_node["memberLocation"].get<std::string>(), m_sourceNames);
 
 	return createASTNode<MemberAccess>(
 		_node,
@@ -1013,7 +1015,7 @@ ASTPointer<MemberAccess> ASTJsonImporter::createMemberAccess(Json::Value const&
 	);
 }
 
-ASTPointer<IndexAccess> ASTJsonImporter::createIndexAccess(Json::Value const& _node)
+ASTPointer<IndexAccess> ASTJsonImporter::createIndexAccess(Json const& _node)
 {
 	return createASTNode<IndexAccess>(
 		_node,
@@ -1022,7 +1024,7 @@ ASTPointer<IndexAccess> ASTJsonImporter::createIndexAccess(Json::Value const& _n
 	);
 }
 
-ASTPointer<IndexRangeAccess> ASTJsonImporter::createIndexRangeAccess(Json::Value const& _node)
+ASTPointer<IndexRangeAccess> ASTJsonImporter::createIndexRangeAccess(Json const& _node)
 {
 	return createASTNode<IndexRangeAccess>(
 		_node,
@@ -1032,12 +1034,12 @@ ASTPointer<IndexRangeAccess> ASTJsonImporter::createIndexRangeAccess(Json::Value
 	);
 }
 
-ASTPointer<Identifier> ASTJsonImporter::createIdentifier(Json::Value const& _node)
+ASTPointer<Identifier> ASTJsonImporter::createIdentifier(Json const& _node)
 {
 	return createASTNode<Identifier>(_node, memberAsASTString(_node, "name"));
 }
 
-ASTPointer<ElementaryTypeNameExpression> ASTJsonImporter::createElementaryTypeNameExpression(Json::Value const&  _node)
+ASTPointer<ElementaryTypeNameExpression> ASTJsonImporter::createElementaryTypeNameExpression(Json const&  _node)
 {
 	return createASTNode<ElementaryTypeNameExpression>(
 		_node,
@@ -1045,116 +1047,116 @@ ASTPointer<ElementaryTypeNameExpression> ASTJsonImporter::createElementaryTypeNa
 	);
 }
 
-ASTPointer<ASTNode> ASTJsonImporter::createLiteral(Json::Value const&  _node)
+ASTPointer<ASTNode> ASTJsonImporter::createLiteral(Json const&  _node)
 {
 	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.");
+	astAssert(member(_node, valStr).is_string() || member(_node, hexValStr).is_string(), "Literal-value is unset.");
 
-	ASTPointer<ASTString> value = _node.isMember(hexValStr) ?
-		std::make_shared<ASTString>(util::asString(util::fromHex(_node[hexValStr].asString()))) :
-		std::make_shared<ASTString>(_node[valStr].asString());
+	ASTPointer<ASTString> value = _node.contains(hexValStr) ?
+		std::make_shared<ASTString>(util::asString(util::fromHex(_node[hexValStr].get<std::string>()))) :
+		std::make_shared<ASTString>(_node[valStr].get<std::string>());
 
 	return createASTNode<Literal>(
 		_node,
 		literalTokenKind(_node),
 		value,
-		member(_node, "subdenomination").isNull() ? Literal::SubDenomination::None : subdenomination(_node)
+		member(_node, "subdenomination").is_null() ? Literal::SubDenomination::None : subdenomination(_node)
 	);
 }
 
-ASTPointer<StructuredDocumentation> ASTJsonImporter::createDocumentation(Json::Value const&  _node)
+ASTPointer<StructuredDocumentation> ASTJsonImporter::createDocumentation(Json const&  _node)
 {
 	static std::string const textString = "text";
 
-	astAssert(member(_node, textString).isString(), "'text' must be a string");
+	astAssert(member(_node, textString).is_string(), "'text' must be a string");
 
 	return createASTNode<StructuredDocumentation>(
 		_node,
-		std::make_shared<ASTString>(_node[textString].asString())
+		std::make_shared<ASTString>(_node[textString].get<std::string>())
 	);
 }
 
 // ===== helper functions ==========
 
-Json::Value ASTJsonImporter::member(Json::Value const& _node, std::string const& _name)
+Json ASTJsonImporter::member(Json const& _node, std::string const& _name)
 {
-	if (!_node.isMember(_name))
-		return Json::nullValue;
+	if (!_node.contains(_name))
+		return Json();
 	return _node[_name];
 }
 
-Token ASTJsonImporter::scanSingleToken(Json::Value const& _node)
+Token ASTJsonImporter::scanSingleToken(Json const& _node)
 {
-	langutil::CharStream charStream(_node.asString(), "");
+	langutil::CharStream charStream(_node.get<std::string>(), "");
 	langutil::Scanner scanner{charStream};
 	astAssert(scanner.peekNextToken() == Token::EOS, "Token string is too long.");
 	return scanner.currentToken();
 }
 
-ASTPointer<ASTString> ASTJsonImporter::nullOrASTString(Json::Value const& _json, std::string const& _name)
+ASTPointer<ASTString> ASTJsonImporter::nullOrASTString(Json const& _json, std::string const& _name)
 {
-	return _json[_name].isString() ? memberAsASTString(_json, _name) : nullptr;
+	return (_json.contains(_name) && (_json[_name].is_string())) ? memberAsASTString(_json, _name) : nullptr;
 }
 
-ASTPointer<ASTString> ASTJsonImporter::memberAsASTString(Json::Value const& _node, std::string const& _name)
+ASTPointer<ASTString> ASTJsonImporter::memberAsASTString(Json const& _node, std::string const& _name)
 {
-	Json::Value value = member(_node, _name);
-	astAssert(value.isString(), "field " + _name + " must be of type string.");
-	return std::make_shared<ASTString>(_node[_name].asString());
+	Json value = member(_node, _name);
+	astAssert(value.is_string(), "field " + _name + " must be of type string.");
+	return std::make_shared<ASTString>(_node[_name].get<std::string>());
 }
 
-bool ASTJsonImporter::memberAsBool(Json::Value const& _node, std::string const& _name)
+bool ASTJsonImporter::memberAsBool(Json const& _node, std::string const& _name)
 {
-	Json::Value value = member(_node, _name);
-	astAssert(value.isBool(), "field " + _name + " must be of type boolean.");
-	return _node[_name].asBool();
+	Json value = member(_node, _name);
+	astAssert(value.is_boolean(), "field " + _name + " must be of type boolean.");
+	return _node[_name].get<bool>();
 }
 
 
 // =========== JSON to definition helpers =======================
 
-ContractKind ASTJsonImporter::contractKind(Json::Value const& _node)
+ContractKind ASTJsonImporter::contractKind(Json const& _node)
 {
 	ContractKind kind;
-	astAssert(!member(_node, "contractKind").isNull(), "'Contract-kind' can not be null.");
-	if (_node["contractKind"].asString() == "interface")
+	astAssert(!member(_node, "contractKind").is_null(), "'Contract-kind' can not be null.");
+	if (_node["contractKind"].get<std::string>() == "interface")
 		kind = ContractKind::Interface;
-	else if (_node["contractKind"].asString() == "contract")
+	else if (_node["contractKind"].get<std::string>() == "contract")
 		kind = ContractKind::Contract;
-	else if (_node["contractKind"].asString() == "library")
+	else if (_node["contractKind"].get<std::string>() == "library")
 		kind = ContractKind::Library;
 	else
 		astAssert(false, "Unknown ContractKind");
 	return kind;
 }
 
-Token ASTJsonImporter::literalTokenKind(Json::Value const& _node)
+Token ASTJsonImporter::literalTokenKind(Json const& _node)
 {
-	astAssert(member(_node, "kind").isString(), "Token-'kind' expected to be a string.");
+	astAssert(member(_node, "kind").is_string(), "Token-'kind' expected to be a string.");
 	Token tok;
-	if (_node["kind"].asString() == "number")
+	if (_node["kind"].get<std::string>() == "number")
 		tok = Token::Number;
-	else if (_node["kind"].asString() == "string")
+	else if (_node["kind"].get<std::string>() == "string")
 		tok = Token::StringLiteral;
-	else if (_node["kind"].asString() == "unicodeString")
+	else if (_node["kind"].get<std::string>() == "unicodeString")
 		tok = Token::UnicodeStringLiteral;
-	else if (_node["kind"].asString() == "hexString")
+	else if (_node["kind"].get<std::string>() == "hexString")
 		tok = Token::HexStringLiteral;
-	else if (_node["kind"].asString() == "bool")
-		tok = (member(_node, "value").asString() == "true") ? Token::TrueLiteral : Token::FalseLiteral;
+	else if (_node["kind"].get<std::string>() == "bool")
+		tok = (member(_node, "value").get<std::string>() == "true") ? Token::TrueLiteral : Token::FalseLiteral;
 	else
 		astAssert(false, "Unknown kind of literalString");
 	return tok;
 }
 
-Visibility ASTJsonImporter::visibility(Json::Value const& _node)
+Visibility ASTJsonImporter::visibility(Json const& _node)
 {
-	Json::Value visibility = member(_node, "visibility");
-	astAssert(visibility.isString(), "'visibility' expected to be a string.");
+	Json visibility = member(_node, "visibility");
+	astAssert(visibility.is_string(), "'visibility' expected to be a string.");
 
-	std::string const visibilityStr = visibility.asString();
+	std::string const visibilityStr = visibility.get<std::string>();
 
 	if (visibilityStr == "default")
 		return Visibility::Default;
@@ -1173,12 +1175,12 @@ Visibility ASTJsonImporter::visibility(Json::Value const& _node)
 	util::unreachable();
 }
 
-VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node)
+VariableDeclaration::Location ASTJsonImporter::location(Json const& _node)
 {
-	Json::Value storageLoc = member(_node, "storageLocation");
-	astAssert(storageLoc.isString(), "'storageLocation' expected to be a string.");
+	Json storageLoc = member(_node, "storageLocation");
+	astAssert(storageLoc.is_string(), "'storageLocation' expected to be a string.");
 
-	std::string const storageLocStr = storageLoc.asString();
+	std::string const storageLocStr = storageLoc.get<std::string>();
 
 	if (storageLocStr == "default")
 		return VariableDeclaration::Location::Unspecified;
@@ -1195,16 +1197,16 @@ VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node
 	util::unreachable();
 }
 
-Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _node)
+Literal::SubDenomination ASTJsonImporter::subdenomination(Json const& _node)
 {
-	Json::Value subDen = member(_node, "subdenomination");
+	Json subDen = member(_node, "subdenomination");
 
-	if (subDen.isNull())
+	if (subDen.is_null())
 		return Literal::SubDenomination::None;
 
-	astAssert(subDen.isString(), "'subDenomination' expected to be string.");
+	astAssert(subDen.is_string(), "'subDenomination' expected to be string.");
 
-	std::string const subDenStr = subDen.asString();
+	std::string const subDenStr = subDen.get<std::string>();
 
 	if (subDenStr == "wei")
 		return Literal::SubDenomination::Wei;
@@ -1231,10 +1233,10 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 	util::unreachable();
 }
 
-StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
+StateMutability ASTJsonImporter::stateMutability(Json const& _node)
 {
-	astAssert(member(_node, "stateMutability").isString(), "StateMutability' expected to be string.");
-	std::string const mutabilityStr = member(_node, "stateMutability").asString();
+	astAssert(member(_node, "stateMutability").is_string(), "StateMutability' expected to be string.");
+	std::string const mutabilityStr = member(_node, "stateMutability").get<std::string>();
 
 	if (mutabilityStr == "pure")
 		return StateMutability::Pure;
diff --git a/libsolidity/ast/ASTJsonImporter.h b/libsolidity/ast/ASTJsonImporter.h
index b9a4d49505..943415df93 100644
--- a/libsolidity/ast/ASTJsonImporter.h
+++ b/libsolidity/ast/ASTJsonImporter.h
@@ -24,8 +24,8 @@
 #pragma once
 
 #include <vector>
+#include <libsolutil/JSON.h>
 #include <libsolidity/ast/AST.h>
-#include <json/json.h>
 #include <libsolidity/ast/ASTAnnotations.h>
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/Exceptions.h>
@@ -47,7 +47,7 @@ class ASTJsonImporter
 	/// Converts the AST from JSON-format to ASTPointer
 	/// @a _sourceList used to provide source names for the ASTs
 	/// @returns map of sourcenames to their respective ASTs
-	std::map<std::string, ASTPointer<SourceUnit>> jsonToSourceUnit(std::map<std::string, Json::Value> const& _sourceList);
+	std::map<std::string, ASTPointer<SourceUnit>> jsonToSourceUnit(std::map<std::string, Json> const& _sourceList);
 
 private:
 
@@ -56,105 +56,105 @@ class ASTJsonImporter
 	/// Sets the source location and nodeID
 	/// @returns the ASTNode Object class of the respective JSON node,
 	template <typename T, typename... Args>
-	ASTPointer<T> createASTNode(Json::Value const& _node, Args&&... _args);
+	ASTPointer<T> createASTNode(Json 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;
+	langutil::SourceLocation const createSourceLocation(Json const& _node);
+	std::optional<std::vector<langutil::SourceLocation>> createSourceLocations(Json 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);
+	ASTPointer<ASTNode> convertJsonToASTNode(Json const& _ast);
 	/// @returns a pointer to the more specific subclass of ASTNode
 	/// as indicated by the nodeType field of the json
 	template<class T>
-	ASTPointer<T> convertJsonToASTNode(Json::Value const& _node);
+	ASTPointer<T> convertJsonToASTNode(Json const& _node);
 
-	langutil::SourceLocation createNameSourceLocation(Json::Value const& _node);
+	langutil::SourceLocation createNameSourceLocation(Json const& _node);
 	/// @returns source location of a mapping key name
-	langutil::SourceLocation createKeyNameSourceLocation(Json::Value const& _node);
+	langutil::SourceLocation createKeyNameSourceLocation(Json const& _node);
 	/// @returns source location of a mapping value name
-	langutil::SourceLocation createValueNameSourceLocation(Json::Value const& _node);
+	langutil::SourceLocation createValueNameSourceLocation(Json const& _node);
 
 	/// \defgroup nodeCreators JSON to AST-Nodes
 	///@{
-	ASTPointer<SourceUnit> createSourceUnit(Json::Value const& _node, std::string const& _srcName);
-	ASTPointer<PragmaDirective> createPragmaDirective(Json::Value const& _node);
-	ASTPointer<ImportDirective> createImportDirective(Json::Value const& _node);
-	ASTPointer<ContractDefinition> createContractDefinition(Json::Value const& _node);
-	ASTPointer<IdentifierPath> createIdentifierPath(Json::Value const& _node);
-	ASTPointer<InheritanceSpecifier> createInheritanceSpecifier(Json::Value const& _node);
-	ASTPointer<UsingForDirective> createUsingForDirective(Json::Value const& _node);
-	ASTPointer<ASTNode> createStructDefinition(Json::Value const& _node);
-	ASTPointer<EnumDefinition> createEnumDefinition(Json::Value const& _node);
-	ASTPointer<EnumValue> createEnumValue(Json::Value const& _node);
-	ASTPointer<UserDefinedValueTypeDefinition> createUserDefinedValueTypeDefinition(Json::Value const& _node);
-	ASTPointer<ParameterList> createParameterList(Json::Value const& _node);
-	ASTPointer<OverrideSpecifier> createOverrideSpecifier(Json::Value const& _node);
-	ASTPointer<FunctionDefinition> createFunctionDefinition(Json::Value const& _node);
-	ASTPointer<VariableDeclaration> createVariableDeclaration(Json::Value const& _node);
-	ASTPointer<ModifierDefinition> createModifierDefinition(Json::Value const& _node);
-	ASTPointer<ModifierInvocation> createModifierInvocation(Json::Value const& _node);
-	ASTPointer<EventDefinition> createEventDefinition(Json::Value const& _node);
-	ASTPointer<ErrorDefinition> createErrorDefinition(Json::Value const& _node);
-	ASTPointer<ElementaryTypeName> createElementaryTypeName(Json::Value const& _node);
-	ASTPointer<UserDefinedTypeName> createUserDefinedTypeName(Json::Value const& _node);
-	ASTPointer<FunctionTypeName> createFunctionTypeName(Json::Value const& _node);
-	ASTPointer<Mapping> createMapping(Json::Value const& _node);
-	ASTPointer<ArrayTypeName> createArrayTypeName(Json::Value const& _node);
-	ASTPointer<InlineAssembly> createInlineAssembly(Json::Value const& _node);
-	ASTPointer<Block> createBlock(Json::Value const& _node, bool _unchecked);
-	ASTPointer<PlaceholderStatement> createPlaceholderStatement(Json::Value const& _node);
-	ASTPointer<IfStatement> createIfStatement(Json::Value const& _node);
-	ASTPointer<TryCatchClause> createTryCatchClause(Json::Value const& _node);
-	ASTPointer<TryStatement> createTryStatement(Json::Value const& _node);
-	ASTPointer<WhileStatement> createWhileStatement(Json::Value const& _node, bool _isDoWhile);
-	ASTPointer<ForStatement> createForStatement(Json::Value const& _node);
-	ASTPointer<Continue> createContinue(Json::Value const& _node);
-	ASTPointer<Break> createBreak(Json::Value const& _node);
-	ASTPointer<Return> createReturn(Json::Value const& _node);
-	ASTPointer<Throw> createThrow(Json::Value const& _node);
-	ASTPointer<EmitStatement> createEmitStatement(Json::Value const& _node);
-	ASTPointer<RevertStatement> createRevertStatement(Json::Value const& _node);
-	ASTPointer<VariableDeclarationStatement> createVariableDeclarationStatement(Json::Value const& _node);
-	ASTPointer<ExpressionStatement> createExpressionStatement(Json::Value const& _node);
-	ASTPointer<Conditional> createConditional(Json::Value const& _node);
-	ASTPointer<Assignment> createAssignment(Json::Value const& _node);
-	ASTPointer<TupleExpression> createTupleExpression(Json::Value const& _node);
-	ASTPointer<UnaryOperation> createUnaryOperation(Json::Value const& _node);
-	ASTPointer<BinaryOperation> createBinaryOperation(Json::Value const& _node);
-	ASTPointer<FunctionCall> createFunctionCall(Json::Value const& _node);
-	ASTPointer<FunctionCallOptions> createFunctionCallOptions(Json::Value const& _node);
-	ASTPointer<NewExpression> createNewExpression(Json::Value const& _node);
-	ASTPointer<MemberAccess> createMemberAccess(Json::Value const& _node);
-	ASTPointer<IndexAccess> createIndexAccess(Json::Value const& _node);
-	ASTPointer<IndexRangeAccess> createIndexRangeAccess(Json::Value const& _node);
-	ASTPointer<Identifier> createIdentifier(Json::Value const& _node);
-	ASTPointer<ElementaryTypeNameExpression> createElementaryTypeNameExpression(Json::Value const& _node);
-	ASTPointer<ASTNode> createLiteral(Json::Value const& _node);
-	ASTPointer<StructuredDocumentation> createDocumentation(Json::Value const& _node);
+	ASTPointer<SourceUnit> createSourceUnit(Json const& _node, std::string const& _srcName);
+	ASTPointer<PragmaDirective> createPragmaDirective(Json const& _node);
+	ASTPointer<ImportDirective> createImportDirective(Json const& _node);
+	ASTPointer<ContractDefinition> createContractDefinition(Json const& _node);
+	ASTPointer<IdentifierPath> createIdentifierPath(Json const& _node);
+	ASTPointer<InheritanceSpecifier> createInheritanceSpecifier(Json const& _node);
+	ASTPointer<UsingForDirective> createUsingForDirective(Json const& _node);
+	ASTPointer<ASTNode> createStructDefinition(Json const& _node);
+	ASTPointer<EnumDefinition> createEnumDefinition(Json const& _node);
+	ASTPointer<EnumValue> createEnumValue(Json const& _node);
+	ASTPointer<UserDefinedValueTypeDefinition> createUserDefinedValueTypeDefinition(Json const& _node);
+	ASTPointer<ParameterList> createParameterList(Json const& _node);
+	ASTPointer<OverrideSpecifier> createOverrideSpecifier(Json const& _node);
+	ASTPointer<FunctionDefinition> createFunctionDefinition(Json const& _node);
+	ASTPointer<VariableDeclaration> createVariableDeclaration(Json const& _node);
+	ASTPointer<ModifierDefinition> createModifierDefinition(Json const& _node);
+	ASTPointer<ModifierInvocation> createModifierInvocation(Json const& _node);
+	ASTPointer<EventDefinition> createEventDefinition(Json const& _node);
+	ASTPointer<ErrorDefinition> createErrorDefinition(Json const& _node);
+	ASTPointer<ElementaryTypeName> createElementaryTypeName(Json const& _node);
+	ASTPointer<UserDefinedTypeName> createUserDefinedTypeName(Json const& _node);
+	ASTPointer<FunctionTypeName> createFunctionTypeName(Json const& _node);
+	ASTPointer<Mapping> createMapping(Json const& _node);
+	ASTPointer<ArrayTypeName> createArrayTypeName(Json const& _node);
+	ASTPointer<InlineAssembly> createInlineAssembly(Json const& _node);
+	ASTPointer<Block> createBlock(Json const& _node, bool _unchecked);
+	ASTPointer<PlaceholderStatement> createPlaceholderStatement(Json const& _node);
+	ASTPointer<IfStatement> createIfStatement(Json const& _node);
+	ASTPointer<TryCatchClause> createTryCatchClause(Json const& _node);
+	ASTPointer<TryStatement> createTryStatement(Json const& _node);
+	ASTPointer<WhileStatement> createWhileStatement(Json const& _node, bool _isDoWhile);
+	ASTPointer<ForStatement> createForStatement(Json const& _node);
+	ASTPointer<Continue> createContinue(Json const& _node);
+	ASTPointer<Break> createBreak(Json const& _node);
+	ASTPointer<Return> createReturn(Json const& _node);
+	ASTPointer<Throw> createThrow(Json const& _node);
+	ASTPointer<EmitStatement> createEmitStatement(Json const& _node);
+	ASTPointer<RevertStatement> createRevertStatement(Json const& _node);
+	ASTPointer<VariableDeclarationStatement> createVariableDeclarationStatement(Json const& _node);
+	ASTPointer<ExpressionStatement> createExpressionStatement(Json const& _node);
+	ASTPointer<Conditional> createConditional(Json const& _node);
+	ASTPointer<Assignment> createAssignment(Json const& _node);
+	ASTPointer<TupleExpression> createTupleExpression(Json const& _node);
+	ASTPointer<UnaryOperation> createUnaryOperation(Json const& _node);
+	ASTPointer<BinaryOperation> createBinaryOperation(Json const& _node);
+	ASTPointer<FunctionCall> createFunctionCall(Json const& _node);
+	ASTPointer<FunctionCallOptions> createFunctionCallOptions(Json const& _node);
+	ASTPointer<NewExpression> createNewExpression(Json const& _node);
+	ASTPointer<MemberAccess> createMemberAccess(Json const& _node);
+	ASTPointer<IndexAccess> createIndexAccess(Json const& _node);
+	ASTPointer<IndexRangeAccess> createIndexRangeAccess(Json const& _node);
+	ASTPointer<Identifier> createIdentifier(Json const& _node);
+	ASTPointer<ElementaryTypeNameExpression> createElementaryTypeNameExpression(Json const& _node);
+	ASTPointer<ASTNode> createLiteral(Json const& _node);
+	ASTPointer<StructuredDocumentation> createDocumentation(Json const& _node);
 	///@}
 
 	// =============== general helper functions ===================
 	/// @returns the member of a given JSON object, throws if member does not exist
-	Json::Value member(Json::Value const& _node, std::string const& _name);
+	Json member(Json const& _node, std::string const& _name);
 	/// @returns the appropriate TokenObject used in parsed Strings (pragma directive or operator)
-	Token scanSingleToken(Json::Value const& _node);
+	Token scanSingleToken(Json const& _node);
 	template<class T>
 	///@returns nullptr or an ASTPointer cast to a specific Class
-	ASTPointer<T> nullOrCast(Json::Value const& _json);
+	ASTPointer<T> nullOrCast(Json const& _json);
 	/// @returns nullptr or ASTString, given an JSON string or an empty field
-	ASTPointer<ASTString> nullOrASTString(Json::Value const& _json, std::string const& _name);
+	ASTPointer<ASTString> nullOrASTString(Json const& _json, std::string const& _name);
 
 	// ============== JSON to definition helpers ===============
 	/// \defgroup typeHelpers Json to ast-datatype helpers
 	/// {@
-	ASTPointer<ASTString> memberAsASTString(Json::Value const& _node, std::string const& _name);
-	bool memberAsBool(Json::Value const& _node, std::string const& _name);
-	Visibility visibility(Json::Value const& _node);
-	StateMutability stateMutability(Json::Value const& _node);
-	VariableDeclaration::Location location(Json::Value const& _node);
-	ContractKind contractKind(Json::Value const& _node);
-	Token literalTokenKind(Json::Value const& _node);
-	Literal::SubDenomination subdenomination(Json::Value const& _node);
+	ASTPointer<ASTString> memberAsASTString(Json const& _node, std::string const& _name);
+	bool memberAsBool(Json const& _node, std::string const& _name);
+	Visibility visibility(Json const& _node);
+	StateMutability stateMutability(Json const& _node);
+	VariableDeclaration::Location location(Json const& _node);
+	ContractKind contractKind(Json const& _node);
+	Token literalTokenKind(Json const& _node);
+	Literal::SubDenomination subdenomination(Json const& _node);
 	///@}
 
 	// =========== member variables ===============
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index a80a18a62a..8e03a378b3 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -37,6 +37,7 @@
 #include <set>
 #include <string>
 #include <memory>
+#include <deque>
 
 namespace solidity::frontend
 {
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index b84fbc3573..59585c762e 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -37,8 +37,7 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Whiskers.h>
-
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <sstream>
 #include <variant>
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index 9026954d61..9f01b74fc2 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include <libsolutil/JSON.h>
+
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/CallGraph.h>
 #include <libsolidity/codegen/ir/IRGenerationContext.h>
@@ -32,8 +34,6 @@
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/EVMVersion.h>
 
-#include <json/json.h>
-
 #include <string>
 
 namespace solidity::frontend
diff --git a/libsolidity/experimental/codegen/IRGenerator.h b/libsolidity/experimental/codegen/IRGenerator.h
index 7d3baf8f95..5da6f9f6fd 100644
--- a/libsolidity/experimental/codegen/IRGenerator.h
+++ b/libsolidity/experimental/codegen/IRGenerator.h
@@ -29,7 +29,7 @@
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/EVMVersion.h>
 
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <string>
 
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 9daa168372..1f97cbeef4 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -41,6 +41,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <stack>
 
 using solidity::util::h256;
 
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index cf6e863bbb..e06f4b5828 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -38,12 +38,14 @@ bool anyDataStoredInStorage(TypePointers const& _pointers)
 }
 }
 
-Json::Value ABI::generate(ContractDefinition const& _contractDef)
+Json ABI::generate(ContractDefinition const& _contractDef)
 {
-	auto compare = [](Json::Value const& _a, Json::Value const& _b) -> bool {
-		return std::make_tuple(_a["type"], _a["name"]) < std::make_tuple(_b["type"], _b["name"]);
+	auto compare = [](Json const& _a, Json const& _b) -> bool
+	{
+		return std::make_tuple(_a.value("type", Json()), _a.value("name", Json())) <
+					std::make_tuple(_b.value("type", Json()), _b.value("name", Json()));
 	};
-	std::multiset<Json::Value, decltype(compare)> abi(compare);
+	std::multiset<Json, decltype(compare)> abi(compare);
 
 	for (auto it: _contractDef.interfaceFunctions())
 	{
@@ -55,7 +57,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 
 		FunctionType const* externalFunctionType = it.second->interfaceFunctionType();
 		solAssert(!!externalFunctionType, "");
-		Json::Value method{Json::objectValue};
+		Json method;
 		method["type"] = "function";
 		method["name"] = it.second->declaration().name();
 		method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
@@ -79,7 +81,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 		FunctionType constrType(*constructor);
 		FunctionType const* externalFunctionType = constrType.interfaceFunctionType();
 		solAssert(!!externalFunctionType, "");
-		Json::Value method{Json::objectValue};
+		Json method;
 		method["type"] = "constructor";
 		method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
 		method["inputs"] = formatTypeList(
@@ -95,25 +97,25 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 		{
 			auto const* externalFunctionType = FunctionType(*fallbackOrReceive).interfaceFunctionType();
 			solAssert(!!externalFunctionType, "");
-			Json::Value method{Json::objectValue};
+			Json method;
 			method["type"] = TokenTraits::toString(fallbackOrReceive->kind());
 			method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
 			abi.emplace(std::move(method));
 		}
 	for (auto const& it: _contractDef.interfaceEvents())
 	{
-		Json::Value event{Json::objectValue};
+		Json event;
 		event["type"] = "event";
 		event["name"] = it->name();
 		event["anonymous"] = it->isAnonymous();
-		Json::Value params{Json::arrayValue};
+		Json params = Json::array();
 		for (auto const& p: it->parameters())
 		{
 			Type const* type = p->annotation().type->interfaceType(false);
 			solAssert(type, "");
 			auto param = formatType(p->name(), *type, *p->annotation().type, false);
 			param["indexed"] = p->isIndexed();
-			params.append(std::move(param));
+			params.emplace_back(param);
 		}
 		event["inputs"] = std::move(params);
 		abi.emplace(std::move(event));
@@ -121,53 +123,53 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 
 	for (ErrorDefinition const* error: _contractDef.interfaceErrors())
 	{
-		Json::Value errorJson{Json::objectValue};
+		Json errorJson;
 		errorJson["type"] = "error";
 		errorJson["name"] = error->name();
-		errorJson["inputs"] = Json::arrayValue;
+		errorJson["inputs"] = Json::array();
 		for (auto const& p: error->parameters())
 		{
 			Type const* type = p->annotation().type->interfaceType(false);
 			solAssert(type, "");
-			errorJson["inputs"].append(
+			errorJson["inputs"].emplace_back(
 				formatType(p->name(), *type, *p->annotation().type, false)
 			);
 		}
 		abi.emplace(std::move(errorJson));
 	}
 
-	Json::Value abiJson{Json::arrayValue};
+	Json abiJson = Json::array();
 	for (auto& f: abi)
-		abiJson.append(std::move(f));
+		abiJson.emplace_back(std::move(f));
 	return abiJson;
 }
 
-Json::Value ABI::formatTypeList(
+Json ABI::formatTypeList(
 	std::vector<std::string> const& _names,
 	std::vector<Type const*> const& _encodingTypes,
 	std::vector<Type const*> const& _solidityTypes,
 	bool _forLibrary
 )
 {
-	Json::Value params{Json::arrayValue};
+	Json params = Json::array();
 	solAssert(_names.size() == _encodingTypes.size(), "Names and types vector size does not match");
 	solAssert(_names.size() == _solidityTypes.size(), "");
 	for (unsigned i = 0; i < _names.size(); ++i)
 	{
 		solAssert(_encodingTypes[i], "");
-		params.append(formatType(_names[i], *_encodingTypes[i], *_solidityTypes[i], _forLibrary));
+		params.emplace_back(formatType(_names[i], *_encodingTypes[i], *_solidityTypes[i], _forLibrary));
 	}
 	return params;
 }
 
-Json::Value ABI::formatType(
+Json ABI::formatType(
 	std::string const& _name,
 	Type const& _encodingType,
 	Type const& _solidityType,
 	bool _forLibrary
 )
 {
-	Json::Value ret{Json::objectValue};
+	Json ret;
 	ret["name"] = _name;
 	ret["internalType"] = _solidityType.toString(true);
 	std::string suffix = (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)) ? " storage" : "";
@@ -185,31 +187,31 @@ Json::Value ABI::formatType(
 			else
 				suffix = std::string("[") + arrayType->length().str() + "]";
 			solAssert(arrayType->baseType(), "");
-			Json::Value subtype = formatType(
+			Json subtype = formatType(
 				"",
 				*arrayType->baseType(),
 				*dynamic_cast<ArrayType const&>(_solidityType).baseType(),
 				_forLibrary
 			);
-			if (subtype.isMember("components"))
+			if (subtype.contains("components"))
 			{
-				ret["type"] = subtype["type"].asString() + suffix;
+				ret["type"] = subtype["type"].get<std::string>() + suffix;
 				ret["components"] = subtype["components"];
 			}
 			else
-				ret["type"] = subtype["type"].asString() + suffix;
+				ret["type"] = subtype["type"].get<std::string>() + suffix;
 		}
 	}
 	else if (StructType const* structType = dynamic_cast<StructType const*>(&_encodingType))
 	{
 		ret["type"] = "tuple";
-		ret["components"] = Json::arrayValue;
+		ret["components"] = Json::array();
 		for (auto const& member: structType->members(nullptr))
 		{
 			solAssert(member.type, "");
 			Type const* t = member.type->interfaceType(_forLibrary);
 			solAssert(t, "");
-			ret["components"].append(formatType(member.name, *t, *member.type, _forLibrary));
+			ret["components"].emplace_back(formatType(member.name, *t, *member.type, _forLibrary));
 		}
 	}
 	else
diff --git a/libsolidity/interface/ABI.h b/libsolidity/interface/ABI.h
index e956614497..22e306c432 100644
--- a/libsolidity/interface/ABI.h
+++ b/libsolidity/interface/ABI.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 #include <memory>
 #include <string>
 
@@ -38,14 +38,14 @@ class ABI
 	/// Get the ABI Interface of the contract
 	/// @param _contractDef The contract definition
 	/// @return             A JSONrepresentation of the contract's ABI Interface
-	static Json::Value generate(ContractDefinition const& _contractDef);
+	static Json generate(ContractDefinition const& _contractDef);
 private:
 	/// @returns a json value suitable for a list of types in function input or output
 	/// parameters or other places. If @a _forLibrary is true, complex types are referenced
 	/// by name, otherwise they are anonymously expanded.
 	/// @a _solidityTypes is the list of original Solidity types where @a _encodingTypes is the list of
 	/// ABI types used for the actual encoding.
-	static Json::Value formatTypeList(
+	static Json formatTypeList(
 		std::vector<std::string> const& _names,
 		std::vector<Type const*> const& _encodingTypes,
 		std::vector<Type const*> const& _solidityTypes,
@@ -56,7 +56,7 @@ class ABI
 	/// If it is possible to express the type as a single string, it is allowed to return a single string.
 	/// @a _solidityType is the original Solidity type and @a _encodingTypes is the
 	/// ABI type used for the actual encoding.
-	static Json::Value formatType(
+	static Json formatType(
 		std::string const& _name,
 		Type const& _encodingType,
 		Type const& _solidityType,
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 2d1fd10743..2a90056806 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -85,8 +85,6 @@
 #include <libsolutil/Algorithms.h>
 #include <libsolutil/FunctionSelector.h>
 
-#include <json/json.h>
-
 #include <boost/algorithm/string/replace.hpp>
 
 #include <range/v3/algorithm/all_of.hpp>
@@ -426,7 +424,7 @@ bool CompilerStack::parse()
 	return true;
 }
 
-void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _sources)
+void CompilerStack::importASTs(std::map<std::string, Json> const& _sources)
 {
 	if (m_stackState != Empty)
 		solThrow(CompilerError, "Must call importASTs only before the SourcesSet state.");
@@ -843,18 +841,18 @@ evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string con
 	return currentContract.evmRuntimeAssembly ? &currentContract.evmRuntimeAssembly->items() : nullptr;
 }
 
-Json::Value CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
+Json CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
 	Contract const& c = contract(_contractName);
-	util::LazyInit<Json::Value const> const& sources =
+	util::LazyInit<Json const> const& sources =
 		_runtime ?
 		c.runtimeGeneratedSources :
 		c.generatedSources;
 	return sources.init([&]{
-		Json::Value sources{Json::arrayValue};
+		Json sources = Json::array();
 		// If there is no compiler, then no bytecode was generated and thus no
 		// sources were generated (or we compiled "via IR").
 		if (c.compiler)
@@ -947,7 +945,7 @@ std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 	return contract(_contractName).yulIR;
 }
 
-Json::Value const& CompilerStack::yulIRAst(std::string const& _contractName) const
+Json const& CompilerStack::yulIRAst(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -965,7 +963,7 @@ std::string const& CompilerStack::yulIROptimized(std::string const& _contractNam
 	return contract(_contractName).yulIROptimized;
 }
 
-Json::Value const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
+Json const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -1005,7 +1003,7 @@ std::string CompilerStack::assemblyString(std::string const& _contractName, Stri
 }
 
 /// TODO: cache the JSON
-Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
+Json CompilerStack::assemblyJSON(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -1016,7 +1014,7 @@ Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
 	if (currentContract.evmAssembly)
 		return currentContract.evmAssembly->assemblyJSON(sourceIndices());
 	else
-		return Json::Value();
+		return Json();
 }
 
 std::vector<std::string> CompilerStack::sourceNames() const
@@ -1035,7 +1033,7 @@ std::map<std::string, unsigned> CompilerStack::sourceIndices() const
 	return indices;
 }
 
-Json::Value const& CompilerStack::contractABI(std::string const& _contractName) const
+Json const& CompilerStack::contractABI(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1043,7 +1041,7 @@ Json::Value const& CompilerStack::contractABI(std::string const& _contractName)
 	return contractABI(contract(_contractName));
 }
 
-Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
+Json const& CompilerStack::contractABI(Contract const& _contract) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1054,7 +1052,7 @@ Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::storageLayout(std::string const& _contractName) const
+Json const& CompilerStack::storageLayout(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1062,7 +1060,7 @@ Json::Value const& CompilerStack::storageLayout(std::string const& _contractName
 	return storageLayout(contract(_contractName));
 }
 
-Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
+Json const& CompilerStack::storageLayout(Contract const& _contract) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1073,7 +1071,7 @@ Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::natspecUser(std::string const& _contractName) const
+Json const& CompilerStack::natspecUser(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1081,7 +1079,7 @@ Json::Value const& CompilerStack::natspecUser(std::string const& _contractName)
 	return natspecUser(contract(_contractName));
 }
 
-Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
+Json const& CompilerStack::natspecUser(Contract const& _contract) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1092,7 +1090,7 @@ Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) const
+Json const& CompilerStack::natspecDev(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1100,7 +1098,7 @@ Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) c
 	return natspecDev(contract(_contractName));
 }
 
-Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
+Json const& CompilerStack::natspecDev(Contract const& _contract) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1112,16 +1110,16 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
-Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) const
+Json CompilerStack::interfaceSymbols(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solUnimplementedAssert(!isExperimentalSolidity());
 
-	Json::Value interfaceSymbols(Json::objectValue);
+	Json interfaceSymbols;
 	// Always have a methods object
-	interfaceSymbols["methods"] = Json::objectValue;
+	interfaceSymbols["methods"] = Json::object();
 
 	for (auto const& it: contractDefinition(_contractName).interfaceFunctions())
 		interfaceSymbols["methods"][it.second->externalSignature()] = it.first.hex();
@@ -1650,7 +1648,7 @@ CompilerStack::Source const& CompilerStack::source(std::string const& _sourceNam
 
 std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) const
 {
-	Json::Value meta{Json::objectValue};
+	Json meta;
 	meta["version"] = 1;
 	std::string sourceType;
 	switch (m_compilationSourceType)
@@ -1671,7 +1669,7 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 	for (auto const sourceUnit: _contract.contract->sourceUnit().referencedSourceUnits(true))
 		referencedSources.insert(*sourceUnit->annotation().path);
 
-	meta["sources"] = Json::objectValue;
+	meta["sources"] = Json::object();
 	for (auto const& s: m_sources)
 	{
 		if (!referencedSources.count(s.first))
@@ -1685,15 +1683,15 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 			meta["sources"][s.first]["content"] = s.second.charStream->source();
 		else
 		{
-			meta["sources"][s.first]["urls"] = Json::arrayValue;
-			meta["sources"][s.first]["urls"].append("bzz-raw://" + util::toHex(s.second.swarmHash().asBytes()));
-			meta["sources"][s.first]["urls"].append(s.second.ipfsUrl());
+			meta["sources"][s.first]["urls"] = Json::array();
+			meta["sources"][s.first]["urls"].emplace_back("bzz-raw://" + util::toHex(s.second.swarmHash().asBytes()));
+			meta["sources"][s.first]["urls"].emplace_back(s.second.ipfsUrl());
 		}
 	}
 
-	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(), "");
-	meta["settings"]["optimizer"]["runs"] = Json::Value(Json::LargestUInt(m_optimiserSettings.expectedExecutionsPerDeployment));
+	static_assert(sizeof(m_optimiserSettings.expectedExecutionsPerDeployment) <= sizeof(Json::number_integer_t), "Invalid word size.");
+	solAssert(static_cast<Json::number_integer_t>(m_optimiserSettings.expectedExecutionsPerDeployment) < std::numeric_limits<Json::number_integer_t>::max(), "");
+	meta["settings"]["optimizer"]["runs"] = Json::number_integer_t(m_optimiserSettings.expectedExecutionsPerDeployment);
 
 	/// Backwards compatibility: If set to one of the default settings, do not provide details.
 	OptimiserSettings settingsWithoutRuns = m_optimiserSettings;
@@ -1705,7 +1703,7 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 		meta["settings"]["optimizer"]["enabled"] = true;
 	else
 	{
-		Json::Value details{Json::objectValue};
+		Json details = Json::object();
 
 		details["orderLiterals"] = m_optimiserSettings.runOrderLiterals;
 		details["inliner"] = m_optimiserSettings.runInliner;
@@ -1718,14 +1716,14 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 		details["yul"] = m_optimiserSettings.runYulOptimiser;
 		if (m_optimiserSettings.runYulOptimiser)
 		{
-			details["yulDetails"] = Json::objectValue;
+			details["yulDetails"] = Json::object();
 			details["yulDetails"]["stackAllocation"] = m_optimiserSettings.optimizeStackAllocation;
 			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps;
 		}
 		else if (OptimiserSuite::isEmptyOptimizerSequence(m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps))
 		{
 			solAssert(m_optimiserSettings.optimizeStackAllocation == false);
-			details["yulDetails"] = Json::objectValue;
+			details["yulDetails"] = Json::object();
 			details["yulDetails"]["optimizerSteps"] = ":";
 		}
 		else
@@ -1758,14 +1756,14 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 	meta["settings"]["compilationTarget"][_contract.contract->sourceUnitName()] =
 		*_contract.contract->annotation().canonicalName;
 
-	meta["settings"]["remappings"] = Json::arrayValue;
+	meta["settings"]["remappings"] = Json::array();
 	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)
-		meta["settings"]["remappings"].append(r);
+		meta["settings"]["remappings"].emplace_back(r);
 
-	meta["settings"]["libraries"] = Json::objectValue;
+	meta["settings"]["libraries"] = Json::object();
 	for (auto const& library: m_libraries)
 		meta["settings"]["libraries"][library.first] = "0x" + util::toHex(library.second.asBytes());
 
@@ -1897,17 +1895,17 @@ bytes CompilerStack::createCBORMetadata(Contract const& _contract, bool _forIR)
 namespace
 {
 
-Json::Value gasToJson(GasEstimator::GasConsumption const& _gas)
+Json gasToJson(GasEstimator::GasConsumption const& _gas)
 {
 	if (_gas.isInfinite)
-		return Json::Value("infinite");
+		return Json("infinite");
 	else
-		return Json::Value(util::toString(_gas.value));
+		return Json(util::toString(_gas.value));
 }
 
 }
 
-Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
+Json CompilerStack::gasEstimates(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -1915,18 +1913,18 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 	solUnimplementedAssert(!isExperimentalSolidity());
 
 	if (!assemblyItems(_contractName) && !runtimeAssemblyItems(_contractName))
-		return Json::Value();
+		return Json();
 
 	using Gas = GasEstimator::GasConsumption;
 	GasEstimator gasEstimator(m_evmVersion);
-	Json::Value output(Json::objectValue);
+	Json output = Json::object();
 
 	if (evmasm::AssemblyItems const* items = assemblyItems(_contractName))
 	{
 		Gas executionGas = gasEstimator.functionalEstimation(*items);
 		Gas codeDepositGas{evmasm::GasMeter::dataGas(runtimeObject(_contractName).bytecode, false, m_evmVersion)};
 
-		Json::Value creation(Json::objectValue);
+		Json creation = Json::object();
 		creation["codeDepositCost"] = gasToJson(codeDepositGas);
 		creation["executionCost"] = gasToJson(executionGas);
 		/// TODO: implement + overload to avoid the need of +=
@@ -1939,7 +1937,7 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 	{
 		/// External functions
 		ContractDefinition const& contract = contractDefinition(_contractName);
-		Json::Value externalFunctions(Json::objectValue);
+		Json externalFunctions = Json::object();
 		for (auto it: contract.interfaceFunctions())
 		{
 			std::string sig = it.second->externalSignature();
@@ -1956,7 +1954,7 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 			output["external"] = externalFunctions;
 
 		/// Internal functions
-		Json::Value internalFunctions(Json::objectValue);
+		Json internalFunctions = Json::object();
 		for (auto const& it: contract.definedFunctions())
 		{
 			/// Exclude externally visible functions, constructor, fallback and receive ether function
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 57d30e602d..ef76764faf 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -47,8 +47,7 @@
 #include <libsolutil/Common.h>
 #include <libsolutil/FixedHash.h>
 #include <libsolutil/LazyInit.h>
-
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <functional>
 #include <memory>
@@ -221,7 +220,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 
 	/// Imports given SourceUnits so they can be analyzed. Leads to the same internal state as parse().
 	/// Will throw errors if the import fails
-	void importASTs(std::map<std::string, Json::Value> const& _sources);
+	void importASTs(std::map<std::string, Json> const& _sources);
 
 	/// Performs the analysis steps (imports, scopesetting, syntaxCheck, referenceResolving,
 	///  typechecking, staticAnalysis) on previously parsed sources.
@@ -277,13 +276,13 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	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;
+	Json 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;
+	Json const& yulIROptimizedAst(std::string const& _contractName) const;
 
 	/// @returns the assembled object for a contract.
 	virtual evmasm::LinkerObject const& object(std::string const& _contractName) const override;
@@ -299,7 +298,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 
 	/// @returns an array containing all utility sources generated during compilation.
 	/// Format: [ { name: string, id: number, language: "Yul", contents: string }, ... ]
-	Json::Value generatedSources(std::string const& _contractName, bool _runtime = false) const;
+	Json generatedSources(std::string const& _contractName, bool _runtime = false) const;
 
 	/// @returns the string that provides a mapping between bytecode and sourcecode or a nullptr
 	/// if the contract does not (yet) have bytecode.
@@ -317,26 +316,26 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// @returns a JSON representation of the assembly.
 	/// @arg _sourceCodes is the map of input files to source code strings
 	/// Prerequisite: Successful compilation.
-	virtual Json::Value assemblyJSON(std::string const& _contractName) const override;
+	virtual Json assemblyJSON(std::string const& _contractName) const override;
 
 	/// @returns a JSON representing the contract ABI.
 	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& contractABI(std::string const& _contractName) const;
+	Json const& contractABI(std::string const& _contractName) const;
 
 	/// @returns a JSON representing the storage layout of the contract.
 	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& storageLayout(std::string const& _contractName) const;
+	Json const& storageLayout(std::string const& _contractName) const;
 
 	/// @returns a JSON representing the contract's user documentation.
 	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& natspecUser(std::string const& _contractName) const;
+	Json const& natspecUser(std::string const& _contractName) const;
 
 	/// @returns a JSON representing the contract's developer documentation.
 	/// Prerequisite: Successful call to parse or compile.
-	Json::Value const& natspecDev(std::string const& _contractName) const;
+	Json 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 interfaceSymbols(std::string const& _contractName) const;
+	Json 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)); }
@@ -350,7 +349,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	bytes cborMetadata(std::string const& _contractName, bool _forIR) const;
 
 	/// @returns a JSON representing the estimated gas usage for contract creation, internal and external functions
-	Json::Value gasEstimates(std::string const& _contractName) const;
+	Json gasEstimates(std::string const& _contractName) const;
 
 	/// Changes the format of the metadata appended at the end of the bytecode.
 	void setMetadataFormat(MetadataFormat _metadataFormat) { m_metadataFormat = _metadataFormat; }
@@ -390,15 +389,15 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		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.
+		Json yulIRAst; ///< JSON AST of Yul IR code.
+		Json 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;
-		util::LazyInit<Json::Value const> userDocumentation;
-		util::LazyInit<Json::Value const> devDocumentation;
-		util::LazyInit<Json::Value const> generatedSources;
-		util::LazyInit<Json::Value const> runtimeGeneratedSources;
+		util::LazyInit<Json const> abi;
+		util::LazyInit<Json const> storageLayout;
+		util::LazyInit<Json const> userDocumentation;
+		util::LazyInit<Json const> devDocumentation;
+		util::LazyInit<Json const> generatedSources;
+		util::LazyInit<Json const> runtimeGeneratedSources;
 		mutable std::optional<std::string const> sourceMapping;
 		mutable std::optional<std::string const> runtimeSourceMapping;
 	};
@@ -479,19 +478,19 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 
 	/// @returns the contract ABI as a JSON object.
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& contractABI(Contract const&) const;
+	Json const& contractABI(Contract const&) const;
 
 	/// @returns the storage layout of the contract as a JSON object.
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& storageLayout(Contract const&) const;
+	Json const& storageLayout(Contract const&) const;
 
 	/// @returns the Natspec User documentation as a JSON object.
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& natspecUser(Contract const&) const;
+	Json const& natspecUser(Contract const&) const;
 
 	/// @returns the Natspec Developer documentation as a JSON object.
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
-	Json::Value const& natspecDev(Contract const&) const;
+	Json const& natspecDev(Contract const&) const;
 
 	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
 	/// This will generate the metadata and store it in the Contract object if it is not present yet.
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 539a3573f5..a0da7b54bb 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -33,13 +33,13 @@
 using namespace solidity;
 using namespace solidity::frontend;
 
-Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
+Json Natspec::userDocumentation(ContractDefinition const& _contractDef)
 {
-	Json::Value doc{Json::objectValue};
+	Json doc;
 
-	doc["version"] = Json::Value(c_natspecVersion);
-	doc["kind"]    = Json::Value("user");
-	doc["methods"] = Json::objectValue;
+	doc["version"] = Json(c_natspecVersion);
+	doc["kind"]    = Json("user");
+	doc["methods"] = Json::object();
 
 	auto constructorDefinition(_contractDef.constructor());
 	if (constructorDefinition)
@@ -48,15 +48,15 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 		if (!value.empty())
 		{
 			// add the constructor, only if we have any documentation to add
-			Json::Value user{Json::objectValue};
-			user["notice"] = Json::Value(value);
+			Json user;
+			user["notice"] = Json(value);
 			doc["methods"]["constructor"] = user;
 		}
 	}
 
 	std::string notice = extractDoc(_contractDef.annotation().docTags, "notice");
 	if (!notice.empty())
-		doc["notice"] = Json::Value(notice);
+		doc["notice"] = Json(notice);
 
 	for (auto const& it: _contractDef.interfaceFunctions())
 		if (it.second->hasDeclaration())
@@ -88,21 +88,21 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 		std::string value = extractDoc(error->annotation().docTags, "notice");
 		if (!value.empty())
 		{
-			Json::Value errorDoc{Json::objectValue};
+			Json errorDoc;
 			errorDoc["notice"] = value;
-			doc["errors"][error->functionType(true)->externalSignature()].append(std::move(errorDoc));
+			doc["errors"][error->functionType(true)->externalSignature()].emplace_back(std::move(errorDoc));
 		}
 	}
 
 	return doc;
 }
 
-Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
+Json Natspec::devDocumentation(ContractDefinition const& _contractDef)
 {
-	Json::Value doc = extractCustomDoc(_contractDef.annotation().docTags);
+	Json doc = extractCustomDoc(_contractDef.annotation().docTags);
 
-	doc["version"] = Json::Value(c_natspecVersion);
-	doc["kind"] = Json::Value("dev");
+	doc["version"] = Json(c_natspecVersion);
+	doc["kind"] = Json("dev");
 
 	auto author = extractDoc(_contractDef.annotation().docTags, "author");
 	if (!author.empty())
@@ -112,13 +112,13 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 		doc["title"] = title;
 	auto dev = extractDoc(_contractDef.annotation().docTags, "dev");
 	if (!dev.empty())
-		doc["details"] = Json::Value(dev);
+		doc["details"] = Json(dev);
 
-	doc["methods"] = Json::objectValue;
+	doc["methods"] = Json::object();
 	auto constructorDefinition(_contractDef.constructor());
 	if (constructorDefinition)
 	{
-		Json::Value constructor(devDocumentation(constructorDefinition->annotation().docTags));
+		Json constructor(devDocumentation(constructorDefinition->annotation().docTags));
 		if (!constructor.empty())
 			// add the constructor, only if we have any documentation to add
 			doc["methods"]["constructor"] = constructor;
@@ -130,9 +130,9 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 			continue;
 		if (auto fun = dynamic_cast<FunctionDefinition const*>(&it.second->declaration()))
 		{
-			Json::Value method(devDocumentation(fun->annotation().docTags));
+			Json method(devDocumentation(fun->annotation().docTags));
 			// add the function, only if we have any documentation to add
-			Json::Value jsonReturn = extractReturnParameterDocs(
+			Json jsonReturn = extractReturnParameterDocs(
 				fun->annotation().docTags,
 				fun->functionType(false)->returnParameterNames()
 			);
@@ -150,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 = [&](std::string const& _name, Json::Value const& _content)
+		auto const assignIfNotEmpty = [&](std::string const& _name, Json const& _content)
 		{
 			if (!_content.empty())
 				doc["stateVariables"][varDecl->name()][_name] = _content;
@@ -171,14 +171,14 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 			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);
+			doc["errors"][error->functionType(true)->externalSignature()].emplace_back(devDoc);
 
 	return doc;
 }
 
-Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames)
+Json Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames)
 {
-	Json::Value jsonReturn{Json::objectValue};
+	Json jsonReturn;
 	auto returnDocs = _tags.equal_range("return");
 
 	if (!_returnParameterNames.empty())
@@ -199,7 +199,7 @@ Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTa
 				content = content.substr(nameEndPos+1);
 			}
 
-			jsonReturn[paramName] = Json::Value(content);
+			jsonReturn[paramName] = Json(content);
 			n++;
 		}
 	}
@@ -216,7 +216,7 @@ std::string Natspec::extractDoc(std::multimap<std::string, DocTag> const& _tags,
 	return value;
 }
 
-Json::Value Natspec::extractCustomDoc(std::multimap<std::string, DocTag> const& _tags)
+Json Natspec::extractCustomDoc(std::multimap<std::string, DocTag> const& _tags)
 {
 	std::map<std::string, std::string> concatenated;
 	for (auto const& [tag, value]: _tags)
@@ -224,28 +224,28 @@ Json::Value Natspec::extractCustomDoc(std::multimap<std::string, DocTag> const&
 			concatenated[tag] += value.content;
 	// We do not want to create an object if there are no custom tags found.
 	if (concatenated.empty())
-		return Json::nullValue;
-	Json::Value result{Json::objectValue};
+		return Json();
+	Json result;
 	for (auto& [tag, value]: concatenated)
 		result[tag] = std::move(value);
 	return result;
 }
 
-Json::Value Natspec::devDocumentation(std::multimap<std::string, DocTag> const& _tags)
+Json Natspec::devDocumentation(std::multimap<std::string, DocTag> const& _tags)
 {
-	Json::Value json = extractCustomDoc(_tags);
+	Json json = extractCustomDoc(_tags);
 	auto dev = extractDoc(_tags, "dev");
 	if (!dev.empty())
-		json["details"] = Json::Value(dev);
+		json["details"] = Json(dev);
 
 	auto author = extractDoc(_tags, "author");
 	if (!author.empty())
 		json["author"] = author;
 
-	Json::Value params(Json::objectValue);
+	Json params;
 	auto paramRange = _tags.equal_range("param");
 	for (auto i = paramRange.first; i != paramRange.second; ++i)
-		params[i->second.paramName] = Json::Value(i->second.content);
+		params[i->second.paramName] = Json(i->second.content);
 
 	if (!params.empty())
 		json["params"] = params;
diff --git a/libsolidity/interface/Natspec.h b/libsolidity/interface/Natspec.h
index e75485097d..994f1350cb 100644
--- a/libsolidity/interface/Natspec.h
+++ b/libsolidity/interface/Natspec.h
@@ -26,10 +26,10 @@
 
 #pragma once
 
-#include <json/json.h>
+#include <libsolutil/JSON.h>
+#include <libsolidity/ast/AST.h>
 #include <memory>
 #include <string>
-#include <libsolidity/ast/AST.h>
 
 namespace solidity::frontend
 {
@@ -46,32 +46,32 @@ class Natspec
 	/// Get the User documentation of the contract
 	/// @param _contractDef The contract definition
 	/// @return             A JSON representation of the contract's user documentation
-	static Json::Value userDocumentation(ContractDefinition const& _contractDef);
+	static Json userDocumentation(ContractDefinition const& _contractDef);
 	/// Generates the Developer's documentation of the contract
 	/// @param _contractDef The contract definition
 	/// @return             A JSON representation
 	///                     of the contract's developer documentation
-	static Json::Value devDocumentation(ContractDefinition const& _contractDef);
+	static Json devDocumentation(ContractDefinition const& _contractDef);
 
 private:
 	/// @returns concatenation of all content under the given tag name.
 	static std::string extractDoc(std::multimap<std::string, DocTag> const& _tags, std::string const& _name);
 
 	/// Extract all custom tags from @a _tags.
-	static Json::Value extractCustomDoc(std::multimap<std::string, DocTag> const& _tags);
+	static Json extractCustomDoc(std::multimap<std::string, DocTag> const& _tags);
 
 	/// Helper-function that will create a json object with dev specific annotations, if present.
 	/// @param _tags docTags that are used.
 	/// @return      A JSON representation
 	///              of the contract's developer documentation
-	static Json::Value devDocumentation(std::multimap<std::string, DocTag> const& _tags);
+	static Json devDocumentation(std::multimap<std::string, DocTag> const& _tags);
 
 	/// Helper-function that will create a json object for the "returns" field for a given function definition.
 	/// @param _tags docTags that are used.
 	/// @param _returnParameterNames names of the return parameters
 	/// @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);
+	static Json 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
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 1f7b3fa758..a54a9aa107 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -54,64 +54,64 @@ using namespace std::string_literals;
 namespace
 {
 
-Json::Value formatError(
+Json formatError(
 	Error::Type _type,
 	std::string const& _component,
 	std::string const& _message,
 	std::string const& _formattedMessage = "",
-	Json::Value const& _sourceLocation = Json::Value(),
-	Json::Value const& _secondarySourceLocation = Json::Value()
+	Json const& _sourceLocation = Json(),
+	Json const& _secondarySourceLocation = Json()
 )
 {
-	Json::Value error{Json::objectValue};
+	Json error;
 	error["type"] = Error::formatErrorType(_type);
 	error["component"] = _component;
 	error["severity"] = Error::formatErrorSeverityLowercase(Error::errorSeverity(_type));
 	error["message"] = _message;
 	error["formattedMessage"] = (_formattedMessage.length() > 0) ? _formattedMessage : _message;
-	if (_sourceLocation.isObject())
+	if (_sourceLocation.is_object())
 		error["sourceLocation"] = _sourceLocation;
-	if (_secondarySourceLocation.isArray())
+	if (_secondarySourceLocation.is_array())
 		error["secondarySourceLocations"] = _secondarySourceLocation;
 	return error;
 }
 
-Json::Value formatFatalError(Error::Type _type, std::string const& _message)
+Json formatFatalError(Error::Type _type, std::string const& _message)
 {
-	Json::Value output{Json::objectValue};
-	output["errors"] = Json::arrayValue;
-	output["errors"].append(formatError(_type, "general", _message));
+	Json output;
+	output["errors"] = Json::array();
+	output["errors"].emplace_back(formatError(_type, "general", _message));
 	return output;
 }
 
-Json::Value formatSourceLocation(SourceLocation const* location)
+Json formatSourceLocation(SourceLocation const* location)
 {
 	if (!location || !location->sourceName)
-		return Json::nullValue;
+		return Json();
 
-	Json::Value sourceLocation{Json::objectValue};
+	Json sourceLocation;
 	sourceLocation["file"] = *location->sourceName;
 	sourceLocation["start"] = location->start;
 	sourceLocation["end"] = location->end;
 	return sourceLocation;
 }
 
-Json::Value formatSecondarySourceLocation(SecondarySourceLocation const* _secondaryLocation)
+Json formatSecondarySourceLocation(SecondarySourceLocation const* _secondaryLocation)
 {
 	if (!_secondaryLocation)
-		return Json::nullValue;
+		return Json();
 
-	Json::Value secondarySourceLocation{Json::arrayValue};
+	Json secondarySourceLocation = Json::array();
 	for (auto const& location: _secondaryLocation->infos)
 	{
-		Json::Value msg = formatSourceLocation(&location.second);
+		Json msg = formatSourceLocation(&location.second);
 		msg["message"] = location.first;
-		secondarySourceLocation.append(msg);
+		secondarySourceLocation.emplace_back(msg);
 	}
 	return secondarySourceLocation;
 }
 
-Json::Value formatErrorWithException(
+Json formatErrorWithException(
 	CharStreamProvider const& _charStreamProvider,
 	util::Exception const& _exception,
 	Error::Type _type,
@@ -134,7 +134,7 @@ Json::Value formatErrorWithException(
 	else
 		message = _message;
 
-	Json::Value error = formatError(
+	Json error = formatError(
 		_type,
 		_component,
 		message,
@@ -149,13 +149,13 @@ Json::Value formatErrorWithException(
 	return error;
 }
 
-std::map<std::string, std::set<std::string>> requestedContractNames(Json::Value const& _outputSelection)
+std::map<std::string, std::set<std::string>> requestedContractNames(Json const& _outputSelection)
 {
 	std::map<std::string, std::set<std::string>> contracts;
-	for (auto const& sourceName: _outputSelection.getMemberNames())
+	for (auto const& [sourceName, _]: _outputSelection.items())
 	{
 		std::string key = (sourceName == "*") ? "" : sourceName;
-		for (auto const& contractName: _outputSelection[sourceName].getMemberNames())
+		for (auto const& [contractName, _]: _outputSelection[sourceName].items())
 		{
 			std::string value = (contractName == "*") ? "" : contractName;
 			contracts[key].insert(value);
@@ -177,12 +177,12 @@ bool hashMatchesContent(std::string const& _hash, std::string const& _content)
 	}
 }
 
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _artifact, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json const& _outputSelection, std::string const& _artifact, bool _wildcardMatchesExperimental)
 {
 	static std::set<std::string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
 	for (auto const& selectedArtifactJson: _outputSelection)
 	{
-		std::string const& selectedArtifact = selectedArtifactJson.asString();
+		std::string const& selectedArtifact = selectedArtifactJson.get<std::string>();
 		if (
 			_artifact == selectedArtifact ||
 			boost::algorithm::starts_with(_artifact, selectedArtifact + ".")
@@ -211,13 +211,13 @@ bool isArtifactRequested(Json::Value const& _outputSelection, std::string const&
 ///
 /// @TODO optimise this. Perhaps flatten the structure upfront.
 ///
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::string const& _artifact, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json const& _outputSelection, std::string const& _file, std::string const& _contract, std::string const& _artifact, bool _wildcardMatchesExperimental)
 {
-	if (!_outputSelection.isObject())
+	if (!_outputSelection.is_object())
 		return false;
 
 	for (auto const& file: { _file, std::string("*") })
-		if (_outputSelection.isMember(file) && _outputSelection[file].isObject())
+		if (_outputSelection.contains(file) && _outputSelection[file].is_object())
 		{
 			/// For SourceUnit-level targets (such as AST) only allow empty name, otherwise
 			/// for Contract-level targets try both contract name and wildcard
@@ -226,8 +226,8 @@ bool isArtifactRequested(Json::Value const& _outputSelection, std::string const&
 				contracts.emplace_back("*");
 			for (auto const& contract: contracts)
 				if (
-					_outputSelection[file].isMember(contract) &&
-					_outputSelection[file][contract].isArray() &&
+					_outputSelection[file].contains(contract) &&
+					_outputSelection[file][contract].is_array() &&
 					isArtifactRequested(_outputSelection[file][contract], _artifact, _wildcardMatchesExperimental)
 				)
 					return true;
@@ -236,7 +236,7 @@ bool isArtifactRequested(Json::Value const& _outputSelection, std::string const&
 	return false;
 }
 
-bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::vector<std::string> const& _artifacts, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json 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))
@@ -255,9 +255,9 @@ std::vector<std::string> evmObjectComponents(std::string const& _objectKind)
 }
 
 /// @returns true if any binary was requested, i.e. we actually have to perform compilation.
-bool isBinaryRequested(Json::Value const& _outputSelection)
+bool isBinaryRequested(Json const& _outputSelection)
 {
-	if (!_outputSelection.isObject())
+	if (!_outputSelection.is_object())
 		return false;
 
 	// This does not include "evm.methodIdentifiers" on purpose!
@@ -276,9 +276,9 @@ bool isBinaryRequested(Json::Value const& _outputSelection)
 }
 
 /// @returns true if EVM bytecode was requested, i.e. we have to run the old code generator.
-bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
+bool isEvmBytecodeRequested(Json const& _outputSelection)
 {
-	if (!_outputSelection.isObject())
+	if (!_outputSelection.is_object())
 		return false;
 
 	static std::vector<std::string> const outputsThatRequireEvmBinaries = std::vector<std::string>{
@@ -296,9 +296,9 @@ bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
 
 /// @returns true if any Yul IR was requested. Note that as an exception, '*' does not
 /// yet match "ir", "irAst", "irOptimized" or "irOptimizedAst"
-bool isIRRequested(Json::Value const& _outputSelection)
+bool isIRRequested(Json const& _outputSelection)
 {
-	if (!_outputSelection.isObject())
+	if (!_outputSelection.is_object())
 		return false;
 
 	for (auto const& fileRequests: _outputSelection)
@@ -315,9 +315,9 @@ bool isIRRequested(Json::Value const& _outputSelection)
 	return false;
 }
 
-Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
+Json formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
 {
-	Json::Value ret{Json::objectValue};
+	Json ret = Json::object();
 
 	for (auto const& ref: linkReferences)
 	{
@@ -329,14 +329,14 @@ Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkRefere
 		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);
+		Json fileObject = ret.value(file, Json::object());
+		Json libraryArray = fileObject.value(name, Json::array());
 
-		Json::Value entry{Json::objectValue};
-		entry["start"] = Json::UInt(ref.first);
+		Json entry;
+		entry["start"] = Json(ref.first);
 		entry["length"] = 20;
 
-		libraryArray.append(entry);
+		libraryArray.emplace_back(entry);
 		fileObject[name] = libraryArray;
 		ret[file] = fileObject;
 	}
@@ -344,20 +344,20 @@ Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkRefere
 	return ret;
 }
 
-Json::Value formatImmutableReferences(std::map<u256, std::pair<std::string, std::vector<size_t>>> const& _immutableReferences)
+Json formatImmutableReferences(std::map<u256, std::pair<std::string, std::vector<size_t>>> const& _immutableReferences)
 {
-	Json::Value ret{Json::objectValue};
+	Json ret = Json::object();
 
 	for (auto const& immutableReference: _immutableReferences)
 	{
 		auto const& [identifier, byteOffsets] = immutableReference.second;
-		Json::Value array(Json::arrayValue);
+		Json array = Json::array();
 		for (size_t byteOffset: byteOffsets)
 		{
-			Json::Value byteRange{Json::objectValue};
-			byteRange["start"] = Json::UInt(byteOffset);
-			byteRange["length"] = Json::UInt(32); // immutable references are currently always 32 bytes wide
-			array.append(byteRange);
+			Json byteRange;
+			byteRange["start"] = Json::number_unsigned_t(byteOffset);
+			byteRange["length"] = Json::number_unsigned_t(32); // immutable references are currently always 32 bytes wide
+			array.emplace_back(byteRange);
 		}
 		ret[identifier] = array;
 	}
@@ -365,16 +365,16 @@ Json::Value formatImmutableReferences(std::map<u256, std::pair<std::string, std:
 	return ret;
 }
 
-Json::Value collectEVMObject(
+Json collectEVMObject(
 	langutil::EVMVersion _evmVersion,
 	evmasm::LinkerObject const& _object,
 	std::string const* _sourceMap,
-	Json::Value _generatedSources,
+	Json _generatedSources,
 	bool _runtimeObject,
 	std::function<bool(std::string)> const& _artifactRequested
 )
 {
-	Json::Value output{Json::objectValue};
+	Json output;
 	if (_artifactRequested("object"))
 		output["object"] = _object.toHex();
 	if (_artifactRequested("opcodes"))
@@ -392,78 +392,78 @@ Json::Value collectEVMObject(
 	return output;
 }
 
-std::optional<Json::Value> checkKeys(Json::Value const& _input, std::set<std::string> const& _keys, std::string const& _name)
+std::optional<Json> checkKeys(Json const& _input, std::set<std::string> const& _keys, std::string const& _name)
 {
-	if (!!_input && !_input.isObject())
+	if (!_input.empty() && !_input.is_object())
 		return formatFatalError(Error::Type::JSONError, "\"" + _name + "\" must be an object");
 
-	for (auto const& member: _input.getMemberNames())
+	for (auto const& [member, _]: _input.items())
 		if (!_keys.count(member))
 			return formatFatalError(Error::Type::JSONError, "Unknown key \"" + member + "\"");
 
 	return std::nullopt;
 }
 
-std::optional<Json::Value> checkRootKeys(Json::Value const& _input)
+std::optional<Json> checkRootKeys(Json const& _input)
 {
 	static std::set<std::string> keys{"auxiliaryInput", "language", "settings", "sources"};
 	return checkKeys(_input, keys, "root");
 }
 
-std::optional<Json::Value> checkSourceKeys(Json::Value const& _input, std::string const& _name)
+std::optional<Json> checkSourceKeys(Json const& _input, std::string const& _name)
 {
 	static std::set<std::string> keys{"content", "keccak256", "urls"};
 	return checkKeys(_input, keys, "sources." + _name);
 }
 
-std::optional<Json::Value> checkAuxiliaryInputKeys(Json::Value const& _input)
+std::optional<Json> checkAuxiliaryInputKeys(Json const& _input)
 {
 	static std::set<std::string> keys{"smtlib2responses"};
 	return checkKeys(_input, keys, "auxiliaryInput");
 }
 
-std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
+std::optional<Json> checkSettingsKeys(Json const& _input)
 {
 	static std::set<std::string> keys{"debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
 	return checkKeys(_input, keys, "settings");
 }
 
-std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
+std::optional<Json> checkModelCheckerSettingsKeys(Json const& _input)
 {
 	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)
+std::optional<Json> checkOptimizerKeys(Json const& _input)
 {
 	static std::set<std::string> keys{"details", "enabled", "runs"};
 	return checkKeys(_input, keys, "settings.optimizer");
 }
 
-std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input)
+std::optional<Json> checkOptimizerDetailsKeys(Json const& _input)
 {
 	static std::set<std::string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails", "simpleCounterForLoopUncheckedIncrement"};
 	return checkKeys(_input, keys, "settings.optimizer.details");
 }
 
-std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std::string const& _name, bool& _setting)
+std::optional<Json> checkOptimizerDetail(Json const& _details, std::string const& _name, bool& _setting)
 {
-	if (_details.isMember(_name))
+	if (_details.contains(_name))
 	{
-		if (!_details[_name].isBool())
+		if (!_details[_name].is_boolean())
 			return formatFatalError(Error::Type::JSONError, "\"settings.optimizer.details." + _name + "\" must be Boolean");
-		_setting = _details[_name].asBool();
+		_setting = _details[_name].get<bool>();
 	}
 	return {};
 }
 
-std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting, bool _runYulOptimizer)
+std::optional<Json> checkOptimizerDetailSteps(Json const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting, bool _runYulOptimizer)
 {
-	if (_details.isMember(_name))
+	if (_details.contains(_name))
 	{
-		if (_details[_name].isString())
+		if (_details[_name].is_string())
 		{
-			std::string const fullSequence = _details[_name].asString();
+			std::string const fullSequence = _details[_name].get<std::string>();
 			if (!_runYulOptimizer && !OptimiserSuite::isEmptyOptimizerSequence(fullSequence))
 			{
 				std::string errorMessage =
@@ -474,7 +474,7 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 
 			try
 			{
-				yul::OptimiserSuite::validateSequence(_details[_name].asString());
+				yul::OptimiserSuite::validateSequence(_details[_name].get<std::string>());
 			}
 			catch (yul::OptimizerException const& _exception)
 			{
@@ -499,43 +499,39 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 	return {};
 }
 
-std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
+std::optional<Json> checkMetadataKeys(Json const& _input)
 {
-	if (_input.isObject())
+	if (_input.is_object())
 	{
-		if (_input.isMember("appendCBOR") && !_input["appendCBOR"].isBool())
+		if (_input.contains("appendCBOR") && !_input["appendCBOR"].is_boolean())
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.appendCBOR\" must be Boolean");
-		if (_input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
+		if (_input.contains("useLiteralContent") && !_input["useLiteralContent"].is_boolean())
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.useLiteralContent\" must be Boolean");
 
 		static std::set<std::string> hashes{"ipfs", "bzzr1", "none"};
-		if (_input.isMember("bytecodeHash") && !hashes.count(_input["bytecodeHash"].asString()))
+		if (_input.contains("bytecodeHash") && !hashes.count(_input["bytecodeHash"].get<std::string>()))
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
 	}
 	static std::set<std::string> keys{"appendCBOR", "useLiteralContent", "bytecodeHash"};
 	return checkKeys(_input, keys, "settings.metadata");
 }
 
-std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelection)
+std::optional<Json> checkOutputSelection(Json const& _outputSelection)
 {
-	if (!!_outputSelection && !_outputSelection.isObject())
+	if (!_outputSelection.empty() && !_outputSelection.is_object())
 		return formatFatalError(Error::Type::JSONError, "\"settings.outputSelection\" must be an object");
 
-	for (auto const& sourceName: _outputSelection.getMemberNames())
+	for (auto const& [sourceName, sourceVal]: _outputSelection.items())
 	{
-		auto const& sourceVal = _outputSelection[sourceName];
-
-		if (!sourceVal.isObject())
+		if (!sourceVal.is_object())
 			return formatFatalError(
 				Error::Type::JSONError,
 				"\"settings.outputSelection." + sourceName + "\" must be an object"
 			);
 
-		for (auto const& contractName: sourceVal.getMemberNames())
+		for (auto const& [contractName, contractVal]: sourceVal.items())
 		{
-			auto const& contractVal = sourceVal[contractName];
-
-			if (!contractVal.isArray())
+			if (!contractVal.is_array())
 				return formatFatalError(
 					Error::Type::JSONError,
 					"\"settings.outputSelection." +
@@ -546,7 +542,7 @@ std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelect
 				);
 
 			for (auto const& output: contractVal)
-				if (!output.isString())
+				if (!output.is_string())
 					return formatFatalError(
 						Error::Type::JSONError,
 						"\"settings.outputSelection." +
@@ -563,32 +559,32 @@ std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelect
 
 /// Validates the optimizer settings and returns them in a parsed object.
 /// On error returns the json-formatted error message.
-std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value const& _jsonInput)
+std::variant<OptimiserSettings, Json> parseOptimizerSettings(Json const& _jsonInput)
 {
 	if (auto result = checkOptimizerKeys(_jsonInput))
 		return *result;
 
 	OptimiserSettings settings = OptimiserSettings::minimal();
 
-	if (_jsonInput.isMember("enabled"))
+	if (_jsonInput.contains("enabled"))
 	{
-		if (!_jsonInput["enabled"].isBool())
+		if (!_jsonInput["enabled"].is_boolean())
 			return formatFatalError(Error::Type::JSONError, "The \"enabled\" setting must be a Boolean.");
 
-		if (_jsonInput["enabled"].asBool())
+		if (_jsonInput["enabled"].get<bool>())
 			settings = OptimiserSettings::standard();
 	}
 
-	if (_jsonInput.isMember("runs"))
+	if (_jsonInput.contains("runs"))
 	{
-		if (!_jsonInput["runs"].isUInt())
+		if (!_jsonInput["runs"].is_number_unsigned())
 			return formatFatalError(Error::Type::JSONError, "The \"runs\" setting must be an unsigned number.");
-		settings.expectedExecutionsPerDeployment = _jsonInput["runs"].asUInt();
+		settings.expectedExecutionsPerDeployment = _jsonInput["runs"].get<size_t>();
 	}
 
-	if (_jsonInput.isMember("details"))
+	if (_jsonInput.contains("details"))
 	{
-		Json::Value const& details = _jsonInput["details"];
+		Json const& details = _jsonInput["details"];
 		if (auto result = checkOptimizerDetailsKeys(details))
 			return *result;
 
@@ -611,7 +607,7 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 		if (auto error = checkOptimizerDetail(details, "simpleCounterForLoopUncheckedIncrement", settings.simpleCounterForLoopUncheckedIncrement))
 			return *error;
 		settings.optimizeStackAllocation = settings.runYulOptimiser;
-		if (details.isMember("yulDetails"))
+		if (details.contains("yulDetails"))
 		{
 			if (!settings.runYulOptimiser)
 			{
@@ -635,45 +631,46 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 
 }
 
-std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler::parseInput(Json::Value const& _input)
+std::variant<StandardCompiler::InputsAndSettings, Json> StandardCompiler::parseInput(Json const& _input)
 {
 	InputsAndSettings ret;
 
-	if (!_input.isObject())
+	if (!_input.is_object())
 		return formatFatalError(Error::Type::JSONError, "Input is not a JSON object.");
 
 	if (auto result = checkRootKeys(_input))
 		return *result;
 
-	ret.language = _input["language"].asString();
+	ret.language = _input.value<std::string>("language", "");
 
-	Json::Value const& sources = _input["sources"];
+	Json const& sources = _input.value<Json>("sources", Json());
 
-	if (!sources.isObject() && !sources.isNull())
+	if (!sources.is_object() && !sources.is_null())
 		return formatFatalError(Error::Type::JSONError, "\"sources\" is not a JSON object.");
 
 	if (sources.empty())
 		return formatFatalError(Error::Type::JSONError, "No input sources specified.");
 
-	ret.errors = Json::arrayValue;
+	ret.errors = Json::array();
+	ret.sources = Json::object();
 
 	if (ret.language == "Solidity" || ret.language == "Yul")
 	{
-		for (auto const& sourceName: sources.getMemberNames())
+		for (auto const& [sourceName, sourceValue]: sources.items())
 		{
 			std::string hash;
 
-			if (auto result = checkSourceKeys(sources[sourceName], sourceName))
+			if (auto result = checkSourceKeys(sourceValue, sourceName))
 				return *result;
 
-			if (sources[sourceName]["keccak256"].isString())
-				hash = sources[sourceName]["keccak256"].asString();
+			if (sourceValue.contains("keccak256") && sourceValue["keccak256"].is_string())
+				hash = sourceValue["keccak256"].get<std::string>();
 
-			if (sources[sourceName]["content"].isString())
+			if (sourceValue.contains("content") && sourceValue["content"].is_string())
 			{
-				std::string content = sources[sourceName]["content"].asString();
+				std::string content = sourceValue["content"].get<std::string>();
 				if (!hash.empty() && !hashMatchesContent(hash, content))
-					ret.errors.append(formatError(
+					ret.errors.emplace_back(formatError(
 						Error::Type::IOError,
 						"general",
 						"Mismatch between content and supplied hash for \"" + sourceName + "\""
@@ -681,7 +678,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				else
 					ret.sources[sourceName] = content;
 			}
-			else if (sources[sourceName]["urls"].isArray())
+			else if (sourceValue["urls"].is_array())
 			{
 				if (!m_readFile)
 					return formatFatalError(
@@ -691,18 +688,18 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				std::vector<std::string> failures;
 				bool found = false;
 
-				for (auto const& url: sources[sourceName]["urls"])
+				for (auto const& url: sourceValue["urls"])
 				{
-					if (!url.isString())
+					if (!url.is_string())
 						return formatFatalError(Error::Type::JSONError, "URL must be a string.");
-					ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.asString());
+					ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.get<std::string>());
 					if (result.success)
 					{
 						if (!hash.empty() && !hashMatchesContent(hash, result.responseOrErrorMessage))
-							ret.errors.append(formatError(
+							ret.errors.emplace_back(formatError(
 								Error::Type::IOError,
 								"general",
-								"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.asString() + "\""
+								"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.get<std::string>() + "\""
 							));
 						else
 						{
@@ -713,14 +710,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 					}
 					else
 						failures.push_back(
-							"Cannot import url (\"" + url.asString() + "\"): " + result.responseOrErrorMessage
+							"Cannot import url (\"" + url.get<std::string>() + "\"): " + 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(
+					ret.errors.emplace_back(formatError(
 						found ? Error::Type::Warning : Error::Type::IOError,
 						"general",
 						failure
@@ -733,25 +730,25 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	}
 	else if (ret.language == "SolidityAST")
 	{
-		for (auto const& sourceName: sources.getMemberNames())
-			ret.sources[sourceName] = util::jsonCompactPrint(sources[sourceName]);
+		for (auto const& [sourceName, sourceValue]: sources.items())
+			ret.sources[sourceName] = util::jsonCompactPrint(sourceValue);
 	}
 	else if (ret.language == "EVMAssembly")
 	{
-		for (std::string const& sourceName: sources.getMemberNames())
+		for (auto const& [sourceName, sourceValue]: sources.items())
 		{
-			solAssert(sources.isMember(sourceName));
+			solAssert(sources.contains(sourceName));
 			if (
-				!sources[sourceName].isMember("assemblyJson") ||
-				!sources[sourceName]["assemblyJson"].isObject() ||
-				sources[sourceName].size() != 1
+				!sourceValue.contains("assemblyJson") ||
+				!sourceValue["assemblyJson"].is_object() ||
+				sourceValue.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"];
+			ret.jsonSources[sourceName] = sourceValue["assemblyJson"];
 		}
 		if (ret.jsonSources.size() != 1)
 			return formatFatalError(
@@ -759,20 +756,20 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				"EVMAssembly import only supports exactly one input file."
 			);
 	}
-	Json::Value const& auxInputs = _input["auxiliaryInput"];
+	Json const& auxInputs = _input.value("auxiliaryInput", Json::object());
 
 	if (auto result = checkAuxiliaryInputKeys(auxInputs))
 		return *result;
 
-	if (!!auxInputs)
+	if (!auxInputs.empty())
 	{
-		Json::Value const& smtlib2Responses = auxInputs["smtlib2responses"];
-		if (!!smtlib2Responses)
+		Json const& smtlib2Responses = auxInputs.value("smtlib2responses", Json::object());
+		if (!smtlib2Responses.empty())
 		{
-			if (!smtlib2Responses.isObject())
+			if (!smtlib2Responses.is_object())
 				return formatFatalError(Error::Type::JSONError, "\"auxiliaryInput.smtlib2responses\" must be an object.");
 
-			for (auto const& hashString: smtlib2Responses.getMemberNames())
+			for (auto const& [hashString, response]: smtlib2Responses.items())
 			{
 				util::h256 hash;
 				try
@@ -784,49 +781,49 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 					return formatFatalError(Error::Type::JSONError, "Invalid hex encoding of SMTLib2 auxiliary input.");
 				}
 
-				if (!smtlib2Responses[hashString].isString())
+				if (!response.is_string())
 					return formatFatalError(
 						Error::Type::JSONError,
 						"\"smtlib2Responses." + hashString + "\" must be a string."
 					);
 
-				ret.smtLib2Responses[hash] = smtlib2Responses[hashString].asString();
+				ret.smtLib2Responses[hash] = response.get<std::string>();
 			}
 		}
 	}
 
-	Json::Value const& settings = _input.get("settings", Json::Value());
+	Json const& settings = _input.value("settings", Json::object());
 
 	if (auto result = checkSettingsKeys(settings))
 		return *result;
 
-	if (settings.isMember("stopAfter"))
+	if (settings.contains("stopAfter"))
 	{
-		if (!settings["stopAfter"].isString())
+		if (!settings["stopAfter"].is_string())
 			return formatFatalError(Error::Type::JSONError, "\"settings.stopAfter\" must be a string.");
 
-		if (settings["stopAfter"].asString() != "parsing")
+		if (settings["stopAfter"].get<std::string>() != "parsing")
 			return formatFatalError(Error::Type::JSONError, "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\".");
 
 		ret.stopAfter = CompilerStack::State::Parsed;
 	}
 
-	if (settings.isMember("viaIR"))
+	if (settings.contains("viaIR"))
 	{
-		if (!settings["viaIR"].isBool())
+		if (!settings["viaIR"].is_boolean())
 			return formatFatalError(Error::Type::JSONError, "\"settings.viaIR\" must be a Boolean.");
-		ret.viaIR = settings["viaIR"].asBool();
+		ret.viaIR = settings["viaIR"].get<bool>();
 	}
 
-	if (settings.isMember("evmVersion"))
+	if (settings.contains("evmVersion"))
 	{
-		if (!settings["evmVersion"].isString())
+		if (!settings["evmVersion"].is_string())
 			return formatFatalError(Error::Type::JSONError, "evmVersion must be a string.");
-		std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(settings["evmVersion"].asString());
+		std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(settings["evmVersion"].get<std::string>());
 		if (!version)
 			return formatFatalError(Error::Type::JSONError, "Invalid EVM version requested.");
 		if (version < EVMVersion::constantinople())
-			ret.errors.append(formatError(
+			ret.errors.emplace_back(formatError(
 				Error::Type::Warning,
 				"general",
 				"Support for EVM versions older than constantinople is deprecated and will be removed in the future."
@@ -834,26 +831,26 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.evmVersion = *version;
 	}
 
-	if (settings.isMember("eofVersion"))
+	if (settings.contains("eofVersion"))
 	{
-		if (!settings["eofVersion"].isUInt())
+		if (!settings["eofVersion"].is_number_unsigned())
 			return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
-		auto eofVersion = settings["evmVersion"].asUInt();
+		auto eofVersion = settings["evmVersion"].get<uint8_t>();
 		if (eofVersion != 1)
 			return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
 		ret.eofVersion = 1;
 	}
 
-	if (settings.isMember("debug"))
+	if (settings.contains("debug"))
 	{
 		if (auto result = checkKeys(settings["debug"], {"revertStrings", "debugInfo"}, "settings.debug"))
 			return *result;
 
-		if (settings["debug"].isMember("revertStrings"))
+		if (settings["debug"].contains("revertStrings"))
 		{
-			if (!settings["debug"]["revertStrings"].isString())
+			if (!settings["debug"]["revertStrings"].is_string())
 				return formatFatalError(Error::Type::JSONError, "settings.debug.revertStrings must be a string.");
-			std::optional<RevertStrings> revertStrings = revertStringsFromString(settings["debug"]["revertStrings"].asString());
+			std::optional<RevertStrings> revertStrings = revertStringsFromString(settings["debug"]["revertStrings"].get<std::string>());
 			if (!revertStrings)
 				return formatFatalError(Error::Type::JSONError, "Invalid value for settings.debug.revertStrings.");
 			if (*revertStrings == RevertStrings::VerboseDebug)
@@ -864,14 +861,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			ret.revertStrings = *revertStrings;
 		}
 
-		if (settings["debug"].isMember("debugInfo"))
+		if (settings["debug"].contains("debugInfo"))
 		{
-			if (!settings["debug"]["debugInfo"].isArray())
+			if (!settings["debug"]["debugInfo"].is_array())
 				return formatFatalError(Error::Type::JSONError, "settings.debug.debugInfo must be an array.");
 
 			std::vector<std::string> components;
-			for (Json::Value const& arrayValue: settings["debug"]["debugInfo"])
-				components.push_back(arrayValue.asString());
+			for (Json const& arrayValue: settings["debug"]["debugInfo"])
+				components.push_back(arrayValue.get<std::string>());
 
 			std::optional<DebugInfoSelection> debugInfoSelection = DebugInfoSelection::fromComponents(
 				components,
@@ -890,41 +887,40 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		}
 	}
 
-	if (settings.isMember("remappings") && !settings["remappings"].isArray())
+	if (settings.contains("remappings") && !settings["remappings"].is_array())
 		return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings.");
 
-	for (auto const& remapping: settings.get("remappings", Json::Value()))
+	for (auto const& remapping: settings.value("remappings", Json::object()))
 	{
-		if (!remapping.isString())
+		if (!remapping.is_string())
 			return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings");
-		if (auto r = ImportRemapper::parseRemapping(remapping.asString()))
+		if (auto r = ImportRemapper::parseRemapping(remapping.get<std::string>()))
 			ret.remappings.emplace_back(std::move(*r));
 		else
-			return formatFatalError(Error::Type::JSONError, "Invalid remapping: \"" + remapping.asString() + "\"");
+			return formatFatalError(Error::Type::JSONError, "Invalid remapping: \"" + remapping.get<std::string>() + "\"");
 	}
 
-	if (settings.isMember("optimizer"))
+	if (settings.contains("optimizer"))
 	{
 		auto optimiserSettings = parseOptimizerSettings(settings["optimizer"]);
-		if (std::holds_alternative<Json::Value>(optimiserSettings))
-			return std::get<Json::Value>(std::move(optimiserSettings)); // was an error
+		if (std::holds_alternative<Json>(optimiserSettings))
+			return std::get<Json>(std::move(optimiserSettings)); // was an error
 		else
 			ret.optimiserSettings = std::get<OptimiserSettings>(std::move(optimiserSettings));
 	}
 
-	Json::Value jsonLibraries = settings.get("libraries", Json::Value(Json::objectValue));
-	if (!jsonLibraries.isObject())
+	Json const& jsonLibraries = settings.value("libraries", Json::object());
+	if (!jsonLibraries.is_object())
 		return formatFatalError(Error::Type::JSONError, "\"libraries\" is not a JSON object.");
-	for (auto const& sourceName: jsonLibraries.getMemberNames())
+	for (auto const& [sourceName, jsonSourceName]: jsonLibraries.items())
 	{
-		auto const& jsonSourceName = jsonLibraries[sourceName];
-		if (!jsonSourceName.isObject())
+		if (!jsonSourceName.is_object())
 			return formatFatalError(Error::Type::JSONError, "Library entry is not a JSON object.");
-		for (auto const& library: jsonSourceName.getMemberNames())
+		for (auto const& [library, libraryValue]: jsonSourceName.items())
 		{
-			if (!jsonSourceName[library].isString())
+			if (!libraryValue.is_string())
 				return formatFatalError(Error::Type::JSONError, "Library address must be a string.");
-			std::string address = jsonSourceName[library].asString();
+			std::string address = libraryValue.get<std::string>();
 
 			if (!boost::starts_with(address, "0x"))
 				return formatFatalError(
@@ -952,21 +948,24 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		}
 	}
 
-	Json::Value metadataSettings = settings.get("metadata", Json::Value());
+	Json const& metadataSettings = settings.value("metadata", Json::object());
 
 	if (auto result = checkMetadataKeys(metadataSettings))
 		return *result;
 
 	solAssert(CompilerStack::defaultMetadataFormat() != CompilerStack::MetadataFormat::NoMetadata, "");
 	ret.metadataFormat =
-		metadataSettings.get("appendCBOR", Json::Value(true)).asBool() ?
+		metadataSettings.value("appendCBOR", Json(true)) ?
 		CompilerStack::defaultMetadataFormat() :
 		CompilerStack::MetadataFormat::NoMetadata;
 
-	ret.metadataLiteralSources = metadataSettings.get("useLiteralContent", Json::Value(false)).asBool();
-	if (metadataSettings.isMember("bytecodeHash"))
+	ret.metadataLiteralSources =
+		metadataSettings.contains("useLiteralContent") &&
+		metadataSettings["useLiteralContent"].is_boolean() &&
+		metadataSettings["useLiteralContent"].get<bool>();
+	if (metadataSettings.contains("bytecodeHash"))
 	{
-		auto metadataHash = metadataSettings["bytecodeHash"].asString();
+		auto metadataHash = metadataSettings["bytecodeHash"].get<std::string>();
 		ret.metadataHash =
 			metadataHash == "ipfs" ?
 			CompilerStack::MetadataHash::IPFS :
@@ -982,12 +981,12 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			);
 	}
 
-	Json::Value outputSelection = settings.get("outputSelection", Json::Value());
+	Json const& outputSelection = settings.value("outputSelection", Json::object());
 
 	if (auto jsonError = checkOutputSelection(outputSelection))
 		return *jsonError;
 
-	ret.outputSelection = std::move(outputSelection);
+	ret.outputSelection = outputSelection;
 
 	if (ret.stopAfter != CompilerStack::State::CompilationSuccessful && isBinaryRequested(ret.outputSelection))
 		return formatFatalError(
@@ -995,34 +994,33 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			"Requested output selection conflicts with \"settings.stopAfter\"."
 		);
 
-	Json::Value const& modelCheckerSettings = settings.get("modelChecker", Json::Value());
+	Json const& modelCheckerSettings = settings.value("modelChecker", Json::object());
 
 	if (auto result = checkModelCheckerSettingsKeys(modelCheckerSettings))
 		return *result;
 
-	if (modelCheckerSettings.isMember("contracts"))
+	if (modelCheckerSettings.contains("contracts"))
 	{
 		auto const& sources = modelCheckerSettings["contracts"];
-		if (!sources.isObject() && !sources.isNull())
+		if (!sources.is_object() && !sources.is_null())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.contracts is not a JSON object.");
 
 		std::map<std::string, std::set<std::string>> sourceContracts;
-		for (auto const& source: sources.getMemberNames())
+		for (auto const& [source, contracts]: sources.items())
 		{
 			if (source.empty())
 				return formatFatalError(Error::Type::JSONError, "Source name cannot be empty.");
 
-			auto const& contracts = sources[source];
-			if (!contracts.isArray())
+			if (!contracts.is_array())
 				return formatFatalError(Error::Type::JSONError, "Source contracts must be an array.");
 
 			for (auto const& contract: contracts)
 			{
-				if (!contract.isString())
+				if (!contract.is_string())
 					return formatFatalError(Error::Type::JSONError, "Every contract in settings.modelChecker.contracts must be a string.");
-				if (contract.asString().empty())
+				if (contract.get<std::string>().empty())
 					return formatFatalError(Error::Type::JSONError, "Contract name cannot be empty.");
-				sourceContracts[source].insert(contract.asString());
+				sourceContracts[source].insert(contract.get<std::string>());
 			}
 
 			if (sourceContracts[source].empty())
@@ -1031,56 +1029,56 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.contracts = {std::move(sourceContracts)};
 	}
 
-	if (modelCheckerSettings.isMember("divModNoSlacks"))
+	if (modelCheckerSettings.contains("divModNoSlacks"))
 	{
 		auto const& divModNoSlacks = modelCheckerSettings["divModNoSlacks"];
-		if (!divModNoSlacks.isBool())
+		if (!divModNoSlacks.is_boolean())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.divModNoSlacks must be a Boolean.");
-		ret.modelCheckerSettings.divModNoSlacks = divModNoSlacks.asBool();
+		ret.modelCheckerSettings.divModNoSlacks = divModNoSlacks.get<bool>();
 	}
 
-	if (modelCheckerSettings.isMember("engine"))
+	if (modelCheckerSettings.contains("engine"))
 	{
-		if (!modelCheckerSettings["engine"].isString())
+		if (!modelCheckerSettings["engine"].is_string())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.engine must be a string.");
-		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(modelCheckerSettings["engine"].asString());
+		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(modelCheckerSettings["engine"].get<std::string>());
 		if (!engine)
 			return formatFatalError(Error::Type::JSONError, "Invalid model checker engine requested.");
 		ret.modelCheckerSettings.engine = *engine;
 	}
 
-	if (modelCheckerSettings.isMember("bmcLoopIterations"))
+	if (modelCheckerSettings.contains("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();
+		if (modelCheckerSettings["bmcLoopIterations"].is_number_unsigned())
+			ret.modelCheckerSettings.bmcLoopIterations = modelCheckerSettings["bmcLoopIterations"].get<unsigned>();
 		else
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.bmcLoopIterations must be an unsigned integer.");
 	}
 
-	if (modelCheckerSettings.isMember("extCalls"))
+	if (modelCheckerSettings.contains("extCalls"))
 	{
-		if (!modelCheckerSettings["extCalls"].isString())
+		if (!modelCheckerSettings["extCalls"].is_string())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.extCalls must be a string.");
-		std::optional<ModelCheckerExtCalls> extCalls = ModelCheckerExtCalls::fromString(modelCheckerSettings["extCalls"].asString());
+		std::optional<ModelCheckerExtCalls> extCalls = ModelCheckerExtCalls::fromString(modelCheckerSettings["extCalls"].get<std::string>());
 		if (!extCalls)
 			return formatFatalError(Error::Type::JSONError, "Invalid model checker extCalls requested.");
 		ret.modelCheckerSettings.externalCalls = *extCalls;
 	}
 
-	if (modelCheckerSettings.isMember("invariants"))
+	if (modelCheckerSettings.contains("invariants"))
 	{
 		auto const& invariantsArray = modelCheckerSettings["invariants"];
-		if (!invariantsArray.isArray())
+		if (!invariantsArray.is_array())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.invariants must be an array.");
 
 		ModelCheckerInvariants invariants;
 		for (auto const& i: invariantsArray)
 		{
-			if (!i.isString())
+			if (!i.is_string())
 				return formatFatalError(Error::Type::JSONError, "Every invariant type in settings.modelChecker.invariants must be a string.");
-			if (!invariants.setFromString(i.asString()))
+			if (!invariants.setFromString(i.get<std::string>()))
 				return formatFatalError(Error::Type::JSONError, "Invalid model checker invariants requested.");
 		}
 
@@ -1090,72 +1088,72 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.invariants = invariants;
 	}
 
-	if (modelCheckerSettings.isMember("showProvedSafe"))
+	if (modelCheckerSettings.contains("showProvedSafe"))
 	{
 		auto const& showProvedSafe = modelCheckerSettings["showProvedSafe"];
-		if (!showProvedSafe.isBool())
+		if (!showProvedSafe.is_boolean())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showProvedSafe must be a Boolean value.");
-		ret.modelCheckerSettings.showProvedSafe = showProvedSafe.asBool();
+		ret.modelCheckerSettings.showProvedSafe = showProvedSafe.get<bool>();
 	}
 
-	if (modelCheckerSettings.isMember("showUnproved"))
+	if (modelCheckerSettings.contains("showUnproved"))
 	{
 		auto const& showUnproved = modelCheckerSettings["showUnproved"];
-		if (!showUnproved.isBool())
+		if (!showUnproved.is_boolean())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnproved must be a Boolean value.");
-		ret.modelCheckerSettings.showUnproved = showUnproved.asBool();
+		ret.modelCheckerSettings.showUnproved = showUnproved.get<bool>();
 	}
 
-	if (modelCheckerSettings.isMember("showUnsupported"))
+	if (modelCheckerSettings.contains("showUnsupported"))
 	{
 		auto const& showUnsupported = modelCheckerSettings["showUnsupported"];
-		if (!showUnsupported.isBool())
+		if (!showUnsupported.is_boolean())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnsupported must be a Boolean value.");
-		ret.modelCheckerSettings.showUnsupported = showUnsupported.asBool();
+		ret.modelCheckerSettings.showUnsupported = showUnsupported.get<bool>();
 	}
 
-	if (modelCheckerSettings.isMember("solvers"))
+	if (modelCheckerSettings.contains("solvers"))
 	{
 		auto const& solversArray = modelCheckerSettings["solvers"];
-		if (!solversArray.isArray())
+		if (!solversArray.is_array())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.solvers must be an array.");
 
 		smtutil::SMTSolverChoice solvers;
 		for (auto const& s: solversArray)
 		{
-			if (!s.isString())
+			if (!s.is_string())
 				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.solvers must be a string.");
-			if (!solvers.setSolver(s.asString()))
+			if (!solvers.setSolver(s.get<std::string>()))
 				return formatFatalError(Error::Type::JSONError, "Invalid model checker solvers requested.");
 		}
 
 		ret.modelCheckerSettings.solvers = solvers;
 	}
 
-	if (modelCheckerSettings.isMember("printQuery"))
+	if (modelCheckerSettings.contains("printQuery"))
 	{
 		auto const& printQuery = modelCheckerSettings["printQuery"];
-		if (!printQuery.isBool())
+		if (!printQuery.is_boolean())
 			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();
+		ret.modelCheckerSettings.printQuery = printQuery.get<bool>();
 	}
 
-	if (modelCheckerSettings.isMember("targets"))
+	if (modelCheckerSettings.contains("targets"))
 	{
 		auto const& targetsArray = modelCheckerSettings["targets"];
-		if (!targetsArray.isArray())
+		if (!targetsArray.is_array())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.targets must be an array.");
 
 		ModelCheckerTargets targets;
 		for (auto const& t: targetsArray)
 		{
-			if (!t.isString())
+			if (!t.is_string())
 				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.targets must be a string.");
-			if (!targets.setFromString(t.asString()))
+			if (!targets.setFromString(t.get<std::string>()))
 				return formatFatalError(Error::Type::JSONError, "Invalid model checker targets requested.");
 		}
 
@@ -1165,45 +1163,45 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.targets = targets;
 	}
 
-	if (modelCheckerSettings.isMember("timeout"))
+	if (modelCheckerSettings.contains("timeout"))
 	{
-		if (!modelCheckerSettings["timeout"].isUInt())
+		if (!modelCheckerSettings["timeout"].is_number_unsigned())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.timeout must be an unsigned integer.");
-		ret.modelCheckerSettings.timeout = modelCheckerSettings["timeout"].asUInt();
+		ret.modelCheckerSettings.timeout = modelCheckerSettings["timeout"].get<Json::number_unsigned_t>();
 	}
 
 	return {std::move(ret)};
 }
 
-std::map<std::string, Json::Value> StandardCompiler::parseAstFromInput(StringMap const& _sources)
+std::map<std::string, Json> StandardCompiler::parseAstFromInput(StringMap const& _sources)
 {
-	std::map<std::string, Json::Value> sourceJsons;
+	std::map<std::string, Json> sourceJsons;
 	for (auto const& [sourceName, sourceCode]: _sources)
 	{
-		Json::Value ast;
+		Json ast;
 		astAssert(util::jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
-		std::string astKey = ast.isMember("ast") ? "ast" : "AST";
+		std::string astKey = ast.contains("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(ast.contains(astKey), "astkey is not member");
+		astAssert(ast[astKey]["nodeType"].get<std::string>() == "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::importEVMAssembly(StandardCompiler::InputsAndSettings _inputsAndSettings)
+Json 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;
+		return Json::object();
 
 	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;
+	Json const& sourceJson = _inputsAndSettings.jsonSources.begin()->second;
 	try
 	{
 		stack.analyze(sourceName, sourceJson);
@@ -1226,11 +1224,11 @@ Json::Value StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSetti
 		);
 	}
 	if (!stack.compilationSuccessful())
-		return Json::objectValue;
+		return Json::object();
 
 	// EVM
 	bool const wildcardMatchesExperimental = false;
-	Json::Value evmData = Json::objectValue;
+	Json evmData;
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "evm.assembly", wildcardMatchesExperimental))
 		evmData["assembly"] = stack.assemblyString(sourceName, {});
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "evm.legacyAssembly", wildcardMatchesExperimental))
@@ -1284,18 +1282,18 @@ Json::Value StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSetti
 			}
 		);
 
-	Json::Value contractData = Json::objectValue;
+	Json contractData;
 	if (!evmData.empty())
 		contractData["evm"] = evmData;
 
-	Json::Value contractsOutput = Json::objectValue;
+	Json contractsOutput;
 	contractsOutput[sourceName][""] = contractData;
-	Json::Value output = Json::objectValue;
+	Json output;
 	output["contracts"] = contractsOutput;
 	return util::removeNullMembers(output);
 }
 
-Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inputsAndSettings)
+Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inputsAndSettings)
 {
 	solAssert(_inputsAndSettings.jsonSources.empty());
 
@@ -1323,7 +1321,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	compilerStack.enableEvmBytecodeGeneration(isEvmBytecodeRequested(_inputsAndSettings.outputSelection));
 	compilerStack.enableIRGeneration(isIRRequested(_inputsAndSettings.outputSelection));
 
-	Json::Value errors = std::move(_inputsAndSettings.errors);
+	Json errors = std::move(_inputsAndSettings.errors);
 
 	bool const binariesRequested = isBinaryRequested(_inputsAndSettings.outputSelection);
 
@@ -1335,7 +1333,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			{
 				compilerStack.importASTs(parseAstFromInput(sourceList));
 				if (!compilerStack.analyze())
-					errors.append(formatError(Error::Type::FatalError, "general", "Analysis of the AST failed."));
+					errors.emplace_back(formatError(Error::Type::FatalError, "general", "Analysis of the AST failed."));
 				if (binariesRequested)
 					compilerStack.compile();
 			}
@@ -1352,7 +1350,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 				compilerStack.parseAndAnalyze(_inputsAndSettings.stopAfter);
 
 			for (auto const& error: compilerStack.errors())
-				errors.append(formatErrorWithException(
+				errors.emplace_back(formatErrorWithException(
 					compilerStack,
 					*error,
 					error->type(),
@@ -1365,7 +1363,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	/// This is only thrown in a very few locations.
 	catch (Error const& _error)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_error,
 			_error.type(),
@@ -1376,7 +1374,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	/// This should not be leaked from compile().
 	catch (FatalError const& _exception)
 	{
-		errors.append(formatError(
+		errors.emplace_back(formatError(
 			Error::Type::FatalError,
 			"general",
 			"Uncaught fatal error: " + boost::diagnostic_information(_exception)
@@ -1384,7 +1382,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (CompilerError const& _exception)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_exception,
 			Error::Type::CompilerError,
@@ -1394,7 +1392,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (InternalCompilerError const& _exception)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_exception,
 			Error::Type::InternalCompilerError,
@@ -1404,7 +1402,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (UnimplementedFeatureError const& _exception)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_exception,
 			Error::Type::UnimplementedFeatureError,
@@ -1414,7 +1412,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (yul::YulException const& _exception)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_exception,
 			Error::Type::YulException,
@@ -1424,7 +1422,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (smtutil::SMTLogicError const& _exception)
 	{
-		errors.append(formatErrorWithException(
+		errors.emplace_back(formatErrorWithException(
 			compilerStack,
 			_exception,
 			Error::Type::SMTLogicException,
@@ -1434,7 +1432,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (util::Exception const& _exception)
 	{
-		errors.append(formatError(
+		errors.emplace_back(formatError(
 			Error::Type::Exception,
 			"general",
 			"Exception during compilation: " + boost::diagnostic_information(_exception)
@@ -1442,7 +1440,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (std::exception const& _exception)
 	{
-		errors.append(formatError(
+		errors.emplace_back(formatError(
 			Error::Type::Exception,
 			"general",
 			"Unknown exception during compilation: " + boost::diagnostic_information(_exception)
@@ -1450,7 +1448,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 	catch (...)
 	{
-		errors.append(formatError(
+		errors.emplace_back(formatError(
 			Error::Type::Exception,
 			"general",
 			"Unknown exception during compilation: " + boost::current_exception_diagnostic_information()
@@ -1473,7 +1471,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	)
 		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
 
-	Json::Value output = Json::objectValue;
+	Json output;
 
 	if (errors.size() > 0)
 		output["errors"] = std::move(errors);
@@ -1484,21 +1482,21 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	bool const wildcardMatchesExperimental = false;
 
-	output["sources"] = Json::objectValue;
+	output["sources"] = Json::object();
 	unsigned sourceIndex = 0;
 	// 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;
+			Json sourceResult;
 			sourceResult["id"] = sourceIndex++;
 			if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "ast", wildcardMatchesExperimental))
 				sourceResult["ast"] = ASTJsonExporter(compilerStack.state(), compilerStack.sourceIndices()).toJson(compilerStack.ast(sourceName));
 			output["sources"][sourceName] = sourceResult;
 		}
 
-	Json::Value contractsOutput = Json::objectValue;
+	Json contractsOutput;
 	for (std::string const& contractName: analysisSuccess ? compilerStack.contractNames() : std::vector<std::string>())
 	{
 		size_t colon = contractName.rfind(':');
@@ -1507,7 +1505,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		std::string name = contractName.substr(colon + 1);
 
 		// ABI, storage layout, documentation and metadata
-		Json::Value contractData(Json::objectValue);
+		Json contractData;
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "abi", wildcardMatchesExperimental))
 			contractData["abi"] = compilerStack.contractABI(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "storageLayout", false))
@@ -1530,7 +1528,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			contractData["irOptimizedAst"] = compilerStack.yulIROptimizedAst(contractName);
 
 		// EVM
-		Json::Value evmData(Json::objectValue);
+		Json evmData;
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.assembly", wildcardMatchesExperimental))
 			evmData["assembly"] = compilerStack.assemblyString(contractName, sourceList);
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.legacyAssembly", wildcardMatchesExperimental))
@@ -1589,8 +1587,8 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 		if (!contractData.empty())
 		{
-			if (!contractsOutput.isMember(file))
-				contractsOutput[file] = Json::objectValue;
+			if (!contractsOutput.contains(file))
+				contractsOutput[file] = Json::object();
 			contractsOutput[file][name] = contractData;
 		}
 	}
@@ -1601,16 +1599,16 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 }
 
 
-Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
+Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 {
 	solAssert(_inputsAndSettings.jsonSources.empty());
 
-	Json::Value output = Json::objectValue;
+	Json output;
 	output["errors"] = std::move(_inputsAndSettings.errors);
 
 	if (_inputsAndSettings.sources.size() != 1)
 	{
-		output["errors"].append(formatError(
+		output["errors"].emplace_back(formatError(
 			Error::Type::JSONError,
 			"general",
 			"Yul mode only supports exactly one input file."
@@ -1619,7 +1617,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	}
 	if (!_inputsAndSettings.smtLib2Responses.empty())
 	{
-		output["errors"].append(formatError(
+		output["errors"].emplace_back(formatError(
 			Error::Type::JSONError,
 			"general",
 			"Yul mode does not support smtlib2responses."
@@ -1628,7 +1626,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	}
 	if (!_inputsAndSettings.remappings.empty())
 	{
-		output["errors"].append(formatError(
+		output["errors"].emplace_back(formatError(
 			Error::Type::JSONError,
 			"general",
 			"Field \"settings.remappings\" cannot be used for Yul."
@@ -1637,7 +1635,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	}
 	if (_inputsAndSettings.revertStrings != RevertStrings::Default)
 	{
-		output["errors"].append(formatError(
+		output["errors"].emplace_back(formatError(
 			Error::Type::JSONError,
 			"general",
 			"Field \"settings.debug.revertStrings\" cannot be used for Yul."
@@ -1660,7 +1658,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	// Inconsistent state - stop here to receive error reports from users
 	if (!stack.parseAndAnalyze(sourceName, sourceContents) && stack.errors().empty())
 	{
-		output["errors"].append(formatError(
+		output["errors"].emplace_back(formatError(
 			Error::Type::InternalCompilerError,
 			"general",
 			"No error reported, but compilation failed."
@@ -1674,7 +1672,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		{
 			auto err = std::dynamic_pointer_cast<Error const>(error);
 
-			output["errors"].append(formatErrorWithException(
+			output["errors"].emplace_back(formatErrorWithException(
 				stack,
 				*error,
 				err->type(),
@@ -1693,7 +1691,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ast", wildcardMatchesExperimental))
 	{
-		Json::Value sourceResult = Json::objectValue;
+		Json sourceResult;
 		sourceResult["id"] = 0;
 		sourceResult["ast"] = stack.astJson();
 		output["sources"][sourceName] = sourceResult;
@@ -1725,7 +1723,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 						_inputsAndSettings.evmVersion,
 						*o.bytecode,
 						o.sourceMappings.get(),
-						Json::arrayValue,
+						Json::array(),
 						isDeployed,
 						[&, kind = kind](std::string const& _element) { return isArtifactRequested(
 							_inputsAndSettings.outputSelection,
@@ -1745,16 +1743,15 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	return output;
 }
 
-
-Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
+Json StandardCompiler::compile(Json const& _input) noexcept
 {
 	YulStringRepository::reset();
 
 	try
 	{
 		auto parsed = parseInput(_input);
-		if (std::holds_alternative<Json::Value>(parsed))
-			return std::get<Json::Value>(std::move(parsed));
+		if (std::holds_alternative<Json>(parsed))
+			return std::get<Json>(std::move(parsed));
 		InputsAndSettings settings = std::get<InputsAndSettings>(std::move(parsed));
 		if (settings.language == "Solidity")
 			return compileSolidity(std::move(settings));
@@ -1767,13 +1764,29 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 		else
 			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\", \"SolidityAST\" or \"EVMAssembly\" is supported as a language.");
 	}
-	catch (Json::LogicError const& _exception)
+	catch (Json::parse_error const& _exception)
+	{
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON parse_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
+	}
+	catch (Json::invalid_iterator const& _exception)
+	{
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON invalid_iterator exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
+	}
+	catch (Json::type_error const& _exception)
+	{
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON type_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
+	}
+	catch (Json::out_of_range const& _exception)
 	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON logic exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON out_of_range exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
 	}
-	catch (Json::RuntimeError const& _exception)
+	catch (Json::other_error const& _exception)
 	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON other_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
+	}
+	catch (Json::exception const& _exception)
+	{
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
 	}
 	catch (util::Exception const& _exception)
 	{
@@ -1787,7 +1800,7 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 
 std::string StandardCompiler::compile(std::string const& _input) noexcept
 {
-	Json::Value input;
+	Json input;
 	std::string errors;
 	try
 	{
@@ -1796,12 +1809,15 @@ std::string StandardCompiler::compile(std::string const& _input) noexcept
 	}
 	catch (...)
 	{
-		return "{\"errors\":[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON.\"}]}";
+		if (errors.empty())
+			return "{\"errors\":[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON.\"}]}";
+		else
+			return "{\"errors\":[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON: " + errors + "\"}]}";
 	}
 
-	// cout << "Input: " << input.toStyledString() << endl;
-	Json::Value output = compile(input);
-	// cout << "Output: " << output.toStyledString() << endl;
+//	std::cout << "Input: " << solidity::util::jsonPrettyPrint(input) << std::endl;
+	Json output = compile(input);
+//	std::cout << "Output: " << solidity::util::jsonPrettyPrint(output) << std::endl;
 
 	try
 	{
@@ -1813,24 +1829,25 @@ std::string StandardCompiler::compile(std::string const& _input) noexcept
 	}
 }
 
-Json::Value StandardCompiler::formatFunctionDebugData(
+Json StandardCompiler::formatFunctionDebugData(
 	std::map<std::string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
 )
 {
-	Json::Value ret(Json::objectValue);
+	static_assert(std::is_same_v<Json::number_unsigned_t, uint64_t>);
+	Json ret = Json::object();
 	for (auto const& [name, info]: _debugInfo)
 	{
-		Json::Value fun;
+		Json fun = Json::object();
 		if (info.sourceID)
-			fun["id"] = Json::UInt64(*info.sourceID);
+			fun["id"] = Json::number_unsigned_t(*info.sourceID);
 		else
-			fun["id"] = Json::nullValue;
+			fun["id"] = Json();
 		if (info.bytecodeOffset)
-			fun["entryPoint"] = Json::UInt64(*info.bytecodeOffset);
+			fun["entryPoint"] = Json::number_unsigned_t(*info.bytecodeOffset);
 		else
-			fun["entryPoint"] = Json::nullValue;
-		fun["parameterSlots"] = Json::UInt64(info.params);
-		fun["returnSlots"] = Json::UInt64(info.returns);
+			fun["entryPoint"] = Json();
+		fun["parameterSlots"] = Json::number_unsigned_t(info.params);
+		fun["returnSlots"] = Json::number_unsigned_t(info.returns);
 		ret[name] = std::move(fun);
 	}
 
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 03bdc7f12b..590d96b9c1 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -58,12 +58,12 @@ 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;
+	Json compile(Json const& _input) noexcept;
 	/// 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;
 
-	static Json::Value formatFunctionDebugData(
+	static Json formatFunctionDebugData(
 		std::map<std::string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
 	);
 
@@ -71,10 +71,10 @@ class StandardCompiler
 	struct InputsAndSettings
 	{
 		std::string language;
-		Json::Value errors;
+		Json errors;
 		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
 		std::map<std::string, std::string> sources;
-		std::map<std::string, Json::Value> jsonSources;
+		std::map<std::string, Json> jsonSources;
 		std::map<util::h256, std::string> smtLib2Responses;
 		langutil::EVMVersion evmVersion;
 		std::optional<uint8_t> eofVersion;
@@ -86,19 +86,19 @@ class StandardCompiler
 		bool metadataLiteralSources = false;
 		CompilerStack::MetadataFormat metadataFormat = CompilerStack::defaultMetadataFormat();
 		CompilerStack::MetadataHash metadataHash = CompilerStack::MetadataHash::IPFS;
-		Json::Value outputSelection;
+		Json outputSelection;
 		ModelCheckerSettings modelCheckerSettings = ModelCheckerSettings{};
 		bool viaIR = false;
 	};
 
 	/// Parses the input json (and potentially invokes the read callback) and either returns
 	/// it in condensed form or an error as a json object.
-	std::variant<InputsAndSettings, Json::Value> parseInput(Json::Value const& _input);
+	std::variant<InputsAndSettings, Json> parseInput(Json 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);
+	std::map<std::string, Json> parseAstFromInput(StringMap const& _sources);
+	Json importEVMAssembly(InputsAndSettings _inputsAndSettings);
+	Json compileSolidity(InputsAndSettings _inputsAndSettings);
+	Json compileYul(InputsAndSettings _inputsAndSettings);
 
 	ReadCallback::Callback m_readFile;
 
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index 8e1d0eed10..7f344f6edf 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -23,7 +23,7 @@
 using namespace solidity;
 using namespace solidity::frontend;
 
-Json::Value StorageLayout::generate(ContractDefinition const& _contractDef)
+Json StorageLayout::generate(ContractDefinition const& _contractDef)
 {
 	solAssert(!m_contract, "");
 	m_contract = &_contractDef;
@@ -34,19 +34,19 @@ Json::Value StorageLayout::generate(ContractDefinition const& _contractDef)
 	auto contractType = dynamic_cast<ContractType const*>(typeType->actualType());
 	solAssert(contractType, "");
 
-	Json::Value variables(Json::arrayValue);
+	Json variables = Json::array();
 	for (auto [var, slot, offset]: contractType->stateVariables())
-		variables.append(generate(*var, slot, offset));
+		variables.emplace_back(generate(*var, slot, offset));
 
-	Json::Value layout;
+	Json layout;
 	layout["storage"] = std::move(variables);
 	layout["types"] = std::move(m_types);
 	return layout;
 }
 
-Json::Value StorageLayout::generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset)
+Json StorageLayout::generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset)
 {
-	Json::Value varEntry;
+	Json varEntry;
 	Type const* varType = _var.type();
 
 	varEntry["label"] = _var.name();
@@ -63,22 +63,22 @@ Json::Value StorageLayout::generate(VariableDeclaration const& _var, u256 const&
 
 void StorageLayout::generate(Type const* _type)
 {
-	if (m_types.isMember(typeKeyName(_type)))
+	if (m_types.contains(typeKeyName(_type)))
 		return;
 
 	// Register it now to cut recursive visits.
-	Json::Value& typeInfo = m_types[typeKeyName(_type)];
+	Json& typeInfo = m_types[typeKeyName(_type)];
 	typeInfo["label"] = _type->toString(true);
 	typeInfo["numberOfBytes"] = u256(_type->storageBytes() * _type->storageSize()).str();
 
 	if (auto structType = dynamic_cast<StructType const*>(_type))
 	{
-		Json::Value members(Json::arrayValue);
+		Json members = Json::array();
 		auto const& structDef = structType->structDefinition();
 		for (auto const& member: structDef.members())
 		{
 			auto const& offsets = structType->storageOffsetsOfMember(member->name());
-			members.append(generate(*member, offsets.first, offsets.second));
+			members.emplace_back(generate(*member, offsets.first, offsets.second));
 		}
 		typeInfo["members"] = std::move(members);
 		typeInfo["encoding"] = "inplace";
@@ -108,7 +108,7 @@ void StorageLayout::generate(Type const* _type)
 		typeInfo["encoding"] = "inplace";
 	}
 
-	solAssert(typeInfo.isMember("encoding"), "");
+	solAssert(typeInfo.contains("encoding"), "");
 }
 
 std::string StorageLayout::typeKeyName(Type const* _type)
diff --git a/libsolidity/interface/StorageLayout.h b/libsolidity/interface/StorageLayout.h
index ffe8e6b5a0..b0b2d70b6d 100644
--- a/libsolidity/interface/StorageLayout.h
+++ b/libsolidity/interface/StorageLayout.h
@@ -21,11 +21,10 @@
 
 #pragma once
 
+#include <libsolutil/JSON.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/Types.h>
 
-#include <json/json.h>
-
 namespace solidity::frontend
 {
 
@@ -35,11 +34,11 @@ class StorageLayout
 	/// Generates the storage layout of the contract
 	/// @param _contractDef The contract definition
 	/// @return A JSON representation of the contract's storage layout.
-	Json::Value generate(ContractDefinition const& _contractDef);
+	Json generate(ContractDefinition const& _contractDef);
 
 private:
 	/// Generates the JSON information for a variable and its storage location.
-	Json::Value generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset);
+	Json generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset);
 
 	/// Generates the JSON information for @param _type
 	void generate(Type const* _type);
@@ -47,7 +46,7 @@ class StorageLayout
 	/// The key for the JSON object describing a type.
 	std::string typeKeyName(Type const* _type);
 
-	Json::Value m_types;
+	Json m_types;
 
 	/// Current analyzed contract
 	ContractDefinition const* m_contract = nullptr;
diff --git a/libsolidity/lsp/DocumentHoverHandler.cpp b/libsolidity/lsp/DocumentHoverHandler.cpp
index 39d1d72c33..e5991b765a 100644
--- a/libsolidity/lsp/DocumentHoverHandler.cpp
+++ b/libsolidity/lsp/DocumentHoverHandler.cpp
@@ -55,7 +55,7 @@ struct MarkdownBuilder
 
 }
 
-void DocumentHoverHandler::operator()(MessageID _id, Json::Value const& _args)
+void DocumentHoverHandler::operator()(MessageID _id, Json const& _args)
 {
 	auto const [sourceUnitName, lineColumn] = HandlerBase(*this).extractSourceUnitNameAndLineColumn(_args);
 	auto const [sourceNode, sourceOffset] = m_server.astNodeAndOffsetAtSourceLocation(sourceUnitName, lineColumn);
@@ -108,11 +108,11 @@ void DocumentHoverHandler::operator()(MessageID _id, Json::Value const& _args)
 
 	if (tooltipText.empty())
 	{
-		client().reply(_id, Json::nullValue);
+		client().reply(_id, Json());
 		return;
 	}
 
-	Json::Value reply = Json::objectValue;
+	Json reply;
 	reply["range"] = rangeToHighlight;
 	reply["contents"]["kind"] = "markdown";
 	reply["contents"]["value"] = std::move(tooltipText);
diff --git a/libsolidity/lsp/DocumentHoverHandler.h b/libsolidity/lsp/DocumentHoverHandler.h
index 9bb4084c26..e35e856098 100644
--- a/libsolidity/lsp/DocumentHoverHandler.h
+++ b/libsolidity/lsp/DocumentHoverHandler.h
@@ -26,7 +26,7 @@ class DocumentHoverHandler: public HandlerBase
 public:
 	using HandlerBase::HandlerBase;
 
-	void operator()(MessageID, Json::Value const&);
+	void operator()(MessageID, Json const&);
 };
 
 }
diff --git a/libsolidity/lsp/GotoDefinition.cpp b/libsolidity/lsp/GotoDefinition.cpp
index 136e4d7c39..07b0c6f0be 100644
--- a/libsolidity/lsp/GotoDefinition.cpp
+++ b/libsolidity/lsp/GotoDefinition.cpp
@@ -31,7 +31,7 @@ using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::lsp;
 
-void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
+void GotoDefinition::operator()(MessageID _id, Json const& _args)
 {
 	auto const [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
 
@@ -58,8 +58,8 @@ void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
 			locations.emplace_back(SourceLocation{0, 0, std::make_shared<std::string const>(path)});
 	}
 
-	Json::Value reply = Json::arrayValue;
+	Json reply = Json::array();
 	for (SourceLocation const& location: locations)
-		reply.append(toJson(location));
+		reply.emplace_back(toJson(location));
 	client().reply(_id, reply);
 }
diff --git a/libsolidity/lsp/GotoDefinition.h b/libsolidity/lsp/GotoDefinition.h
index 453da3f156..4ffd64e7ff 100644
--- a/libsolidity/lsp/GotoDefinition.h
+++ b/libsolidity/lsp/GotoDefinition.h
@@ -25,7 +25,7 @@ class GotoDefinition: public HandlerBase
 public:
 	explicit GotoDefinition(LanguageServer& _server): HandlerBase(_server) {}
 
-	void operator()(MessageID, Json::Value const&);
+	void operator()(MessageID, Json const&);
 };
 
 }
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
index a23e43a83c..c49bce1dd6 100644
--- a/libsolidity/lsp/HandlerBase.cpp
+++ b/libsolidity/lsp/HandlerBase.cpp
@@ -29,8 +29,9 @@
 using namespace solidity::langutil;
 using namespace solidity::lsp;
 using namespace solidity::util;
+using namespace solidity;
 
-Json::Value HandlerBase::toRange(SourceLocation const& _location) const
+Json HandlerBase::toRange(SourceLocation const& _location) const
 {
 	if (!_location.hasText())
 		return toJsonRange({}, {});
@@ -42,18 +43,18 @@ Json::Value HandlerBase::toRange(SourceLocation const& _location) const
 	return toJsonRange(start, end);
 }
 
-Json::Value HandlerBase::toJson(SourceLocation const& _location) const
+Json HandlerBase::toJson(SourceLocation const& _location) const
 {
 	solAssert(_location.sourceName);
-	Json::Value item = Json::objectValue;
+	Json item;
 	item["uri"] = fileRepository().sourceUnitNameToUri(*_location.sourceName);
 	item["range"] = toRange(_location);
 	return item;
 }
 
-std::pair<std::string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
+std::pair<std::string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json const& _args) const
 {
-	std::string const uri = _args["textDocument"]["uri"].asString();
+	std::string const uri = _args["textDocument"]["uri"].get<std::string>();
 	std::string const sourceUnitName = fileRepository().uriToSourceUnitName(uri);
 	if (!fileRepository().sourceUnits().count(sourceUnitName))
 		BOOST_THROW_EXCEPTION(
diff --git a/libsolidity/lsp/HandlerBase.h b/libsolidity/lsp/HandlerBase.h
index e2ccb88d82..718d15c5f6 100644
--- a/libsolidity/lsp/HandlerBase.h
+++ b/libsolidity/lsp/HandlerBase.h
@@ -38,12 +38,12 @@ 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;
+	Json toRange(langutil::SourceLocation const& _location) const;
+	Json toJson(langutil::SourceLocation const& _location) 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;
+	std::pair<std::string, langutil::LineColumn> extractSourceUnitNameAndLineColumn(Json const& _params) const;
 
 	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.compilerStack(); }
 	FileRepository& fileRepository() const noexcept { return m_server.fileRepository(); }
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 2b8b62706d..d726139e3a 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -52,6 +52,7 @@ using namespace std::placeholders;
 using namespace solidity::lsp;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace solidity;
 
 namespace fs = boost::filesystem;
 
@@ -85,44 +86,44 @@ int toDiagnosticSeverity(Error::Type _errorType)
 	return -1;
 }
 
-Json::Value semanticTokensLegend()
+Json semanticTokensLegend()
 {
-	Json::Value legend = Json::objectValue;
+	Json legend;
 
 	// 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("std::string");
-	tokenTypes.append("struct");
-	tokenTypes.append("type");
-	tokenTypes.append("typeParameter");
-	tokenTypes.append("variable");
+	Json tokenTypes = Json::array();
+	tokenTypes.emplace_back("class");
+	tokenTypes.emplace_back("comment");
+	tokenTypes.emplace_back("enum");
+	tokenTypes.emplace_back("enumMember");
+	tokenTypes.emplace_back("event");
+	tokenTypes.emplace_back("function");
+	tokenTypes.emplace_back("interface");
+	tokenTypes.emplace_back("keyword");
+	tokenTypes.emplace_back("macro");
+	tokenTypes.emplace_back("method");
+	tokenTypes.emplace_back("modifier");
+	tokenTypes.emplace_back("number");
+	tokenTypes.emplace_back("operator");
+	tokenTypes.emplace_back("parameter");
+	tokenTypes.emplace_back("property");
+	tokenTypes.emplace_back("std::string");
+	tokenTypes.emplace_back("struct");
+	tokenTypes.emplace_back("type");
+	tokenTypes.emplace_back("typeParameter");
+	tokenTypes.emplace_back("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");
+	Json tokenModifiers = Json::array();
+	tokenModifiers.emplace_back("abstract");
+	tokenModifiers.emplace_back("declaration");
+	tokenModifiers.emplace_back("definition");
+	tokenModifiers.emplace_back("deprecated");
+	tokenModifiers.emplace_back("documentation");
+	tokenModifiers.emplace_back("modification");
+	tokenModifiers.emplace_back("readonly");
 	legend["tokenModifiers"] = tokenModifiers;
 
 	return legend;
@@ -138,7 +139,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
 		{"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"]); }},
+		{"$/setTrace", [this](auto, Json const& args) { setTrace(args["value"]); }},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
 		{"textDocument/definition", GotoDefinition(*this) },
 		{"textDocument/didOpen", std::bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
@@ -155,17 +156,17 @@ LanguageServer::LanguageServer(Transport& _transport):
 {
 }
 
-Json::Value LanguageServer::toRange(SourceLocation const& _location)
+Json LanguageServer::toRange(SourceLocation const& _location)
 {
 	return HandlerBase(*this).toRange(_location);
 }
 
-Json::Value LanguageServer::toJson(SourceLocation const& _location)
+Json LanguageServer::toJson(SourceLocation const& _location)
 {
 	return HandlerBase(*this).toJson(_location);
 }
 
-void LanguageServer::changeConfiguration(Json::Value const& _settings)
+void LanguageServer::changeConfiguration(Json 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.
@@ -176,9 +177,9 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 	//
 	// 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"])
+	if (_settings.contains("file-load-strategy"))
 	{
-		auto const text = _settings["file-load-strategy"].asString();
+		auto const text = _settings["file-load-strategy"].get<std::string>();
 		if (text == "project-directory")
 			m_fileLoadStrategy = FileLoadStrategy::ProjectDirectory;
 		else if (text == "directly-opened-and-on-import")
@@ -188,18 +189,18 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 	}
 
 	m_settingsObject = _settings;
-	Json::Value jsonIncludePaths = _settings["include-paths"];
+	Json jsonIncludePaths = _settings.contains("include-paths") ? _settings["include-paths"] : Json::object();
 
-	if (jsonIncludePaths)
+	if (!jsonIncludePaths.empty())
 	{
 		int typeFailureCount = 0;
-		if (jsonIncludePaths.isArray())
+		if (jsonIncludePaths.is_array())
 		{
 			std::vector<boost::filesystem::path> includePaths;
-			for (Json::Value const& jsonPath: jsonIncludePaths)
+			for (Json const& jsonPath: jsonIncludePaths)
 			{
-				if (jsonPath.isString())
-					includePaths.emplace_back(boost::filesystem::path(jsonPath.asString()));
+				if (jsonPath.is_string())
+					includePaths.emplace_back(jsonPath.get<std::string>());
 				else
 					typeFailureCount++;
 			}
@@ -274,11 +275,11 @@ 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.
-	std::map<std::string, Json::Value> diagnosticsBySourceUnit;
+	std::map<std::string, Json> diagnosticsBySourceUnit;
 	for (std::string const& sourceUnitName: m_fileRepository.sourceUnits() | ranges::views::keys)
-		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
+		diagnosticsBySourceUnit[sourceUnitName] = Json::array();
 	for (std::string const& sourceUnitName: m_nonemptyDiagnostics)
-		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
+		diagnosticsBySourceUnit[sourceUnitName] = Json::array();
 
 	for (std::shared_ptr<Error const> const& error: m_compilerStack.errors())
 	{
@@ -287,10 +288,10 @@ void LanguageServer::compileAndUpdateDiagnostics()
 			// LSP only has diagnostics applied to individual files.
 			continue;
 
-		Json::Value jsonDiag;
+		Json jsonDiag;
 		jsonDiag["source"] = "solc";
 		jsonDiag["severity"] = toDiagnosticSeverity(error->type());
-		jsonDiag["code"] = Json::UInt64{error->errorId().error};
+		jsonDiag["code"] = Json(error->errorId().error);
 		std::string message = Error::formatErrorType(error->type()) + ":";
 		if (std::string const* comment = error->comment())
 			message += " " + *comment;
@@ -300,26 +301,26 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		if (auto const* secondary = error->secondarySourceLocation())
 			for (auto&& [secondaryMessage, secondaryLocation]: secondary->infos)
 			{
-				Json::Value jsonRelated;
+				Json jsonRelated;
 				jsonRelated["message"] = secondaryMessage;
 				jsonRelated["location"] = toJson(secondaryLocation);
-				jsonDiag["relatedInformation"].append(jsonRelated);
+				jsonDiag["relatedInformation"].emplace_back(jsonRelated);
 			}
 
-		diagnosticsBySourceUnit[*location->sourceName].append(jsonDiag);
+		diagnosticsBySourceUnit[*location->sourceName].emplace_back(jsonDiag);
 	}
 
 	if (m_client.traceValue() != TraceValue::Off)
 	{
-		Json::Value extra;
-		extra["openFileCount"] = Json::UInt64(diagnosticsBySourceUnit.size());
+		Json extra;
+		extra["openFileCount"] = Json(diagnosticsBySourceUnit.size());
 		m_client.trace("Number of currently open files: " + std::to_string(diagnosticsBySourceUnit.size()), extra);
 	}
 
 	m_nonemptyDiagnostics.clear();
 	for (auto&& [sourceUnitName, diagnostics]: diagnosticsBySourceUnit)
 	{
-		Json::Value params;
+		Json params;
 		params["uri"] = m_fileRepository.sourceUnitNameToUri(sourceUnitName);
 		if (!diagnostics.empty())
 			m_nonemptyDiagnostics.insert(sourceUnitName);
@@ -335,14 +336,15 @@ bool LanguageServer::run()
 		MessageID id;
 		try
 		{
-			std::optional<Json::Value> const jsonMessage = m_client.receive();
+			std::optional<Json> const jsonMessage = m_client.receive();
 			if (!jsonMessage)
 				continue;
 
-			if ((*jsonMessage)["method"].isString())
+			if ((*jsonMessage).contains("method") && (*jsonMessage)["method"].is_string())
 			{
-				std::string const methodName = (*jsonMessage)["method"].asString();
-				id = (*jsonMessage)["id"];
+				std::string const methodName = (*jsonMessage)["method"].get<std::string>();
+				if ((*jsonMessage).contains("id"))
+					id = (*jsonMessage)["id"];
 				lspDebug(fmt::format("received method call: {}", methodName));
 
 				if (auto handler = util::valueOrDefault(m_handlers, methodName))
@@ -353,7 +355,7 @@ bool LanguageServer::run()
 			else
 				m_client.error({}, ErrorCode::ParseError, "\"method\" has to be a string.");
 		}
-		catch (Json::Exception const&)
+		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);
 		}
@@ -378,7 +380,7 @@ void LanguageServer::requireServerInitialized()
 	);
 }
 
-void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
+void LanguageServer::handleInitialize(MessageID _id, Json const& _args)
 {
 	lspRequire(
 		m_state == State::Started,
@@ -391,9 +393,9 @@ 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.
 	std::string rootPath("/");
-	if (Json::Value uri = _args["rootUri"])
+	if (_args.contains("rootUri") && _args["rootUri"].is_string())
 	{
-		rootPath = uri.asString();
+		rootPath = _args["rootUri"].get<std::string>();
 		lspRequire(
 			boost::starts_with(rootPath, "file://"),
 			ErrorCode::InvalidParams,
@@ -401,17 +403,17 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 		);
 		rootPath = stripFileUriSchemePrefix(rootPath);
 	}
-	else if (Json::Value rootPath = _args["rootPath"])
-		rootPath = rootPath.asString();
+	else if (_args.contains("rootPath"))
+		rootPath = _args["rootPath"].get<std::string>();
 
-	if (_args["trace"])
+	if (_args.contains("trace"))
 		setTrace(_args["trace"]);
 
 	m_fileRepository = FileRepository(rootPath, {});
-	if (_args["initializationOptions"].isObject())
+	if (_args.contains("initializationOptions") && _args["initializationOptions"].is_object())
 		changeConfiguration(_args["initializationOptions"]);
 
-	Json::Value replyArgs;
+	Json replyArgs;
 	replyArgs["serverInfo"]["name"] = "solc";
 	replyArgs["serverInfo"]["version"] = std::string(VersionNumber);
 	replyArgs["capabilities"]["definitionProvider"] = true;
@@ -427,44 +429,49 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	m_client.reply(_id, std::move(replyArgs));
 }
 
-void LanguageServer::handleInitialized(MessageID, Json::Value const&)
+void LanguageServer::handleInitialized(MessageID, Json const&)
 {
 	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
 		compileAndUpdateDiagnostics();
 }
 
-void LanguageServer::semanticTokensFull(MessageID _id, Json::Value const& _args)
+void LanguageServer::semanticTokensFull(MessageID _id, Json const& _args)
 {
-	auto uri = _args["textDocument"]["uri"];
+	if (_args.contains("textDocument") && _args["textDocument"].contains("uri"))
+	{
+		auto uri = _args["textDocument"]["uri"];
 
-	compile();
+		compile();
 
-	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));
+		auto const sourceName = m_fileRepository.uriToSourceUnitName(uri.get<std::string>());
+		SourceUnit const& ast = m_compilerStack.ast(sourceName);
+		m_compilerStack.charStream(sourceName);
+		Json data = SemanticTokensBuilder().build(ast, m_compilerStack.charStream(sourceName));
 
-	Json::Value reply = Json::objectValue;
-	reply["data"] = data;
+		Json reply;
+		reply["data"] = data;
 
-	m_client.reply(_id, std::move(reply));
+		m_client.reply(_id, std::move(reply));
+	}
+	else
+		m_client.error(_id, ErrorCode::InvalidParams, "Invalid parameter: textDocument.uri expected.");
 }
 
-void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _args)
+void LanguageServer::handleWorkspaceDidChangeConfiguration(Json const& _args)
 {
 	requireServerInitialized();
 
-	if (_args["settings"].isObject())
+	if (_args.contains("settings") && _args["settings"].is_object())
 		changeConfiguration(_args["settings"]);
 }
 
-void LanguageServer::setTrace(Json::Value const& _args)
+void LanguageServer::setTrace(Json const& _args)
 {
-	if (!_args.isString())
+	if (!_args.is_string())
 		// Simply ignore invalid parameter.
 		return;
 
-	std::string const stringValue = _args.asString();
+	std::string const stringValue = _args.get<std::string>();
 	if (stringValue == "off")
 		m_client.setTrace(TraceValue::Off);
 	else if (stringValue == "messages")
@@ -473,78 +480,90 @@ void LanguageServer::setTrace(Json::Value const& _args)
 		m_client.setTrace(TraceValue::Verbose);
 }
 
-void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidOpen(Json const& _args)
 {
 	requireServerInitialized();
 
 	lspRequire(
-		_args["textDocument"],
+		_args.contains("textDocument"),
 		ErrorCode::RequestFailed,
 		"Text document parameter missing."
 	);
 
-	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();
+	if (_args["textDocument"].contains("text") && _args["textDocument"].contains("uri"))
+	{
+		std::string text = _args["textDocument"]["text"].get<std::string>();
+		std::string uri = _args["textDocument"]["uri"].get<std::string>();
+		m_openFiles.insert(uri);
+		m_fileRepository.setSourceByUri(uri, std::move(text));
+		compileAndUpdateDiagnostics();
+	}
 }
 
-void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidChange(Json const& _args)
 {
 	requireServerInitialized();
 
-	std::string const uri = _args["textDocument"]["uri"].asString();
-
-	for (Json::Value jsonContentChange: _args["contentChanges"])
+	if (_args.contains("textDocument") && _args["textDocument"].contains("uri"))
 	{
-		lspRequire(
-			jsonContentChange.isObject(),
-			ErrorCode::RequestFailed,
-			"Invalid content reference."
-		);
-
-		std::string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
-		lspRequire(
-			m_fileRepository.sourceUnits().count(sourceUnitName),
-			ErrorCode::RequestFailed,
-			"Unknown file: " + uri
-		);
+		std::string const uri = _args["textDocument"]["uri"].get<std::string>();
 
-		std::string text = jsonContentChange["text"].asString();
-		if (jsonContentChange["range"].isObject()) // otherwise full content update
-		{
-			std::optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
-			lspRequire(
-				change && change->hasText(),
-				ErrorCode::RequestFailed,
-				"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"])
-			);
+		if (_args.contains("contentChanges"))
+			for (auto const& [_, jsonContentChange]: _args["contentChanges"].items())
+			{
+				lspRequire(jsonContentChange.is_object(), ErrorCode::RequestFailed, "Invalid content reference.");
+
+				std::string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
+				lspRequire(
+					m_fileRepository.sourceUnits().count(sourceUnitName),
+					ErrorCode::RequestFailed,
+					"Unknown file: " + uri);
+
+				if (jsonContentChange.contains("text"))
+				{
+					std::string text = jsonContentChange["text"].get<std::string>();
+					if (jsonContentChange.contains("range")
+						&& jsonContentChange["range"].is_object()) // otherwise full content update
+					{
+						std::optional<SourceLocation> change
+							= parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
+						lspRequire(
+							change && change->hasText(),
+							ErrorCode::RequestFailed,
+							"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"]));
+
+						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);
+					}
+					m_fileRepository.setSourceByUri(uri, std::move(text));
+				}
+			}
 
-			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);
-		}
-		m_fileRepository.setSourceByUri(uri, std::move(text));
+		compileAndUpdateDiagnostics();
 	}
-
-	compileAndUpdateDiagnostics();
 }
 
-void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidClose(Json const& _args)
 {
 	requireServerInitialized();
 
 	lspRequire(
-		_args["textDocument"],
+		_args.contains("textDocument"),
 		ErrorCode::RequestFailed,
 		"Text document parameter missing."
 	);
 
-	std::string uri = _args["textDocument"]["uri"].asString();
-	m_openFiles.erase(uri);
+	if (_args["textDocument"].contains("uri"))
+	{
+		std::string uri = _args["textDocument"]["uri"].get<std::string>();
+		m_openFiles.erase(uri);
 
-	compileAndUpdateDiagnostics();
+		compileAndUpdateDiagnostics();
+	}
 }
 
 ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index d80f8e879c..4bea5809fa 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -22,7 +22,7 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/FileReader.h>
 
-#include <json/value.h>
+#include <libsolutil/JSON.h>
 
 #include <functional>
 #include <map>
@@ -85,29 +85,29 @@ class LanguageServer
 	/// 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.
 	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);
-	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);
+	void handleInitialize(MessageID _id, Json const& _args);
+	void handleInitialized(MessageID _id, Json const& _args);
+	void handleWorkspaceDidChangeConfiguration(Json const& _args);
+	void setTrace(Json const& _args);
+	void handleTextDocumentDidOpen(Json const& _args);
+	void handleTextDocumentDidChange(Json const& _args);
+	void handleTextDocumentDidClose(Json const& _args);
+	void handleRename(Json const& _args);
+	void handleGotoDefinition(MessageID _id, Json const& _args);
+	void semanticTokensFull(MessageID _id, Json const& _args);
 
 	/// Invoked when the server user-supplied configuration changes (initiated by the client).
-	void changeConfiguration(Json::Value const&);
+	void changeConfiguration(Json const&);
 
 	/// Compile everything until after analysis phase.
 	void compile();
 
 	std::vector<boost::filesystem::path> allSolidityFilesFromProject() const;
 
-	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
+	using MessageHandler = std::function<void(MessageID, Json const&)>;
 
-	Json::Value toRange(langutil::SourceLocation const& _location);
-	Json::Value toJson(langutil::SourceLocation const& _location);
+	Json toRange(langutil::SourceLocation const& _location);
+	Json toJson(langutil::SourceLocation const& _location);
 
 	// LSP related member fields
 
@@ -127,7 +127,7 @@ class LanguageServer
 	frontend::CompilerStack m_compilerStack;
 
 	/// User-supplied custom configuration settings (such as EVM version).
-	Json::Value m_settingsObject;
+	Json m_settingsObject;
 };
 
 }
diff --git a/libsolidity/lsp/RenameSymbol.cpp b/libsolidity/lsp/RenameSymbol.cpp
index 75f032fcca..497ee50fb4 100644
--- a/libsolidity/lsp/RenameSymbol.cpp
+++ b/libsolidity/lsp/RenameSymbol.cpp
@@ -47,11 +47,11 @@ CallableDeclaration const* extractCallableDeclaration(FunctionCall const& _funct
 
 }
 
-void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
+void RenameSymbol::operator()(MessageID _id, Json const& _args)
 {
 	auto const&& [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
-	std::string const newName = _args["newName"].asString();
-	std::string const uri = _args["textDocument"]["uri"].asString();
+	std::string const newName = _args["newName"].get<std::string>();
+	std::string const uri = _args["textDocument"]["uri"].get<std::string>();
 
 	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
 
@@ -90,10 +90,10 @@ void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 	// 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 reply;
+	reply["changes"] = Json::object();
 
-	Json::Value edits = Json::arrayValue;
+	Json edits = Json::array();
 
 	for (auto i = m_locations.rbegin(); i != m_locations.rend(); i++)
 	{
@@ -105,16 +105,16 @@ void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 		buffer.replace((size_t)i->start, (size_t)(i->end - i->start), newName);
 		fileRepository().setSourceByUri(uri, std::move(buffer));
 
-		Json::Value edit = Json::objectValue;
+		Json edit;
 		edit["range"] = toRange(*i);
 		edit["newText"] = newName;
 
 		// Record changes for the client
-		edits.append(edit);
+		edits.emplace_back(edit);
 		if (i + 1 == m_locations.rend() || (i + 1)->sourceName != i->sourceName)
 		{
 			reply["changes"][uri] = edits;
-			edits = Json::arrayValue;
+			edits = Json::array(); // Reset.
 		}
 	}
 
diff --git a/libsolidity/lsp/RenameSymbol.h b/libsolidity/lsp/RenameSymbol.h
index cafa8c067a..c4a2ac98f3 100644
--- a/libsolidity/lsp/RenameSymbol.h
+++ b/libsolidity/lsp/RenameSymbol.h
@@ -27,7 +27,7 @@ class RenameSymbol: public HandlerBase
 public:
 	explicit RenameSymbol(LanguageServer& _server): HandlerBase(_server) {}
 
-	void operator()(MessageID, Json::Value const&);
+	void operator()(MessageID, Json const&);
 protected:
 	// Nested class because otherwise `RenameSymbol` couldn't be easily used
 	// with LanguageServer::m_handlers as `ASTConstVisitor` deletes required
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
index 2f44354184..be0796860c 100644
--- a/libsolidity/lsp/SemanticTokensBuilder.cpp
+++ b/libsolidity/lsp/SemanticTokensBuilder.cpp
@@ -70,7 +70,7 @@ SemanticTokenType semanticTokenTypeForExpression(frontend::Type const* _type)
 
 } // end namespace
 
-Json::Value SemanticTokensBuilder::build(SourceUnit const& _sourceUnit, CharStream const& _charStream)
+Json SemanticTokensBuilder::build(SourceUnit const& _sourceUnit, CharStream const& _charStream)
 {
 	reset(&_charStream);
 	_sourceUnit.accept(*this);
@@ -79,7 +79,7 @@ Json::Value SemanticTokensBuilder::build(SourceUnit const& _sourceUnit, CharStre
 
 void SemanticTokensBuilder::reset(CharStream const* _charStream)
 {
-	m_encodedTokens = Json::arrayValue;
+	m_encodedTokens = Json::array();
 	m_charStream = _charStream;
 	m_lastLine = 0;
 	m_lastStartChar = 0;
@@ -120,14 +120,14 @@ void SemanticTokensBuilder::encode(
 
 	lspDebug(fmt::format("encode [{}:{}..{}] {}", line, startChar, length, static_cast<int>(_tokenType)));
 
-	m_encodedTokens.append(line - m_lastLine);
+	m_encodedTokens.emplace_back(line - m_lastLine);
 	if (line == m_lastLine)
-		m_encodedTokens.append(startChar - m_lastStartChar);
+		m_encodedTokens.emplace_back(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_encodedTokens.emplace_back(startChar);
+	m_encodedTokens.emplace_back(length);
+	m_encodedTokens.emplace_back(static_cast<int>(_tokenType));
+	m_encodedTokens.emplace_back(static_cast<int>(_modifiers));
 
 	m_lastLine = line;
 	m_lastStartChar = startChar;
diff --git a/libsolidity/lsp/SemanticTokensBuilder.h b/libsolidity/lsp/SemanticTokensBuilder.h
index ca3c48d1c6..3facb99e2b 100644
--- a/libsolidity/lsp/SemanticTokensBuilder.h
+++ b/libsolidity/lsp/SemanticTokensBuilder.h
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/ASTVisitor.h>
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <fmt/format.h>
 
@@ -87,7 +87,7 @@ constexpr SemanticTokenModifiers operator|(SemanticTokenModifiers a, SemanticTok
 class SemanticTokensBuilder: public frontend::ASTConstVisitor
 {
 public:
-	Json::Value build(frontend::SourceUnit const& _sourceUnit, langutil::CharStream const& _charStream);
+	Json build(frontend::SourceUnit const& _sourceUnit, langutil::CharStream const& _charStream);
 
 	void reset(langutil::CharStream const* _charStream);
 	void encode(
@@ -114,7 +114,7 @@ class SemanticTokensBuilder: public frontend::ASTConstVisitor
 	bool visit(frontend::VariableDeclaration const&) override;
 
 private:
-	Json::Value m_encodedTokens;
+	Json m_encodedTokens;
 	langutil::CharStream const* m_charStream;
 	int m_lastLine;
 	int m_lastStartChar;
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index 7f8eb22834..743ad6d669 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -38,9 +38,10 @@
 #endif
 
 using namespace solidity::lsp;
+using namespace solidity;
 
 // {{{ Transport
-std::optional<Json::Value> Transport::receive()
+std::optional<Json> Transport::receive()
 {
 	auto const headers = parseHeaders();
 	if (!headers)
@@ -57,10 +58,10 @@ std::optional<Json::Value> Transport::receive()
 
 	std::string const data = readBytes(stoul(headers->at("content-length")));
 
-	Json::Value jsonMessage;
+	Json jsonMessage;
 	std::string jsonParsingErrors;
 	solidity::util::jsonParseStrict(data, jsonMessage, &jsonParsingErrors);
-	if (!jsonParsingErrors.empty() || !jsonMessage || !jsonMessage.isObject())
+	if (!jsonParsingErrors.empty() || jsonMessage.empty() || !jsonMessage.is_object())
 	{
 		error({}, ErrorCode::ParseError, "Could not parse RPC JSON payload. " + jsonParsingErrors);
 		return std::nullopt;
@@ -69,12 +70,12 @@ std::optional<Json::Value> Transport::receive()
 	return {std::move(jsonMessage)};
 }
 
-void Transport::trace(std::string _message, Json::Value _extra)
+void Transport::trace(std::string _message, Json _extra)
 {
 	if (m_logTrace != TraceValue::Off)
 	{
-		Json::Value params;
-		if (_extra.isObject())
+		Json params;
+		if (_extra.is_object())
 			params = std::move(_extra);
 		params["message"] = std::move(_message);
 		notify("$/logTrace", std::move(params));
@@ -103,34 +104,34 @@ std::optional<std::map<std::string, std::string>> Transport::parseHeaders()
 	return {std::move(headers)};
 }
 
-void Transport::notify(std::string _method, Json::Value _message)
+void Transport::notify(std::string _method, Json _message)
 {
-	Json::Value json;
+	Json json;
 	json["method"] = std::move(_method);
 	json["params"] = std::move(_message);
 	send(std::move(json));
 }
 
-void Transport::reply(MessageID _id, Json::Value _message)
+void Transport::reply(MessageID _id, Json _message)
 {
-	Json::Value json;
+	Json json;
 	json["result"] = std::move(_message);
 	send(std::move(json), _id);
 }
 
 void Transport::error(MessageID _id, ErrorCode _code, std::string _message)
 {
-	Json::Value json;
+	Json json;
 	json["error"]["code"] = static_cast<int>(_code);
 	json["error"]["message"] = std::move(_message);
 	send(std::move(json), _id);
 }
 
-void Transport::send(Json::Value _json, MessageID _id)
+void Transport::send(Json _json, MessageID _id)
 {
-	solAssert(_json.isObject());
+	solAssert(_json.is_object());
 	_json["jsonrpc"] = "2.0";
-	if (_id != Json::nullValue)
+	if (_id != Json())
 		_json["id"] = _id;
 
 	// Trailing CRLF only for easier readability.
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index e3b03bcc7f..e76cb5f7da 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -18,8 +18,7 @@
 #pragma once
 
 #include <libsolutil/Exceptions.h>
-
-#include <json/value.h>
+#include <libsolutil/JSON.h>
 
 #include <functional>
 #include <iosfwd>
@@ -32,7 +31,7 @@
 namespace solidity::lsp
 {
 
-using MessageID = Json::Value;
+using MessageID = Json;
 
 enum class TraceValue
 {
@@ -98,14 +97,14 @@ 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);
+	std::optional<Json> receive();
+	void notify(std::string _method, Json _params);
+	void reply(MessageID _id, Json _result);
 	void error(MessageID _id, ErrorCode _code, std::string _message);
 
 	virtual bool closed() const noexcept = 0;
 
-	void trace(std::string _message, Json::Value _extra = Json::nullValue);
+	void trace(std::string _message, Json _extra = Json{});
 
 	TraceValue traceValue() const noexcept { return m_logTrace; }
 	void setTrace(TraceValue _value) noexcept { m_logTrace = _value; }
@@ -135,7 +134,7 @@ class Transport
 	/// 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);
+	virtual void send(Json _message, MessageID _id = Json{});
 };
 
 /**
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
index 85e27a4fda..7667ce688e 100644
--- a/libsolidity/lsp/Utils.cpp
+++ b/libsolidity/lsp/Utils.cpp
@@ -31,26 +31,26 @@ namespace solidity::lsp
 using namespace frontend;
 using namespace langutil;
 
-std::optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
+std::optional<LineColumn> parseLineColumn(Json const& _lineColumn)
 {
-	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
-		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
+	if (_lineColumn.is_object() && _lineColumn["line"].is_number_integer() && _lineColumn["character"].is_number_integer())
+		return LineColumn{_lineColumn["line"].get<int>(), _lineColumn["character"].get<int>()};
 	else
 		return std::nullopt;
 }
 
-Json::Value toJson(LineColumn const& _pos)
+Json toJson(LineColumn const& _pos)
 {
-	Json::Value json = Json::objectValue;
+	Json json;
 	json["line"] = std::max(_pos.line, 0);
 	json["character"] = std::max(_pos.column, 0);
 
 	return json;
 }
 
-Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
+Json toJsonRange(LineColumn const& _start, LineColumn const& _end)
 {
-	Json::Value json;
+	Json json;
 	json["start"] = toJson(_start);
 	json["end"] = toJson(_end);
 	return json;
@@ -86,7 +86,7 @@ std::optional<SourceLocation> declarationLocation(Declaration const* _declaratio
 std::optional<SourceLocation> parsePosition(
 	FileRepository const& _fileRepository,
 	std::string const& _sourceUnitName,
-	Json::Value const& _position
+	Json const& _position
 )
 {
 	if (!_fileRepository.sourceUnits().count(_sourceUnitName))
@@ -101,9 +101,9 @@ std::optional<SourceLocation> parsePosition(
 	return std::nullopt;
 }
 
-std::optional<SourceLocation> parseRange(FileRepository const& _fileRepository, std::string const& _sourceUnitName, Json::Value const& _range)
+std::optional<SourceLocation> parseRange(FileRepository const& _fileRepository, std::string const& _sourceUnitName, Json const& _range)
 {
-	if (!_range.isObject())
+	if (!_range.is_object())
 		return std::nullopt;
 	std::optional<SourceLocation> start = parsePosition(_fileRepository, _sourceUnitName, _range["start"]);
 	std::optional<SourceLocation> end = parsePosition(_fileRepository, _sourceUnitName, _range["end"]);
diff --git a/libsolidity/lsp/Utils.h b/libsolidity/lsp/Utils.h
index c6d40213e6..318cdc87d6 100644
--- a/libsolidity/lsp/Utils.h
+++ b/libsolidity/lsp/Utils.h
@@ -44,16 +44,16 @@ namespace solidity::lsp
 
 class FileRepository;
 
-std::optional<langutil::LineColumn> parseLineColumn(Json::Value const& _lineColumn);
-Json::Value toJson(langutil::LineColumn const& _pos);
-Json::Value toJsonRange(langutil::LineColumn const& _start, langutil::LineColumn const& _end);
+std::optional<langutil::LineColumn> parseLineColumn(Json const& _lineColumn);
+Json toJson(langutil::LineColumn const& _pos);
+Json toJsonRange(langutil::LineColumn const& _start, langutil::LineColumn const& _end);
 
 /// @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
+	Json const& _position
 );
 
 /// @returns the source location given a source unit name and an LSP Range object,
@@ -61,7 +61,7 @@ std::optional<langutil::SourceLocation> parsePosition(
 std::optional<langutil::SourceLocation> parseRange(
 	FileRepository const& _fileRepository,
 	std::string const& _sourceUnitName,
-	Json::Value const& _range
+	Json const& _range
 );
 
 /// Strips the file:// URI prefix off the given path, if present,
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index f97d61b671..0fdb23b044 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 fmt::fmt-header-only)
+target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only nlohmann-json)
 target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 
diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index 9d73a0012e..7dd9b6769a 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -76,6 +76,7 @@ DEV_SIMPLE_EXCEPTION(FileNotFound);
 DEV_SIMPLE_EXCEPTION(NotAFile);
 DEV_SIMPLE_EXCEPTION(DataTooLong);
 DEV_SIMPLE_EXCEPTION(StringTooLong);
+DEV_SIMPLE_EXCEPTION(InvalidType);
 
 // error information to be added to exceptions
 using errinfo_comment = boost::error_info<struct tag_comment, std::string>;
diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index 3a2570d47e..63746c8653 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -22,19 +22,18 @@
 
 #include <libsolutil/JSON.h>
 
-#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 
-#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/trim.hpp>
 
-#include <sstream>
 #include <map>
-#include <memory>
+#include <sstream>
 
-#ifdef STRICT_JSONCPP_VERSION_CHECK
+#ifdef STRICT_NLOHMANN_JSON_VERSION_CHECK
 static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
-);
+	(NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 11) && (NLOHMANN_JSON_VERSION_PATCH == 3),
+	"Unexpected nlohmann-json version. Expecting 3.11.3.");
 #endif
 
 namespace solidity::util
@@ -43,116 +42,209 @@ namespace solidity::util
 namespace
 {
 
-/// StreamWriterBuilder that can be constructed with specific settings
-class StreamWriterBuilder: public Json::StreamWriterBuilder
+/// Takes a JSON value (@ _json) and removes all its members with value 'null' recursively.
+void removeNullMembersHelper(Json& _json)
 {
-public:
-	explicit StreamWriterBuilder(std::map<std::string, Json::Value> const& _settings)
+	if (_json.is_array())
 	{
-		for (auto const& iter: _settings)
-			this->settings_[iter.first] = iter.second;
+		for (auto& child: _json)
+			removeNullMembersHelper(child);
 	}
-};
-
-/// CharReaderBuilder with strict-mode settings
-class StrictModeCharReaderBuilder: public Json::CharReaderBuilder
-{
-public:
-	StrictModeCharReaderBuilder()
+	else if (_json.is_object())
 	{
-		Json::CharReaderBuilder::strictMode(&this->settings_);
+		for (auto it = _json.begin(); it != _json.end();)
+		{
+			if (it->is_null())
+				it = _json.erase(it);
+			else
+			{
+				removeNullMembersHelper(*it);
+				++it;
+			}
+		}
 	}
-};
+}
 
-/// Serialise the JSON object (@a _input) with specific builder (@a _builder)
-/// \param _input JSON input string
-/// \param _builder StreamWriterBuilder that is used to create new Json::StreamWriter
-/// \return serialized json object
-std::string print(Json::Value const& _input, Json::StreamWriterBuilder const& _builder)
+std::string trimRightAllLines(std::string const& input)
 {
-	std::stringstream stream;
-	std::unique_ptr<Json::StreamWriter> writer(_builder.newStreamWriter());
-	writer->write(_input, &stream);
-	return stream.str();
+	std::vector<std::string> lines;
+	std::string output;
+	boost::split(lines, input, boost::is_any_of("\n"));
+	for (auto& line: lines)
+	{
+		boost::trim_right(line);
+		if (!line.empty())
+			output += line + "\n";
+	}
+	return boost::trim_right_copy(output);
 }
 
-/// Parse a JSON string (@a _input) with specified builder (@ _builder) and writes resulting JSON object to (@a _json)
-/// \param _builder CharReaderBuilder that is used to create new Json::CharReaders
-/// \param _input JSON input string
-/// \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, std::string const& _input, Json::Value& _json, std::string* _errs)
+std::string formatLikeJsoncpp(std::string const& _dumped, JsonFormat const& _format)
 {
-	std::unique_ptr<Json::CharReader> reader(_builder.newCharReader());
-	return reader->parse(_input.c_str(), _input.c_str() + _input.length(), &_json, _errs);
+	uint32_t indentLevel = 0;
+	std::stringstream reformatted;
+	bool inQuotes = false;
+	for (size_t i = 0; i < _dumped.size(); ++i)
+	{
+		char c = _dumped[i];
+		bool emptyThing = false;
+
+		if (c == '"' && (i == 0 || _dumped[i - 1] != '\\'))
+			inQuotes = !inQuotes;
+
+		if (!inQuotes)
+		{
+			if (i < _dumped.size() - 1)
+			{
+				char nc = _dumped[i + 1];
+				if ((c == '[' && nc == ']') || (c == '{' && nc == '}'))
+					emptyThing = true;
+			}
+			if (c == '[' || c == '{')
+			{
+				if (i > 0 && _dumped[i - 1] != '\n')
+					if (!emptyThing)
+						reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
+				indentLevel++;
+			}
+			else if (c == ']' || c == '}')
+			{
+				indentLevel--;
+				if (i + 1 < _dumped.size() && _dumped[i + 1] != '\n'
+					&& (_dumped[i + 1] == ']' || _dumped[i + 1] == '}'))
+					reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
+			}
+		}
+		reformatted << c;
+		if (!emptyThing && !inQuotes && (c == '[' || c == '{') && indentLevel > 0 && i + 1 < _dumped.size()
+			&& _dumped[i + 1] != '\n')
+			reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
+	}
+	return trimRightAllLines(reformatted.str());
 }
 
-/// Takes a JSON value (@ _json) and removes all its members with value 'null' recursively.
-void removeNullMembersHelper(Json::Value& _json)
+std::string escapeNewlinesAndTabsWithinStringLiterals(std::string const& _json)
 {
-	if (_json.type() == Json::ValueType::arrayValue)
-		for (auto& child: _json)
-			removeNullMembersHelper(child);
-	else if (_json.type() == Json::ValueType::objectValue)
-		for (auto const& key: _json.getMemberNames())
+	std::stringstream fixed;
+	bool inQuotes = false;
+	for (size_t i = 0; i < _json.size(); ++i)
+	{
+		char c = _json[i];
+
+		// Originally we had just this here:
+		// if (c == '"' && (i == 0 || _json[i - 1] != '\\'))
+		//    inQuotes = !inQuotes;
+		// However, this is not working if the escape character itself was escaped. e.g. "\n\r'\"\\".
+
+		if (c == '"')
+		{
+			size_t backslashCount = 0;
+			size_t j = i;
+			while (j > 0 && _json[j - 1] == '\\')
+			{
+				backslashCount++;
+				j--;
+			}
+			if (backslashCount % 2 == 0)
+			{
+				inQuotes = !inQuotes;
+				fixed << c;
+				continue;
+			}
+		}
+
+		if (inQuotes)
 		{
-			Json::Value& value = _json[key];
-			if (value.isNull())
-				_json.removeMember(key);
+			if (c == '\n')
+				fixed << "\\n";
+			else if (c == '\t')
+				fixed << "\\t";
 			else
-				removeNullMembersHelper(value);
+				fixed << c;
 		}
+		else
+			fixed << c;
+	}
+	return fixed.str();
 }
 
 } // end anonymous namespace
 
-Json::Value removeNullMembers(Json::Value _json)
+Json removeNullMembers(Json _json)
 {
 	removeNullMembersHelper(_json);
 	return _json;
 }
 
-std::string jsonPrettyPrint(Json::Value const& _input)
+std::string removeNlohmannInternalErrorIdentifier(std::string const& _input)
 {
-	return jsonPrint(_input, JsonFormat{ JsonFormat::Pretty });
-}
+	std::string result = _input;
+	std::size_t startPos = result.find('[');
+	std::size_t endPos = result.find(']', startPos);
 
-std::string jsonCompactPrint(Json::Value const& _input)
-{
-	return jsonPrint(_input, JsonFormat{ JsonFormat::Compact });
+	if (startPos != std::string::npos && endPos != std::string::npos)
+		result.erase(startPos, endPos - startPos + 1);
+
+	return boost::trim_copy(result);
 }
 
-std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format)
+std::string jsonPrettyPrint(Json const& _input) { return jsonPrint(_input, JsonFormat{JsonFormat::Pretty}); }
+
+std::string jsonCompactPrint(Json const& _input) { return jsonPrint(_input, JsonFormat{JsonFormat::Compact}); }
+
+std::string jsonPrint(Json const& _input, JsonFormat const& _format)
 {
-	std::map<std::string, Json::Value> settings;
-	if (_format.format == JsonFormat::Pretty)
-	{
-		settings["indentation"] = std::string(_format.indent, ' ');
-		settings["enableYAMLCompatibility"] = true;
-	}
-	else
-		settings["indentation"] = "";
-	StreamWriterBuilder writerBuilder(settings);
-	std::string result = print(_input, writerBuilder);
+	// NOTE: -1 here means no new lines (it is also the default setting)
+	std::string dumped = _input.dump(
+		/* indent */ (_format.format == JsonFormat::Pretty) ? static_cast<int>(_format.indent) : -1,
+		/* indent_char */ ' ',
+		/* ensure_ascii */ true
+	);
+
+	// let's remove this once all test-cases having the correct output.
 	if (_format.format == JsonFormat::Pretty)
-		boost::replace_all(result, " \n", "\n");
-	return result;
+		dumped = formatLikeJsoncpp(dumped, _format);
+
+	return dumped;
 }
 
-bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs /* = nullptr */)
+bool jsonParseStrict(std::string const& _input, Json& _json, std::string* _errs /* = nullptr */)
 {
-	static StrictModeCharReaderBuilder readerBuilder;
-	return parse(readerBuilder, _input, _json, _errs);
+	try
+	{
+		_json = Json::parse(
+			// TODO: remove this in the next breaking release?
+			escapeNewlinesAndTabsWithinStringLiterals(_input),
+			/* callback */ nullptr,
+			/* allow exceptions */ true,
+			/* ignore_comments */true
+		);
+		_errs = {};
+		return true;
+	}
+	catch (Json::parse_error const& e)
+	{
+		if (_errs)
+		{
+			std::stringstream escaped;
+			for (char c: removeNlohmannInternalErrorIdentifier(e.what()))
+				if (std::isprint(c))
+					escaped << c;
+				else
+					escaped << "\\x" + toHex(static_cast<uint8_t>(c));
+			*_errs = escaped.str();
+		}
+		return false;
+	}
 }
 
-std::optional<Json::Value> jsonValueByPath(Json::Value const& _node, std::string_view _jsonPath)
+std::optional<Json> jsonValueByPath(Json const& _node, std::string_view _jsonPath)
 {
-	if (!_node.isObject() || _jsonPath.empty())
+	if (!_node.is_object() || _jsonPath.empty())
 		return {};
 
 	std::string memberName = std::string(_jsonPath.substr(0, _jsonPath.find_first_of('.')));
-	if (!_node.isMember(memberName))
+	if (!_node.contains(memberName))
 		return {};
 
 	if (memberName == _jsonPath)
diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
index f368739e1a..2cdac70c78 100644
--- a/libsolutil/JSON.h
+++ b/libsolutil/JSON.h
@@ -23,17 +23,26 @@
 
 #pragma once
 
-#include <json/json.h>
+#include <libsolutil/Assertions.h>
+#include <nlohmann/json.hpp>
 
 #include <string>
 #include <string_view>
 #include <optional>
+#include <limits>
+
+namespace solidity
+{
+
+using Json = nlohmann::json;
+
+} // namespace solidity
 
 namespace solidity::util
 {
 
 /// Removes members with null value recursively from (@a _json).
-Json::Value removeNullMembers(Json::Value _json);
+Json removeNullMembers(Json _json);
 
 /// JSON printing format.
 struct JsonFormat
@@ -54,27 +63,29 @@ struct JsonFormat
 };
 
 /// Serialise the JSON object (@a _input) with indentation
-std::string jsonPrettyPrint(Json::Value const& _input);
+std::string jsonPrettyPrint(Json const& _input);
 
 /// Serialise the JSON object (@a _input) without indentation
-std::string jsonCompactPrint(Json::Value const& _input);
+std::string jsonCompactPrint(Json const& _input);
 
 /// Serialise the JSON object (@a _input) using specified format (@a _format)
-std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format);
+std::string jsonPrint(Json const& _input, JsonFormat const& _format);
 
 /// Parse a JSON string (@a _input) with enabled strict-mode and writes resulting JSON object to (@a _json)
 /// \param _input JSON input string
 /// \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 jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
+bool jsonParseStrict(std::string const& _input, Json& _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);
+std::optional<Json> jsonValueByPath(Json const& _node, std::string_view _jsonPath);
+
+std::string removeNlohmannInternalErrorIdentifier(std::string const& _input);
 
 namespace detail
 {
@@ -82,60 +93,95 @@ namespace detail
 template<typename T>
 struct helper;
 
-template<typename T, bool(Json::Value::*checkMember)() const, T(Json::Value::*convertMember)() const>
+template<typename T, bool(Json::*checkMember)() const, T(Json::*convertMember)() const>
 struct helper_impl
 {
-	static bool isOfType(Json::Value const& _input)
+	static bool isOfType(Json const& _input)
 	{
 		return (_input.*checkMember)();
 	}
-	static T get(Json::Value const& _input)
+	static T get(Json const& _input)
 	{
+		assertThrow(isOfType(_input), InvalidType,  "");
 		return (_input.*convertMember)();
 	}
-	static T getOrDefault(Json::Value const& _input, T _default = {})
+	static T getOrDefault(Json const& _input, std::string const& _name, T _default = {})
 	{
 		T result = _default;
-		if (isOfType(_input))
-			result = (_input.*convertMember)();
+		if (_input.contains(_name) && isOfType(_input[_name]))
+			result = (_input[_name].*convertMember)();
 		return result;
 	}
 };
 
-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> {};
+template<typename T, typename RT, bool(Json::*checkMember)() const, T(Json::*convertMember)() const>
+struct helper_impl_with_range_check
+{
+	static bool isOfType(Json const& _input)
+	{
+		if ( (_input.*checkMember)())
+		{
+			T value = (_input.*convertMember)();
+			return (value >= std::numeric_limits<RT>::min() && value <= std::numeric_limits<RT>::max());
+		}
+		return false;
+	}
+
+	static RT get(Json const& _input)
+	{
+		assertThrow(isOfType(_input), InvalidType,  "");
+		return static_cast<RT>((_input.*convertMember)());
+	}
+
+	static RT getOrDefault(Json const& _input, std::string const& _name, RT _default = {})
+	{
+		RT value = _default;
+		if (_input.contains(_name) && isOfType(_input[_name]))
+			value = static_cast<RT>((_input[_name].*convertMember)());
+		return value;
+	}
+};
+
+template<> struct helper<Json::string_t>: helper_impl<Json::string_t, &Json::is_string, &Json::get<Json::string_t>> {};
+template<> struct helper<Json::number_integer_t>: helper_impl<Json::number_integer_t, &Json::is_number_integer, &Json::get<Json::number_integer_t>> {};
+template<> struct helper<Json::number_unsigned_t>: helper_impl<Json::number_unsigned_t, &Json::is_number_integer, &Json::get<Json::number_unsigned_t>> {};
+template<> struct helper<Json::number_float_t>: helper_impl<Json::number_float_t, &Json::is_number, &Json::get<Json::number_float_t>> {};
+template<> struct helper<Json::boolean_t>: helper_impl<Json::boolean_t, &Json::is_boolean, &Json::get<Json::boolean_t>> {};
+
+template<> struct helper<int32_t>: helper_impl_with_range_check<Json::number_integer_t, int32_t, &Json::is_number_integer, &Json::get<Json::number_integer_t>> {};
+template<> struct helper<int16_t>: helper_impl_with_range_check<Json::number_integer_t, int16_t, &Json::is_number_integer, &Json::get<Json::number_integer_t>> {};
+template<> struct helper<int8_t>: helper_impl_with_range_check<Json::number_integer_t, int8_t, &Json::is_number_integer, &Json::get<Json::number_integer_t>> {};
+template<> struct helper<uint32_t>: helper_impl_with_range_check<Json::number_unsigned_t, uint32_t, &Json::is_number_integer, &Json::get<Json::number_unsigned_t>> {};
+template<> struct helper<uint16_t>: helper_impl_with_range_check<Json::number_unsigned_t, uint16_t, &Json::is_number_integer, &Json::get<Json::number_unsigned_t>> {};
+template<> struct helper<uint8_t>: helper_impl_with_range_check<Json::number_integer_t, uint8_t, &Json::is_number_integer, &Json::get<Json::number_integer_t>> {};
+template<> struct helper<float>: helper_impl_with_range_check<Json::number_float_t, float, &Json::is_number, &Json::get<Json::number_float_t>> {};
 
 } // namespace detail
 
 template<typename T>
-bool isOfType(Json::Value const& _input)
+bool isOfType(Json const& _input)
 {
 	return detail::helper<T>::isOfType(_input);
 }
 
 template<typename T>
-bool isOfTypeIfExists(Json::Value const& _input, std::string const& _name)
+bool isOfTypeIfExists(Json const& _input, std::string const& _name)
 {
-	if (_input.isMember(_name))
+	if (_input.contains(_name))
 		return isOfType<T>(_input[_name]);
 	return true;
 }
 
 template<typename T>
-T get(Json::Value const& _input)
+T get(Json const& _input)
 {
 	return detail::helper<T>::get(_input);
 }
 
 template<typename T>
-T getOrDefault(Json::Value const& _input, T _default = {})
+T getOrDefault(Json const& _input, std::string const& _name, T _default = {})
 {
-	return detail::helper<T>::getOrDefault(_input, _default);
+	return detail::helper<T>::getOrDefault(_input, _name, _default);
 }
 
 } // namespace solidity::util
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index bf2468b4e4..a89e4967aa 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -29,25 +29,25 @@
 namespace solidity::yul
 {
 
-Json::Value AsmJsonConverter::operator()(Block const& _node) const
+Json AsmJsonConverter::operator()(Block const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBlock");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBlock");
 	ret["statements"] = vectorOfVariantsToJson(_node.statements);
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(TypedName const& _node) const
+Json AsmJsonConverter::operator()(TypedName const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid variable name.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
 	ret["name"] = _node.name.str();
 	ret["type"] = _node.type.str();
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Literal const& _node) const
+Json AsmJsonConverter::operator()(Literal const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLiteral");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLiteral");
 	switch (_node.kind)
 	{
 	case LiteralKind::Number:
@@ -71,94 +71,92 @@ Json::Value AsmJsonConverter::operator()(Literal const& _node) const
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Identifier const& _node) const
+Json AsmJsonConverter::operator()(Identifier const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid identifier");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIdentifier");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIdentifier");
 	ret["name"] = _node.name.str();
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Assignment const& _node) const
+Json AsmJsonConverter::operator()(Assignment const& _node) const
 {
 	yulAssert(_node.variableNames.size() >= 1, "Invalid assignment syntax");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulAssignment");
+	Json 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;
+		ret["variableNames"].emplace_back((*this)(var));
+	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json();
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(FunctionCall const& _node) const
+Json AsmJsonConverter::operator()(FunctionCall const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionCall");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionCall");
 	ret["functionName"] = (*this)(_node.functionName);
 	ret["arguments"] = vectorOfVariantsToJson(_node.arguments);
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(ExpressionStatement const& _node) const
+Json AsmJsonConverter::operator()(ExpressionStatement const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulExpressionStatement");
+	Json 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 AsmJsonConverter::operator()(VariableDeclaration const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulVariableDeclaration");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulVariableDeclaration");
 	for (auto const& var: _node.variables)
-		ret["variables"].append((*this)(var));
-
-	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json::nullValue;
-
+		ret["variables"].emplace_back((*this)(var));
+	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json();
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(FunctionDefinition const& _node) const
+Json AsmJsonConverter::operator()(FunctionDefinition const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid function name.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionDefinition");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionDefinition");
 	ret["name"] = _node.name.str();
 	for (auto const& var: _node.parameters)
-		ret["parameters"].append((*this)(var));
+		ret["parameters"].emplace_back((*this)(var));
 	for (auto const& var: _node.returnVariables)
-		ret["returnVariables"].append((*this)(var));
+		ret["returnVariables"].emplace_back((*this)(var));
 	ret["body"] = (*this)(_node.body);
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(If const& _node) const
+Json AsmJsonConverter::operator()(If const& _node) const
 {
 	yulAssert(_node.condition, "Invalid if condition.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIf");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIf");
 	ret["condition"] = std::visit(*this, *_node.condition);
 	ret["body"] = (*this)(_node.body);
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Switch const& _node) const
+Json AsmJsonConverter::operator()(Switch const& _node) const
 {
 	yulAssert(_node.expression, "Invalid expression pointer.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulSwitch");
+	Json 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));
+		ret["cases"].emplace_back((*this)(var));
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Case const& _node) const
+Json AsmJsonConverter::operator()(Case const& _node) const
 {
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulCase");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulCase");
 	ret["value"] = _node.value ? (*this)(*_node.value) : "default";
 	ret["body"] = (*this)(_node.body);
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(ForLoop const& _node) const
+Json AsmJsonConverter::operator()(ForLoop const& _node) const
 {
 	yulAssert(_node.condition, "Invalid for loop condition.");
-	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulForLoop");
+	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulForLoop");
 	ret["pre"] = (*this)(_node.pre);
 	ret["condition"] = std::visit(*this, *_node.condition);
 	ret["post"] = (*this)(_node.post);
@@ -166,24 +164,24 @@ Json::Value AsmJsonConverter::operator()(ForLoop const& _node) const
 	return ret;
 }
 
-Json::Value AsmJsonConverter::operator()(Break const& _node) const
+Json AsmJsonConverter::operator()(Break const& _node) const
 {
 	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBreak");
 }
 
-Json::Value AsmJsonConverter::operator()(Continue const& _node) const
+Json AsmJsonConverter::operator()(Continue const& _node) const
 {
 	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulContinue");
 }
 
-Json::Value AsmJsonConverter::operator()(Leave const& _node) const
+Json 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, std::string _nodeType) const
+Json AsmJsonConverter::createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const
 {
-	Json::Value ret{Json::objectValue};
+	Json ret;
 	ret["nodeType"] = std::move(_nodeType);
 	auto srcLocation = [&](int start, int end) -> std::string
 	{
@@ -196,11 +194,11 @@ Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _ori
 }
 
 template <class T>
-Json::Value AsmJsonConverter::vectorOfVariantsToJson(std::vector<T> const& _vec) const
+Json AsmJsonConverter::vectorOfVariantsToJson(std::vector<T> const& _vec) const
 {
-	Json::Value ret{Json::arrayValue};
+	Json ret = Json::array();
 	for (auto const& var: _vec)
-		ret.append(std::visit(*this, var));
+		ret.emplace_back(std::visit(*this, var));
 	return ret;
 }
 
diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
index 236ecbba57..9c4b5d5e8e 100644
--- a/libyul/AsmJsonConverter.h
+++ b/libyul/AsmJsonConverter.h
@@ -25,7 +25,7 @@
 
 #include <libyul/ASTForward.h>
 #include <liblangutil/SourceLocation.h>
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 #include <boost/variant/static_visitor.hpp>
 #include <optional>
 #include <vector>
@@ -36,35 +36,35 @@ namespace solidity::yul
 /**
  * Converter of the yul AST into JSON format
  */
-class AsmJsonConverter: public boost::static_visitor<Json::Value>
+class AsmJsonConverter: public boost::static_visitor<Json>
 {
 public:
 	/// Create a converter to JSON for any block of inline assembly
 	/// @a _sourceIndex to be used to abbreviate source name in the source locations
 	explicit AsmJsonConverter(std::optional<size_t> _sourceIndex): m_sourceIndex(_sourceIndex) {}
 
-	Json::Value operator()(Block const& _node) const;
-	Json::Value operator()(TypedName const& _node) const;
-	Json::Value operator()(Literal const& _node) const;
-	Json::Value operator()(Identifier const& _node) const;
-	Json::Value operator()(Assignment const& _node) const;
-	Json::Value operator()(VariableDeclaration const& _node) const;
-	Json::Value operator()(FunctionDefinition const& _node) const;
-	Json::Value operator()(FunctionCall const& _node) const;
-	Json::Value operator()(If const& _node) const;
-	Json::Value operator()(Switch const& _node) const;
-	Json::Value operator()(Case const& _node) const;
-	Json::Value operator()(ForLoop const& _node) const;
-	Json::Value operator()(Break const& _node) const;
-	Json::Value operator()(Continue const& _node) const;
-	Json::Value operator()(Leave const& _node) const;
-	Json::Value operator()(ExpressionStatement const& _node) const;
-	Json::Value operator()(Label const& _node) const;
+	Json operator()(Block const& _node) const;
+	Json operator()(TypedName const& _node) const;
+	Json operator()(Literal const& _node) const;
+	Json operator()(Identifier const& _node) const;
+	Json operator()(Assignment const& _node) const;
+	Json operator()(VariableDeclaration const& _node) const;
+	Json operator()(FunctionDefinition const& _node) const;
+	Json operator()(FunctionCall const& _node) const;
+	Json operator()(If const& _node) const;
+	Json operator()(Switch const& _node) const;
+	Json operator()(Case const& _node) const;
+	Json operator()(ForLoop const& _node) const;
+	Json operator()(Break const& _node) const;
+	Json operator()(Continue const& _node) const;
+	Json operator()(Leave const& _node) const;
+	Json operator()(ExpressionStatement const& _node) const;
+	Json operator()(Label const& _node) const;
 
 private:
-	Json::Value createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const;
+	Json 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;
+	Json vectorOfVariantsToJson(std::vector<T> const& vec) const;
 
 	std::optional<size_t> const m_sourceIndex;
 };
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 190dcda21d..41e0658535 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -41,15 +41,15 @@ namespace solidity::yul
 
 using SourceLocation = langutil::SourceLocation;
 
-SourceLocation const AsmJsonImporter::createSourceLocation(Json::Value const& _node)
+SourceLocation const AsmJsonImporter::createSourceLocation(Json const& _node)
 {
-	yulAssert(member(_node, "src").isString(), "'src' must be a string");
+	yulAssert(member(_node, "src").is_string(), "'src' must be a string");
 
-	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
+	return solidity::langutil::parseSourceLocation(_node["src"].get<std::string>(), m_sourceNames);
 }
 
 template <class T>
-T AsmJsonImporter::createAsmNode(Json::Value const& _node)
+T AsmJsonImporter::createAsmNode(Json const& _node)
 {
 	T r;
 	SourceLocation nativeLocation = createSourceLocation(_node);
@@ -61,26 +61,26 @@ T AsmJsonImporter::createAsmNode(Json::Value const& _node)
 	return r;
 }
 
-Json::Value AsmJsonImporter::member(Json::Value const& _node, std::string const& _name)
+Json AsmJsonImporter::member(Json const& _node, std::string const& _name)
 {
-	if (!_node.isMember(_name))
-		return Json::nullValue;
+	if (!_node.contains(_name))
+		return Json();
 	return _node[_name];
 }
 
-TypedName AsmJsonImporter::createTypedName(Json::Value const& _node)
+TypedName AsmJsonImporter::createTypedName(Json const& _node)
 {
 	auto typedName = createAsmNode<TypedName>(_node);
-	typedName.type = YulString{member(_node, "type").asString()};
-	typedName.name = YulString{member(_node, "name").asString()};
+	typedName.type = YulString{member(_node, "type").get<std::string>()};
+	typedName.name = YulString{member(_node, "name").get<std::string>()};
 	return typedName;
 }
 
-Statement AsmJsonImporter::createStatement(Json::Value const& _node)
+Statement AsmJsonImporter::createStatement(Json const& _node)
 {
-	Json::Value jsonNodeType = member(_node, "nodeType");
-	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	std::string nodeType = jsonNodeType.asString();
+	Json jsonNodeType = member(_node, "nodeType");
+	yulAssert(jsonNodeType.is_string(), "Expected \"nodeType\" to be of type string!");
+	std::string nodeType = jsonNodeType.get<std::string>();
 
 	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
 	nodeType = nodeType.substr(3);
@@ -114,11 +114,11 @@ Statement AsmJsonImporter::createStatement(Json::Value const& _node)
 	util::unreachable();
 }
 
-Expression AsmJsonImporter::createExpression(Json::Value const& _node)
+Expression AsmJsonImporter::createExpression(Json const& _node)
 {
-	Json::Value jsonNodeType = member(_node, "nodeType");
-	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	std::string nodeType = jsonNodeType.asString();
+	Json jsonNodeType = member(_node, "nodeType");
+	yulAssert(jsonNodeType.is_string(), "Expected \"nodeType\" to be of type string!");
+	std::string nodeType = jsonNodeType.get<std::string>();
 
 	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
 	nodeType = nodeType.substr(3);
@@ -136,7 +136,7 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 	util::unreachable();
 }
 
-std::vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
+std::vector<Expression> AsmJsonImporter::createExpressionVector(Json const& _array)
 {
 	std::vector<Expression> ret;
 	for (auto& var: _array)
@@ -144,7 +144,7 @@ std::vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value cons
 	return ret;
 }
 
-std::vector<Statement> AsmJsonImporter::createStatementVector(Json::Value const& _array)
+std::vector<Statement> AsmJsonImporter::createStatementVector(Json const& _array)
 {
 	std::vector<Statement> ret;
 	for (auto& var: _array)
@@ -152,25 +152,25 @@ std::vector<Statement> AsmJsonImporter::createStatementVector(Json::Value const&
 	return ret;
 }
 
-Block AsmJsonImporter::createBlock(Json::Value const& _node)
+Block AsmJsonImporter::createBlock(Json const& _node)
 {
 	auto block = createAsmNode<Block>(_node);
 	block.statements = createStatementVector(_node["statements"]);
 	return block;
 }
 
-Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
+Literal AsmJsonImporter::createLiteral(Json const& _node)
 {
 	auto lit = createAsmNode<Literal>(_node);
-	std::string kind = member(_node, "kind").asString();
+	std::string kind = member(_node, "kind").get<std::string>();
 
-	solAssert(member(_node, "hexValue").isString() || member(_node, "value").isString(), "");
-	if (_node.isMember("hexValue"))
-		lit.value = YulString{util::asString(util::fromHex(member(_node, "hexValue").asString()))};
+	solAssert(member(_node, "hexValue").is_string() || member(_node, "value").is_string(), "");
+	if (_node.contains("hexValue"))
+		lit.value = YulString{util::asString(util::fromHex(member(_node, "hexValue").get<std::string>()))};
 	else
-		lit.value = YulString{member(_node, "value").asString()};
+		lit.value = YulString{member(_node, "value").get<std::string>()};
 
-	lit.type= YulString{member(_node, "type").asString()};
+	lit.type= YulString{member(_node, "type").get<std::string>()};
 
 	if (kind == "number")
 	{
@@ -207,23 +207,23 @@ Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
 	return lit;
 }
 
-Leave AsmJsonImporter::createLeave(Json::Value const& _node)
+Leave AsmJsonImporter::createLeave(Json const& _node)
 {
 	return createAsmNode<Leave>(_node);
 }
 
-Identifier AsmJsonImporter::createIdentifier(Json::Value const& _node)
+Identifier AsmJsonImporter::createIdentifier(Json const& _node)
 {
 	auto identifier = createAsmNode<Identifier>(_node);
-	identifier.name = YulString(member(_node, "name").asString());
+	identifier.name = YulString(member(_node, "name").get<std::string>());
 	return identifier;
 }
 
-Assignment AsmJsonImporter::createAssignment(Json::Value const& _node)
+Assignment AsmJsonImporter::createAssignment(Json const& _node)
 {
 	auto assignment = createAsmNode<Assignment>(_node);
 
-	if (_node.isMember("variableNames"))
+	if (_node.contains("variableNames"))
 		for (auto const& var: member(_node, "variableNames"))
 			assignment.variableNames.emplace_back(createIdentifier(var));
 
@@ -231,7 +231,7 @@ Assignment AsmJsonImporter::createAssignment(Json::Value const& _node)
 	return assignment;
 }
 
-FunctionCall AsmJsonImporter::createFunctionCall(Json::Value const& _node)
+FunctionCall AsmJsonImporter::createFunctionCall(Json const& _node)
 {
 	auto functionCall = createAsmNode<FunctionCall>(_node);
 
@@ -243,35 +243,35 @@ FunctionCall AsmJsonImporter::createFunctionCall(Json::Value const& _node)
 	return functionCall;
 }
 
-ExpressionStatement AsmJsonImporter::createExpressionStatement(Json::Value const& _node)
+ExpressionStatement AsmJsonImporter::createExpressionStatement(Json const& _node)
 {
 	auto statement = createAsmNode<ExpressionStatement>(_node);
 	statement.expression = createExpression(member(_node, "expression"));
 	return statement;
 }
 
-VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json::Value const& _node)
+VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json const& _node)
 {
 	auto varDec = createAsmNode<VariableDeclaration>(_node);
 	for (auto const& var: member(_node, "variables"))
 		varDec.variables.emplace_back(createTypedName(var));
 
-	if (_node.isMember("value"))
+	if (_node.contains("value"))
 		varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
 
 	return varDec;
 }
 
-FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json::Value const& _node)
+FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json const& _node)
 {
 	auto funcDef = createAsmNode<FunctionDefinition>(_node);
-	funcDef.name = YulString{member(_node, "name").asString()};
+	funcDef.name = YulString{member(_node, "name").get<std::string>()};
 
-	if (_node.isMember("parameters"))
+	if (_node.contains("parameters"))
 		for (auto const& var: member(_node, "parameters"))
 			funcDef.parameters.emplace_back(createTypedName(var));
 
-	if (_node.isMember("returnVariables"))
+	if (_node.contains("returnVariables"))
 		for (auto const& var: member(_node, "returnVariables"))
 			funcDef.returnVariables.emplace_back(createTypedName(var));
 
@@ -279,7 +279,7 @@ FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json::Value const&
 	return funcDef;
 }
 
-If AsmJsonImporter::createIf(Json::Value const& _node)
+If AsmJsonImporter::createIf(Json const& _node)
 {
 	auto ifStatement = createAsmNode<If>(_node);
 	ifStatement.condition = std::make_unique<Expression>(createExpression(member(_node, "condition")));
@@ -287,19 +287,19 @@ If AsmJsonImporter::createIf(Json::Value const& _node)
 	return ifStatement;
 }
 
-Case AsmJsonImporter::createCase(Json::Value const& _node)
+Case AsmJsonImporter::createCase(Json const& _node)
 {
 	auto caseStatement = createAsmNode<Case>(_node);
 	auto const& value = member(_node, "value");
-	if (value.isString())
-		yulAssert(value.asString() == "default", "Expected default case");
+	if (value.is_string())
+		yulAssert(value.get<std::string>() == "default", "Expected default case");
 	else
 		caseStatement.value = std::make_unique<Literal>(createLiteral(value));
 	caseStatement.body = createBlock(member(_node, "body"));
 	return caseStatement;
 }
 
-Switch AsmJsonImporter::createSwitch(Json::Value const& _node)
+Switch AsmJsonImporter::createSwitch(Json const& _node)
 {
 	auto switchStatement = createAsmNode<Switch>(_node);
 	switchStatement.expression = std::make_unique<Expression>(createExpression(member(_node, "expression")));
@@ -308,7 +308,7 @@ Switch AsmJsonImporter::createSwitch(Json::Value const& _node)
 	return switchStatement;
 }
 
-ForLoop AsmJsonImporter::createForLoop(Json::Value const& _node)
+ForLoop AsmJsonImporter::createForLoop(Json const& _node)
 {
 	auto forLoop = createAsmNode<ForLoop>(_node);
 	forLoop.pre = createBlock(member(_node, "pre"));
@@ -318,12 +318,12 @@ ForLoop AsmJsonImporter::createForLoop(Json::Value const& _node)
 	return forLoop;
 }
 
-Break AsmJsonImporter::createBreak(Json::Value const& _node)
+Break AsmJsonImporter::createBreak(Json const& _node)
 {
 	return createAsmNode<Break>(_node);
 }
 
-Continue AsmJsonImporter::createContinue(Json::Value const& _node)
+Continue AsmJsonImporter::createContinue(Json const& _node)
 {
 	return createAsmNode<Continue>(_node);
 }
diff --git a/libyul/AsmJsonImporter.h b/libyul/AsmJsonImporter.h
index 506352fa48..87933761a6 100644
--- a/libyul/AsmJsonImporter.h
+++ b/libyul/AsmJsonImporter.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 #include <liblangutil/SourceLocation.h>
 #include <libyul/ASTForward.h>
 
@@ -41,36 +41,36 @@ class AsmJsonImporter
 	explicit AsmJsonImporter(std::vector<std::shared_ptr<std::string const>> const& _sourceNames):
 		m_sourceNames(_sourceNames)
 	{}
-	yul::Block createBlock(Json::Value const& _node);
+	yul::Block createBlock(Json const& _node);
 
 private:
-	langutil::SourceLocation const createSourceLocation(Json::Value const& _node);
+	langutil::SourceLocation const createSourceLocation(Json const& _node);
 	template <class T>
-	T createAsmNode(Json::Value const& _node);
+	T createAsmNode(Json const& _node);
 	/// helper function to access member functions of the JSON
 	/// and throw an error if it does not exist
-	Json::Value member(Json::Value const& _node, std::string const& _name);
+	Json member(Json const& _node, std::string const& _name);
 
-	yul::Statement createStatement(Json::Value const& _node);
-	yul::Expression createExpression(Json::Value const& _node);
-	std::vector<yul::Statement> createStatementVector(Json::Value const& _array);
-	std::vector<yul::Expression> createExpressionVector(Json::Value const& _array);
+	yul::Statement createStatement(Json const& _node);
+	yul::Expression createExpression(Json const& _node);
+	std::vector<yul::Statement> createStatementVector(Json const& _array);
+	std::vector<yul::Expression> createExpressionVector(Json const& _array);
 
-	yul::TypedName createTypedName(Json::Value const& _node);
-	yul::Literal createLiteral(Json::Value const& _node);
-	yul::Leave createLeave(Json::Value const& _node);
-	yul::Identifier createIdentifier(Json::Value const& _node);
-	yul::Assignment createAssignment(Json::Value const& _node);
-	yul::FunctionCall createFunctionCall(Json::Value const& _node);
-	yul::ExpressionStatement createExpressionStatement(Json::Value const& _node);
-	yul::VariableDeclaration createVariableDeclaration(Json::Value const& _node);
-	yul::FunctionDefinition createFunctionDefinition(Json::Value const& _node);
-	yul::If createIf(Json::Value const& _node);
-	yul::Case createCase(Json::Value const& _node);
-	yul::Switch createSwitch(Json::Value const& _node);
-	yul::ForLoop createForLoop(Json::Value const& _node);
-	yul::Break createBreak(Json::Value const& _node);
-	yul::Continue createContinue(Json::Value const& _node);
+	yul::TypedName createTypedName(Json const& _node);
+	yul::Literal createLiteral(Json const& _node);
+	yul::Leave createLeave(Json const& _node);
+	yul::Identifier createIdentifier(Json const& _node);
+	yul::Assignment createAssignment(Json const& _node);
+	yul::FunctionCall createFunctionCall(Json const& _node);
+	yul::ExpressionStatement createExpressionStatement(Json const& _node);
+	yul::VariableDeclaration createVariableDeclaration(Json const& _node);
+	yul::FunctionDefinition createFunctionDefinition(Json const& _node);
+	yul::If createIf(Json const& _node);
+	yul::Case createCase(Json const& _node);
+	yul::Switch createSwitch(Json const& _node);
+	yul::ForLoop createForLoop(Json const& _node);
+	yul::Break createBreak(Json const& _node);
+	yul::Continue createContinue(Json const& _node);
 
 	std::vector<std::shared_ptr<std::string const>> const& m_sourceNames;
 };
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 0d3d66c8e5..260cb73301 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -75,27 +75,27 @@ std::string Object::toString(
 	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
 }
 
-Json::Value Data::toJson() const
+Json Data::toJson() const
 {
-	Json::Value ret{Json::objectValue};
+	Json ret;
 	ret["nodeType"] = "YulData";
 	ret["value"] = util::toHex(data);
 	return ret;
 }
 
-Json::Value Object::toJson() const
+Json Object::toJson() const
 {
 	yulAssert(code, "No code");
 
-	Json::Value codeJson{Json::objectValue};
+	Json codeJson;
 	codeJson["nodeType"] = "YulCode";
 	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(*code);
 
-	Json::Value subObjectsJson{Json::arrayValue};
+	Json subObjectsJson = Json::array();
 	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)
-		subObjectsJson.append(subObject->toJson());
+		subObjectsJson.emplace_back(subObject->toJson());
 
-	Json::Value ret{Json::objectValue};
+	Json ret;
 	ret["nodeType"] = "YulObject";
 	ret["name"] = name.str();
 	ret["code"] = codeJson;
diff --git a/libyul/Object.h b/libyul/Object.h
index 5f88d3bc7f..54a8080d08 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -28,11 +28,11 @@
 #include <liblangutil/DebugInfoSelection.h>
 
 #include <libsolutil/Common.h>
+#include <libsolutil/JSON.h>
 
 #include <memory>
 #include <set>
 #include <limits>
-#include <json/json.h>
 
 namespace solidity::yul
 {
@@ -58,7 +58,7 @@ struct ObjectNode
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const = 0;
-	virtual Json::Value toJson() const = 0;
+	virtual Json toJson() const = 0;
 };
 
 /**
@@ -75,7 +75,7 @@ struct Data: public ObjectNode
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const override;
-	Json::Value toJson() const override;
+	Json toJson() const override;
 };
 
 
@@ -98,7 +98,7 @@ struct Object: public ObjectNode
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
 	/// @returns a compact JSON representation of the AST.
-	Json::Value toJson() const;
+	Json 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 6c89cadbdf..a4341cba30 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -312,7 +312,7 @@ std::string YulStack::print(
 	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
 }
 
-Json::Value YulStack::astJson() const
+Json YulStack::astJson() const
 {
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 700fd2b3ba..27f530b44c 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -25,6 +25,7 @@
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/EVMVersion.h>
+#include <libsolutil/JSON.h>
 
 #include <libyul/Object.h>
 #include <libyul/ObjectParser.h>
@@ -33,8 +34,6 @@
 
 #include <libevmasm/LinkerObject.h>
 
-#include <json/json.h>
-
 #include <memory>
 #include <string>
 
@@ -132,7 +131,7 @@ class YulStack: public langutil::CharStreamProvider
 	std::string print(
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
-	Json::Value astJson() const;
+	Json astJson() const;
 	/// Return the parsed and analyzed object.
 	std::shared_ptr<Object> parserResult() const;
 
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 51db3a14d5..954c9f2af7 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -771,7 +771,7 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 					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());;
+					opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(0), langutil::EVMVersion());
 				}
 			}
 		};
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 4c08efb51a..514f84c209 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -353,23 +353,23 @@ void CommandLineInterface::handleSignatureHashes(std::string const& _contract)
 	if (!m_options.compiler.outputs.signatureHashes)
 		return;
 
-	Json::Value interfaceSymbols = m_compiler->interfaceSymbols(_contract);
+	Json interfaceSymbols = m_compiler->interfaceSymbols(_contract);
 	std::string out = "Function signatures:\n";
-	for (auto const& name: interfaceSymbols["methods"].getMemberNames())
-		out += interfaceSymbols["methods"][name].asString() + ": " + name + "\n";
+	for (auto const& [name, value]: interfaceSymbols["methods"].items())
+		out += value.get<std::string>() + ": " + name + "\n";
 
-	if (interfaceSymbols.isMember("errors"))
+	if (interfaceSymbols.contains("errors"))
 	{
 		out += "\nError signatures:\n";
-		for (auto const& name: interfaceSymbols["errors"].getMemberNames())
-			out += interfaceSymbols["errors"][name].asString() + ": " + name + "\n";
+		for (auto const& [name, value]: interfaceSymbols["errors"].items())
+			out += value.get<std::string>() + ": " + name + "\n";
 	}
 
-	if (interfaceSymbols.isMember("events"))
+	if (interfaceSymbols.contains("events"))
 	{
 		out += "\nEvent signatures:\n";
-		for (auto const& name: interfaceSymbols["events"].getMemberNames())
-			out += interfaceSymbols["events"][name].asString() + ": " + name + "\n";
+		for (auto const& [name, value]: interfaceSymbols["events"].items())
+			out += value.get<std::string>() + ": " + name + "\n";
 	}
 
 	if (!m_options.output.dir.empty())
@@ -467,40 +467,40 @@ void CommandLineInterface::handleGasEstimation(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
-	Json::Value estimates = m_compiler->gasEstimates(_contract);
+	Json estimates = m_compiler->gasEstimates(_contract);
 	sout() << "Gas estimation:" << std::endl;
 
-	if (estimates["creation"].isObject())
+	if (estimates["creation"].is_object())
 	{
-		Json::Value creation = estimates["creation"];
+		Json creation = estimates["creation"];
 		sout() << "construction:" << std::endl;
-		sout() << "   " << creation["executionCost"].asString();
-		sout() << " + " << creation["codeDepositCost"].asString();
-		sout() << " = " << creation["totalCost"].asString() << std::endl;
+		sout() << "   " << creation["executionCost"].get<std::string>();
+		sout() << " + " << creation["codeDepositCost"].get<std::string>();
+		sout() << " = " << creation["totalCost"].get<std::string>() << std::endl;
 	}
 
-	if (estimates["external"].isObject())
+	if (estimates["external"].is_object())
 	{
-		Json::Value externalFunctions = estimates["external"];
+		Json externalFunctions = estimates["external"];
 		sout() << "external:" << std::endl;
-		for (auto const& name: externalFunctions.getMemberNames())
+		for (auto const& [name, value]: externalFunctions.items())
 		{
 			if (name.empty())
 				sout() << "   fallback:\t";
 			else
 				sout() << "   " << name << ":\t";
-			sout() << externalFunctions[name].asString() << std::endl;
+			sout() << value.get<std::string>() << std::endl;
 		}
 	}
 
-	if (estimates["internal"].isObject())
+	if (estimates["internal"].is_object())
 	{
-		Json::Value internalFunctions = estimates["internal"];
+		Json internalFunctions = estimates["internal"];
 		sout() << "internal:" << std::endl;
-		for (auto const& name: internalFunctions.getMemberNames())
+		for (auto const& [name, value]: internalFunctions.items())
 		{
 			sout() << "   " << name << ":\t";
-			sout() << internalFunctions[name].asString() << std::endl;
+			sout() << value.get<std::string>() << std::endl;
 		}
 	}
 }
@@ -613,27 +613,27 @@ void CommandLineInterface::readInputFiles()
 		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
 }
 
-std::map<std::string, Json::Value> CommandLineInterface::parseAstFromInput()
+std::map<std::string, Json> CommandLineInterface::parseAstFromInput()
 {
 	solAssert(m_options.input.mode == InputMode::CompilerWithASTImport);
 
-	std::map<std::string, Json::Value> sourceJsons;
+	std::map<std::string, Json> sourceJsons;
 	std::map<std::string, std::string> tmpSources;
 
 	for (SourceCode const& sourceCode: m_fileReader.sourceUnits() | ranges::views::values)
 	{
-		Json::Value ast;
+		Json ast;
 		astAssert(jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
-		astAssert(ast.isMember("sources"), "Invalid Format for import-JSON: Must have 'sources'-object");
+		astAssert(ast.contains("sources"), "Invalid Format for import-JSON: Must have 'sources'-object");
 
-		for (auto& src: ast["sources"].getMemberNames())
+		for (auto const& [src, value]: ast["sources"].items())
 		{
-			std::string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
+			std::string astKey = value.contains("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'");
+			astAssert(ast["sources"][src].contains(astKey), "astkey is not member");
+			astAssert(ast["sources"][src][astKey]["nodeType"].get<std::string>() == "SourceUnit",  "Top-level node should be a 'SourceUnit'");
 			astAssert(sourceJsons.count(src) == 0, "All sources must have unique names");
-			sourceJsons.emplace(src, std::move(ast["sources"][src][astKey]));
+			sourceJsons.emplace(src, std::move(value[astKey]));
 			tmpSources[src] = util::jsonCompactPrint(ast);
 		}
 	}
@@ -942,16 +942,16 @@ void CommandLineInterface::handleCombinedJSON()
 	if (!m_options.compiler.combinedJsonRequests.has_value())
 		return;
 
-	Json::Value output(Json::objectValue);
+	Json output;
 
 	output[g_strVersion] = frontend::VersionString;
 	std::vector<std::string> contracts = m_assemblyStack->contractNames();
 
 	if (!contracts.empty())
-		output[g_strContracts] = Json::Value(Json::objectValue);
+		output[g_strContracts] = Json::object();
 	for (std::string const& contractName: contracts)
 	{
-		Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
+		Json& contractData = output[g_strContracts][contractName] = Json::object();
 
 		// 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.
@@ -1013,19 +1013,19 @@ void CommandLineInterface::handleCombinedJSON()
 	if (needsSourceList)
 	{
 		// Indices into this array are used to abbreviate source names in source locations.
-		output[g_strSourceList] = Json::Value(Json::arrayValue);
+		output[g_strSourceList] = Json::array();
 
 		for (auto const& source: m_assemblyStack->sourceNames())
-			output[g_strSourceList].append(source);
+			output[g_strSourceList].emplace_back(source);
 	}
 
 	if (m_options.compiler.combinedJsonRequests->ast)
 	{
 		solAssert(m_compiler);
-		output[g_strSources] = Json::Value(Json::objectValue);
+		output[g_strSources] = Json::object();
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
-			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
+			output[g_strSources][sourceCode.first] = Json::object();
 			output[g_strSources][sourceCode.first]["AST"] = ASTJsonExporter(
 				m_compiler->state(),
 				m_compiler->sourceIndices()
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 1fb4ac00bc..bcebcbcfd3 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -120,7 +120,7 @@ class CommandLineInterface
 	/// such that they can be imported into the compiler  (importASTs())
 	/// (produced by --combined-json ast <file.sol>
 	/// or standard-json output
-	std::map<std::string, Json::Value> parseAstFromInput();
+	std::map<std::string, Json> parseAstFromInput();
 
 	/// Create a file in the given directory
 	/// @arg _fileName the name of the file
diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 2fea65c65b..cdfcdfb19c 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -172,33 +172,33 @@ std::optional<std::map<std::string, std::string>> parseCBORMetadata(bytes const&
 
 bool isValidMetadata(std::string const& _serialisedMetadata)
 {
-	Json::Value metadata;
+	Json metadata;
 	if (!util::jsonParseStrict(_serialisedMetadata, metadata))
 		return false;
 
 	return isValidMetadata(metadata);
 }
 
-bool isValidMetadata(Json::Value const& _metadata)
+bool isValidMetadata(Json const& _metadata)
 {
 	if (
-		!_metadata.isObject() ||
-		!_metadata.isMember("version") ||
-		!_metadata.isMember("language") ||
-		!_metadata.isMember("compiler") ||
-		!_metadata.isMember("settings") ||
-		!_metadata.isMember("sources") ||
-		!_metadata.isMember("output") ||
-		!_metadata["settings"].isMember("evmVersion") ||
-		!_metadata["settings"].isMember("metadata") ||
-		!_metadata["settings"]["metadata"].isMember("bytecodeHash")
+		!_metadata.is_object() ||
+		!_metadata.contains("version") ||
+		!_metadata.contains("language") ||
+		!_metadata.contains("compiler") ||
+		!_metadata.contains("settings") ||
+		!_metadata.contains("sources") ||
+		!_metadata.contains("output") ||
+		!_metadata["settings"].contains("evmVersion") ||
+		!_metadata["settings"].contains("metadata") ||
+		!_metadata["settings"]["metadata"].contains("bytecodeHash")
 	)
 		return false;
 
-	if (!_metadata["version"].isNumeric() || _metadata["version"] != 1)
+	if (!_metadata["version"].is_number() || _metadata["version"] != 1)
 		return false;
 
-	if (!_metadata["language"].isString() || _metadata["language"].asString() != "Solidity")
+	if (!_metadata["language"].is_string() || _metadata["language"].get<std::string>() != "Solidity")
 		return false;
 
 	/// @TODO add more strict checks
diff --git a/test/Metadata.h b/test/Metadata.h
index 86b43e245f..f3dae0cbde 100644
--- a/test/Metadata.h
+++ b/test/Metadata.h
@@ -53,6 +53,6 @@ std::optional<std::map<std::string, std::string>> parseCBORMetadata(bytes const&
 bool isValidMetadata(std::string const& _serialisedMetadata);
 
 /// Expects a deserialised metadata JSON and returns true if the content is valid metadata.
-bool isValidMetadata(Json::Value const& _metadata);
+bool isValidMetadata(Json const& _metadata);
 
 } // end namespaces
diff --git a/test/cmdlineTests/standard_import_with_comments/input.json b/test/cmdlineTests/standard_import_with_comments/input.json
new file mode 100644
index 0000000000..4ed88177cf
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_comments/input.json
@@ -0,0 +1,95 @@
+{
+	"language": "SolidityAST",
+	"sources": { // this is a comment
+		"A": {
+			"ast": {
+				"absolutePath": "A",
+				"exportedSymbols": {
+					"C": [
+						6 /* and this another comment */
+					]
+				},
+				"id": 7,
+				"license": "GPL-3.0",
+				"nodeType": "SourceUnit",
+				"nodes": /* and this is a comment too */[
+					// this is a comment
+					{
+						/*this is a comment*/"id"/* and this is another comment too*/: 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_with_comments/output.json b/test/cmdlineTests/standard_import_with_comments/output.json
new file mode 100644
index 0000000000..6ecac5ca36
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_comments/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_with_comments_simple/input.json b/test/cmdlineTests/standard_import_with_comments_simple/input.json
new file mode 100644
index 0000000000..21faca8c62
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_comments_simple/input.json
@@ -0,0 +1,85 @@
+{
+	"language": "SolidityAST",
+	"sources": {
+		// this is a comment
+		"A": {
+			"ast": {
+				"absolutePath": "A",
+				"exportedSymbols": {
+					"C": [6 /* and this another comment */]
+				},
+				"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_with_comments_simple/output.json b/test/cmdlineTests/standard_import_with_comments_simple/output.json
new file mode 100644
index 0000000000..6ecac5ca36
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_comments_simple/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_with_invalid_utf8/input.json b/test/cmdlineTests/standard_import_with_invalid_utf8/input.json
new file mode 100644
index 0000000000..7b54aebfbb
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_invalid_utf8/input.json
@@ -0,0 +1,29 @@
+{
+	"language": "EVMAssembly",
+	"sources": {
+		"A": {
+			"assemblyJson": {
+				".code": [
+					{
+						"begin": 36,
+						"end": 51,
+						"name": "PUSH",
+						"source": 0,
+						"value": "\ud800"
+					}
+				],
+				"sourceList": [
+					"<stdin>"
+				]
+			}
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"": [
+				]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_import_with_invalid_utf8/output.json b/test/cmdlineTests/standard_import_with_invalid_utf8/output.json
new file mode 100644
index 0000000000..057e4fe169
--- /dev/null
+++ b/test/cmdlineTests/standard_import_with_invalid_utf8/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "parse error at line 12, column 23: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\ud800\"'",
+            "message": "parse error at line 12, column 23: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\ud800\"'",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_non_utf8_filename/input.json b/test/cmdlineTests/standard_non_utf8_filename/input.json
new file mode 100644
index 0000000000..b0f7d59576
--- /dev/null
+++ b/test/cmdlineTests/standard_non_utf8_filename/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"�":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "*": ["ir"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_non_utf8_filename/output.json b/test/cmdlineTests/standard_non_utf8_filename/output.json
new file mode 100644
index 0000000000..a74a83a989
--- /dev/null
+++ b/test/cmdlineTests/standard_non_utf8_filename/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
+            "message": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_non_utf8_filename2/input.json b/test/cmdlineTests/standard_non_utf8_filename2/input.json
new file mode 100644
index 0000000000..7310c14723
--- /dev/null
+++ b/test/cmdlineTests/standard_non_utf8_filename2/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"��":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "*": ["ir"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_non_utf8_filename2/output.json b/test/cmdlineTests/standard_non_utf8_filename2/output.json
new file mode 100644
index 0000000000..a74a83a989
--- /dev/null
+++ b/test/cmdlineTests/standard_non_utf8_filename2/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
+            "message": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_raw_utf16_filename/input.json b/test/cmdlineTests/standard_raw_utf16_filename/input.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c4a1b3232cf6ae00d16546bd94afcc8ee2d4fd6
GIT binary patch
literal 297
zcmYk1O-sZu5QckAe#I~+mF;fPTNk~opu!#&dQeag*>qY4Vp7sXkkG%qXVX$phGCcw
zo_XIS1sY}hsCvR0uyKZ44nMfbi_t}|X~bHJB!$4@xwsT2$EA2()90?850(po+Sx!h
z%&6TCn$zQ3d1Os?r1GWB3+|YF4Ns?IdAF@T?BG@ZrC?m&!oz*Ft@f~v)tR+x$;0>U
z9%i&xI=}%EbkXX-&O&!}4MRK|*133sG{J;f&LqXOc%Ts2_J1Z^3_}bJ8Cn4UwBKaa
R32-j&$R0l-Ll%&n<S(~kRc8PI

literal 0
HcmV?d00001

diff --git a/test/cmdlineTests/standard_raw_utf16_filename/output.json b/test/cmdlineTests/standard_raw_utf16_filename/output.json
new file mode 100644
index 0000000000..a370472f25
--- /dev/null
+++ b/test/cmdlineTests/standard_raw_utf16_filename/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"<U+0000>'; expected string literal",
+            "message": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"<U+0000>'; expected string literal",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 2b01ae03c7..afad9d13dd 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		"{\"begin\":8,\"end\":18,\"name\":\"MSTORE\",\"source\":2}"
 		"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"},\"sourceList\":[\"root.asm\",\"sub.asm\",\"verbatim.asm\"]}"
 	};
-	Json::Value jsonValue;
+	Json jsonValue;
 	BOOST_CHECK(util::jsonParseStrict(json, jsonValue));
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON(indices)), util::jsonCompactPrint(jsonValue));
 }
diff --git a/test/libsolidity/ASTPropertyTest.cpp b/test/libsolidity/ASTPropertyTest.cpp
index 8dc2c2930b..05c9b8786d 100644
--- a/test/libsolidity/ASTPropertyTest.cpp
+++ b/test/libsolidity/ASTPropertyTest.cpp
@@ -108,20 +108,20 @@ void ASTPropertyTest::readExpectations()
 	m_expectation = formatExpectations(false /* _obtainedResult */);
 }
 
-void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
+void ASTPropertyTest::extractTestsFromAST(Json const& _astJson)
 {
-	std::queue<Json::Value> nodesToVisit;
+	std::queue<Json> nodesToVisit;
 	nodesToVisit.push(_astJson);
 
 	while (!nodesToVisit.empty())
 	{
-		Json::Value& node = nodesToVisit.front();
+		Json& node = nodesToVisit.front();
 
-		if (node.isArray())
+		if (node.is_array())
 			for (auto&& member: node)
 				nodesToVisit.push(member);
-		else if (node.isObject())
-			for (std::string const& memberName: node.getMemberNames())
+		else if (node.is_object())
+			for (auto const& [memberName, value]: node.items())
 			{
 				if (memberName != "documentation")
 				{
@@ -129,9 +129,8 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 					continue;
 				}
 
-				std::string nodeDocstring = node["documentation"].isObject() ?
-					node["documentation"]["text"].asString() :
-					node["documentation"].asString();
+				std::string nodeDocstring = value.is_object() ?
+					value["text"].get<std::string>() : value.get<std::string>();
 				soltestAssert(!nodeDocstring.empty());
 
 				std::vector<StringPair> pairs = readKeyValuePairs(nodeDocstring);
@@ -150,17 +149,22 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 					);
 					m_tests[testId].property = testedProperty;
 
-					soltestAssert(node.isMember("nodeType"));
-					std::optional<Json::Value> propertyNode = jsonValueByPath(node, testedProperty);
+					soltestAssert(node.contains("nodeType"));
+					std::optional<Json> propertyNode = jsonValueByPath(node, testedProperty);
 					soltestAssert(
 						propertyNode.has_value(),
-						node["nodeType"].asString() + " node does not have a property named \""s + testedProperty + "\""
+						node["nodeType"].get<std::string>() + " node does not have a property named \""s + testedProperty + "\""
 					);
 					soltestAssert(
-						!propertyNode->isObject() && !propertyNode->isArray(),
+						!propertyNode->is_object() && !propertyNode->is_array(),
 						"Property \"" + testedProperty + "\" is an object or an array."
 					);
-					m_tests[testId].obtainedValue = propertyNode->asString();
+					if (propertyNode->is_string())
+						m_tests[testId].obtainedValue = propertyNode->get<std::string>();
+					else if  (propertyNode->is_boolean())
+						m_tests[testId].obtainedValue = fmt::format("{}", propertyNode->get<bool>());
+					else
+						soltestAssert(false);
 				}
 			}
 
@@ -195,8 +199,8 @@ TestCase::TestResult ASTPropertyTest::run(std::ostream& _stream, std::string con
 			SourceReferenceFormatter::formatErrorInformation(compiler.errors(), compiler, _formatted)
 		));
 
-	Json::Value astJson = ASTJsonExporter(compiler.state()).toJson(compiler.ast("A"));
-	soltestAssert(astJson);
+	Json astJson = ASTJsonExporter(compiler.state()).toJson(compiler.ast("A"));
+	soltestAssert(!astJson.empty());
 
 	extractTestsFromAST(astJson);
 
diff --git a/test/libsolidity/ASTPropertyTest.h b/test/libsolidity/ASTPropertyTest.h
index e4cec05280..6130cedb29 100644
--- a/test/libsolidity/ASTPropertyTest.h
+++ b/test/libsolidity/ASTPropertyTest.h
@@ -56,7 +56,7 @@ class ASTPropertyTest: public TestCase
 
 	void readExpectations();
 	std::vector<StringPair> readKeyValuePairs(std::string const& _input);
-	void extractTestsFromAST(Json::Value const& _astJson);
+	void extractTestsFromAST(Json const& _astJson);
 	std::string formatExpectations(bool _obtainedResult = true);
 
 	std::vector<std::string> m_testOrder;
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 4786a2a863..14722535e4 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -82,18 +82,18 @@ void GasTest::parseExpectations(std::istream& _stream)
 
 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)
+	Json estimates = compiler().gasEstimates(compiler().lastContractName());
+	for (auto& [key, group] : estimates.items())
 	{
-		_stream << _linePrefix << groupIt.key().asString() << ":" << std::endl;
-		for (auto it = groupIt->begin(); it != groupIt->end(); ++it)
+		_stream << _linePrefix << key << ":" << std::endl;
+		for (auto& [elementKey, value] : group.items())
 		{
 			_stream << _linePrefix << "  ";
-			if (it.key().asString().empty())
+			if (elementKey.empty())
 				_stream << "fallback";
 			else
-				_stream << it.key().asString();
-			_stream << ": " << it->asString() << std::endl;
+				_stream << elementKey;
+			_stream << ": " << value.get<std::string>() << std::endl;
 		}
 	}
 }
@@ -128,14 +128,14 @@ TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _lin
 		return TestResult::FatalError;
 	}
 
-	Json::Value estimateGroups = compiler().gasEstimates(compiler().lastContractName());
+	Json estimateGroups = compiler().gasEstimates(compiler().lastContractName());
 	if (
 		m_expectations.size() == estimateGroups.size() &&
 		boost::all(m_expectations, [&](auto const& expectations) {
 		auto const& estimates = estimateGroups[expectations.first];
 		return estimates.size() == expectations.second.size() &&
 			boost::all(expectations.second, [&](auto const& entry) {
-				return entry.second == estimates[entry.first].asString();
+				return entry.second == estimates[entry.first].template get<std::string>();
 			});
 		})
 	)
diff --git a/test/libsolidity/LibSolc.cpp b/test/libsolidity/LibSolc.cpp
index 1a7a6ba696..f7a434dcfd 100644
--- a/test/libsolidity/LibSolc.cpp
+++ b/test/libsolidity/LibSolc.cpp
@@ -36,30 +36,30 @@ namespace
 
 /// TODO: share this between StandardCompiler.cpp
 /// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
+bool containsError(Json const& _compilerResult, std::string const& _type, std::string const& _message)
 {
-	if (!_compilerResult.isMember("errors"))
+	if (!_compilerResult.contains("errors"))
 		return false;
 
 	for (auto const& error: _compilerResult["errors"])
 	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["type"].isString());
-		BOOST_REQUIRE(error["message"].isString());
-		if ((error["type"].asString() == _type) && (error["message"].asString() == _message))
+		BOOST_REQUIRE(error.is_object());
+		BOOST_REQUIRE(error["type"].is_string());
+		BOOST_REQUIRE(error["message"].is_string());
+		if ((error["type"].get<std::string>() == _type) && (error["message"].get<std::string>() == _message))
 			return true;
 	}
 
 	return false;
 }
 
-Json::Value compile(std::string const& _input, CStyleReadFileCallback _callback = nullptr)
+Json compile(std::string const& _input, CStyleReadFileCallback _callback = nullptr)
 {
 	char* output_ptr = solidity_compile(_input.c_str(), _callback, nullptr);
 	std::string output(output_ptr);
 	solidity_free(output_ptr);
 	solidity_reset();
-	Json::Value ret;
+	Json ret;
 	BOOST_REQUIRE(util::jsonParseStrict(output, ret));
 	return ret;
 }
@@ -100,14 +100,14 @@ BOOST_AUTO_TEST_CASE(standard_compilation)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
-	BOOST_REQUIRE(result.isObject());
+	Json result = compile(input);
+	BOOST_REQUIRE(result.is_object());
 
 	// Only tests some assumptions. The StandardCompiler is tested properly in another suite.
-	BOOST_CHECK(result.isMember("sources"));
+	BOOST_CHECK(result.contains("sources"));
 	// This used to test that it is a member, but we did not actually request any output,
 	// so there should not be a contract member.
-	BOOST_CHECK(!result.isMember("contracts"));
+	BOOST_CHECK(!result.contains("contracts"));
 }
 
 BOOST_AUTO_TEST_CASE(missing_callback)
@@ -122,8 +122,8 @@ BOOST_AUTO_TEST_CASE(missing_callback)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
-	BOOST_REQUIRE(result.isObject());
+	Json result = compile(input);
+	BOOST_REQUIRE(result.is_object());
 
 	BOOST_CHECK(containsError(result, "ParserError", "Source \"missing.sol\" not found: File not supplied initially."));
 }
@@ -168,8 +168,8 @@ BOOST_AUTO_TEST_CASE(with_callback)
 		}
 	};
 
-	Json::Value result = compile(input, callback);
-	BOOST_REQUIRE(result.isObject());
+	Json result = compile(input, callback);
+	BOOST_REQUIRE(result.is_object());
 
 	// This ensures that "found.sol" was properly loaded which triggered the second import statement.
 	BOOST_CHECK(containsError(result, "ParserError", "Source \"missing.sol\" not found: Missing file."));
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index 029419af11..94687f9900 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -57,17 +57,17 @@ std::optional<std::string> compileAndCheckLicenseMetadata(std::string const& _co
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
 	std::string const& serialisedMetadata = compilerStack.metadata(_contractName);
-	Json::Value metadata;
+	Json metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 	BOOST_CHECK_EQUAL(metadata["sources"].size(), 1);
-	BOOST_REQUIRE(metadata["sources"].isMember("A.sol"));
+	BOOST_REQUIRE(metadata["sources"].contains("A.sol"));
 
-	if (metadata["sources"]["A.sol"].isMember("license"))
+	if (metadata["sources"]["A.sol"].contains("license"))
 	{
-		BOOST_REQUIRE(metadata["sources"]["A.sol"]["license"].isString());
-		return metadata["sources"]["A.sol"]["license"].asString();
+		BOOST_REQUIRE(metadata["sources"]["A.sol"]["license"].is_string());
+		return metadata["sources"]["A.sol"]["license"].get<std::string>();
 	}
 	else
 		return std::nullopt;
@@ -288,12 +288,12 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
 	std::string const& serialisedMetadata = compilerStack.metadata("A");
-	Json::Value metadata;
+	Json metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 	BOOST_CHECK_EQUAL(metadata["sources"].size(), 1);
-	BOOST_CHECK(metadata["sources"].isMember("A"));
+	BOOST_CHECK(metadata["sources"].contains("A"));
 }
 
 BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
@@ -329,14 +329,14 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
 	std::string const& serialisedMetadata = compilerStack.metadata("C");
-	Json::Value metadata;
+	Json metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 	BOOST_CHECK_EQUAL(metadata["sources"].size(), 3);
-	BOOST_CHECK(metadata["sources"].isMember("A"));
-	BOOST_CHECK(metadata["sources"].isMember("B"));
-	BOOST_CHECK(metadata["sources"].isMember("C"));
+	BOOST_CHECK(metadata["sources"].contains("A"));
+	BOOST_CHECK(metadata["sources"].contains("B"));
+	BOOST_CHECK(metadata["sources"].contains("C"));
 }
 
 BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
@@ -357,16 +357,16 @@ BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
 		compilerStack.useMetadataLiteralSources(_literal);
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 		std::string metadata_str = compilerStack.metadata("test");
-		Json::Value metadata;
+		Json metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(metadata_str, metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-		BOOST_CHECK(metadata.isMember("settings"));
-		BOOST_CHECK(metadata["settings"].isMember("metadata"));
-		BOOST_CHECK(metadata["settings"]["metadata"].isMember("bytecodeHash"));
+		BOOST_CHECK(metadata.contains("settings"));
+		BOOST_CHECK(metadata["settings"].contains("metadata"));
+		BOOST_CHECK(metadata["settings"]["metadata"].contains("bytecodeHash"));
 		if (_literal)
 		{
-			BOOST_CHECK(metadata["settings"]["metadata"].isMember("useLiteralContent"));
-			BOOST_CHECK(metadata["settings"]["metadata"]["useLiteralContent"].asBool());
+			BOOST_CHECK(metadata["settings"]["metadata"].contains("useLiteralContent"));
+			BOOST_CHECK(metadata["settings"]["metadata"]["useLiteralContent"].get<bool>());
 		}
 	};
 
@@ -391,17 +391,17 @@ BOOST_AUTO_TEST_CASE(metadata_viair)
 		compilerStack.setViaIR(_viaIR);
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-		Json::Value metadata;
+		Json metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(compilerStack.metadata("test"), metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
-		BOOST_CHECK(metadata.isMember("settings"));
+		BOOST_CHECK(metadata.contains("settings"));
 		if (_viaIR)
 		{
-			BOOST_CHECK(metadata["settings"].isMember("viaIR"));
-			BOOST_CHECK(metadata["settings"]["viaIR"].asBool());
+			BOOST_CHECK(metadata["settings"].contains("viaIR"));
+			BOOST_CHECK(metadata["settings"]["viaIR"].get<bool>());
 		}
 		else
-			BOOST_CHECK(!metadata["settings"].isMember("viaIR"));
+			BOOST_CHECK(!metadata["settings"].contains("viaIR"));
 
 		BOOST_CHECK(compilerStack.cborMetadata("test") == compilerStack.cborMetadata("test", _viaIR));
 		BOOST_CHECK(compilerStack.cborMetadata("test") != compilerStack.cborMetadata("test", !_viaIR));
@@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(metadata_revert_strings)
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
 	std::string const& serialisedMetadata = compilerStack.metadata("A");
-	Json::Value metadata;
+	Json metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
@@ -469,14 +469,14 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
 		std::string const& serialisedMetadata = compilerStack.metadata("C");
-		Json::Value metadata;
+		Json 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"));
+		BOOST_CHECK(metadata["settings"]["optimizer"].contains("details"));
+		BOOST_CHECK(metadata["settings"]["optimizer"]["details"].contains("yulDetails"));
+		BOOST_CHECK(metadata["settings"]["optimizer"]["details"]["yulDetails"].contains("optimizerSteps"));
 
-		std::string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
+		std::string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].get<std::string>();
 		std::string const expectedMetadataOptimiserSteps = _optimizerSequence + ":" + _optimizerCleanupSequence;
 		BOOST_CHECK_EQUAL(metadataOptimizerSteps, expectedMetadataOptimiserSteps);
 	};
diff --git a/test/libsolidity/NatspecJSONTest.cpp b/test/libsolidity/NatspecJSONTest.cpp
index 9f1ba1d7de..7dff638f0d 100644
--- a/test/libsolidity/NatspecJSONTest.cpp
+++ b/test/libsolidity/NatspecJSONTest.cpp
@@ -67,7 +67,7 @@ void NatspecJSONTest::parseCustomExpectations(std::istream& _stream)
 
 		std::string rawJSON = extractExpectationJSON(_stream);
 		std::string jsonErrors;
-		Json::Value parsedJSON;
+		Json parsedJSON;
 		bool jsonParsingSuccessful = jsonParseStrict(rawJSON, parsedJSON, &jsonErrors);
 		if (!jsonParsingSuccessful)
 			BOOST_THROW_EXCEPTION(std::runtime_error(fmt::format(
@@ -86,7 +86,7 @@ void NatspecJSONTest::parseCustomExpectations(std::istream& _stream)
 
 bool NatspecJSONTest::expectationsMatch()
 {
-	// NOTE: Comparing pretty printed Json::Values to avoid using its operator==, which fails to
+	// NOTE: Comparing pretty printed Jsons 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
diff --git a/test/libsolidity/NatspecJSONTest.h b/test/libsolidity/NatspecJSONTest.h
index 762b88d106..619ece83b1 100644
--- a/test/libsolidity/NatspecJSONTest.h
+++ b/test/libsolidity/NatspecJSONTest.h
@@ -44,7 +44,7 @@ enum class NatspecJSONKind
 
 std::ostream& operator<<(std::ostream& _output, NatspecJSONKind _kind);
 
-using NatspecMap = std::map<std::string, std::map<NatspecJSONKind, Json::Value>>;
+using NatspecMap = std::map<std::string, std::map<NatspecJSONKind, Json>>;
 using SerializedNatspecMap = std::map<std::string, std::map<NatspecJSONKind, std::string>>;
 
 class NatspecJSONTest: public SyntaxTest
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 63e8a924ab..b0bdb95cb9 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -429,7 +429,7 @@ TestCase::TestResult SemanticTest::runTest(
 			{
 				soltestAssert(
 					m_allowNonExistingFunctions ||
-					m_compiler.interfaceSymbols(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].isMember(test.call().signature),
+					m_compiler.interfaceSymbols(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].contains(test.call().signature),
 					"The function " + test.call().signature + " is not known to the compiler"
 				);
 
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 22db222ea5..cdb6c5bd2d 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -22,6 +22,7 @@
 
 #include <string>
 #include <boost/test/unit_test.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <libsolidity/interface/OptimiserSettings.h>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
@@ -55,97 +56,97 @@ langutil::Error::Severity str2Severity(std::string const& _cat)
 }
 
 /// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
+bool containsError(Json const& _compilerResult, std::string const& _type, std::string const& _message)
 {
-	if (!_compilerResult.isMember("errors"))
+	if (!_compilerResult.contains("errors"))
 		return false;
 
 	for (auto const& error: _compilerResult["errors"])
 	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["type"].isString());
-		BOOST_REQUIRE(error["message"].isString());
-		if ((error["type"].asString() == _type) && (error["message"].asString() == _message))
+		BOOST_REQUIRE(error.is_object());
+		BOOST_REQUIRE(error["type"].is_string());
+		BOOST_REQUIRE(error["message"].is_string());
+		if ((error["type"].get<std::string>() == _type) && (error["message"].get<std::string>() == _message))
 			return true;
 	}
 
 	return false;
 }
 
-bool containsAtMostWarnings(Json::Value const& _compilerResult)
+bool containsAtMostWarnings(Json const& _compilerResult)
 {
-	if (!_compilerResult.isMember("errors"))
+	if (!_compilerResult.contains("errors"))
 		return true;
 
 	for (auto const& error: _compilerResult["errors"])
 	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["severity"].isString());
-		if (langutil::Error::isError(str2Severity(error["severity"].asString())))
+		BOOST_REQUIRE(error.is_object());
+		BOOST_REQUIRE(error["severity"].is_string());
+		if (langutil::Error::isError(str2Severity(error["severity"].get<std::string>())))
 			return false;
 	}
 
 	return true;
 }
 
-Json::Value getContractResult(Json::Value const& _compilerResult, std::string const& _file, std::string const& _name)
+Json getContractResult(Json const& _compilerResult, std::string const& _file, std::string const& _name)
 {
-	if (
-		!_compilerResult["contracts"].isObject() ||
-		!_compilerResult["contracts"][_file].isObject() ||
-		!_compilerResult["contracts"][_file][_name].isObject()
+	if (!_compilerResult.contains("contracts") ||
+		!_compilerResult["contracts"].is_object() ||
+		!_compilerResult["contracts"][_file].is_object() ||
+		!_compilerResult["contracts"][_file][_name].is_object()
 	)
-		return Json::Value();
+		return Json();
 	return _compilerResult["contracts"][_file][_name];
 }
 
-void checkLinkReferencesSchema(Json::Value const& _contractResult)
+void checkLinkReferencesSchema(Json const& _contractResult)
 {
-	BOOST_TEST_REQUIRE(_contractResult.isObject());
-	BOOST_TEST_REQUIRE(_contractResult["evm"]["bytecode"].isObject());
+	BOOST_TEST_REQUIRE(_contractResult.is_object());
+	BOOST_TEST_REQUIRE(_contractResult["evm"]["bytecode"].is_object());
 
-	Json::Value const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
-	BOOST_TEST_REQUIRE(linkReferenceResult.isObject());
+	Json const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
+	BOOST_TEST_REQUIRE(linkReferenceResult.is_object());
 
-	for (std::string const& fileName: linkReferenceResult.getMemberNames())
+	for (auto const& [fileName, references]: linkReferenceResult.items())
 	{
-		BOOST_TEST_REQUIRE(linkReferenceResult[fileName].isObject());
-		for (std::string const& libraryName: linkReferenceResult[fileName].getMemberNames())
+		BOOST_TEST_REQUIRE(references.is_object());
+		for (auto const& [libraryName, libraryValue]: references.items())
 		{
-			BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName].isArray());
-			BOOST_TEST_REQUIRE(!linkReferenceResult[fileName][libraryName].empty());
-			for (int i = 0; i < static_cast<int>(linkReferenceResult.size()); ++i)
+			BOOST_TEST_REQUIRE(libraryValue.is_array());
+			BOOST_TEST_REQUIRE(!libraryValue.empty());
+			for (size_t i = 0; i < static_cast<size_t>(linkReferenceResult.size()); ++i)
 			{
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i].isObject());
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i].size() == 2);
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i]["length"].isUInt());
-				BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName][i]["start"].isUInt());
+				BOOST_TEST_REQUIRE(libraryValue[i].is_object());
+				BOOST_TEST_REQUIRE(libraryValue[i].size() == 2);
+				BOOST_TEST_REQUIRE(libraryValue[i]["length"].is_number_unsigned());
+				BOOST_TEST_REQUIRE(libraryValue[i]["start"].is_number_unsigned());
 			}
 		}
 	}
 }
 
-void expectLinkReferences(Json::Value const& _contractResult, std::map<std::string, std::set<std::string>> const& _expectedLinkReferences)
+void expectLinkReferences(Json const& _contractResult, std::map<std::string, std::set<std::string>> const& _expectedLinkReferences)
 {
 	checkLinkReferencesSchema(_contractResult);
 
-	Json::Value const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
+	Json const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
 	BOOST_TEST(linkReferenceResult.size() == _expectedLinkReferences.size());
 
 	for (auto const& [fileName, libraries]: _expectedLinkReferences)
 	{
-		BOOST_TEST(linkReferenceResult.isMember(fileName));
+		BOOST_TEST(linkReferenceResult.contains(fileName));
 		BOOST_TEST(linkReferenceResult[fileName].size() == libraries.size());
 		for (std::string const& libraryName: libraries)
-			BOOST_TEST(linkReferenceResult[fileName].isMember(libraryName));
+			BOOST_TEST(linkReferenceResult[fileName].contains(libraryName));
 	}
 }
 
-Json::Value compile(std::string _input)
+Json compile(std::string _input)
 {
 	StandardCompiler compiler;
 	std::string output = compiler.compile(std::move(_input));
-	Json::Value ret;
+	Json ret;
 	BOOST_REQUIRE(util::jsonParseStrict(output, ret));
 	return ret;
 }
@@ -156,25 +157,24 @@ BOOST_AUTO_TEST_SUITE(StandardCompiler)
 
 BOOST_AUTO_TEST_CASE(assume_object_input)
 {
-	Json::Value result;
+	Json result;
 
 	/// Use the native JSON interface of StandardCompiler to trigger these
 	frontend::StandardCompiler compiler;
-	result = compiler.compile(Json::Value());
+	result = compiler.compile(Json());
 	BOOST_CHECK(containsError(result, "JSONError", "Input is not a JSON object."));
-	result = compiler.compile(Json::Value("INVALID"));
+	result = compiler.compile(Json("INVALID"));
 	BOOST_CHECK(containsError(result, "JSONError", "Input is not a JSON object."));
 
 	/// Use the string interface of StandardCompiler to trigger these
 	result = compile("");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n* Line 1, Column 1\n  A valid JSON document must be either an array or an object value.\n"));
+	BOOST_CHECK(containsError(result, "JSONError", "parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON"));
 	result = compile("invalid");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n* Line 1, Column 2\n  Extra non-whitespace after JSON value.\n"));
+	BOOST_CHECK(containsError(result, "JSONError", "parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'i'"));
 	result = compile("\"invalid\"");
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 1, Column 1\n  A valid JSON document must be either an array or an object value.\n"));
-	BOOST_CHECK(!containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n"));
+	BOOST_CHECK(containsError(result, "JSONError", "Input is not a JSON object."));
 	result = compile("{}");
-	BOOST_CHECK(!containsError(result, "JSONError", "* Line 1, Column 1\n  Syntax error: value, object or array expected.\n"));
+	BOOST_CHECK(containsError(result, "JSONError", "No input sources specified."));
 	BOOST_CHECK(!containsAtMostWarnings(result));
 }
 
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE(invalid_language)
 		"sources": { "name": { "content": "abc" } }
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\", \"Yul\", \"SolidityAST\" or \"EVMAssembly\" is supported as a language."));
 }
 
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(valid_language)
 		"language": "Solidity"
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(!containsError(result, "JSONError", "Only \"Solidity\" or \"Yul\" is supported as a language."));
 }
 
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(no_sources)
 		"language": "Solidity"
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "No input sources specified."));
 }
 
@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(no_sources_empty_object)
 		"sources": {}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "No input sources specified."));
 }
 
@@ -232,7 +232,7 @@ BOOST_AUTO_TEST_CASE(no_sources_empty_array)
 		"sources": []
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "\"sources\" is not a JSON object."));
 }
 
@@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(sources_is_array)
 		"sources": ["aa", "bb"]
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "\"sources\" is not a JSON object."));
 }
 
@@ -262,8 +262,8 @@ BOOST_AUTO_TEST_CASE(unexpected_trailing_test)
 	}
 	}
 	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "* Line 10, Column 2\n  Extra non-whitespace after JSON value.\n"));
+	Json result = compile(input);
+	BOOST_CHECK(containsError(result, "JSONError", "parse error at line 10, column 2: syntax error while parsing value - unexpected '}'; expected end of input"));
 }
 
 BOOST_AUTO_TEST_CASE(smoke_test)
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
 }
 
@@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE(optimizer_enabled_not_boolean)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "The \"enabled\" setting must be a Boolean."));
 }
 
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(optimizer_runs_not_a_number)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "The \"runs\" setting must be an unsigned number."));
 }
 
@@ -343,7 +343,7 @@ BOOST_AUTO_TEST_CASE(optimizer_runs_not_an_unsigned_number)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "The \"runs\" setting must be an unsigned number."));
 }
 
@@ -367,28 +367,28 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
-	BOOST_CHECK(contract["devdoc"].isObject());
+	BOOST_CHECK(contract["devdoc"].is_object());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["devdoc"]), R"({"kind":"dev","methods":{},"version":1})");
-	BOOST_CHECK(contract["userdoc"].isObject());
+	BOOST_CHECK(contract["userdoc"].is_object());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["userdoc"]), R"({"kind":"user","methods":{},"version":1})");
-	BOOST_CHECK(contract["evm"].isObject());
+	BOOST_CHECK(contract["evm"].is_object());
 	/// @TODO check evm.methodIdentifiers, legacyAssembly, bytecode, deployedBytecode
-	BOOST_CHECK(contract["evm"]["bytecode"].isObject());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
+	BOOST_CHECK(contract["evm"]["bytecode"].is_object());
+	BOOST_CHECK(contract["evm"]["bytecode"]["object"].is_string());
 	BOOST_CHECK_EQUAL(
-		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].asString()),
+		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].get<std::string>()),
 		std::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(
+	BOOST_CHECK(contract["evm"]["assembly"].is_string());
+	BOOST_CHECK(contract["evm"]["assembly"].get<std::string>().find(
 		"    /* \"fileA\":0:14  contract A { } */\n  mstore(0x40, 0x80)\n  "
 		"callvalue\n  dup1\n  "
 		"iszero\n  tag_1\n  jumpi\n  "
@@ -400,22 +400,22 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 		"0x00\n      "
 		"dup1\n      revert\n\n    auxdata: 0xa26469706673582212"
 	) == 0);
-	BOOST_CHECK(contract["evm"]["gasEstimates"].isObject());
+	BOOST_CHECK(contract["evm"]["gasEstimates"].is_object());
 	BOOST_CHECK_EQUAL(contract["evm"]["gasEstimates"].size(), 1);
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"].isObject());
+	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"].is_object());
 	BOOST_CHECK_EQUAL(contract["evm"]["gasEstimates"]["creation"].size(), 3);
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].isString());
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["executionCost"].isString());
-	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["totalCost"].isString());
+	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].is_string());
+	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["executionCost"].is_string());
+	BOOST_CHECK(contract["evm"]["gasEstimates"]["creation"]["totalCost"].is_string());
 	BOOST_CHECK_EQUAL(
-		u256(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].asString()) +
-		u256(contract["evm"]["gasEstimates"]["creation"]["executionCost"].asString()),
-		u256(contract["evm"]["gasEstimates"]["creation"]["totalCost"].asString())
+		u256(contract["evm"]["gasEstimates"]["creation"]["codeDepositCost"].get<std::string>()) +
+		u256(contract["evm"]["gasEstimates"]["creation"]["executionCost"].get<std::string>()),
+		u256(contract["evm"]["gasEstimates"]["creation"]["totalCost"].get<std::string>())
 	);
 	// Lets take the top level `.code` section (the "deployer code"), that should expose most of the features of
 	// the assembly JSON. What we want to check here is Operation, Push, PushTag, PushSub, PushSubSize and Tag.
-	BOOST_CHECK(contract["evm"]["legacyAssembly"].isObject());
-	BOOST_CHECK(contract["evm"]["legacyAssembly"][".code"].isArray());
+	BOOST_CHECK(contract["evm"]["legacyAssembly"].is_object());
+	BOOST_CHECK(contract["evm"]["legacyAssembly"][".code"].is_array());
 	BOOST_CHECK_EQUAL(
 		util::jsonCompactPrint(contract["evm"]["legacyAssembly"][".code"]),
 		"[{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"80\"},"
@@ -440,11 +440,11 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
 		"{\"begin\":0,\"end\":14,\"name\":\"RETURN\",\"source\":0}]"
 	);
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
-	BOOST_CHECK(result["sources"].isObject());
-	BOOST_CHECK(result["sources"]["fileA"].isObject());
-	BOOST_CHECK(result["sources"]["fileA"]["ast"].isObject());
+	BOOST_CHECK(contract["metadata"].is_string());
+	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].get<std::string>()));
+	BOOST_CHECK(result["sources"].is_object());
+	BOOST_CHECK(result["sources"]["fileA"].is_object());
+	BOOST_CHECK(result["sources"]["fileA"]["ast"].is_object());
 	BOOST_CHECK_EQUAL(
 		util::jsonCompactPrint(result["sources"]["fileA"]["ast"]),
 		"{\"absolutePath\":\"fileA\",\"exportedSymbols\":{\"A\":[1]},\"id\":2,\"nodeType\":\"SourceUnit\",\"nodes\":[{\"abstract\":false,"
@@ -476,14 +476,14 @@ BOOST_AUTO_TEST_CASE(compilation_error)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(result.isMember("errors"));
+	Json result = compile(input);
+	BOOST_CHECK(result.contains("errors"));
 	BOOST_CHECK(result["errors"].size() >= 1);
 	for (auto const& error: result["errors"])
 	{
-		BOOST_REQUIRE(error.isObject());
-		BOOST_REQUIRE(error["message"].isString());
-		if (error["message"].asString().find("pre-release compiler") == std::string::npos)
+		BOOST_REQUIRE(error.is_object());
+		BOOST_REQUIRE(error["message"].is_string());
+		if (error["message"].get<std::string>().find("pre-release compiler") == std::string::npos)
 		{
 			BOOST_CHECK_EQUAL(
 				util::jsonCompactPrint(error),
@@ -516,11 +516,11 @@ BOOST_AUTO_TEST_CASE(output_selection_explicit)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
 }
 
@@ -545,11 +545,11 @@ BOOST_AUTO_TEST_CASE(output_selection_all_contracts)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
 }
 
@@ -574,11 +574,11 @@ BOOST_AUTO_TEST_CASE(output_selection_all_files_single_contract)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
 }
 
@@ -603,11 +603,11 @@ BOOST_AUTO_TEST_CASE(output_selection_all_files_all_contracts)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
 }
 
@@ -632,11 +632,11 @@ BOOST_AUTO_TEST_CASE(output_selection_dependent_contract)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[{\"inputs\":[],\"name\":\"f\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]");
 }
 
@@ -664,11 +664,11 @@ BOOST_AUTO_TEST_CASE(output_selection_dependent_contract_with_import)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[{\"inputs\":[],\"name\":\"f\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]");
 }
 
@@ -693,11 +693,11 @@ BOOST_AUTO_TEST_CASE(filename_with_colon)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "http://github.com/ethereum/solidity/std/StandardToken.sol", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["abi"].isArray());
+	Json contract = getContractResult(result, "http://github.com/ethereum/solidity/std/StandardToken.sol", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["abi"].is_array());
 	BOOST_CHECK_EQUAL(util::jsonCompactPrint(contract["abi"]), "[]");
 }
 
@@ -725,10 +725,10 @@ BOOST_AUTO_TEST_CASE(library_filename_with_colon)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
 	expectLinkReferences(contract, {{"git:library.sol", {"L"}}});
 }
 
@@ -747,7 +747,7 @@ BOOST_AUTO_TEST_CASE(libraries_invalid_top_level)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "\"libraries\" is not a JSON object."));
 }
 
@@ -768,7 +768,7 @@ BOOST_AUTO_TEST_CASE(libraries_invalid_entry)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Library entry is not a JSON object."));
 }
 
@@ -791,7 +791,7 @@ BOOST_AUTO_TEST_CASE(libraries_invalid_hex)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Invalid library address (\"0x4200000000000000000000000000000000000xx1\") supplied."));
 }
 
@@ -815,7 +815,7 @@ BOOST_AUTO_TEST_CASE(libraries_invalid_length)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Library address is of invalid length."));
 }
 
@@ -838,7 +838,7 @@ BOOST_AUTO_TEST_CASE(libraries_missing_hex_prefix)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Library address is not prefixed with \"0x\"."));
 }
 
@@ -874,9 +874,9 @@ BOOST_AUTO_TEST_CASE(library_linking)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "A");
+	Json contractResult = getContractResult(result, "fileA", "A");
 	expectLinkReferences(contractResult, {{"library2.sol", {"L2"}}});
 }
 
@@ -906,9 +906,9 @@ BOOST_AUTO_TEST_CASE(linking_yul)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
+	Json contractResult = getContractResult(result, "fileA", "a");
 	expectLinkReferences(contractResult, {});
 }
 
@@ -938,9 +938,9 @@ BOOST_AUTO_TEST_CASE(linking_yul_empty_link_reference)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
+	Json contractResult = getContractResult(result, "fileA", "a");
 	expectLinkReferences(contractResult, {{"", {""}}});
 }
 
@@ -970,9 +970,9 @@ BOOST_AUTO_TEST_CASE(linking_yul_no_filename_in_link_reference)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
+	Json contractResult = getContractResult(result, "fileA", "a");
 	expectLinkReferences(contractResult, {{"", {"L"}}});
 }
 
@@ -1002,9 +1002,9 @@ BOOST_AUTO_TEST_CASE(linking_yul_same_library_name_different_files)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_TEST(containsAtMostWarnings(result));
-	Json::Value contractResult = getContractResult(result, "fileA", "a");
+	Json contractResult = getContractResult(result, "fileA", "a");
 	expectLinkReferences(contractResult, {{"fileC", {"L"}}});
 }
 
@@ -1027,37 +1027,37 @@ BOOST_AUTO_TEST_CASE(evm_version)
 			}
 		)";
 	};
-	Json::Value result;
+	Json result;
 	result = compile(inputForVersion("\"evmVersion\": \"homestead\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"homestead\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"homestead\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"tangerineWhistle\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"tangerineWhistle\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"tangerineWhistle\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"spuriousDragon\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"spuriousDragon\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"spuriousDragon\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"byzantium\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"byzantium\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"byzantium\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"constantinople\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"constantinople\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"constantinople\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"petersburg\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"petersburg\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"petersburg\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"istanbul\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"istanbul\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"istanbul\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"berlin\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"berlin\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"berlin\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"london\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"london\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"paris\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"paris\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"shanghai\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"cancun\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"cancun\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"cancun\"") != std::string::npos);
 	// test default
 	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"cancun\"") != std::string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].get<std::string>().find("\"evmVersion\":\"cancun\"") != std::string::npos);
 	// test invalid
 	result = compile(inputForVersion("\"evmVersion\": \"invalid\","));
-	BOOST_CHECK(result["errors"][0]["message"].asString() == "Invalid EVM version requested.");
+	BOOST_CHECK(result["errors"][0]["message"].get<std::string>() == "Invalid EVM version requested.");
 }
 
 BOOST_AUTO_TEST_CASE(optimizer_settings_default_disabled)
@@ -1077,19 +1077,19 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_default_disabled)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer["enabled"].asBool() == false);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	Json metadata;
+	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].get<std::string>(), metadata));
+
+	Json const& optimizer = metadata["settings"]["optimizer"];
+	BOOST_CHECK(optimizer.contains("enabled"));
+	BOOST_CHECK(optimizer["enabled"].get<bool>() == false);
+	BOOST_CHECK(!optimizer.contains("details"));
+	BOOST_CHECK(optimizer["runs"].get<unsigned>() == 200);
 }
 
 BOOST_AUTO_TEST_CASE(optimizer_settings_default_enabled)
@@ -1110,19 +1110,19 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_default_enabled)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer["enabled"].asBool() == true);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	Json metadata;
+	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].get<std::string>(), metadata));
+
+	Json const& optimizer = metadata["settings"]["optimizer"];
+	BOOST_CHECK(optimizer.contains("enabled"));
+	BOOST_CHECK(optimizer["enabled"].get<bool>() == true);
+	BOOST_CHECK(!optimizer.contains("details"));
+	BOOST_CHECK(optimizer["runs"].get<unsigned>() == 200);
 }
 
 BOOST_AUTO_TEST_CASE(optimizer_settings_details_exactly_as_default_disabled)
@@ -1150,20 +1150,20 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_exactly_as_default_disabled)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(optimizer.isMember("enabled"));
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	Json metadata;
+	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].get<std::string>(), metadata));
+
+	Json const& optimizer = metadata["settings"]["optimizer"];
+	BOOST_CHECK(optimizer.contains("enabled"));
 	// enabled is switched to false instead!
-	BOOST_CHECK(optimizer["enabled"].asBool() == false);
-	BOOST_CHECK(!optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["runs"].asUInt() == 200);
+	BOOST_CHECK(optimizer["enabled"].get<bool>() == false);
+	BOOST_CHECK(!optimizer.contains("details"));
+	BOOST_CHECK(optimizer["runs"].get<unsigned>() == 200);
 }
 
 BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
@@ -1193,36 +1193,36 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].asString(), metadata));
-
-	Json::Value const& optimizer = metadata["settings"]["optimizer"];
-	BOOST_CHECK(!optimizer.isMember("enabled"));
-	BOOST_CHECK(optimizer.isMember("details"));
-	BOOST_CHECK(optimizer["details"]["constantOptimizer"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["cse"].asBool() == false);
-	BOOST_CHECK(optimizer["details"]["deduplicate"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["jumpdestRemover"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["orderLiterals"].asBool() == false);
-	BOOST_CHECK(optimizer["details"]["peephole"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yul"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yulDetails"].isObject());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	Json metadata;
+	BOOST_CHECK(util::jsonParseStrict(contract["metadata"].get<std::string>(), metadata));
+
+	Json const& optimizer = metadata["settings"]["optimizer"];
+	BOOST_CHECK(!optimizer.contains("enabled"));
+	BOOST_CHECK(optimizer.contains("details"));
+	BOOST_CHECK(optimizer["details"]["constantOptimizer"].get<bool>() == true);
+	BOOST_CHECK(optimizer["details"]["cse"].get<bool>() == false);
+	BOOST_CHECK(optimizer["details"]["deduplicate"].get<bool>() == true);
+	BOOST_CHECK(optimizer["details"]["jumpdestRemover"].get<bool>() == true);
+	BOOST_CHECK(optimizer["details"]["orderLiterals"].get<bool>() == false);
+	BOOST_CHECK(optimizer["details"]["peephole"].get<bool>() == true);
+	BOOST_CHECK(optimizer["details"]["yul"].get<bool>() == true);
+	BOOST_CHECK(optimizer["details"]["yulDetails"].is_object());
+//	BOOST_CHECK(
+//		util::convertContainer<std::set<std::string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
+//		(std::set<std::string>{"stackAllocation", "optimizerSteps"})
+//	);
+	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].get<bool>() == true);
 	BOOST_CHECK(
-		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(
-		optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
+		optimizer["details"]["yulDetails"]["optimizerSteps"].get<std::string>() ==
 		OptimiserSettings::DefaultYulOptimiserSteps + ":"s + OptimiserSettings::DefaultYulOptimiserCleanupSteps
-	);
-	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 10);
-	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
+ 	);
+	BOOST_CHECK_EQUAL(optimizer["details"].size(), 10);
+	BOOST_CHECK(optimizer["runs"].get<unsigned>() == 600);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_without_compilation)
@@ -1250,12 +1250,12 @@ BOOST_AUTO_TEST_CASE(metadata_without_compilation)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].get<std::string>()));
 }
 
 
@@ -1281,13 +1281,13 @@ BOOST_AUTO_TEST_CASE(license_in_metadata)
 				}
 			}
 		)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	Json::Value metadata;
-	BOOST_REQUIRE(util::jsonParseStrict(contract["metadata"].asString(), metadata));
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	Json metadata;
+	BOOST_REQUIRE(util::jsonParseStrict(contract["metadata"].get<std::string>(), metadata));
 	BOOST_CHECK_EQUAL(metadata["sources"]["fileA"]["license"], "GPL-3.0");
 	BOOST_CHECK_EQUAL(metadata["sources"]["fileB"]["license"], "MIT");
 	BOOST_CHECK_EQUAL(metadata["sources"]["fileC"]["license"], "MIT AND GPL-3.0");
@@ -1317,14 +1317,14 @@ BOOST_AUTO_TEST_CASE(common_pattern)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_CHECK(contract.isObject());
-	BOOST_CHECK(contract["metadata"].isString());
-	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].asString()));
-	BOOST_CHECK(contract["evm"]["bytecode"].isObject());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_CHECK(contract.is_object());
+	BOOST_CHECK(contract["metadata"].is_string());
+	BOOST_CHECK(solidity::test::isValidMetadata(contract["metadata"].get<std::string>()));
+	BOOST_CHECK(contract["evm"]["bytecode"].is_object());
+	BOOST_CHECK(contract["evm"]["bytecode"]["object"].is_string());
 }
 
 BOOST_AUTO_TEST_CASE(use_stack_optimization)
@@ -1375,17 +1375,17 @@ BOOST_AUTO_TEST_CASE(use_stack_optimization)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
 	BOOST_CHECK(containsAtMostWarnings(result));
-	Json::Value contract = getContractResult(result, "fileA", "A");
-	BOOST_REQUIRE(contract.isObject());
-	BOOST_REQUIRE(contract["evm"]["bytecode"]["object"].isString());
-	BOOST_CHECK(contract["evm"]["bytecode"]["object"].asString().length() > 20);
+	Json contract = getContractResult(result, "fileA", "A");
+	BOOST_REQUIRE(contract.is_object());
+	BOOST_REQUIRE(contract["evm"]["bytecode"]["object"].is_string());
+	BOOST_CHECK(contract["evm"]["bytecode"]["object"].get<std::string>().length() > 20);
 
 	// Now disable stack optimizations and UnusedFunctionParameterPruner (p)
 	// results in "stack too deep"
@@ -1398,10 +1398,10 @@ BOOST_AUTO_TEST_CASE(use_stack_optimization)
 	parsedInput["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"] = optimiserSteps;
 
 	result = compiler.compile(parsedInput);
-	BOOST_REQUIRE(result["errors"].isArray());
+	BOOST_REQUIRE(result["errors"].is_array());
 	BOOST_CHECK(result["errors"][0]["severity"] == "error");
-	BOOST_REQUIRE(result["errors"][0]["message"].isString());
-	BOOST_CHECK(result["errors"][0]["message"].asString().find("When compiling inline assembly") != std::string::npos);
+	BOOST_REQUIRE(result["errors"][0]["message"].is_string());
+	BOOST_CHECK(result["errors"][0]["message"].get<std::string>().find("When compiling inline assembly") != std::string::npos);
 	BOOST_CHECK(result["errors"][0]["type"] == "CompilerError");
 }
 
@@ -1427,22 +1427,22 @@ BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A"].isObject());
+	BOOST_REQUIRE(result["contracts"]["A"].is_object());
 	BOOST_REQUIRE(result["contracts"]["A"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["contracts"]["A"]["C"].is_object());
+	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"].is_object());
+	BOOST_REQUIRE(result["contracts"]["A"]["C"]["evm"]["bytecode"].is_object());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"]["A"].isObject());
+	BOOST_REQUIRE(result["sources"]["A"].is_object());
 
 }
 
@@ -1468,22 +1468,22 @@ BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_colon_source)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][":A"].isObject());
+	BOOST_REQUIRE(result["contracts"][":A"].is_object());
 	BOOST_REQUIRE(result["contracts"][":A"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][":A"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["contracts"][":A"]["C"].is_object());
+	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"].is_object());
+	BOOST_REQUIRE(result["contracts"][":A"]["C"]["evm"]["bytecode"].is_object());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"][":A"].isObject());
+	BOOST_REQUIRE(result["sources"][":A"].is_object());
 }
 
 BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_empty_source)
@@ -1508,22 +1508,22 @@ BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_empty_source)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"][""].isObject());
+	BOOST_REQUIRE(result["contracts"][""].is_object());
 	BOOST_REQUIRE(result["contracts"][""].size() == 1);
-	BOOST_REQUIRE(result["contracts"][""]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["contracts"][""]["C"].is_object());
+	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"].is_object());
+	BOOST_REQUIRE(result["contracts"][""]["C"]["evm"]["bytecode"].is_object());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 1);
-	BOOST_REQUIRE(result["sources"][""].isObject());
+	BOOST_REQUIRE(result["sources"][""].is_object());
 }
 
 BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_multiple_sources)
@@ -1552,23 +1552,23 @@ BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard_multiple_sources)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["B"].isObject());
+	BOOST_REQUIRE(result["contracts"]["B"].is_object());
 	BOOST_REQUIRE(result["contracts"]["B"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["B"]["D"].isObject());
-	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["contracts"]["B"]["D"].is_object());
+	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"].is_object());
+	BOOST_REQUIRE(result["contracts"]["B"]["D"]["evm"]["bytecode"].is_object());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 2);
-	BOOST_REQUIRE(result["sources"]["A"].isObject());
-	BOOST_REQUIRE(result["sources"]["B"].isObject());
+	BOOST_REQUIRE(result["sources"]["A"].is_object());
+	BOOST_REQUIRE(result["sources"]["B"].is_object());
 }
 
 BOOST_AUTO_TEST_CASE(stopAfter_invalid_value)
@@ -1588,7 +1588,7 @@ BOOST_AUTO_TEST_CASE(stopAfter_invalid_value)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\"."));
 }
 
@@ -1609,7 +1609,7 @@ BOOST_AUTO_TEST_CASE(stopAfter_invalid_type)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "\"settings.stopAfter\" must be a string."));
 }
 
@@ -1630,7 +1630,7 @@ BOOST_AUTO_TEST_CASE(stopAfter_bin_conflict)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
+	Json result = compile(input);
 	BOOST_CHECK(containsError(result, "JSONError", "Requested output selection conflicts with \"settings.stopAfter\"."));
 }
 
@@ -1650,10 +1650,10 @@ BOOST_AUTO_TEST_CASE(stopAfter_ast_output)
 		}
 	}
 	)";
-	Json::Value result = compile(input);
-	BOOST_CHECK(result["sources"].isObject());
-	BOOST_CHECK(result["sources"]["a.sol"].isObject());
-	BOOST_CHECK(result["sources"]["a.sol"]["ast"].isObject());
+	Json result = compile(input);
+	BOOST_CHECK(result["sources"].is_object());
+	BOOST_CHECK(result["sources"]["a.sol"].is_object());
+	BOOST_CHECK(result["sources"]["a.sol"]["ast"].is_object());
 }
 
 BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract)
@@ -1679,21 +1679,21 @@ BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"].isObject());
+	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"].is_object());
 	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"].isObject());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"].isObject());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["ir"].isString());
-	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"]["bytecode"].isObject());
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"].is_object());
+	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"].is_object());
+	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["ir"].is_string());
+	BOOST_REQUIRE(result["contracts"]["BlockRewardAuRaCoins.sol"]["BlockRewardAuRaCoins"]["evm"]["bytecode"].is_object());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 2);
 }
 
@@ -1717,20 +1717,20 @@ BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract_yul)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	BOOST_REQUIRE(result["contracts"].isObject());
+	BOOST_REQUIRE(result["contracts"].is_object());
 	BOOST_REQUIRE(result["contracts"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A.sol"].isObject());
+	BOOST_REQUIRE(result["contracts"]["A.sol"].is_object());
 	BOOST_REQUIRE(result["contracts"]["A.sol"].size() == 1);
-	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"].isObject());
-	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"]["ir"].isString());
+	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"].is_object());
+	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"]["ir"].is_string());
 
-	const std::string& irCode = result["contracts"]["A.sol"]["C"]["ir"].asString();
+	const std::string& irCode = result["contracts"]["A.sol"]["C"]["ir"].get<std::string>();
 
 	// Make sure C and B contracts are deployed
 	BOOST_REQUIRE(irCode.find("object \"C") != std::string::npos);
@@ -1742,7 +1742,7 @@ BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract_yul)
 	BOOST_REQUIRE(irCode.find("object \"D") == std::string::npos);
 
 
-	BOOST_REQUIRE(result["sources"].isObject());
+	BOOST_REQUIRE(result["sources"].is_object());
 	BOOST_REQUIRE(result["sources"].size() == 1);
 }
 
@@ -1766,13 +1766,13 @@ BOOST_AUTO_TEST_CASE(source_location_of_bare_block)
 	}
 	)";
 
-	Json::Value parsedInput;
+	Json parsedInput;
 	BOOST_REQUIRE(util::jsonParseStrict(input, parsedInput));
 
 	solidity::frontend::StandardCompiler compiler;
-	Json::Value result = compiler.compile(parsedInput);
+	Json result = compiler.compile(parsedInput);
 
-	std::string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].asString();
+	std::string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].get<std::string>();
 
 	// Check that the bare block's source location is referenced.
 	std::string sourceRef =
diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
index 641c9107d6..fb2f4eb626 100644
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ b/test/libsolidity/util/ContractABIUtils.cpp
@@ -140,16 +140,16 @@ std::optional<ABIType> isFixedPoint(std::string const& type)
 	return fixedPointType;
 }
 
-std::string functionSignatureFromABI(Json::Value const& _functionABI)
+std::string functionSignatureFromABI(Json const& _functionABI)
 {
 	auto inputs = _functionABI["inputs"];
-	std::string signature = {_functionABI["name"].asString() + "("};
+	std::string signature = {_functionABI["name"].get<std::string>() + "("};
 	size_t parameterCount = 0;
 
 	for (auto const& input: inputs)
 	{
 		parameterCount++;
-		signature += input["type"].asString();
+		signature += input["type"].get<std::string>();
 		if (parameterCount < inputs.size())
 			signature += ",";
 	}
@@ -161,11 +161,11 @@ std::string functionSignatureFromABI(Json::Value const& _functionABI)
 
 std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::parametersFromJsonOutputs(
 	ErrorReporter& _errorReporter,
-	Json::Value const& _contractABI,
+	Json const& _contractABI,
 	std::string const& _functionSignature
 )
 {
-	if (!_contractABI)
+	if (_contractABI.empty())
 		return std::nullopt;
 
 	for (auto const& function: _contractABI)
@@ -177,7 +177,7 @@ std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::paramet
 
 			for (auto const& output: function["outputs"])
 			{
-				std::string type = output["type"].asString();
+				std::string type = output["type"].get<std::string>();
 
 				ABITypes inplaceTypes;
 				ABITypes dynamicTypes;
@@ -209,13 +209,13 @@ std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::paramet
 }
 
 bool ContractABIUtils::appendTypesFromName(
-	Json::Value const& _functionOutput,
+	Json const& _functionOutput,
 	ABITypes& _inplaceTypes,
 	ABITypes& _dynamicTypes,
 	bool _isCompoundType
 )
 {
-	std::string type = _functionOutput["type"].asString();
+	std::string type = _functionOutput["type"].get<std::string>();
 	if (isBool(type))
 		_inplaceTypes.push_back(ABIType{ABIType::Boolean});
 	else if (isUint(type))
diff --git a/test/libsolidity/util/ContractABIUtils.h b/test/libsolidity/util/ContractABIUtils.h
index 209eca4232..3f0b1b04e2 100644
--- a/test/libsolidity/util/ContractABIUtils.h
+++ b/test/libsolidity/util/ContractABIUtils.h
@@ -19,8 +19,7 @@
 #include <test/libsolidity/util/SoltestErrors.h>
 
 #include <libsolutil/CommonData.h>
-
-#include <json/json.h>
+#include <libsolutil/JSON.h>
 
 namespace solidity::frontend::test
 {
@@ -40,7 +39,7 @@ class ContractABIUtils
 	/// auto-correction during interactive update routine.
 	static std::optional<ParameterList> parametersFromJsonOutputs(
 		ErrorReporter& _errorReporter,
-		Json::Value const& _contractABI,
+		Json const& _contractABI,
 		std::string const& _functionSignature
 	);
 
@@ -86,7 +85,7 @@ class ContractABIUtils
 	/// `bytes` -> [`Unsigned`, `Unsigned`, `HexString`]
 	/// ...
 	static bool appendTypesFromName(
-		Json::Value const& _functionOutput,
+		Json const& _functionOutput,
 		ABITypes& _inplaceTypes,
 		ABITypes& _dynamicTypes,
 		bool _isCompoundType = false
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index dd74d4035c..3e0d3e8737 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -413,7 +413,7 @@ void TestFunctionCall::reset()
 {
 	m_rawBytes = bytes{};
 	m_failure = true;
-	m_contractABI = Json::Value{};
+	m_contractABI = Json();
 	m_calledNonExistingFunction = false;
 }
 
diff --git a/test/libsolidity/util/TestFunctionCall.h b/test/libsolidity/util/TestFunctionCall.h
index 724cb8286c..9a63262cc2 100644
--- a/test/libsolidity/util/TestFunctionCall.h
+++ b/test/libsolidity/util/TestFunctionCall.h
@@ -23,8 +23,6 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/JSON.h>
 
-#include <json/json.h>
-
 #include <iosfwd>
 #include <numeric>
 #include <stdexcept>
@@ -99,7 +97,7 @@ class TestFunctionCall
 	void setRawBytes(const bytes _rawBytes) { m_rawBytes = _rawBytes; }
 	void setGasCostExcludingCode(std::string const& _runType, u256 const& _gasCost) { m_gasCostsExcludingCode[_runType] = _gasCost; }
 	void setCodeDepositGasCost(std::string const& _runType, u256 const& _gasCost) { m_codeDepositGasCosts[_runType] = _gasCost; }
-	void setContractABI(Json::Value _contractABI) { m_contractABI = std::move(_contractABI); }
+	void setContractABI(Json _contractABI) { m_contractABI = std::move(_contractABI); }
 	void setSideEffects(std::vector<std::string> _sideEffects) { m_call.actualSideEffects = _sideEffects; }
 
 private:
@@ -154,7 +152,7 @@ class TestFunctionCall
 	bool m_failure = true;
 	/// JSON object which holds the contract ABI and that is used to set the output formatting
 	/// in the interactive update routine.
-	Json::Value m_contractABI = Json::Value{};
+	Json m_contractABI = Json{};
 	/// Flags that the test failed because the called function is not known to exist on the contract.
 	bool m_calledNonExistingFunction = false;
 };
diff --git a/test/libsolutil/JSON.cpp b/test/libsolutil/JSON.cpp
index da10c0b3c6..91e6771acc 100644
--- a/test/libsolutil/JSON.cpp
+++ b/test/libsolutil/JSON.cpp
@@ -34,50 +34,50 @@ BOOST_AUTO_TEST_SUITE(JsonTest, *boost::unit_test::label("nooptions"))
 
 BOOST_AUTO_TEST_CASE(json_types)
 {
-	auto check = [](Json::Value value, std::string const& expectation) {
+	auto check = [](Json value, std::string const& expectation) {
 		BOOST_CHECK(jsonCompactPrint(value) == expectation);
 	};
 
-	Json::Value value;
+	Json value;
 	BOOST_CHECK(value.empty());
 	value = {};
 	BOOST_CHECK(value.empty());
-	value = Json::Value();
+	value = Json();
 	BOOST_CHECK(value.empty());
-	value = Json::nullValue;
+	value = Json();
 	BOOST_CHECK(value.empty());
 
 	check(value, "null");
 	check({}, "null");
-	check(Json::Value(), "null");
-	check(Json::nullValue, "null");
-	check(Json::objectValue, "{}");
-	check(Json::arrayValue, "[]");
-	check(Json::UInt(1), "1");
-	check(Json::UInt(-1), "4294967295");
-	check(Json::UInt64(1), "1");
-	check(Json::UInt64(-1), "18446744073709551615");
-	check(Json::LargestUInt(1), "1");
-	check(Json::LargestUInt(-1), "18446744073709551615");
-	check(Json::LargestUInt(0xffffffff), "4294967295");
-	check(Json::Value("test"), "\"test\"");
+	check(Json(), "null");
+	check(Json(), "null");
+	check(Json::object(), "{}");
+	check(Json::array(), "[]");
+	check(1, "1");
+	check(static_cast<uint32_t>(-1), "4294967295");
+	check(1, "1");
+	check(static_cast<uint64_t>(-1), "18446744073709551615");
+	check(1, "1");
+	check(static_cast<uint64_t>(-1), "18446744073709551615");
+	check(0xffffffff, "4294967295");
+	check(Json("test"), "\"test\"");
 	check("test", "\"test\"");
 	check(true, "true");
 
-	value = Json::objectValue;
+	value = Json::object();
 	value["key"] = "value";
 	check(value, "{\"key\":\"value\"}");
 
-	value = Json::arrayValue;
-	value.append(1);
-	value.append(2);
+	value = Json::array();
+	value.push_back(1);
+	value.push_back(2);
 	check(value, "[1,2]");
 }
 
 BOOST_AUTO_TEST_CASE(json_pretty_print)
 {
-	Json::Value json;
-	Json::Value jsonChild;
+	Json json;
+	Json jsonChild;
 
 	jsonChild["3.1"] = "3.1";
 	jsonChild["3.2"] = 2;
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(json_pretty_print)
 	json["2"] = "2";
 	json["3"] = jsonChild;
 	json["4"] = "ऑ ऒ ओ औ क ख";
-	json["5"] = "\xff";
+	json["5"] = "\\xff\\xfe";
 
 	BOOST_CHECK(
 	"{\n"
@@ -97,14 +97,14 @@ BOOST_AUTO_TEST_CASE(json_pretty_print)
 	"    \"3.2\": 2\n"
 	"  },\n"
 	"  \"4\": \"\\u0911 \\u0912 \\u0913 \\u0914 \\u0915 \\u0916\",\n"
-	"  \"5\": \"\\ufffd\"\n"
+	"  \"5\": \"\\\\xff\\\\xfe\"\n"
 	"}" == jsonPrettyPrint(json));
 }
 
 BOOST_AUTO_TEST_CASE(json_compact_print)
 {
-	Json::Value json;
-	Json::Value jsonChild;
+	Json json;
+	Json jsonChild;
 
 	jsonChild["3.1"] = "3.1";
 	jsonChild["3.2"] = 2;
@@ -112,9 +112,10 @@ BOOST_AUTO_TEST_CASE(json_compact_print)
 	json["2"] = "2";
 	json["3"] = jsonChild;
 	json["4"] = "ऑ ऒ ओ औ क ख";
-	json["5"] = "\xff";
+	json["5"] = "\x10";
+	json["6"] = "\u4e2d";
 
-	BOOST_CHECK("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2},\"4\":\"\\u0911 \\u0912 \\u0913 \\u0914 \\u0915 \\u0916\",\"5\":\"\\ufffd\"}" == jsonCompactPrint(json));
+	BOOST_CHECK(R"({"1":1,"2":"2","3":{"3.1":"3.1","3.2":2},"4":"\u0911 \u0912 \u0913 \u0914 \u0915 \u0916","5":"\u0010","6":"\u4e2d"})" == jsonCompactPrint(json));
 }
 
 BOOST_AUTO_TEST_CASE(parse_json_strict)
@@ -122,7 +123,7 @@ BOOST_AUTO_TEST_CASE(parse_json_strict)
 	// In this test we check conformance against JSON.parse (https://tc39.es/ecma262/multipage/structured-data.html#sec-json.parse)
 	// and ECMA-404 (https://www.ecma-international.org/publications-and-standards/standards/ecma-404/)
 
-	Json::Value json;
+	Json json;
 	std::string errors;
 
 	// Just parse a valid json input
@@ -135,179 +136,202 @@ BOOST_AUTO_TEST_CASE(parse_json_strict)
 	// Trailing garbage is not allowed in ECMA-262
 	BOOST_CHECK(!jsonParseStrict("{\"1\":2,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":3}}}}}}}}}}", json, &errors));
 
-	// Comments are not allowed in ECMA-262
-	// ... but JSONCPP allows them
-	BOOST_CHECK(jsonParseStrict(
-		"{\"1\":3, // awesome comment\n\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":5}}", json, &errors
-	));
-	BOOST_CHECK(json["1"] == 3);
-	BOOST_CHECK(json["2"] == "2");
-	BOOST_CHECK(json["3"]["3.1"] == "3.1");
-	BOOST_CHECK(json["3"]["3.2"] == 5);
-
 	// According to ECMA-404 object, array, number, string, true, false, null are allowed
 	// ... but JSONCPP disallows value types
 	BOOST_CHECK(jsonParseStrict("[]", json, &errors));
-	BOOST_CHECK(json.isArray());
+	BOOST_CHECK(json.is_array());
 	BOOST_CHECK(jsonParseStrict("{}", json, &errors));
-	BOOST_CHECK(json.isObject());
-	BOOST_CHECK(!jsonParseStrict("1", json, &errors));
-	// BOOST_CHECK(json.isNumeric());
-	BOOST_CHECK(!jsonParseStrict("\"hello\"", json, &errors));
-	// BOOST_CHECK(json.isString());
-	BOOST_CHECK(!jsonParseStrict("true", json, &errors));
-	// BOOST_CHECK(json.isBool());
-	BOOST_CHECK(!jsonParseStrict("null", json, &errors));
-	// BOOST_CHECK(json.isNull());
+	BOOST_CHECK(json.is_object());
+	BOOST_CHECK(jsonParseStrict("1", json, &errors));
+	BOOST_CHECK(json.is_number());
+	BOOST_CHECK(jsonParseStrict("\"hello\"", json, &errors));
+	BOOST_CHECK(json.is_string());
+	BOOST_CHECK(jsonParseStrict("true", json, &errors));
+	BOOST_CHECK(json.is_boolean());
+	BOOST_CHECK(jsonParseStrict("null", json, &errors));
+	BOOST_CHECK(json.is_null());
 
 	// Single quotes are also disallowed by ECMA-404
 	BOOST_CHECK(!jsonParseStrict("'hello'", json, &errors));
-	// BOOST_CHECK(json.isString());
+	// BOOST_CHECK(json.is_string());
 
 	// Only string keys in objects are allowed in ECMA-404
 	BOOST_CHECK(!jsonParseStrict("{ 42: \"hello\" }", json, &errors));
 
 	// According to ECMA-404 hex escape sequences are not allowed, only unicode (\uNNNN) and
 	// a few control characters (\b, \f, \n, \r, \t)
-	//
-	// More lenient parsers allow hex escapes as long as they translate to a valid UTF-8 encoding.
-	//
-	// ... but JSONCPP allows any hex escapes
-	BOOST_CHECK(jsonParseStrict("[ \"\x80\xec\x80\" ]", json, &errors));
-	BOOST_CHECK(json.isArray());
-	BOOST_CHECK(json[0] == "\x80\xec\x80");
-
-	// This would be valid more lenient parsers.
+
 	BOOST_CHECK(jsonParseStrict("[ \"\xF0\x9F\x98\x8A\" ]", json, &errors));
-	BOOST_CHECK(json.isArray());
+	BOOST_CHECK(json.is_array());
 	BOOST_CHECK(json[0] == "😊");
+	BOOST_CHECK(json[0] == "\xF0\x9F\x98\x8A");
 }
 
 BOOST_AUTO_TEST_CASE(json_isOfType)
 {
-	Json::Value json;
+	Json json;
 
 	json["float"] = 3.1f;
 	json["double"] = 3.1;
 	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
+	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<int>(json["int"]));
+	BOOST_CHECK(isOfType<uint64_t>(json["int"]));
+	BOOST_CHECK(isOfType<uint64_t>(json["int"]));
+	BOOST_CHECK(isOfType<int>(json["int"]));
+	BOOST_CHECK(isOfType<int64_t>(json["int64"]));
+	BOOST_CHECK(isOfType<uint64_t>(json["int64"]));
+	BOOST_CHECK(isOfType<uint64_t >(json["int64"]));
 	BOOST_CHECK(isOfType<std::string>(json["string"]));
-	BOOST_CHECK(!isOfType<Json::Int>(json["int64"]));
+	BOOST_CHECK(!isOfType<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_CHECK(!isOfType<int>(json["string"]));
+	BOOST_CHECK(!isOfType<int64_t>(json["string"]));
+	BOOST_CHECK(!isOfType<unsigned >(json["string"]));
+	BOOST_CHECK(!isOfType<uint64_t >(json["string"]));
 }
 
 BOOST_AUTO_TEST_CASE(json_isisOfTypeIfExists)
 {
-	Json::Value json;
+	Json json;
 
 	json["float"] = 3.1f;
 	json["double"] = 3.1;
 	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
+	json["uint"] = 2u;
+	json["int64"] = 0x4000000000000000;
+	json["uint64"] = 0x4000000000000000u;
 	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<int>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<unsigned>(json, "uint"));
+	BOOST_CHECK(isOfTypeIfExists<int64_t>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<int64_t >(json, "int64"));
+	BOOST_CHECK(isOfTypeIfExists<uint64_t>(json, "uint64"));
 	BOOST_CHECK(isOfTypeIfExists<std::string>(json, "string"));
-	BOOST_CHECK(!isOfTypeIfExists<Json::Int>(json, "int64"));
+	BOOST_CHECK(!isOfTypeIfExists<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_CHECK(!isOfTypeIfExists<int>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<int64_t>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<unsigned>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<uint64_t>(json, "string"));
+	BOOST_CHECK(isOfTypeIfExists<uint64_t>(json, "NOT_EXISTING"));
 }
 
 BOOST_AUTO_TEST_CASE(json_getOrDefault)
 {
-	Json::Value json;
+	Json json;
 
 	json["float"] = 3.1f;
 	json["double"] = 3.1;
 	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["uint64"] = Json::UInt64{0x5000000000000000};
+	json["int64"] = 0x4000000000000000;
+	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_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<int>(json, "int") == 2);
+	BOOST_CHECK(getOrDefault<int>(json, "int", -1) == 2);
+	BOOST_CHECK(getOrDefault<int>(json, "no_int", -1) == -1);
+	BOOST_CHECK(getOrDefault<unsigned>(json, "int") == 2);
+	BOOST_CHECK(getOrDefault<unsigned>(json, "int", 1) == 2);
+	BOOST_CHECK(getOrDefault<unsigned>(json, "no_int", 1) == 1);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "int") == 2);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "int", -1) == 2);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "no_int", -1) == -1);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "int64") == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "int64", -1) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<int64_t>(json, "no_int64", -1) == -1);
+	BOOST_CHECK(getOrDefault<uint64_t>(json, "int64") == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<uint64_t>(json, "int64", 1) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<uint64_t>(json, "no_int64", 1) == 1);
+	BOOST_CHECK(getOrDefault<uint64_t>(json, "uint64") == 0x5000000000000000);
+	BOOST_CHECK(getOrDefault<uint64_t>(json, "uint64", 1) == 0x5000000000000000);
+	BOOST_CHECK(getOrDefault<uint64_t>(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 json;
 
 	json["float"] = 3.1f;
 	json["double"] = 3.1;
 	json["int"] = 2;
-	json["int64"] = Json::Int64{0x4000000000000000};
-	json["uint64"] = Json::UInt64{0x5000000000000000};
+	json["int64"] = 0x4000000000000000;
+	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<int>(json["int"]) == 2);
+	BOOST_CHECK(get<unsigned>(json["int"]) == 2);
+	BOOST_CHECK(get<int64_t>(json["int"]) == 2);
+	BOOST_CHECK(get<int64_t>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(get<uint64_t>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(get<uint64_t>(json["uint64"]) == 0x5000000000000000);
 	BOOST_CHECK(get<std::string>(json["string"]) == "Hello World!");
 }
 
+template<typename T>
+void json_test_int_range()
+{
+	Json max = {{"v", std::numeric_limits<T>::max()}};
+	Json min = {{"v", std::numeric_limits<T>::min()}};
+	Json overflow = {{"v", static_cast<int64_t>(std::numeric_limits<T>::max()) + 1}};
+	Json underflow = {{"v", static_cast<int64_t>(std::numeric_limits<T>::min()) - 1}};
+	BOOST_CHECK(getOrDefault<T>(max, "v", 0) == std::numeric_limits<T>::max());
+	BOOST_CHECK(getOrDefault<T>(min, "v", 0) == std::numeric_limits<T>::min());
+	BOOST_CHECK(getOrDefault<T>(overflow, "v", 0) == 0);
+	BOOST_CHECK(getOrDefault<T>(underflow, "v", 0) == 0);
+	BOOST_CHECK(get<T>(max["v"]) == std::numeric_limits<T>::max());
+	BOOST_CHECK(get<T>(min["v"]) == std::numeric_limits<T>::min());
+	BOOST_CHECK_THROW(get<T>(overflow["v"]), InvalidType);
+	BOOST_CHECK_THROW(get<T>(underflow["v"]), InvalidType);
+}
+
+BOOST_AUTO_TEST_CASE(json_range_checks)
+{
+	json_test_int_range<int32_t>();
+	json_test_int_range<uint32_t>();
+	json_test_int_range<int16_t>();
+	json_test_int_range<uint16_t>();
+	json_test_int_range<int8_t>();
+	json_test_int_range<uint8_t>();
+
+	Json overflow = {{"v", static_cast<double>(std::numeric_limits<float>::max()) * 2}};
+	Json underflow = {{"v", static_cast<double>(std::numeric_limits<float>::min()) / 2}};
+	BOOST_CHECK(getOrDefault<float>({{"v", std::numeric_limits<float>::max()}}, "v", 0) == std::numeric_limits<float>::max());
+	BOOST_CHECK(getOrDefault<float>({{"v", std::numeric_limits<float>::min()}}, "v", 0) == std::numeric_limits<float>::min());
+	BOOST_CHECK(getOrDefault<float>(overflow, "v", 0) == 0);
+	BOOST_CHECK(getOrDefault<float>(underflow, "v", 0) == 0);
+	BOOST_CHECK_THROW(get<float>(overflow["v"]), InvalidType);
+	BOOST_CHECK_THROW(get<float>(underflow["v"]), InvalidType);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 73ebb2c540..b3b93cb3aa 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -1180,15 +1180,20 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 
 	OptionsReaderAndMessages result = runCLI(commandLine, standardJsonInput);
 
-	Json::Value parsedStdout;
+	Json parsedStdout;
 	std::string jsonParsingErrors;
 	BOOST_TEST(util::jsonParseStrict(result.stdoutContent, parsedStdout, &jsonParsingErrors));
 	BOOST_TEST(jsonParsingErrors == "");
-	for (Json::Value const& errorDict: parsedStdout["errors"])
+	for (Json const& errorDict: parsedStdout["errors"])
 		// The error list might contain pre-release compiler warning
 		BOOST_TEST(errorDict["severity"] != "error");
+	// we might be able to use ranges again, but the nlohmann::json support is not yet fully there.
+	// (parsedStdout["sources"].items() | ranges::views::keys | ranges::to<std::set>)
+	std::set<std::string> sources;
+	for (auto const& [key, _]: parsedStdout["sources"].items())
+		sources.insert(key);
 	BOOST_TEST(
-		(parsedStdout["sources"].getMemberNames() | ranges::to<std::set>) ==
+		sources ==
 		(expectedSources | ranges::views::keys | ranges::to<std::set>) + std::set<std::string>{"main.sol"}
 	);
 
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 1bb04bf66a..c7e94f40b7 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -58,13 +58,13 @@ void FuzzerUtil::testCompilerJsonInterface(string const& _input, bool _optimize,
 	if (!_quiet)
 		cout << "Testing compiler " << (_optimize ? "with" : "without") << " optimizer." << endl;
 
-	Json::Value config = Json::objectValue;
+	Json config;
 	config["language"] = "Solidity";
-	config["sources"] = Json::objectValue;
-	config["sources"][""] = Json::objectValue;
+	config["sources"] = Json::object();
+	config["sources"][""] = Json::object();
 	config["sources"][""]["content"] = _input;
-	config["settings"] = Json::objectValue;
-	config["settings"]["optimizer"] = Json::objectValue;
+	config["settings"] = Json::object();
+	config["settings"]["optimizer"] = Json::object();
 	config["settings"]["optimizer"]["enabled"] = _optimize;
 	config["settings"]["optimizer"]["runs"] = static_cast<int>(OptimiserSettings{}.expectedExecutionsPerDeployment);
 	config["settings"]["evmVersion"] = "berlin";
@@ -155,23 +155,23 @@ void FuzzerUtil::runCompiler(string const& _input, bool _quiet)
 	// This should be safe given the above copies the output.
 	solidity_reset();
 
-	Json::Value output;
+	Json output;
 	if (!jsonParseStrict(outputString, output))
 	{
 		string msg{"Compiler produced invalid JSON output."};
 		cout << msg << endl;
 		BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
 	}
-	if (output.isMember("errors"))
+	if (output.contains("errors"))
 		for (auto const& error: output["errors"])
 		{
-			string invalid = findAnyOf(error["type"].asString(), vector<string>{
+			string invalid = findAnyOf(error["type"].get<std::string>(), vector<string>{
 					"Exception",
 					"InternalCompilerError"
 			});
 			if (!invalid.empty())
 			{
-				string msg = "Invalid error: \"" + error["type"].asString() + "\"";
+				string msg = "Invalid error: \"" + error["type"].get<std::string>() + "\"";
 				cout << msg << endl;
 				BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
 			}
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index 3414709088..9d98190dda 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -57,7 +57,7 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 		else
 			contractName = m_compilerInput.contractName;
 		evmasm::LinkerObject obj = m_compiler.object(contractName);
-		Json::Value methodIdentifiers = m_compiler.interfaceSymbols(contractName)["methods"];
+		Json methodIdentifiers = m_compiler.interfaceSymbols(contractName)["methods"];
 		return CompilerOutput{obj.bytecode, methodIdentifiers};
 	}
 }
@@ -164,10 +164,10 @@ evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 		// 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() +
+		methodName = (++cOutput->methodIdentifiersInContract.begin())->get<std::string>() +
 			_fuzzIsabelle.substr(2, _fuzzIsabelle.size());
 	else
-		methodName = cOutput->methodIdentifiersInContract[m_methodName].asString();
+		methodName = cOutput->methodIdentifiersInContract[m_methodName].get<std::string>();
 
 	return deployAndExecute(
 		cOutput->byteCode,
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index ea684ea723..00582c681e 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -35,7 +35,7 @@ struct CompilerOutput
 	/// EVM bytecode returned by compiler
 	solidity::bytes byteCode;
 	/// Method identifiers in a contract
-	Json::Value methodIdentifiersInContract;
+	Json methodIdentifiersInContract;
 };
 
 struct CompilerInput
@@ -89,7 +89,7 @@ class SolidityCompilationFramework
 		m_compilerInput.libraryAddresses = std::move(_libraryAddresses);
 	}
 	/// @returns method identifiers in contract called @param _contractName.
-	Json::Value methodIdentifiers(std::string const& _contractName)
+	Json methodIdentifiers(std::string const& _contractName)
 	{
 		return m_compiler.interfaceSymbols(_contractName)["methods"];
 	}
diff --git a/test/yulPhaser/Program.cpp b/test/yulPhaser/Program.cpp
index a54bf09af1..018de32ee2 100644
--- a/test/yulPhaser/Program.cpp
+++ b/test/yulPhaser/Program.cpp
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(toJson)
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	Program program = get<Program>(Program::load(sourceStream));
 
-	Json::Value parsingResult;
+	Json parsingResult;
 	std::string errors;
 	BOOST_TEST(jsonParseStrict(program.toJson(), parsingResult, &errors));
 	BOOST_TEST(errors.empty());
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 3089591ed8..f24f5e03f4 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -111,7 +111,7 @@ ostream& phaser::operator<<(ostream& _stream, Program const& _program)
 
 string Program::toJson() const
 {
-	Json::Value serializedAst = AsmJsonConverter(0)(*m_ast);
+	Json serializedAst = AsmJsonConverter(0)(*m_ast);
 	return jsonPrettyPrint(removeNullMembers(std::move(serializedAst)));
 }
 

From dd07096a98e48430143596ed0d6acab9f7282157 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Thu, 2 May 2024 16:12:46 +0200
Subject: [PATCH 0834/1140] StaticAnalyzer: Only raise a compile time error for
 division and modulo by zero when it's between literals.

---
 Changelog.md                                                 | 1 +
 libsolidity/analysis/StaticAnalyzer.cpp                      | 3 ++-
 .../literalOperations/division_by_zero_complex_compound.sol  | 5 +++++
 .../literalOperations/division_by_zero_compound.sol          | 5 +++++
 .../literalOperations/division_by_zero_nonliteral.sol        | 4 ++++
 .../literalOperations/mod_zero_complex_compound.sol          | 5 +++++
 .../syntaxTests/literalOperations/mod_zero_compound.sol      | 5 +++++
 .../syntaxTests/literalOperations/mod_zero_nonliteral.sol    | 4 ++++
 8 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex_compound.sol
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/division_by_zero_compound.sol
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/division_by_zero_nonliteral.sol
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/mod_zero_complex_compound.sol
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/mod_zero_compound.sol
 create mode 100644 test/libsolidity/syntaxTests/literalOperations/mod_zero_nonliteral.sol

diff --git a/Changelog.md b/Changelog.md
index c118e9f248..16e42aff26 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Bugfixes:
  * SMTChecker: Fix internal error when using an empty tuple in a conditional operator.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
  * Standard JSON Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``optimizerSteps`` sequence.
+ * StaticAnalyzer: Only raise a compile time error for division and modulo by zero when it's between literals.
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 
diff --git a/libsolidity/analysis/StaticAnalyzer.cpp b/libsolidity/analysis/StaticAnalyzer.cpp
index 10c2c922ca..563295e23c 100644
--- a/libsolidity/analysis/StaticAnalyzer.cpp
+++ b/libsolidity/analysis/StaticAnalyzer.cpp
@@ -298,7 +298,8 @@ bool StaticAnalyzer::visit(BinaryOperation const& _operation)
 {
 	if (
 		*_operation.rightExpression().annotation().isPure &&
-		(_operation.getOperator() == Token::Div || _operation.getOperator() == Token::Mod)
+		(_operation.getOperator() == Token::Div || _operation.getOperator() == Token::Mod) &&
+		ConstantEvaluator::evaluate(m_errorReporter, _operation.leftExpression())
 	)
 		if (auto rhs = ConstantEvaluator::evaluate(m_errorReporter, _operation.rightExpression()))
 			if (rhs->value == 0)
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex_compound.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex_compound.sol
new file mode 100644
index 0000000000..c3a51cc297
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex_compound.sol
@@ -0,0 +1,5 @@
+contract A {
+    uint a;
+    constructor() { a /= (((2)*2)%4); }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_compound.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_compound.sol
new file mode 100644
index 0000000000..9404f0ce97
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_compound.sol
@@ -0,0 +1,5 @@
+contract A {
+    uint a = 5;
+    constructor() { a /= uint(0); }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_nonliteral.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_nonliteral.sol
new file mode 100644
index 0000000000..66540568f3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_nonliteral.sol
@@ -0,0 +1,4 @@
+contract A {
+    constructor() { uint a; a / 0; }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex_compound.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex_compound.sol
new file mode 100644
index 0000000000..1e9f1e1fa7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex_compound.sol
@@ -0,0 +1,5 @@
+contract A {
+    uint a = 5;
+    constructor() { a %= uint(((2)*2)%4); }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_compound.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_compound.sol
new file mode 100644
index 0000000000..2fb6e1df09
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_compound.sol
@@ -0,0 +1,5 @@
+contract A {
+    uint a;
+    constructor() { a = 5; a %= 0; }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_nonliteral.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_nonliteral.sol
new file mode 100644
index 0000000000..0722a096fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_nonliteral.sol
@@ -0,0 +1,4 @@
+contract A {
+    constructor() { uint a; a % 0; }
+}
+// ----

From cb783989c78f67dca4208fa269544ab720846143 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 7 May 2024 16:37:00 +0200
Subject: [PATCH 0835/1140] Correct changelog.

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

diff --git a/Changelog.md b/Changelog.md
index 193f5bb462..59284486b3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,10 @@ Bugfixes:
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 
+Build System:
+* Replace internal JSON library jsoncpp with nlohmann::json.
+
+
 ### 0.8.25 (2024-03-14)
 
 Compiler Features:
@@ -33,9 +37,6 @@ Bugfixes:
  * SMTChecker: Fix internal error caused by not respecting the sign of an integer type when constructing zero-value SMT expressions.
  * SMTChecker: Run Eldarica only when explicitly requested with `--model-checker-solvers eld`, even when it is present on the system.
 
-Build System:
- * Replace internal JSON library jsoncpp with nlohmann::json.
-
 ### 0.8.24 (2024-01-25)
 
 Language Features:

From 6cc75270d996e1af22c9318a29cff64bed5b6191 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 7 May 2024 17:08:24 +0200
Subject: [PATCH 0836/1140] Mark embedding options as advanced.

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e2332b922..91c1056ec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser ste
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
 option(STRICT_NLOHMANN_JSON_VERSION "Strictly check installed nlohmann json version" ON)
+mark_as_advanced(USE_SYSTEM_LIBRARIES)
+mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
+mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)
 
 # Setup cccache.
 include(EthCcache)

From 3485bc94cf1c8bd4152fee33b3161c0b5649a69b Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 7 May 2024 14:58:41 +0200
Subject: [PATCH 0837/1140] Reformat tests in nlohmann::json style.

---
 libsolutil/JSON.cpp                           |  64 --
 test/cmdlineTests/abi_via_ir/output           |  36 +-
 test/cmdlineTests/asm_json/output             |  15 +-
 .../ast_compact_json_with_base_path/output    |  27 +-
 test/cmdlineTests/ast_ir/output               | 345 +++----
 test/cmdlineTests/combined_json_abi/output    |   6 +-
 .../combined_json_generated_sources/output    | 333 +++----
 .../combined_json_stop_after_parsing/output   |  21 +-
 .../combined_json_with_base_path/output       |  48 +-
 .../combined_json_with_devdoc/output          |  15 +-
 .../combined_json_with_userdoc/output         |  15 +-
 test/cmdlineTests/events_in_abi/output        |   9 +-
 test/cmdlineTests/function_debug_info/output  |  36 +-
 .../function_debug_info_via_yul/output        |   6 +-
 .../import_asm_json_all_valid_flags/output    |  42 +-
 .../output                                    | 105 +--
 .../linking_standard_solidity/output.json     |  21 +-
 .../output.json                               |  21 +-
 .../output.json                               |  30 +-
 .../linking_standard_yul/output.json          |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |  24 +-
 .../no_contract_combined_json/output          |  18 +-
 .../output_selection_all_A1/output.json       |  36 +-
 .../output_selection_all_A2/output.json       |  24 +-
 .../output_selection_all_blank/output.json    |   9 +-
 .../output_selection_all_star/output.json     |  54 +-
 .../output_selection_single_A1/output.json    |  24 +-
 .../output_selection_single_B1/output.json    |  24 +-
 .../output_selection_single_all/output.json   |  33 +-
 .../pretty_json_indent_only/output.json       |   6 +-
 .../pretty_json_standard/output.json          |   6 +-
 .../pretty_json_standard_indent/output.json   |   6 +-
 .../output.json                               |  30 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |   3 +-
 .../output.json                               |  24 +-
 .../standard_default_success/output.json      |   6 +-
 .../standard_empty_file_name/output.json      |   6 +-
 .../output.json                               |   9 +-
 .../output.json                               |   6 +-
 .../standard_function_debug_info/output.json  |  93 +-
 .../standard_generatedSources/output.json     | 852 ++++++------------
 .../standard_immutable_references/output.json |  27 +-
 .../standard_import_asm_json/output.json      |  27 +-
 .../output.json                               |  24 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |  27 +-
 .../output.json                               |   3 +-
 .../standard_import_ast/output.json           |  36 +-
 .../output.json                               |  21 +-
 .../standard_import_with_comments/output.json |  36 +-
 .../output.json                               |  36 +-
 .../output.json                               |   3 +-
 .../output.json                               | 198 ++--
 .../output.json                               |  15 +-
 .../standard_ir_ast_requested/output.json     | 246 ++---
 .../standard_ir_requested/output.json         |  15 +-
 .../standard_metadata/output.json             |  15 +-
 .../output.json                               |  21 +-
 .../output.json                               |  18 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   3 +-
 .../output.json                               |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |  15 +-
 .../output.json                               |  21 +-
 .../output.json                               |  15 +-
 .../output.json                               |   9 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |  15 +-
 .../output.json                               |   9 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |  12 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |   6 +-
 .../output.json                               |   3 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |  18 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |  15 +-
 .../output.json                               |   6 +-
 .../output.json                               |  15 +-
 .../output.json                               |   6 +-
 .../output.json                               |  33 +-
 .../output.json                               |  33 +-
 .../output.json                               |  21 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |  12 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |   6 +-
 .../output.json                               |  12 +-
 .../output.json                               |  15 +-
 .../output.json                               |  12 +-
 .../output.json                               |  27 +-
 .../output.json                               |  18 +-
 .../output.json                               |  21 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../standard_no_append_cbor/output.json       |  21 +-
 .../output.json                               |   3 +-
 .../standard_no_import_callback/output.json   |   6 +-
 .../standard_non_utf8_filename/output.json    |   3 +-
 .../standard_non_utf8_filename2/output.json   |   3 +-
 .../standard_only_ast_requested/output.json   |  36 +-
 .../output.json                               | 522 ++++-------
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../standard_optimizer_no_yul/output.json     |   6 +-
 .../standard_optimizer_yul/output.json        |   6 +-
 .../standard_optimizer_yulDetails/output.json |   6 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               |   6 +-
 .../output.json                               | 108 +--
 .../output.json                               |   6 +-
 .../output.json                               |  27 +-
 .../standard_raw_utf16_filename/output.json   |   3 +-
 .../output.json                               |   9 +-
 .../output.json                               |  15 +-
 .../output.json                               |   3 +-
 .../output.json                               |   6 +-
 .../output.json                               |   9 +-
 .../standard_urls_missing/output.json         |   3 +-
 .../standard_viair_requested/output.json      |  42 +-
 .../output.json                               |   3 +-
 .../standard_wrong_key_metadata/output.json   |   3 +-
 .../standard_wrong_key_optimizer/output.json  |   3 +-
 .../standard_wrong_key_root/output.json       |   3 +-
 .../standard_wrong_key_settings/output.json   |   3 +-
 .../standard_wrong_key_source/output.json     |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../standard_wrong_type_metadata/output.json  |   3 +-
 .../standard_wrong_type_optimizer/output.json |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../standard_wrong_type_root/output.json      |   3 +-
 .../standard_wrong_type_settings/output.json  |   3 +-
 .../standard_wrong_type_source/output.json    |   3 +-
 .../standard_wrong_type_sources/output.json   |   3 +-
 .../output.json                               |   3 +-
 test/cmdlineTests/standard_yul/output.json    |  60 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |  24 +-
 .../standard_yul_multiple_files/output.json   |   3 +-
 .../output.json                               |   3 +-
 .../standard_yul_object/output.json           |  63 +-
 .../output.json                               |   6 +-
 .../standard_yul_object_name/output.json      |  84 +-
 .../standard_yul_optimiserSteps/output.json   |  60 +-
 .../standard_yul_optimized/output.json        |  60 +-
 .../output.json                               |   3 +-
 .../standard_yul_stack_opt/output.json        |  12 +-
 .../output.json                               |  12 +-
 .../stop_after_parsing_ast/output             |   6 +-
 .../storage_layout_bytes/output.json          |  27 +-
 .../storage_layout_dyn_array/output.json      |  36 +-
 .../storage_layout_many/output.json           |  60 +-
 .../storage_layout_mapping/output.json        |  39 +-
 .../storage_layout_smoke/output.json          |  18 +-
 .../output.json                               |  21 +-
 .../storage_layout_string/output.json         |  27 +-
 .../storage_layout_struct/output.json         |  42 +-
 .../storage_layout_struct_packed/output.json  |  45 +-
 .../storage_layout_user_defined/output        |  12 +-
 .../storage_layout_value_types/output.json    |  33 +-
 .../output.json                               |  39 +-
 .../strict_asm_ast_compact_json/output        |  21 +-
 .../yul_string_format_ascii/output.json       |  15 +-
 .../output.json                               |  15 +-
 .../output.json                               |  15 +-
 .../yul_string_format_ascii_long/output.json  |  15 +-
 .../yul_string_format_hex/output.json         |  15 +-
 test/libsolidity/ABIJson/basic_test.sol       |   6 +-
 test/libsolidity/ABIJson/constructor_abi.sol  |   3 +-
 ...ty_name_input_parameter_with_named_one.sol |   6 +-
 .../ABIJson/empty_name_return_parameters.sol  |   6 +-
 test/libsolidity/ABIJson/errors.sol           |  15 +-
 .../libsolidity/ABIJson/errors_referenced.sol |   9 +-
 .../ABIJson/event_emited_in_base_contract.sol |   9 +-
 .../event_emitted_from_foreign_contract.sol   |  18 +-
 test/libsolidity/ABIJson/event_file_level.sol |   9 +-
 test/libsolidity/ABIJson/event_structs.sol    |  12 +-
 test/libsolidity/ABIJson/events.sol           |  12 +-
 test/libsolidity/ABIJson/events_indirect.sol  |   9 +-
 test/libsolidity/ABIJson/function_type.sol    |   3 +-
 .../ABIJson/function_type_extended.sol        |   3 +-
 test/libsolidity/ABIJson/global_struct.sol    |  12 +-
 test/libsolidity/ABIJson/inherited.sol        |  27 +-
 test/libsolidity/ABIJson/library_function.sol |   6 +-
 test/libsolidity/ABIJson/mapping.sol          |  18 +-
 test/libsolidity/ABIJson/multiple_methods.sol |  12 +-
 .../ABIJson/multiple_methods_order.sol        |  12 +-
 test/libsolidity/ABIJson/multiple_params.sol  |   6 +-
 .../ABIJson/payable_constructor_abi.sol       |   3 +-
 test/libsolidity/ABIJson/pure_function.sol    |  12 +-
 .../ABIJson/return_param_in_abi.sol           |   6 +-
 test/libsolidity/ABIJson/return_structs.sol   |   9 +-
 .../ABIJson/return_structs_with_contracts.sol |   6 +-
 .../ABIJson/structs_and_arrays.sol            |   3 +-
 .../ABIJson/structs_in_libraries.sol          |   9 +-
 .../ABIJson/user_defined_value_type.sol       |  30 +-
 test/libsolidity/ABIJson/view_function.sol    |  12 +-
 .../ASTJSON/abstract_contract.json            |  24 +-
 .../libsolidity/ASTJSON/abstract_contract.sol |   1 +
 .../ASTJSON/abstract_contract_parseOnly.json  |  15 +-
 test/libsolidity/ASTJSON/address_payable.json | 210 ++---
 test/libsolidity/ASTJSON/address_payable.sol  |   1 +
 .../ASTJSON/address_payable_parseOnly.json    | 111 +--
 test/libsolidity/ASTJSON/array_type_name.json |  30 +-
 .../ASTJSON/array_type_name_parseOnly.json    |  12 +-
 test/libsolidity/ASTJSON/assembly/call.json   |  48 +-
 test/libsolidity/ASTJSON/assembly/call.sol    |   1 +
 .../ASTJSON/assembly/call_parseOnly.json      |  39 +-
 .../ASTJSON/assembly/empty_block.json         |  33 +-
 .../ASTJSON/assembly/empty_block.sol          |   1 +
 .../assembly/empty_block_parseOnly.json       |  24 +-
 .../empty_let_variable_declaration.json       |  36 +-
 .../empty_let_variable_declaration.sol        |   1 +
 ...ty_let_variable_declaration_parseOnly.json |  27 +-
 .../ASTJSON/assembly/function.json            |  60 +-
 .../libsolidity/ASTJSON/assembly/function.sol |   1 +
 .../ASTJSON/assembly/function_parseOnly.json  |  51 +-
 test/libsolidity/ASTJSON/assembly/leave.json  |  39 +-
 test/libsolidity/ASTJSON/assembly/leave.sol   |   1 +
 .../ASTJSON/assembly/leave_parseOnly.json     |  30 +-
 test/libsolidity/ASTJSON/assembly/loop.json   |  66 +-
 test/libsolidity/ASTJSON/assembly/loop.sol    |   1 +
 .../ASTJSON/assembly/loop_parseOnly.json      |  57 +-
 .../ASTJSON/assembly/nested_functions.json    |  63 +-
 .../ASTJSON/assembly/nested_functions.sol     |   1 +
 .../assembly/nested_functions_parseOnly.json  |  45 +-
 .../ASTJSON/assembly/slot_offset.json         |  81 +-
 .../ASTJSON/assembly/slot_offset.sol          |   1 +
 .../assembly/slot_offset_parseOnly.json       |  57 +-
 .../ASTJSON/assembly/stringlit.json           |  39 +-
 .../ASTJSON/assembly/stringlit.sol            |   1 +
 .../ASTJSON/assembly/stringlit_parseOnly.json |  30 +-
 test/libsolidity/ASTJSON/assembly/switch.json |  75 +-
 test/libsolidity/ASTJSON/assembly/switch.sol  |   1 +
 .../ASTJSON/assembly/switch_default.json      |  48 +-
 .../ASTJSON/assembly/switch_default.sol       |   1 +
 .../assembly/switch_default_parseOnly.json    |  39 +-
 .../ASTJSON/assembly/switch_parseOnly.json    |  66 +-
 .../ASTJSON/assembly/var_access.json          |  57 +-
 .../ASTJSON/assembly/var_access.sol           |   1 +
 .../assembly/var_access_parseOnly.json        |  39 +-
 ...nternal_function_different_ids_export.json | 333 +++----
 ...internal_function_different_ids_export.sol |   3 -
 .../ast_internal_function_id_export.json      | 477 ++++------
 .../ASTJSON/base_constructor_call.json        |  78 +-
 .../base_constructor_call_parseOnly.json      |  54 +-
 test/libsolidity/ASTJSON/constructor.json     |  24 +-
 test/libsolidity/ASTJSON/constructor.sol      |   1 +
 .../ASTJSON/constructor_parseOnly.json        |  15 +-
 .../ASTJSON/contract_dep_order.json           |  72 +-
 .../ASTJSON/contract_dep_order_parseOnly.json |  39 +-
 test/libsolidity/ASTJSON/documentation.json   |  90 +-
 test/libsolidity/ASTJSON/documentation.sol    |   4 +-
 .../ASTJSON/documentation_local_variable.json | 174 ++--
 ...ocumentation_local_variable_parseOnly.json | 102 +--
 .../ASTJSON/documentation_on_statements.json  | 138 +--
 ...documentation_on_statements_parseOnly.json |  78 +-
 .../ASTJSON/documentation_parseOnly.json      |  51 +-
 .../ASTJSON/documentation_triple.json         | 141 +--
 .../documentation_triple_parseOnly.json       |  78 +-
 test/libsolidity/ASTJSON/enum_natspec.json    |  15 +-
 .../ASTJSON/enum_natspec_parseOnly.json       |   9 +-
 test/libsolidity/ASTJSON/enum_value.json      |  18 +-
 .../ASTJSON/enum_value_declaration.json       |  57 +-
 .../enum_value_declaration_parseOnly.json     |  36 +-
 .../ASTJSON/enum_value_parseOnly.json         |   9 +-
 .../ASTJSON/event_aggregated_contract.json    | 138 +--
 .../libsolidity/ASTJSON/event_definition.json |  21 +-
 .../ASTJSON/event_definition_parseOnly.json   |   9 +-
 .../event_emited_in_base_contract.json        | 102 +--
 .../event_emitted_from_foreign_contract.json  | 102 +--
 ...itted_from_foreign_contract_parseOnly.json |  51 +-
 .../ASTJSON/event_inheritance.json            |  69 +-
 ...event_with_variables_of_internal_types.sol |   1 +
 ...variables_of_internal_types_parseOnly.json |  21 +-
 .../ASTJSON/fail_after_parsing.sol            |   5 +-
 .../ASTJSON/fail_after_parsing_parseOnly.json |  87 +-
 test/libsolidity/ASTJSON/fallback.json        |  24 +-
 test/libsolidity/ASTJSON/fallback.sol         |   1 +
 .../ASTJSON/fallback_and_receive_ether.json   |  33 +-
 .../ASTJSON/fallback_and_receive_ether.sol    |   1 +
 .../fallback_and_receive_ether_parseOnly.json |  24 +-
 .../ASTJSON/fallback_parseOnly.json           |  15 +-
 .../libsolidity/ASTJSON/fallback_payable.json |  24 +-
 test/libsolidity/ASTJSON/fallback_payable.sol |   1 +
 .../ASTJSON/fallback_payable_parseOnly.json   |  15 +-
 test/libsolidity/ASTJSON/function_type.json   |  84 +-
 .../ASTJSON/function_type_parseOnly.json      |  51 +-
 test/libsolidity/ASTJSON/global_enum.json     |  12 +-
 .../ASTJSON/global_enum_parseOnly.json        |   6 +-
 test/libsolidity/ASTJSON/global_struct.json   |  21 +-
 .../ASTJSON/global_struct_parseOnly.json      |   9 +-
 test/libsolidity/ASTJSON/indirect_event.json  | 102 +--
 .../ASTJSON/indirect_event_parseOnly.json     |  60 +-
 .../ASTJSON/inheritance_specifier.json        |  27 +-
 .../inheritance_specifier_parseOnly.json      |  12 +-
 test/libsolidity/ASTJSON/license.json         |  12 +-
 .../ASTJSON/license_parseOnly.json            |   3 +-
 .../long_type_name_binary_operation.json      |  63 +-
 ..._type_name_binary_operation_parseOnly.json |  36 +-
 .../ASTJSON/long_type_name_identifier.json    |  69 +-
 .../long_type_name_identifier_parseOnly.json  |  39 +-
 test/libsolidity/ASTJSON/mappings.json        | 114 +--
 test/libsolidity/ASTJSON/mappings.sol         |   1 +
 .../ASTJSON/mappings_parseOnly.json           |  57 +-
 .../ASTJSON/modifier_definition.json          |  60 +-
 .../modifier_definition_parseOnly.json        |  42 +-
 .../ASTJSON/modifier_invocation.json          |  60 +-
 .../modifier_invocation_parseOnly.json        |  42 +-
 test/libsolidity/ASTJSON/mutability.json      |  60 +-
 test/libsolidity/ASTJSON/mutability.sol       |   1 +
 .../ASTJSON/mutability_parseOnly.json         |  24 +-
 test/libsolidity/ASTJSON/non_utf8.json        |  84 +-
 .../ASTJSON/non_utf8_parseOnly.json           |  48 +-
 .../ASTJSON/not_existing_import.sol           |   2 +-
 .../not_existing_import_parseOnly.json        |  33 +-
 test/libsolidity/ASTJSON/override.json        | 111 +--
 test/libsolidity/ASTJSON/override.sol         |   1 +
 .../ASTJSON/override_parseOnly.json           |  81 +-
 .../ASTJSON/placeholder_statement.json        |  24 +-
 .../placeholder_statement_parseOnly.json      |  15 +-
 ...ragma_experimental_solidity_parseOnly.json |   6 +-
 test/libsolidity/ASTJSON/receive_ether.json   |  24 +-
 test/libsolidity/ASTJSON/receive_ether.sol    |   1 +
 .../ASTJSON/receive_ether_parseOnly.json      |  15 +-
 test/libsolidity/ASTJSON/short_type_name.json |  48 +-
 .../ASTJSON/short_type_name_parseOnly.json    |  30 +-
 .../ASTJSON/short_type_name_ref.json          |  54 +-
 .../short_type_name_ref_parseOnly.json        |  33 +-
 test/libsolidity/ASTJSON/smoke.json           |  12 +-
 test/libsolidity/ASTJSON/smoke_parseOnly.json |   3 +-
 test/libsolidity/ASTJSON/source_location.json |  60 +-
 .../ASTJSON/source_location_parseOnly.json    |  36 +-
 test/libsolidity/ASTJSON/string.json          |  48 +-
 .../libsolidity/ASTJSON/string_parseOnly.json |  30 +-
 test/libsolidity/ASTJSON/struct_natspec.json  |  42 +-
 .../ASTJSON/struct_natspec_parseOnly.json     |  18 +-
 .../ASTJSON/two_base_functions.json           |  90 +-
 .../ASTJSON/two_base_functions.sol            |   1 +
 .../ASTJSON/two_base_functions_parseOnly.json |  66 +-
 test/libsolidity/ASTJSON/unicode.json         |  48 +-
 .../ASTJSON/unicode_parseOnly.json            |  30 +-
 test/libsolidity/ASTJSON/used_errors.json     |  78 +-
 test/libsolidity/ASTJSON/used_errors.sol      |   1 +
 .../ASTJSON/used_errors_parseOnly.json        |  48 +-
 .../ASTJSON/userDefinedValueType.json         | 135 +--
 .../ASTJSON/userDefinedValueType.sol          |   1 +
 .../userDefinedValueType_parseOnly.json       |  81 +-
 .../ASTJSON/user_defined_operator.json        | 252 ++----
 .../ASTJSON/user_defined_operator.sol         |   1 +
 .../ASTJSON/using_for_directive.json          |  66 +-
 .../using_for_directive_parseOnly.json        |  39 +-
 test/libsolidity/ASTJSON/yul_hex_literal.json |  51 +-
 test/libsolidity/ASTJSON/yul_hex_literal.sol  |   1 +
 .../ASTJSON/yul_hex_literal_parseOnly.json    |  42 +-
 test/libsolutil/JSON.cpp                      |   3 +-
 470 files changed, 4707 insertions(+), 9427 deletions(-)

diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index 63746c8653..055024edb3 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -25,9 +25,7 @@
 #include <libsolutil/CommonData.h>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/trim.hpp>
 
-#include <map>
 #include <sstream>
 
 #ifdef STRICT_NLOHMANN_JSON_VERSION_CHECK
@@ -65,64 +63,6 @@ void removeNullMembersHelper(Json& _json)
 	}
 }
 
-std::string trimRightAllLines(std::string const& input)
-{
-	std::vector<std::string> lines;
-	std::string output;
-	boost::split(lines, input, boost::is_any_of("\n"));
-	for (auto& line: lines)
-	{
-		boost::trim_right(line);
-		if (!line.empty())
-			output += line + "\n";
-	}
-	return boost::trim_right_copy(output);
-}
-
-std::string formatLikeJsoncpp(std::string const& _dumped, JsonFormat const& _format)
-{
-	uint32_t indentLevel = 0;
-	std::stringstream reformatted;
-	bool inQuotes = false;
-	for (size_t i = 0; i < _dumped.size(); ++i)
-	{
-		char c = _dumped[i];
-		bool emptyThing = false;
-
-		if (c == '"' && (i == 0 || _dumped[i - 1] != '\\'))
-			inQuotes = !inQuotes;
-
-		if (!inQuotes)
-		{
-			if (i < _dumped.size() - 1)
-			{
-				char nc = _dumped[i + 1];
-				if ((c == '[' && nc == ']') || (c == '{' && nc == '}'))
-					emptyThing = true;
-			}
-			if (c == '[' || c == '{')
-			{
-				if (i > 0 && _dumped[i - 1] != '\n')
-					if (!emptyThing)
-						reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
-				indentLevel++;
-			}
-			else if (c == ']' || c == '}')
-			{
-				indentLevel--;
-				if (i + 1 < _dumped.size() && _dumped[i + 1] != '\n'
-					&& (_dumped[i + 1] == ']' || _dumped[i + 1] == '}'))
-					reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
-			}
-		}
-		reformatted << c;
-		if (!emptyThing && !inQuotes && (c == '[' || c == '{') && indentLevel > 0 && i + 1 < _dumped.size()
-			&& _dumped[i + 1] != '\n')
-			reformatted << '\n' << std::string(indentLevel * _format.indent, ' ');
-	}
-	return trimRightAllLines(reformatted.str());
-}
-
 std::string escapeNewlinesAndTabsWithinStringLiterals(std::string const& _json)
 {
 	std::stringstream fixed;
@@ -201,10 +141,6 @@ std::string jsonPrint(Json const& _input, JsonFormat const& _format)
 		/* ensure_ascii */ true
 	);
 
-	// let's remove this once all test-cases having the correct output.
-	if (_format.format == JsonFormat::Pretty)
-		dumped = formatLikeJsoncpp(dumped, _format);
-
 	return dumped;
 }
 
diff --git a/test/cmdlineTests/abi_via_ir/output b/test/cmdlineTests/abi_via_ir/output
index daf18f3497..56ba01a4a2 100644
--- a/test/cmdlineTests/abi_via_ir/output
+++ b/test/cmdlineTests/abi_via_ir/output
@@ -3,8 +3,7 @@
 Contract JSON ABI
 [
     {
-        "inputs":
-        [
+        "inputs": [
             {
                 "internalType": "uint256",
                 "name": "z",
@@ -20,8 +19,7 @@ Contract JSON ABI
         "type": "error"
     },
     {
-        "inputs":
-        [
+        "inputs": [
             {
                 "internalType": "uint256",
                 "name": "z",
@@ -32,8 +30,7 @@ Contract JSON ABI
         "type": "error"
     },
     {
-        "inputs":
-        [
+        "inputs": [
             {
                 "internalType": "uint256",
                 "name": "r",
@@ -45,8 +42,7 @@ Contract JSON ABI
     },
     {
         "anonymous": true,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
@@ -59,8 +55,7 @@ Contract JSON ABI
     },
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
@@ -73,8 +68,7 @@ Contract JSON ABI
     },
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
@@ -86,11 +80,9 @@ Contract JSON ABI
         "type": "event"
     },
     {
-        "inputs":
-        [
+        "inputs": [
             {
-                "components":
-                [
+                "components": [
                     {
                         "internalType": "uint256",
                         "name": "x",
@@ -113,8 +105,7 @@ Contract JSON ABI
 Contract JSON ABI
 [
     {
-        "inputs":
-        [
+        "inputs": [
             {
                 "internalType": "uint256",
                 "name": "r",
@@ -125,8 +116,7 @@ Contract JSON ABI
         "type": "error"
     },
     {
-        "inputs":
-        [
+        "inputs": [
             {
                 "internalType": "uint256",
                 "name": "u",
@@ -138,8 +128,7 @@ Contract JSON ABI
     },
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
@@ -152,8 +141,7 @@ Contract JSON ABI
     },
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
diff --git a/test/cmdlineTests/asm_json/output b/test/cmdlineTests/asm_json/output
index f6a0a4b190..38d9c9fdf5 100644
--- a/test/cmdlineTests/asm_json/output
+++ b/test/cmdlineTests/asm_json/output
@@ -2,8 +2,7 @@
 ======= asm_json/input.sol:C =======
 EVM assembly:
 {
-  ".code":
-  [
+  ".code": [
     {
       "begin": 60,
       "end": 160,
@@ -140,13 +139,10 @@ EVM assembly:
       "source": 0
     }
   ],
-  ".data":
-  {
-    "0":
-    {
+  ".data": {
+    "0": {
       ".auxdata": "<BYTECODE REMOVED>",
-      ".code":
-      [
+      ".code": [
         {
           "begin": 60,
           "end": 160,
@@ -1570,8 +1566,7 @@ EVM assembly:
       ]
     }
   },
-  "sourceList":
-  [
+  "sourceList": [
     "asm_json/input.sol",
     "#utility.yul"
   ]
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/output b/test/cmdlineTests/ast_compact_json_with_base_path/output
index 5c5c6ffd51..c615020207 100644
--- a/test/cmdlineTests/ast_compact_json_with_base_path/output
+++ b/test/cmdlineTests/ast_compact_json_with_base_path/output
@@ -4,22 +4,18 @@ JSON AST (compact format):
 ======= ast_compact_json_with_base_path/c.sol =======
 {
   "absolutePath": "ast_compact_json_with_base_path/c.sol",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 4,
-      "literals":
-      [
+      "literals": [
         "solidity",
         ">=",
         "0.0"
@@ -35,8 +31,7 @@ JSON AST (compact format):
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
@@ -54,22 +49,18 @@ JSON AST (compact format):
 ======= ast_compact_json_with_base_path/input.sol =======
 {
   "absolutePath": "ast_compact_json_with_base_path/input.sol",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 3,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 1,
-      "literals":
-      [
+      "literals": [
         "solidity",
         ">=",
         "0.0"
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
index cca31349e8..c68c778729 100644
--- a/test/cmdlineTests/ast_ir/output
+++ b/test/cmdlineTests/ast_ir/output
@@ -1,19 +1,14 @@
 IR AST:
 {
-    "code":
-    {
-        "block":
-        {
+    "code": {
+        "block": {
             "nativeSrc": "59:790:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
-            "statements":
-            [
+            "statements": [
                 {
-                    "expression":
-                    {
-                        "arguments":
-                        [
+                    "expression": {
+                        "arguments": [
                             {
                                 "kind": "number",
                                 "nativeSrc": "118:2:0",
@@ -23,8 +18,7 @@ IR AST:
                                 "value": "64"
                             },
                             {
-                                "arguments":
-                                [
+                                "arguments": [
                                     {
                                         "kind": "number",
                                         "nativeSrc": "134:3:0",
@@ -34,8 +28,7 @@ IR AST:
                                         "value": "128"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "memoryguard",
                                     "nativeSrc": "122:11:0",
                                     "nodeType": "YulIdentifier",
@@ -46,8 +39,7 @@ IR AST:
                                 "src": "60:13:0"
                             }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "mstore",
                             "nativeSrc": "111:6:0",
                             "nodeType": "YulIdentifier",
@@ -62,19 +54,15 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "body":
-                    {
+                    "body": {
                         "nativeSrc": "163:83:0",
                         "nodeType": "YulBlock",
                         "src": "60:13:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
-                                "expression":
-                                {
+                                "expression": {
                                     "arguments": [],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
                                         "nativeSrc": "165:77:0",
                                         "nodeType": "YulIdentifier",
@@ -90,11 +78,9 @@ IR AST:
                             }
                         ]
                     },
-                    "condition":
-                    {
+                    "condition": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "callvalue",
                             "nativeSrc": "151:9:0",
                             "nodeType": "YulIdentifier",
@@ -109,11 +95,9 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "expression":
-                    {
+                    "expression": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "constructor_C_2",
                             "nativeSrc": "256:15:0",
                             "nodeType": "YulIdentifier",
@@ -131,11 +115,9 @@ IR AST:
                     "nativeSrc": "283:30:0",
                     "nodeType": "YulVariableDeclaration",
                     "src": "60:13:0",
-                    "value":
-                    {
+                    "value": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "allocate_unbounded",
                             "nativeSrc": "293:18:0",
                             "nodeType": "YulIdentifier",
@@ -145,8 +127,7 @@ IR AST:
                         "nodeType": "YulFunctionCall",
                         "src": "60:13:0"
                     },
-                    "variables":
-                    [
+                    "variables": [
                         {
                             "name": "_1",
                             "nativeSrc": "287:2:0",
@@ -157,10 +138,8 @@ IR AST:
                     ]
                 },
                 {
-                    "expression":
-                    {
-                        "arguments":
-                        [
+                    "expression": {
+                        "arguments": [
                             {
                                 "name": "_1",
                                 "nativeSrc": "331:2:0",
@@ -168,8 +147,7 @@ IR AST:
                                 "src": "60:13:0"
                             },
                             {
-                                "arguments":
-                                [
+                                "arguments": [
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
@@ -180,8 +158,7 @@ IR AST:
                                         "value": "C_2_deployed"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "dataoffset",
                                     "nativeSrc": "335:10:0",
                                     "nodeType": "YulIdentifier",
@@ -192,8 +169,7 @@ IR AST:
                                 "src": "60:13:0"
                             },
                             {
-                                "arguments":
-                                [
+                                "arguments": [
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
@@ -204,8 +180,7 @@ IR AST:
                                         "value": "C_2_deployed"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "datasize",
                                     "nativeSrc": "363:8:0",
                                     "nodeType": "YulIdentifier",
@@ -216,8 +191,7 @@ IR AST:
                                 "src": "60:13:0"
                             }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "codecopy",
                             "nativeSrc": "322:8:0",
                             "nodeType": "YulIdentifier",
@@ -232,10 +206,8 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "expression":
-                    {
-                        "arguments":
-                        [
+                    "expression": {
+                        "arguments": [
                             {
                                 "name": "_1",
                                 "nativeSrc": "405:2:0",
@@ -243,8 +215,7 @@ IR AST:
                                 "src": "60:13:0"
                             },
                             {
-                                "arguments":
-                                [
+                                "arguments": [
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
@@ -255,8 +226,7 @@ IR AST:
                                         "value": "C_2_deployed"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "datasize",
                                     "nativeSrc": "409:8:0",
                                     "nodeType": "YulIdentifier",
@@ -267,8 +237,7 @@ IR AST:
                                 "src": "60:13:0"
                             }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                             "name": "return",
                             "nativeSrc": "398:6:0",
                             "nodeType": "YulIdentifier",
@@ -283,21 +252,17 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "body":
-                    {
+                    "body": {
                         "nativeSrc": "484:43:0",
                         "nodeType": "YulBlock",
                         "src": "60:13:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "498:19:0",
                                 "nodeType": "YulAssignment",
                                 "src": "60:13:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "kind": "number",
                                             "nativeSrc": "514:2:0",
@@ -307,8 +272,7 @@ IR AST:
                                             "value": "64"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "mload",
                                         "nativeSrc": "508:5:0",
                                         "nodeType": "YulIdentifier",
@@ -318,8 +282,7 @@ IR AST:
                                     "nodeType": "YulFunctionCall",
                                     "src": "60:13:0"
                                 },
-                                "variableNames":
-                                [
+                                "variableNames": [
                                     {
                                         "name": "memPtr",
                                         "nativeSrc": "498:6:0",
@@ -333,8 +296,7 @@ IR AST:
                     "name": "allocate_unbounded",
                     "nativeSrc": "444:83:0",
                     "nodeType": "YulFunctionDefinition",
-                    "returnVariables":
-                    [
+                    "returnVariables": [
                         {
                             "name": "memPtr",
                             "nativeSrc": "477:6:0",
@@ -346,18 +308,14 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "body":
-                    {
+                    "body": {
                         "nativeSrc": "626:36:0",
                         "nodeType": "YulBlock",
                         "src": "60:13:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
                                             "kind": "number",
                                             "nativeSrc": "647:1:0",
@@ -375,8 +333,7 @@ IR AST:
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "revert",
                                         "nativeSrc": "640:6:0",
                                         "nodeType": "YulIdentifier",
@@ -398,8 +355,7 @@ IR AST:
                     "src": "60:13:0"
                 },
                 {
-                    "body":
-                    {
+                    "body": {
                         "nativeSrc": "741:59:0",
                         "nodeType": "YulBlock",
                         "src": "60:13:0",
@@ -416,23 +372,17 @@ IR AST:
     },
     "name": "C_2",
     "nodeType": "YulObject",
-    "subObjects":
-    [
+    "subObjects": [
         {
-            "code":
-            {
-                "block":
-                {
+            "code": {
+                "block": {
                     "nativeSrc": "929:588:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
-                    "statements":
-                    [
+                    "statements": [
                         {
-                            "expression":
-                            {
-                                "arguments":
-                                [
+                            "expression": {
+                                "arguments": [
                                     {
                                         "kind": "number",
                                         "nativeSrc": "996:2:0",
@@ -442,8 +392,7 @@ IR AST:
                                         "value": "64"
                                     },
                                     {
-                                        "arguments":
-                                        [
+                                        "arguments": [
                                             {
                                                 "kind": "number",
                                                 "nativeSrc": "1012:3:0",
@@ -453,8 +402,7 @@ IR AST:
                                                 "value": "128"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "memoryguard",
                                             "nativeSrc": "1000:11:0",
                                             "nodeType": "YulIdentifier",
@@ -465,8 +413,7 @@ IR AST:
                                         "src": "60:13:0"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "mstore",
                                     "nativeSrc": "989:6:0",
                                     "nodeType": "YulIdentifier",
@@ -481,11 +428,9 @@ IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "expression":
-                            {
+                            "expression": {
                                 "arguments": [],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
                                     "nativeSrc": "1031:77:0",
                                     "nodeType": "YulIdentifier",
@@ -500,21 +445,17 @@ IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "body":
-                            {
+                            "body": {
                                 "nativeSrc": "1177:77:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
-                                "statements":
-                                [
+                                "statements": [
                                     {
                                         "nativeSrc": "1195:44:0",
                                         "nodeType": "YulAssignment",
                                         "src": "60:13:0",
-                                        "value":
-                                        {
-                                            "arguments":
-                                            [
+                                        "value": {
+                                            "arguments": [
                                                 {
                                                     "kind": "number",
                                                     "nativeSrc": "1228:3:0",
@@ -530,8 +471,7 @@ IR AST:
                                                     "src": "60:13:0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "shr",
                                                 "nativeSrc": "1224:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -541,8 +481,7 @@ IR AST:
                                             "nodeType": "YulFunctionCall",
                                             "src": "60:13:0"
                                         },
-                                        "variableNames":
-                                        [
+                                        "variableNames": [
                                             {
                                                 "name": "newValue",
                                                 "nativeSrc": "1195:8:0",
@@ -556,8 +495,7 @@ IR AST:
                             "name": "shift_right_224_unsigned",
                             "nativeSrc": "1124:130:0",
                             "nodeType": "YulFunctionDefinition",
-                            "parameters":
-                            [
+                            "parameters": [
                                 {
                                     "name": "value",
                                     "nativeSrc": "1158:5:0",
@@ -566,8 +504,7 @@ IR AST:
                                     "type": ""
                                 }
                             ],
-                            "returnVariables":
-                            [
+                            "returnVariables": [
                                 {
                                     "name": "newValue",
                                     "nativeSrc": "1168:8:0",
@@ -579,21 +516,17 @@ IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "body":
-                            {
+                            "body": {
                                 "nativeSrc": "1308:51:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
-                                "statements":
-                                [
+                                "statements": [
                                     {
                                         "nativeSrc": "1326:19:0",
                                         "nodeType": "YulAssignment",
                                         "src": "60:13:0",
-                                        "value":
-                                        {
-                                            "arguments":
-                                            [
+                                        "value": {
+                                            "arguments": [
                                                 {
                                                     "kind": "number",
                                                     "nativeSrc": "1342:2:0",
@@ -603,8 +536,7 @@ IR AST:
                                                     "value": "64"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "mload",
                                                 "nativeSrc": "1336:5:0",
                                                 "nodeType": "YulIdentifier",
@@ -614,8 +546,7 @@ IR AST:
                                             "nodeType": "YulFunctionCall",
                                             "src": "60:13:0"
                                         },
-                                        "variableNames":
-                                        [
+                                        "variableNames": [
                                             {
                                                 "name": "memPtr",
                                                 "nativeSrc": "1326:6:0",
@@ -629,8 +560,7 @@ IR AST:
                             "name": "allocate_unbounded",
                             "nativeSrc": "1268:91:0",
                             "nodeType": "YulFunctionDefinition",
-                            "returnVariables":
-                            [
+                            "returnVariables": [
                                 {
                                     "name": "memPtr",
                                     "nativeSrc": "1301:6:0",
@@ -642,18 +572,14 @@ IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "body":
-                            {
+                            "body": {
                                 "nativeSrc": "1462:44:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
-                                "statements":
-                                [
+                                "statements": [
                                     {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
+                                        "expression": {
+                                            "arguments": [
                                                 {
                                                     "kind": "number",
                                                     "nativeSrc": "1487:1:0",
@@ -671,8 +597,7 @@ IR AST:
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "revert",
                                                 "nativeSrc": "1480:6:0",
                                                 "nodeType": "YulIdentifier",
@@ -699,8 +624,7 @@ IR AST:
             },
             "name": "C_2_deployed",
             "nodeType": "YulObject",
-            "subObjects":
-            [
+            "subObjects": [
                 {
                     "nodeType": "YulData",
                     "value": "<BYTECODE REMOVED>"
@@ -711,29 +635,23 @@ IR AST:
 }
 Optimized IR AST:
 {
-    "code":
-    {
-        "block":
-        {
+    "code": {
+        "block": {
             "nativeSrc": "59:790:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
-            "statements":
-            [
+            "statements": [
                 {
                     "nativeSrc": "59:790:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
-                    "statements":
-                    [
+                    "statements": [
                         {
                             "nativeSrc": "122:16:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
-                            "value":
-                            {
-                                "arguments":
-                                [
+                            "value": {
+                                "arguments": [
                                     {
                                         "kind": "number",
                                         "nativeSrc": "134:3:0",
@@ -743,8 +661,7 @@ Optimized IR AST:
                                         "value": "0x80"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "memoryguard",
                                     "nativeSrc": "122:11:0",
                                     "nodeType": "YulIdentifier",
@@ -754,8 +671,7 @@ Optimized IR AST:
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "variables":
-                            [
+                            "variables": [
                                 {
                                     "name": "_1",
                                     "nativeSrc": "122:16:0",
@@ -766,10 +682,8 @@ Optimized IR AST:
                             ]
                         },
                         {
-                            "expression":
-                            {
-                                "arguments":
-                                [
+                            "expression": {
+                                "arguments": [
                                     {
                                         "kind": "number",
                                         "nativeSrc": "118:2:0",
@@ -785,8 +699,7 @@ Optimized IR AST:
                                         "src": "60:13:0"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "mstore",
                                     "nativeSrc": "111:6:0",
                                     "nodeType": "YulIdentifier",
@@ -801,18 +714,14 @@ Optimized IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "body":
-                            {
+                            "body": {
                                 "nativeSrc": "163:83:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
-                                "statements":
-                                [
+                                "statements": [
                                     {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
+                                        "expression": {
+                                            "arguments": [
                                                 {
                                                     "kind": "number",
                                                     "nativeSrc": "650:1:0",
@@ -830,8 +739,7 @@ Optimized IR AST:
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "revert",
                                                 "nativeSrc": "640:6:0",
                                                 "nodeType": "YulIdentifier",
@@ -847,11 +755,9 @@ Optimized IR AST:
                                     }
                                 ]
                             },
-                            "condition":
-                            {
+                            "condition": {
                                 "arguments": [],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "callvalue",
                                     "nativeSrc": "151:9:0",
                                     "nodeType": "YulIdentifier",
@@ -869,10 +775,8 @@ Optimized IR AST:
                             "nativeSrc": "363:24:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
-                            "value":
-                            {
-                                "arguments":
-                                [
+                            "value": {
+                                "arguments": [
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
@@ -883,8 +787,7 @@ Optimized IR AST:
                                         "value": "C_2_deployed"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "datasize",
                                     "nativeSrc": "363:8:0",
                                     "nodeType": "YulIdentifier",
@@ -894,8 +797,7 @@ Optimized IR AST:
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "variables":
-                            [
+                            "variables": [
                                 {
                                     "name": "_2",
                                     "nativeSrc": "363:24:0",
@@ -906,10 +808,8 @@ Optimized IR AST:
                             ]
                         },
                         {
-                            "expression":
-                            {
-                                "arguments":
-                                [
+                            "expression": {
+                                "arguments": [
                                     {
                                         "name": "_1",
                                         "nativeSrc": "331:2:0",
@@ -917,8 +817,7 @@ Optimized IR AST:
                                         "src": "60:13:0"
                                     },
                                     {
-                                        "arguments":
-                                        [
+                                        "arguments": [
                                             {
                                                 "hexValue": "435f325f6465706c6f796564",
                                                 "kind": "string",
@@ -929,8 +828,7 @@ Optimized IR AST:
                                                 "value": "C_2_deployed"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "dataoffset",
                                             "nativeSrc": "335:10:0",
                                             "nodeType": "YulIdentifier",
@@ -947,8 +845,7 @@ Optimized IR AST:
                                         "src": "60:13:0"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "codecopy",
                                     "nativeSrc": "322:8:0",
                                     "nodeType": "YulIdentifier",
@@ -963,10 +860,8 @@ Optimized IR AST:
                             "src": "60:13:0"
                         },
                         {
-                            "expression":
-                            {
-                                "arguments":
-                                [
+                            "expression": {
+                                "arguments": [
                                     {
                                         "name": "_1",
                                         "nativeSrc": "405:2:0",
@@ -980,8 +875,7 @@ Optimized IR AST:
                                         "src": "60:13:0"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "return",
                                     "nativeSrc": "398:6:0",
                                     "nodeType": "YulIdentifier",
@@ -1003,29 +897,22 @@ Optimized IR AST:
     },
     "name": "C_2",
     "nodeType": "YulObject",
-    "subObjects":
-    [
+    "subObjects": [
         {
-            "code":
-            {
-                "block":
-                {
+            "code": {
+                "block": {
                     "nativeSrc": "929:588:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
-                    "statements":
-                    [
+                    "statements": [
                         {
                             "nativeSrc": "929:588:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
-                            "statements":
-                            [
+                            "statements": [
                                 {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
+                                    "expression": {
+                                        "arguments": [
                                             {
                                                 "kind": "number",
                                                 "nativeSrc": "1490:1:0",
@@ -1043,8 +930,7 @@ Optimized IR AST:
                                                 "value": "0"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "revert",
                                             "nativeSrc": "1480:6:0",
                                             "nodeType": "YulIdentifier",
@@ -1066,8 +952,7 @@ Optimized IR AST:
             },
             "name": "C_2_deployed",
             "nodeType": "YulObject",
-            "subObjects":
-            [
+            "subObjects": [
                 {
                     "nodeType": "YulData",
                     "value": "<BYTECODE REMOVED>"
diff --git a/test/cmdlineTests/combined_json_abi/output b/test/cmdlineTests/combined_json_abi/output
index c775c6d72c..79b539db78 100644
--- a/test/cmdlineTests/combined_json_abi/output
+++ b/test/cmdlineTests/combined_json_abi/output
@@ -1,8 +1,6 @@
 {
-   "contracts":
-   {
-      "combined_json_abi/input.sol:C":
-      {
+   "contracts": {
+      "combined_json_abi/input.sol:C": {
          "abi": []
       }
    },
diff --git a/test/cmdlineTests/combined_json_generated_sources/output b/test/cmdlineTests/combined_json_generated_sources/output
index 5ef9078d6e..db7c86ce13 100644
--- a/test/cmdlineTests/combined_json_generated_sources/output
+++ b/test/cmdlineTests/combined_json_generated_sources/output
@@ -1,35 +1,26 @@
 {
-  "contracts":
-  {
-    "combined_json_generated_sources/input.sol:C":
-    {
+  "contracts": {
+    "combined_json_generated_sources/input.sol:C": {
       "generated-sources": [],
-      "generated-sources-runtime":
-      [
+      "generated-sources-runtime": [
         {
-          "ast":
-          {
+          "ast": {
             "nativeSrc": "0:1856:1",
             "nodeType": "YulBlock",
             "src": "0:1856:1",
-            "statements":
-            [
+            "statements": [
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "47:35:1",
                   "nodeType": "YulBlock",
                   "src": "47:35:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "57:19:1",
                       "nodeType": "YulAssignment",
                       "src": "57:19:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
+                      "value": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "73:2:1",
@@ -39,8 +30,7 @@
                             "value": "64"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "mload",
                           "nativeSrc": "67:5:1",
                           "nodeType": "YulIdentifier",
@@ -50,8 +40,7 @@
                         "nodeType": "YulFunctionCall",
                         "src": "67:9:1"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "memPtr",
                           "nativeSrc": "57:6:1",
@@ -65,8 +54,7 @@
                 "name": "allocate_unbounded",
                 "nativeSrc": "7:75:1",
                 "nodeType": "YulFunctionDefinition",
-                "returnVariables":
-                [
+                "returnVariables": [
                   {
                     "name": "memPtr",
                     "nativeSrc": "40:6:1",
@@ -78,18 +66,14 @@
                 "src": "7:75:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "177:28:1",
                   "nodeType": "YulBlock",
                   "src": "177:28:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "194:1:1",
@@ -107,8 +91,7 @@
                             "value": "0"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "revert",
                           "nativeSrc": "187:6:1",
                           "nodeType": "YulIdentifier",
@@ -130,18 +113,14 @@
                 "src": "88:117:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "300:28:1",
                   "nodeType": "YulBlock",
                   "src": "300:28:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "317:1:1",
@@ -159,8 +138,7 @@
                             "value": "0"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "revert",
                           "nativeSrc": "310:6:1",
                           "nodeType": "YulIdentifier",
@@ -182,18 +160,14 @@
                 "src": "211:117:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "423:28:1",
                   "nodeType": "YulBlock",
                   "src": "423:28:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "440:1:1",
@@ -211,8 +185,7 @@
                             "value": "0"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "revert",
                           "nativeSrc": "433:6:1",
                           "nodeType": "YulIdentifier",
@@ -234,18 +207,14 @@
                 "src": "334:117:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "546:28:1",
                   "nodeType": "YulBlock",
                   "src": "546:28:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "563:1:1",
@@ -263,8 +232,7 @@
                             "value": "0"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "revert",
                           "nativeSrc": "556:6:1",
                           "nodeType": "YulIdentifier",
@@ -286,18 +254,14 @@
                 "src": "457:117:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "669:28:1",
                   "nodeType": "YulBlock",
                   "src": "669:28:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
                             "kind": "number",
                             "nativeSrc": "686:1:1",
@@ -315,8 +279,7 @@
                             "value": "0"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "revert",
                           "nativeSrc": "679:6:1",
                           "nodeType": "YulIdentifier",
@@ -338,27 +301,21 @@
                 "src": "580:117:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "810:478:1",
                   "nodeType": "YulBlock",
                   "src": "810:478:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "859:83:1",
                         "nodeType": "YulBlock",
                         "src": "859:83:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
+                            "expression": {
                               "arguments": [],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
                                 "nativeSrc": "861:77:1",
                                 "nodeType": "YulIdentifier",
@@ -374,16 +331,12 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
-                        "arguments":
-                        [
+                      "condition": {
+                        "arguments": [
                           {
-                            "arguments":
-                            [
+                            "arguments": [
                               {
-                                "arguments":
-                                [
+                                "arguments": [
                                   {
                                     "name": "offset",
                                     "nativeSrc": "838:6:1",
@@ -399,8 +352,7 @@
                                     "value": "0x1f"
                                   }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                   "name": "add",
                                   "nativeSrc": "834:3:1",
                                   "nodeType": "YulIdentifier",
@@ -417,8 +369,7 @@
                                 "src": "853:3:1"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "slt",
                               "nativeSrc": "830:3:1",
                               "nodeType": "YulIdentifier",
@@ -429,8 +380,7 @@
                             "src": "830:27:1"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "iszero",
                           "nativeSrc": "823:6:1",
                           "nodeType": "YulIdentifier",
@@ -448,10 +398,8 @@
                       "nativeSrc": "951:30:1",
                       "nodeType": "YulAssignment",
                       "src": "951:30:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
+                      "value": {
+                        "arguments": [
                           {
                             "name": "offset",
                             "nativeSrc": "974:6:1",
@@ -459,8 +407,7 @@
                             "src": "974:6:1"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "calldataload",
                           "nativeSrc": "961:12:1",
                           "nodeType": "YulIdentifier",
@@ -470,8 +417,7 @@
                         "nodeType": "YulFunctionCall",
                         "src": "961:20:1"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "length",
                           "nativeSrc": "951:6:1",
@@ -481,19 +427,15 @@
                       ]
                     },
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "1024:83:1",
                         "nodeType": "YulBlock",
                         "src": "1024:83:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
+                            "expression": {
                               "arguments": [],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490",
                                 "nativeSrc": "1026:77:1",
                                 "nodeType": "YulIdentifier",
@@ -509,10 +451,8 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
-                        "arguments":
-                        [
+                      "condition": {
+                        "arguments": [
                           {
                             "name": "length",
                             "nativeSrc": "996:6:1",
@@ -528,8 +468,7 @@
                             "value": "0xffffffffffffffff"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "gt",
                           "nativeSrc": "993:2:1",
                           "nodeType": "YulIdentifier",
@@ -547,10 +486,8 @@
                       "nativeSrc": "1116:29:1",
                       "nodeType": "YulAssignment",
                       "src": "1116:29:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
+                      "value": {
+                        "arguments": [
                           {
                             "name": "offset",
                             "nativeSrc": "1132:6:1",
@@ -566,8 +503,7 @@
                             "value": "0x20"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "add",
                           "nativeSrc": "1128:3:1",
                           "nodeType": "YulIdentifier",
@@ -577,8 +513,7 @@
                         "nodeType": "YulFunctionCall",
                         "src": "1128:17:1"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "arrayPos",
                           "nativeSrc": "1116:8:1",
@@ -588,19 +523,15 @@
                       ]
                     },
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "1199:83:1",
                         "nodeType": "YulBlock",
                         "src": "1199:83:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
+                            "expression": {
                               "arguments": [],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
                                 "nativeSrc": "1201:77:1",
                                 "nodeType": "YulIdentifier",
@@ -616,13 +547,10 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
-                        "arguments":
-                        [
+                      "condition": {
+                        "arguments": [
                           {
-                            "arguments":
-                            [
+                            "arguments": [
                               {
                                 "name": "arrayPos",
                                 "nativeSrc": "1164:8:1",
@@ -630,8 +558,7 @@
                                 "src": "1164:8:1"
                               },
                               {
-                                "arguments":
-                                [
+                                "arguments": [
                                   {
                                     "name": "length",
                                     "nativeSrc": "1178:6:1",
@@ -647,8 +574,7 @@
                                     "value": "0x20"
                                   }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                   "name": "mul",
                                   "nativeSrc": "1174:3:1",
                                   "nodeType": "YulIdentifier",
@@ -659,8 +585,7 @@
                                 "src": "1174:17:1"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "add",
                               "nativeSrc": "1160:3:1",
                               "nodeType": "YulIdentifier",
@@ -677,8 +602,7 @@
                             "src": "1194:3:1"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "gt",
                           "nativeSrc": "1157:2:1",
                           "nodeType": "YulIdentifier",
@@ -697,8 +621,7 @@
                 "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
                 "nativeSrc": "720:568:1",
                 "nodeType": "YulFunctionDefinition",
-                "parameters":
-                [
+                "parameters": [
                   {
                     "name": "offset",
                     "nativeSrc": "777:6:1",
@@ -714,8 +637,7 @@
                     "type": ""
                   }
                 ],
-                "returnVariables":
-                [
+                "returnVariables": [
                   {
                     "name": "arrayPos",
                     "nativeSrc": "793:8:1",
@@ -734,27 +656,21 @@
                 "src": "720:568:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "nativeSrc": "1395:458:1",
                   "nodeType": "YulBlock",
                   "src": "1395:458:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "1441:83:1",
                         "nodeType": "YulBlock",
                         "src": "1441:83:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
+                            "expression": {
                               "arguments": [],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
                                 "nativeSrc": "1443:77:1",
                                 "nodeType": "YulIdentifier",
@@ -770,13 +686,10 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
-                        "arguments":
-                        [
+                      "condition": {
+                        "arguments": [
                           {
-                            "arguments":
-                            [
+                            "arguments": [
                               {
                                 "name": "dataEnd",
                                 "nativeSrc": "1416:7:1",
@@ -790,8 +703,7 @@
                                 "src": "1425:9:1"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "sub",
                               "nativeSrc": "1412:3:1",
                               "nodeType": "YulIdentifier",
@@ -810,8 +722,7 @@
                             "value": "32"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "slt",
                           "nativeSrc": "1408:3:1",
                           "nodeType": "YulIdentifier",
@@ -829,19 +740,15 @@
                       "nativeSrc": "1534:312:1",
                       "nodeType": "YulBlock",
                       "src": "1534:312:1",
-                      "statements":
-                      [
+                      "statements": [
                         {
                           "nativeSrc": "1549:45:1",
                           "nodeType": "YulVariableDeclaration",
                           "src": "1549:45:1",
-                          "value":
-                          {
-                            "arguments":
-                            [
+                          "value": {
+                            "arguments": [
                               {
-                                "arguments":
-                                [
+                                "arguments": [
                                   {
                                     "name": "headStart",
                                     "nativeSrc": "1580:9:1",
@@ -857,8 +764,7 @@
                                     "value": "0"
                                   }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                   "name": "add",
                                   "nativeSrc": "1576:3:1",
                                   "nodeType": "YulIdentifier",
@@ -869,8 +775,7 @@
                                 "src": "1576:17:1"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "calldataload",
                               "nativeSrc": "1563:12:1",
                               "nodeType": "YulIdentifier",
@@ -880,8 +785,7 @@
                             "nodeType": "YulFunctionCall",
                             "src": "1563:31:1"
                           },
-                          "variables":
-                          [
+                          "variables": [
                             {
                               "name": "offset",
                               "nativeSrc": "1553:6:1",
@@ -892,19 +796,15 @@
                           ]
                         },
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "1641:83:1",
                             "nodeType": "YulBlock",
                             "src": "1641:83:1",
-                            "statements":
-                            [
+                            "statements": [
                               {
-                                "expression":
-                                {
+                                "expression": {
                                   "arguments": [],
-                                  "functionName":
-                                  {
+                                  "functionName": {
                                     "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
                                     "nativeSrc": "1643:77:1",
                                     "nodeType": "YulIdentifier",
@@ -920,10 +820,8 @@
                               }
                             ]
                           },
-                          "condition":
-                          {
-                            "arguments":
-                            [
+                          "condition": {
+                            "arguments": [
                               {
                                 "name": "offset",
                                 "nativeSrc": "1613:6:1",
@@ -939,8 +837,7 @@
                                 "value": "0xffffffffffffffff"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "gt",
                               "nativeSrc": "1610:2:1",
                               "nodeType": "YulIdentifier",
@@ -958,13 +855,10 @@
                           "nativeSrc": "1738:98:1",
                           "nodeType": "YulAssignment",
                           "src": "1738:98:1",
-                          "value":
-                          {
-                            "arguments":
-                            [
+                          "value": {
+                            "arguments": [
                               {
-                                "arguments":
-                                [
+                                "arguments": [
                                   {
                                     "name": "headStart",
                                     "nativeSrc": "1808:9:1",
@@ -978,8 +872,7 @@
                                     "src": "1819:6:1"
                                   }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                   "name": "add",
                                   "nativeSrc": "1804:3:1",
                                   "nodeType": "YulIdentifier",
@@ -996,8 +889,7 @@
                                 "src": "1828:7:1"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
                               "nativeSrc": "1756:47:1",
                               "nodeType": "YulIdentifier",
@@ -1007,8 +899,7 @@
                             "nodeType": "YulFunctionCall",
                             "src": "1756:80:1"
                           },
-                          "variableNames":
-                          [
+                          "variableNames": [
                             {
                               "name": "value0",
                               "nativeSrc": "1738:6:1",
@@ -1030,8 +921,7 @@
                 "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr",
                 "nativeSrc": "1294:559:1",
                 "nodeType": "YulFunctionDefinition",
-                "parameters":
-                [
+                "parameters": [
                   {
                     "name": "headStart",
                     "nativeSrc": "1357:9:1",
@@ -1047,8 +937,7 @@
                     "type": ""
                   }
                 ],
-                "returnVariables":
-                [
+                "returnVariables": [
                   {
                     "name": "value0",
                     "nativeSrc": "1380:6:1",
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/output b/test/cmdlineTests/combined_json_stop_after_parsing/output
index 32cdd019b8..64e66e3f12 100644
--- a/test/cmdlineTests/combined_json_stop_after_parsing/output
+++ b/test/cmdlineTests/combined_json_stop_after_parsing/output
@@ -1,28 +1,21 @@
 {
-    "contracts":
-    {
+    "contracts": {
         "combined_json_stop_after_parsing/input.sol:C": {}
     },
-    "sourceList":
-    [
+    "sourceList": [
         "combined_json_stop_after_parsing/input.sol"
     ],
-    "sources":
-    {
-        "combined_json_stop_after_parsing/input.sol":
-        {
-            "AST":
-            {
+    "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":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             "*"
                         ],
diff --git a/test/cmdlineTests/combined_json_with_base_path/output b/test/cmdlineTests/combined_json_with_base_path/output
index ec9bbcbcb2..0a3add37e3 100644
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ b/test/cmdlineTests/combined_json_with_base_path/output
@@ -1,36 +1,27 @@
 {
-  "contracts":
-  {
+  "contracts": {
     "combined_json_with_base_path/c.sol:C": {}
   },
-  "sourceList":
-  [
+  "sourceList": [
     "combined_json_with_base_path/c.sol",
     "combined_json_with_base_path/input.sol"
   ],
-  "sources":
-  {
-    "combined_json_with_base_path/c.sol":
-    {
-      "AST":
-      {
+  "sources": {
+    "combined_json_with_base_path/c.sol": {
+      "AST": {
         "absolutePath": "combined_json_with_base_path/c.sol",
-        "exportedSymbols":
-        {
-          "C":
-          [
+        "exportedSymbols": {
+          "C": [
             5
           ]
         },
         "id": 6,
         "license": "GPL-3.0",
         "nodeType": "SourceUnit",
-        "nodes":
-        [
+        "nodes": [
           {
             "id": 4,
-            "literals":
-            [
+            "literals": [
               "solidity",
               ">=",
               "0.0"
@@ -46,8 +37,7 @@
             "contractKind": "contract",
             "fullyImplemented": true,
             "id": 5,
-            "linearizedBaseContracts":
-            [
+            "linearizedBaseContracts": [
               5
             ],
             "name": "C",
@@ -64,27 +54,21 @@
       },
       "id": 0
     },
-    "combined_json_with_base_path/input.sol":
-    {
-      "AST":
-      {
+    "combined_json_with_base_path/input.sol": {
+      "AST": {
         "absolutePath": "combined_json_with_base_path/input.sol",
-        "exportedSymbols":
-        {
-          "C":
-          [
+        "exportedSymbols": {
+          "C": [
             5
           ]
         },
         "id": 3,
         "license": "GPL-3.0",
         "nodeType": "SourceUnit",
-        "nodes":
-        [
+        "nodes": [
           {
             "id": 1,
-            "literals":
-            [
+            "literals": [
               "solidity",
               ">=",
               "0.0"
diff --git a/test/cmdlineTests/combined_json_with_devdoc/output b/test/cmdlineTests/combined_json_with_devdoc/output
index d3df44a90d..817018ea6c 100644
--- a/test/cmdlineTests/combined_json_with_devdoc/output
+++ b/test/cmdlineTests/combined_json_with_devdoc/output
@@ -1,20 +1,15 @@
 {
-  "contracts":
-  {
-    "combined_json_with_devdoc/input.sol:C":
-    {
-      "devdoc":
-      {
+  "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":
-      {
+    "combined_json_with_devdoc/input.sol:D": {
+      "devdoc": {
         "kind": "dev",
         "methods": {},
         "version": 1
diff --git a/test/cmdlineTests/combined_json_with_userdoc/output b/test/cmdlineTests/combined_json_with_userdoc/output
index 650981d67c..4eb56fe24d 100644
--- a/test/cmdlineTests/combined_json_with_userdoc/output
+++ b/test/cmdlineTests/combined_json_with_userdoc/output
@@ -1,20 +1,15 @@
 {
-  "contracts":
-  {
-    "combined_json_with_userdoc/input.sol:C":
-    {
-      "userdoc":
-      {
+  "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":
-      {
+    "combined_json_with_userdoc/input.sol:D": {
+      "userdoc": {
         "kind": "user",
         "methods": {},
         "version": 1
diff --git a/test/cmdlineTests/events_in_abi/output b/test/cmdlineTests/events_in_abi/output
index 6c18a17521..ab246ef24a 100644
--- a/test/cmdlineTests/events_in_abi/output
+++ b/test/cmdlineTests/events_in_abi/output
@@ -4,8 +4,7 @@ Contract JSON ABI
 [
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
@@ -18,8 +17,7 @@ Contract JSON ABI
     },
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": true,
                 "internalType": "uint256",
@@ -44,8 +42,7 @@ Contract JSON ABI
 [
     {
         "anonymous": false,
-        "inputs":
-        [
+        "inputs": [
             {
                 "indexed": false,
                 "internalType": "uint256",
diff --git a/test/cmdlineTests/function_debug_info/output b/test/cmdlineTests/function_debug_info/output
index c359d4e1c1..bd7ba1197b 100644
--- a/test/cmdlineTests/function_debug_info/output
+++ b/test/cmdlineTests/function_debug_info/output
@@ -1,57 +1,45 @@
 {
-  "contracts":
-  {
-    "function_debug_info/input.sol:C":
-    {
-      "function-debug":
-      {
-        "@_34":
-        {
+  "contracts": {
+    "function_debug_info/input.sol:C": {
+      "function-debug": {
+        "@_34": {
           "id": 34,
           "parameterSlots": 1,
           "returnSlots": 0
         },
-        "abi_decode_tuple_t_uint256_fromMemory":
-        {
+        "abi_decode_tuple_t_uint256_fromMemory": {
           "entryPoint": 88,
           "parameterSlots": 2,
           "returnSlots": 1
         }
       },
-      "function-debug-runtime":
-      {
-        "@f_14":
-        {
+      "function-debug-runtime": {
+        "@f_14": {
           "entryPoint": 124,
           "id": 14,
           "parameterSlots": 2,
           "returnSlots": 1
         },
-        "@t_22":
-        {
+        "@t_22": {
           "id": 22,
           "parameterSlots": 0,
           "returnSlots": 0
         },
-        "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr":
-        {
+        "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr": {
           "entryPoint": 158,
           "parameterSlots": 2,
           "returnSlots": 2
         },
-        "abi_decode_tuple_t_uint256":
-        {
+        "abi_decode_tuple_t_uint256": {
           "entryPoint": 269,
           "parameterSlots": 2,
           "returnSlots": 1
         },
-        "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
-        {
+        "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed": {
           "parameterSlots": 2,
           "returnSlots": 1
         },
-        "panic_error_0x32":
-        {
+        "panic_error_0x32": {
           "entryPoint": 292,
           "parameterSlots": 0,
           "returnSlots": 0
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 5af245ce4a..05c2da48c6 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -1,8 +1,6 @@
 {
-  "contracts":
-  {
-    "function_debug_info_via_yul/input.sol:C":
-    {
+  "contracts": {
+    "function_debug_info_via_yul/input.sol:C": {
       "function-debug": {},
       "function-debug-runtime": {}
     }
diff --git a/test/cmdlineTests/import_asm_json_all_valid_flags/output b/test/cmdlineTests/import_asm_json_all_valid_flags/output
index 837187d195..c96001047a 100644
--- a/test/cmdlineTests/import_asm_json_all_valid_flags/output
+++ b/test/cmdlineTests/import_asm_json_all_valid_flags/output
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "<stdin>":
-        {
-            "asm":
-            {
-                ".code":
-                [
+    "contracts": {
+        "<stdin>": {
+            "asm": {
+                ".code": [
                     {
                         "begin": -1,
                         "end": -1,
@@ -15,12 +11,9 @@
                         "value": "0"
                     }
                 ],
-                ".data":
-                {
-                    "0":
-                    {
-                        ".code":
-                        [
+                ".data": {
+                    "0": {
+                        ".code": [
                             {
                                 "begin": -1,
                                 "end": -1,
@@ -31,8 +24,7 @@
                         ]
                     }
                 },
-                "sourceList":
-                [
+                "sourceList": [
                     "contract.sol",
                     "#utility.yul"
                 ]
@@ -44,8 +36,7 @@
             "srcmap-runtime": ":::-:0"
         }
     },
-    "sourceList":
-    [
+    "sourceList": [
         "contract.sol",
         "#utility.yul"
     ],
@@ -57,8 +48,7 @@ Binary of the runtime part:
 6001
 EVM assembly:
 {
-    ".code":
-    [
+    ".code": [
         {
             "begin": -1,
             "end": -1,
@@ -67,12 +57,9 @@ EVM assembly:
             "value": "0"
         }
     ],
-    ".data":
-    {
-        "0":
-        {
-            ".code":
-            [
+    ".data": {
+        "0": {
+            ".code": [
                 {
                     "begin": -1,
                     "end": -1,
@@ -83,8 +70,7 @@ EVM assembly:
             ]
         }
     },
-    "sourceList":
-    [
+    "sourceList": [
         "contract.sol",
         "#utility.yul"
     ]
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
index 8becb87ae0..d7c7bf9e09 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -1,204 +1,169 @@
 {
-    "contracts":
-    {
-        "inline_assembly_function_name_clash/input.sol:C":
-        {
-            "function-debug-runtime":
-            {
-                "abi_decode":
-                {
+    "contracts": {
+        "inline_assembly_function_name_clash/input.sol:C": {
+            "function-debug-runtime": {
+                "abi_decode": {
                     "entryPoint": 80,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
-                "abi_encode_uint256":
-                {
+                "abi_encode_uint256": {
                     "entryPoint": 111,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
-                "abi_encode_uint256_to_uint256":
-                {
+                "abi_encode_uint256_to_uint256": {
                     "entryPoint": 98,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
-                "allocate_unbounded":
-                {
+                "allocate_unbounded": {
                     "entryPoint": 66,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "cleanup_uint256":
-                {
+                "cleanup_uint256": {
                     "entryPoint": 95,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "convert_uint256_to_uint256":
-                {
+                "convert_uint256_to_uint256": {
                     "entryPoint": 276,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "external_fun_f":
-                {
+                "external_fun_f": {
                     "entryPoint": 132,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "external_fun_g":
-                {
+                "external_fun_g": {
                     "entryPoint": 185,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "fun_f":
-                {
+                "fun_f": {
                     "entryPoint": 442,
                     "id": 25,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "fun_f_inner":
-                {
+                "fun_f_inner": {
                     "entryPoint": 430,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "fun_g":
-                {
+                "fun_g": {
                     "entryPoint": 564,
                     "id": 36,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "fun_g_inner":
-                {
+                "fun_g_inner": {
                     "entryPoint": 552,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "identity":
-                {
+                "identity": {
                     "entryPoint": 273,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m":
-                {
+                "modifier_m": {
                     "entryPoint": 509,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_17":
-                {
+                "modifier_m_17": {
                     "entryPoint": 344,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_19":
-                {
+                "modifier_m_19": {
                     "entryPoint": 387,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_28":
-                {
+                "modifier_m_28": {
                     "entryPoint": 466,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "prepare_store_uint256":
-                {
+                "prepare_store_uint256": {
                     "entryPoint": 304,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
-                {
+                "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74": {
                     "entryPoint": 238,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
-                {
+                "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb": {
                     "entryPoint": 72,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
-                {
+                "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b": {
                     "entryPoint": 76,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "shift_left":
-                {
+                "shift_left": {
                     "entryPoint": 246,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "shift_right_unsigned":
-                {
+                "shift_right_unsigned": {
                     "entryPoint": 60,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "update_byte_slice_shift":
-                {
+                "update_byte_slice_shift": {
                     "entryPoint": 251,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
-                "update_storage_value_offsett_uint256_to_uint256":
-                {
+                "update_storage_value_offsett_uint256_to_uint256": {
                     "entryPoint": 307,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
-                "usr$f":
-                {
+                "usr$f": {
                     "entryPoint": 339,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "usr$f_17":
-                {
+                "usr$f_17": {
                     "entryPoint": 382,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "usr$f_22":
-                {
+                "usr$f_22": {
                     "entryPoint": 425,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "usr$f_26":
-                {
+                "usr$f_26": {
                     "entryPoint": 461,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "usr$f_32":
-                {
+                "usr$f_32": {
                     "entryPoint": 504,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "usr$f_37":
-                {
+                "usr$f_37": {
                     "entryPoint": 547,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "zero_value_for_split_uint256":
-                {
+                "zero_value_for_split_uint256": {
                     "entryPoint": 242,
                     "parameterSlots": 0,
                     "returnSlots": 1
diff --git a/test/cmdlineTests/linking_standard_solidity/output.json b/test/cmdlineTests/linking_standard_solidity/output.json
index 83813d806b..1e49af2ca0 100644
--- a/test/cmdlineTests/linking_standard_solidity/output.json
+++ b/test/cmdlineTests/linking_standard_solidity/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "C": {
+                "evm": {
+                    "bytecode": {
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>"
                     }
@@ -16,10 +11,8 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 38e0a1b5aa..87e80b8d19 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,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A\"B":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A\"B": {
+            "C": {
+                "evm": {
+                    "bytecode": {
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>"
                     }
@@ -16,10 +11,8 @@
             }
         }
     },
-    "sources":
-    {
-        "A\"B":
-        {
+    "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 3a69e3e2d7..71c17347a7 100644
--- a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
@@ -1,20 +1,12 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences":
-                        {
-                            "A":
-                            {
-                                "L2":
-                                [
+    "contracts": {
+        "A": {
+            "C": {
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {
+                            "A": {
+                                "L2": [
                                     {
                                         "length": 20,
                                         "start": 173
@@ -32,10 +24,8 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/linking_standard_yul/output.json b/test/cmdlineTests/linking_standard_yul/output.json
index b9059bdfd6..90445cfe08 100644
--- a/test/cmdlineTests/linking_standard_yul/output.json
+++ b/test/cmdlineTests/linking_standard_yul/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "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 b9059bdfd6..90445cfe08 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,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "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 ac1250cd4c..041e8206b8 100644
--- a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
@@ -1,20 +1,12 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "a":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
-                        "linkReferences":
-                        {
-                            "contract/test.sol":
-                            {
-                                "L2":
-                                [
+    "contracts": {
+        "A": {
+            "a": {
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {
+                            "contract/test.sol": {
+                                "L2": [
                                     {
                                         "length": 20,
                                         "start": 22
diff --git a/test/cmdlineTests/no_contract_combined_json/output b/test/cmdlineTests/no_contract_combined_json/output
index e0caa6fa1a..8c454e3414 100644
--- a/test/cmdlineTests/no_contract_combined_json/output
+++ b/test/cmdlineTests/no_contract_combined_json/output
@@ -1,25 +1,19 @@
 {
-    "sourceList":
-    [
+    "sourceList": [
         "no_contract_combined_json/input.sol"
     ],
-    "sources":
-    {
-        "no_contract_combined_json/input.sol":
-        {
-            "AST":
-            {
+    "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":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
diff --git a/test/cmdlineTests/output_selection_all_A1/output.json b/test/cmdlineTests/output_selection_all_A1/output.json
index b21b632bdc..e28a8af254 100644
--- a/test/cmdlineTests/output_selection_all_A1/output.json
+++ b/test/cmdlineTests/output_selection_all_A1/output.json
@@ -1,41 +1,29 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         },
-        "b.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+        "b.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 c33941c2f9..9e6ea3b0e7 100644
--- a/test/cmdlineTests/output_selection_all_A2/output.json
+++ b/test/cmdlineTests/output_selection_all_A2/output.json
@@ -1,28 +1,20 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A2": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 b4c60911cb..d05ed608c3 100644
--- a/test/cmdlineTests/output_selection_all_blank/output.json
+++ b/test/cmdlineTests/output_selection_all_blank/output.json
@@ -1,12 +1,9 @@
 {
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 f709636212..668c4b4235 100644
--- a/test/cmdlineTests/output_selection_all_star/output.json
+++ b/test/cmdlineTests/output_selection_all_star/output.json
@@ -1,61 +1,43 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             },
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+            "A2": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         },
-        "b.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+        "b.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             },
-            "B2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+            "B2": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 ab44a2d540..137b19cc0d 100644
--- a/test/cmdlineTests/output_selection_single_A1/output.json
+++ b/test/cmdlineTests/output_selection_single_A1/output.json
@@ -1,28 +1,20 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 ffaf266b4d..87dd70b3aa 100644
--- a/test/cmdlineTests/output_selection_single_B1/output.json
+++ b/test/cmdlineTests/output_selection_single_B1/output.json
@@ -1,28 +1,20 @@
 {
-    "contracts":
-    {
-        "b.sol":
-        {
-            "B2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "b.sol": {
+            "B2": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "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 52d04cb18d..123f437137 100644
--- a/test/cmdlineTests/output_selection_single_all/output.json
+++ b/test/cmdlineTests/output_selection_single_all/output.json
@@ -1,38 +1,27 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A1":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A1": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             },
-            "A2":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+            "A2": {
+                "evm": {
+                    "bytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         },
-        "b.sol":
-        {
+        "b.sol": {
             "id": 1
         }
     }
diff --git a/test/cmdlineTests/pretty_json_indent_only/output.json b/test/cmdlineTests/pretty_json_indent_only/output.json
index 80d51c4f1f..eeefefbd74 100644
--- a/test/cmdlineTests/pretty_json_indent_only/output.json
+++ b/test/cmdlineTests/pretty_json_indent_only/output.json
@@ -1,8 +1,6 @@
 {
-       "sources":
-       {
-              "A":
-              {
+       "sources": {
+              "A": {
                      "id": 0
               }
        }
diff --git a/test/cmdlineTests/pretty_json_standard/output.json b/test/cmdlineTests/pretty_json_standard/output.json
index 29185e7583..96281af4e0 100644
--- a/test/cmdlineTests/pretty_json_standard/output.json
+++ b/test/cmdlineTests/pretty_json_standard/output.json
@@ -1,8 +1,6 @@
 {
-  "sources":
-  {
-    "A":
-    {
+  "sources": {
+    "A": {
       "id": 0
     }
   }
diff --git a/test/cmdlineTests/pretty_json_standard_indent/output.json b/test/cmdlineTests/pretty_json_standard_indent/output.json
index 80d51c4f1f..eeefefbd74 100644
--- a/test/cmdlineTests/pretty_json_standard_indent/output.json
+++ b/test/cmdlineTests/pretty_json_standard_indent/output.json
@@ -1,8 +1,6 @@
 {
-       "sources":
-       {
-              "A":
-              {
+       "sources": {
+              "A": {
                      "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 97041b2380..642d07f49a 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,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C": {
+                "evm": {
                     "assembly": "    /* \"C\":79:503  contract C... */
   0xa0
   jumpi(tag_5, callvalue)
@@ -350,12 +346,9 @@ sub_0: assembly {
                 }
             }
         },
-        "D":
-        {
-            "D":
-            {
-                "evm":
-                {
+        "D": {
+            "D": {
+                "evm": {
                     "assembly": "    /* \"D\":91:181  contract D is C(3)... */
   0xa0
   jumpi(tag_5, callvalue)
@@ -716,14 +709,11 @@ sub_0: assembly {
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         },
-        "D":
-        {
+        "D": {
             "id": 1
         }
     }
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 ee958b55b0..9489a75bf3 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
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C": {
+                "evm": {
                     "assembly": "    /* \"C\":60:101  contract C {... */
   mstore(0x40, 0x80)
   callvalue
@@ -211,10 +207,8 @@ object \"C_6\" {
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 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 007b7fc62b..f8f2958b03 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
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C": {
+                "evm": {
                     "assembly": "    /* \"C\":60:101 */
   mstore(0x40, 0x80)
   callvalue
@@ -210,10 +206,8 @@ object \"C_6\" {
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 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 884da9eb97..2a5a2bc2ae 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
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C": {
+                "evm": {
                     "assembly": "  mstore(0x40, 0x80)
   callvalue
   dup1
@@ -199,10 +195,8 @@ object \"C_6\" {
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json
index fb7f199a75..7f48fd4e93 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
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 54748658fd..3e687cc1a0 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
+    "contracts": {
+        "C": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"C\"
 object \"C_54\" {
@@ -769,10 +766,8 @@ object \"C_54\" {
 "
             }
         },
-        "D":
-        {
-            "D":
-            {
+        "D": {
+            "D": {
                 "ir": "
 /// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
@@ -1615,14 +1610,11 @@ object \"D_72\" {
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         },
-        "D":
-        {
+        "D": {
             "id": 1
         }
     }
diff --git a/test/cmdlineTests/standard_default_success/output.json b/test/cmdlineTests/standard_default_success/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_default_success/output.json
+++ b/test/cmdlineTests/standard_default_success/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 4e4d84c41c..1fd016e54e 100644
--- a/test/cmdlineTests/standard_empty_file_name/output.json
+++ b/test/cmdlineTests/standard_empty_file_name/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2904",
@@ -9,8 +8,7 @@
 ",
             "message": "Declaration \"A\" not found in \"\" (referenced as \".\").",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 79,
                 "file": "",
                 "start": 59
diff --git a/test/cmdlineTests/standard_evm_version_byzantium/output.json b/test/cmdlineTests/standard_evm_version_byzantium/output.json
index b2428b1050..36570f9c2a 100644
--- a/test/cmdlineTests/standard_evm_version_byzantium/output.json
+++ b/test/cmdlineTests/standard_evm_version_byzantium/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
@@ -9,10 +8,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "input.sol":
-        {
+    "sources": {
+        "input.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_evm_version_constantinople/output.json b/test/cmdlineTests/standard_evm_version_constantinople/output.json
index 1ce414a4cc..81fa23ff62 100644
--- a/test/cmdlineTests/standard_evm_version_constantinople/output.json
+++ b/test/cmdlineTests/standard_evm_version_constantinople/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "input.sol":
-        {
+    "sources": {
+        "input.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_function_debug_info/output.json b/test/cmdlineTests/standard_function_debug_info/output.json
index bbbb6b96fa..645e1646a6 100644
--- a/test/cmdlineTests/standard_function_debug_info/output.json
+++ b/test/cmdlineTests/standard_function_debug_info/output.json
@@ -1,169 +1,140 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {}
                     },
-                    "deployedBytecode":
-                    {
-                        "functionDebugData":
-                        {
-                            "@f_19":
-                            {
+                    "deployedBytecode": {
+                        "functionDebugData": {
+                            "@f_19": {
                                 "entryPoint": 93,
                                 "id": 19,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
-                            "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
+                            "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr": {
                                 "entryPoint": 421,
                                 "id": null,
                                 "parameterSlots": 3,
                                 "returnSlots": 1
                             },
-                            "abi_decode_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
+                            "abi_decode_t_array$_t_uint256_$dyn_memory_ptr": {
                                 "entryPoint": 525,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
-                            "abi_decode_t_uint256":
-                            {
+                            "abi_decode_t_uint256": {
                                 "entryPoint": 401,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
-                            "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
+                            "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr": {
                                 "entryPoint": 570,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
-                            "abi_encode_t_uint256_to_t_uint256_fromStack":
-                            {
+                            "abi_encode_t_uint256_to_t_uint256_fromStack": {
                                 "entryPoint": 641,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 0
                             },
-                            "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
-                            {
+                            "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed": {
                                 "entryPoint": 656,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
-                            "allocate_memory":
-                            {
+                            "allocate_memory": {
                                 "entryPoint": 297,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
-                            "allocate_unbounded":
-                            {
+                            "allocate_unbounded": {
                                 "entryPoint": 166,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 1
                             },
-                            "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":
-                            {
+                            "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr": {
                                 "entryPoint": 323,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
-                            "checked_add_t_uint256":
-                            {
+                            "checked_add_t_uint256": {
                                 "entryPoint": 771,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
-                            "cleanup_t_uint256":
-                            {
+                            "cleanup_t_uint256": {
                                 "entryPoint": 370,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
-                            "finalize_allocation":
-                            {
+                            "finalize_allocation": {
                                 "entryPoint": 248,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 0
                             },
-                            "panic_error_0x11":
-                            {
+                            "panic_error_0x11": {
                                 "entryPoint": 726,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "panic_error_0x32":
-                            {
+                            "panic_error_0x32": {
                                 "entryPoint": 681,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "panic_error_0x41":
-                            {
+                            "panic_error_0x41": {
                                 "entryPoint": 203,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":
-                            {
+                            "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d": {
                                 "entryPoint": 183,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":
-                            {
+                            "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef": {
                                 "entryPoint": 366,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":
-                            {
+                            "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db": {
                                 "entryPoint": 179,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
-                            {
+                            "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b": {
                                 "entryPoint": 175,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
-                            "round_up_to_mul_of_32":
-                            {
+                            "round_up_to_mul_of_32": {
                                 "entryPoint": 187,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
-                            "validator_revert_t_uint256":
-                            {
+                            "validator_revert_t_uint256": {
                                 "entryPoint": 379,
                                 "id": null,
                                 "parameterSlots": 1,
@@ -175,10 +146,8 @@
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_generatedSources/output.json b/test/cmdlineTests/standard_generatedSources/output.json
index 350d108991..4fb0b3dcc3 100644
--- a/test/cmdlineTests/standard_generatedSources/output.json
+++ b/test/cmdlineTests/standard_generatedSources/output.json
@@ -1,45 +1,32 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A": {
+                "evm": {
+                    "bytecode": {
                         "generatedSources": [],
                         "object": "<BYTECODE REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
-                        "generatedSources":
-                        [
+                    "deployedBytecode": {
+                        "generatedSources": [
                             {
-                                "ast":
-                                {
+                                "ast": {
                                     "nativeSrc": "0:3989:1",
                                     "nodeType": "YulBlock",
                                     "src": "0:3989:1",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "47:35:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "47:35:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "57:19:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "57:19:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "73:2:1",
@@ -49,8 +36,7 @@
                                                                     "value": "64"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mload",
                                                                 "nativeSrc": "67:5:1",
                                                                 "nodeType": "YulIdentifier",
@@ -60,8 +46,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "67:9:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "memPtr",
                                                                 "nativeSrc": "57:6:1",
@@ -75,8 +60,7 @@
                                             "name": "allocate_unbounded",
                                             "nativeSrc": "7:75:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "memPtr",
                                                     "nativeSrc": "40:6:1",
@@ -88,18 +72,14 @@
                                             "src": "7:75:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "177:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "177:28:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "194:1:1",
@@ -117,8 +97,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "187:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -140,18 +119,14 @@
                                             "src": "88:117:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "300:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "300:28:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "317:1:1",
@@ -169,8 +144,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "310:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -192,18 +166,14 @@
                                             "src": "211:117:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "423:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "423:28:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "440:1:1",
@@ -221,8 +191,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "433:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -244,24 +213,19 @@
                                             "src": "334:117:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "505:54:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "505:54:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "515:38:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "515:38:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "value",
                                                                             "nativeSrc": "533:5:1",
@@ -277,8 +241,7 @@
                                                                             "value": "31"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "add",
                                                                         "nativeSrc": "529:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -289,8 +252,7 @@
                                                                     "src": "529:14:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "kind": "number",
                                                                             "nativeSrc": "549:2:1",
@@ -300,8 +262,7 @@
                                                                             "value": "31"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "not",
                                                                         "nativeSrc": "545:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -312,8 +273,7 @@
                                                                     "src": "545:7:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "and",
                                                                 "nativeSrc": "525:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -323,8 +283,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "525:28:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "result",
                                                                 "nativeSrc": "515:6:1",
@@ -338,8 +297,7 @@
                                             "name": "round_up_to_mul_of_32",
                                             "nativeSrc": "457:102:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "488:5:1",
@@ -348,8 +306,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "result",
                                                     "nativeSrc": "498:6:1",
@@ -361,18 +318,14 @@
                                             "src": "457:102:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "593:152:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "593:152:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "610:1:1",
@@ -390,8 +343,7 @@
                                                                     "value": "35408467139433450592217433187231851964531694900788300625387963629091585785856"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "603:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -406,10 +358,8 @@
                                                         "src": "603:88:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "707:1:1",
@@ -427,8 +377,7 @@
                                                                     "value": "0x41"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "700:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -443,10 +392,8 @@
                                                         "src": "700:15:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "731:1:1",
@@ -464,8 +411,7 @@
                                                                     "value": "0x24"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "724:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -487,21 +433,17 @@
                                             "src": "565:180:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "794:238:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "794:238:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "804:58:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "804:58:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "memPtr",
                                                                     "nativeSrc": "826:6:1",
@@ -509,8 +451,7 @@
                                                                     "src": "826:6:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "size",
                                                                             "nativeSrc": "856:4:1",
@@ -518,8 +459,7 @@
                                                                             "src": "856:4:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "round_up_to_mul_of_32",
                                                                         "nativeSrc": "834:21:1",
                                                                         "nodeType": "YulIdentifier",
@@ -530,8 +470,7 @@
                                                                     "src": "834:27:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "822:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -541,8 +480,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "822:40:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "newFreePtr",
                                                                 "nativeSrc": "808:10:1",
@@ -553,19 +491,15 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "973:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "973:22:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "panic_error_0x41",
                                                                             "nativeSrc": "975:16:1",
                                                                             "nodeType": "YulIdentifier",
@@ -581,13 +515,10 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
                                                                             "nativeSrc": "916:10:1",
@@ -603,8 +534,7 @@
                                                                             "value": "0xffffffffffffffff"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "gt",
                                                                         "nativeSrc": "913:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -615,8 +545,7 @@
                                                                     "src": "913:34:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
                                                                             "nativeSrc": "952:10:1",
@@ -630,8 +559,7 @@
                                                                             "src": "964:6:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "lt",
                                                                         "nativeSrc": "949:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -642,8 +570,7 @@
                                                                     "src": "949:22:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "or",
                                                                 "nativeSrc": "910:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -658,10 +585,8 @@
                                                         "src": "907:88:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1011:2:1",
@@ -677,8 +602,7 @@
                                                                     "src": "1015:10:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "1004:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -697,8 +621,7 @@
                                             "name": "finalize_allocation",
                                             "nativeSrc": "751:281:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "memPtr",
                                                     "nativeSrc": "780:6:1",
@@ -717,22 +640,18 @@
                                             "src": "751:281:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1079:88:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1079:88:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1089:30:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1089:30:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "arguments": [],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "allocate_unbounded",
                                                                 "nativeSrc": "1099:18:1",
                                                                 "nodeType": "YulIdentifier",
@@ -742,8 +661,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1099:20:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "memPtr",
                                                                 "nativeSrc": "1089:6:1",
@@ -753,10 +671,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "memPtr",
                                                                     "nativeSrc": "1148:6:1",
@@ -770,8 +686,7 @@
                                                                     "src": "1156:4:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "finalize_allocation",
                                                                 "nativeSrc": "1128:19:1",
                                                                 "nodeType": "YulIdentifier",
@@ -790,8 +705,7 @@
                                             "name": "allocate_memory",
                                             "nativeSrc": "1038:129:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "size",
                                                     "nativeSrc": "1063:4:1",
@@ -800,8 +714,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "memPtr",
                                                     "nativeSrc": "1072:6:1",
@@ -813,27 +726,21 @@
                                             "src": "1038:129:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1255:229:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1255:229:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "1360:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1360:22:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "panic_error_0x41",
                                                                             "nativeSrc": "1362:16:1",
                                                                             "nodeType": "YulIdentifier",
@@ -849,10 +756,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "length",
                                                                     "nativeSrc": "1332:6:1",
@@ -868,8 +773,7 @@
                                                                     "value": "0xffffffffffffffff"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "gt",
                                                                 "nativeSrc": "1329:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -887,10 +791,8 @@
                                                         "nativeSrc": "1392:25:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1392:25:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "length",
                                                                     "nativeSrc": "1404:6:1",
@@ -906,8 +808,7 @@
                                                                     "value": "0x20"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mul",
                                                                 "nativeSrc": "1400:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -917,8 +818,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1400:17:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "size",
                                                                 "nativeSrc": "1392:4:1",
@@ -931,10 +831,8 @@
                                                         "nativeSrc": "1454:23:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1454:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "size",
                                                                     "nativeSrc": "1466:4:1",
@@ -950,8 +848,7 @@
                                                                     "value": "0x20"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "1462:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -961,8 +858,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1462:15:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "size",
                                                                 "nativeSrc": "1454:4:1",
@@ -976,8 +872,7 @@
                                             "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
                                             "nativeSrc": "1173:311:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "length",
                                                     "nativeSrc": "1239:6:1",
@@ -986,8 +881,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "size",
                                                     "nativeSrc": "1250:4:1",
@@ -999,18 +893,14 @@
                                             "src": "1173:311:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1579:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1579:28:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1596:1:1",
@@ -1028,8 +918,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "1589:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1051,26 +940,22 @@
                                             "src": "1490:117:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1658:32:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1658:32:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1668:16:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1668:16:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "name": "value",
                                                             "nativeSrc": "1679:5:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "1679:5:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "cleaned",
                                                                 "nativeSrc": "1668:7:1",
@@ -1084,8 +969,7 @@
                                             "name": "cleanup_t_uint256",
                                             "nativeSrc": "1613:77:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "1640:5:1",
@@ -1094,8 +978,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "cleaned",
                                                     "nativeSrc": "1650:7:1",
@@ -1107,26 +990,20 @@
                                             "src": "1613:77:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1739:79:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1739:79:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "1796:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1796:16:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "kind": "number",
                                                                                 "nativeSrc": "1805:1:1",
@@ -1144,8 +1021,7 @@
                                                                                 "value": "0"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert",
                                                                             "nativeSrc": "1798:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1161,13 +1037,10 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "value",
                                                                             "nativeSrc": "1762:5:1",
@@ -1175,8 +1048,7 @@
                                                                             "src": "1762:5:1"
                                                                         },
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "value",
                                                                                     "nativeSrc": "1787:5:1",
@@ -1184,8 +1056,7 @@
                                                                                     "src": "1787:5:1"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "cleanup_t_uint256",
                                                                                 "nativeSrc": "1769:17:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -1196,8 +1067,7 @@
                                                                             "src": "1769:24:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "eq",
                                                                         "nativeSrc": "1759:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -1208,8 +1078,7 @@
                                                                     "src": "1759:35:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "iszero",
                                                                 "nativeSrc": "1752:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1228,8 +1097,7 @@
                                             "name": "validator_revert_t_uint256",
                                             "nativeSrc": "1696:122:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "1732:5:1",
@@ -1241,21 +1109,17 @@
                                             "src": "1696:122:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1876:87:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1876:87:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1886:29:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1886:29:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "offset",
                                                                     "nativeSrc": "1908:6:1",
@@ -1263,8 +1127,7 @@
                                                                     "src": "1908:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "calldataload",
                                                                 "nativeSrc": "1895:12:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1274,8 +1137,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1895:20:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "value",
                                                                 "nativeSrc": "1886:5:1",
@@ -1285,10 +1147,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "value",
                                                                     "nativeSrc": "1951:5:1",
@@ -1296,8 +1156,7 @@
                                                                     "src": "1951:5:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "validator_revert_t_uint256",
                                                                 "nativeSrc": "1924:26:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1316,8 +1175,7 @@
                                             "name": "abi_decode_t_uint256",
                                             "nativeSrc": "1824:139:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "offset",
                                                     "nativeSrc": "1854:6:1",
@@ -1333,8 +1191,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "1870:5:1",
@@ -1346,24 +1203,19 @@
                                             "src": "1824:139:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "2088:608:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "2088:608:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "2098:90:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2098:90:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "length",
                                                                             "nativeSrc": "2180:6:1",
@@ -1371,8 +1223,7 @@
                                                                             "src": "2180:6:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
                                                                         "nativeSrc": "2123:56:1",
                                                                         "nodeType": "YulIdentifier",
@@ -1383,8 +1234,7 @@
                                                                     "src": "2123:64:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "allocate_memory",
                                                                 "nativeSrc": "2107:15:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1394,8 +1244,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2107:81:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "array",
                                                                 "nativeSrc": "2098:5:1",
@@ -1408,15 +1257,13 @@
                                                         "nativeSrc": "2197:16:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2197:16:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "name": "array",
                                                             "nativeSrc": "2208:5:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "2208:5:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "dst",
                                                                 "nativeSrc": "2201:3:1",
@@ -1427,10 +1274,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "array",
                                                                     "nativeSrc": "2230:5:1",
@@ -1444,8 +1289,7 @@
                                                                     "src": "2237:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "2223:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1463,10 +1307,8 @@
                                                         "nativeSrc": "2253:23:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2253:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "array",
                                                                     "nativeSrc": "2264:5:1",
@@ -1482,8 +1324,7 @@
                                                                     "value": "0x20"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "2260:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1493,8 +1334,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2260:16:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "dst",
                                                                 "nativeSrc": "2253:3:1",
@@ -1507,10 +1347,8 @@
                                                         "nativeSrc": "2286:44:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2286:44:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "offset",
                                                                     "nativeSrc": "2304:6:1",
@@ -1518,8 +1356,7 @@
                                                                     "src": "2304:6:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "length",
                                                                             "nativeSrc": "2316:6:1",
@@ -1535,8 +1372,7 @@
                                                                             "value": "0x20"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "mul",
                                                                         "nativeSrc": "2312:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -1547,8 +1383,7 @@
                                                                     "src": "2312:17:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "2300:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1558,8 +1393,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2300:30:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "srcEnd",
                                                                 "nativeSrc": "2290:6:1",
@@ -1570,19 +1404,15 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "2358:103:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2358:103:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
                                                                             "nativeSrc": "2372:77:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1598,10 +1428,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "srcEnd",
                                                                     "nativeSrc": "2345:6:1",
@@ -1615,8 +1443,7 @@
                                                                     "src": "2353:3:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "gt",
                                                                 "nativeSrc": "2342:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1631,26 +1458,22 @@
                                                         "src": "2339:122:1"
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "2546:144:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2546:144:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
                                                                     "nativeSrc": "2561:21:1",
                                                                     "nodeType": "YulVariableDeclaration",
                                                                     "src": "2561:21:1",
-                                                                    "value":
-                                                                    {
+                                                                    "value": {
                                                                         "name": "src",
                                                                         "nativeSrc": "2579:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2579:3:1"
                                                                     },
-                                                                    "variables":
-                                                                    [
+                                                                    "variables": [
                                                                         {
                                                                             "name": "elementPos",
                                                                             "nativeSrc": "2565:10:1",
@@ -1661,10 +1484,8 @@
                                                                     ]
                                                                 },
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "dst",
                                                                                 "nativeSrc": "2603:3:1",
@@ -1672,8 +1493,7 @@
                                                                                 "src": "2603:3:1"
                                                                             },
                                                                             {
-                                                                                "arguments":
-                                                                                [
+                                                                                "arguments": [
                                                                                     {
                                                                                         "name": "elementPos",
                                                                                         "nativeSrc": "2629:10:1",
@@ -1687,8 +1507,7 @@
                                                                                         "src": "2641:3:1"
                                                                                     }
                                                                                 ],
-                                                                                "functionName":
-                                                                                {
+                                                                                "functionName": {
                                                                                     "name": "abi_decode_t_uint256",
                                                                                     "nativeSrc": "2608:20:1",
                                                                                     "nodeType": "YulIdentifier",
@@ -1699,8 +1518,7 @@
                                                                                 "src": "2608:37:1"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "mstore",
                                                                             "nativeSrc": "2596:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1718,10 +1536,8 @@
                                                                     "nativeSrc": "2659:21:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "2659:21:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "value": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "dst",
                                                                                 "nativeSrc": "2670:3:1",
@@ -1737,8 +1553,7 @@
                                                                                 "value": "0x20"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "add",
                                                                             "nativeSrc": "2666:3:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1748,8 +1563,7 @@
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2666:14:1"
                                                                     },
-                                                                    "variableNames":
-                                                                    [
+                                                                    "variableNames": [
                                                                         {
                                                                             "name": "dst",
                                                                             "nativeSrc": "2659:3:1",
@@ -1760,10 +1574,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "src",
                                                                     "nativeSrc": "2499:3:1",
@@ -1777,8 +1589,7 @@
                                                                     "src": "2504:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "lt",
                                                                 "nativeSrc": "2496:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1790,21 +1601,17 @@
                                                         },
                                                         "nativeSrc": "2470:220:1",
                                                         "nodeType": "YulForLoop",
-                                                        "post":
-                                                        {
+                                                        "post": {
                                                             "nativeSrc": "2512:25:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2512:25:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
                                                                     "nativeSrc": "2514:21:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "2514:21:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "value": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "src",
                                                                                 "nativeSrc": "2525:3:1",
@@ -1820,8 +1627,7 @@
                                                                                 "value": "0x20"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "add",
                                                                             "nativeSrc": "2521:3:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1831,8 +1637,7 @@
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2521:14:1"
                                                                     },
-                                                                    "variableNames":
-                                                                    [
+                                                                    "variableNames": [
                                                                         {
                                                                             "name": "src",
                                                                             "nativeSrc": "2514:3:1",
@@ -1843,26 +1648,22 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "pre":
-                                                        {
+                                                        "pre": {
                                                             "nativeSrc": "2474:21:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2474:21:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
                                                                     "nativeSrc": "2476:17:1",
                                                                     "nodeType": "YulVariableDeclaration",
                                                                     "src": "2476:17:1",
-                                                                    "value":
-                                                                    {
+                                                                    "value": {
                                                                         "name": "offset",
                                                                         "nativeSrc": "2487:6:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2487:6:1"
                                                                     },
-                                                                    "variables":
-                                                                    [
+                                                                    "variables": [
                                                                         {
                                                                             "name": "src",
                                                                             "nativeSrc": "2480:3:1",
@@ -1881,8 +1682,7 @@
                                             "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
                                             "nativeSrc": "1986:710:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "offset",
                                                     "nativeSrc": "2058:6:1",
@@ -1905,8 +1705,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "array",
                                                     "nativeSrc": "2082:5:1",
@@ -1918,27 +1717,21 @@
                                             "src": "1986:710:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "2796:293:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "2796:293:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "2845:83:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2845:83:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
                                                                             "nativeSrc": "2847:77:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1954,16 +1747,12 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "offset",
                                                                                     "nativeSrc": "2824:6:1",
@@ -1979,8 +1768,7 @@
                                                                                     "value": "0x1f"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "add",
                                                                                 "nativeSrc": "2820:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -1997,8 +1785,7 @@
                                                                             "src": "2839:3:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "slt",
                                                                         "nativeSrc": "2816:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2009,8 +1796,7 @@
                                                                     "src": "2816:27:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "iszero",
                                                                 "nativeSrc": "2809:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2028,10 +1814,8 @@
                                                         "nativeSrc": "2937:34:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2937:34:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "offset",
                                                                     "nativeSrc": "2964:6:1",
@@ -2039,8 +1823,7 @@
                                                                     "src": "2964:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "calldataload",
                                                                 "nativeSrc": "2951:12:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2050,8 +1833,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2951:20:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "length",
                                                                 "nativeSrc": "2941:6:1",
@@ -2065,13 +1847,10 @@
                                                         "nativeSrc": "2980:103:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2980:103:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "offset",
                                                                             "nativeSrc": "3056:6:1",
@@ -2087,8 +1866,7 @@
                                                                             "value": "0x20"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "add",
                                                                         "nativeSrc": "3052:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2111,8 +1889,7 @@
                                                                     "src": "3079:3:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
                                                                 "nativeSrc": "2989:62:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2122,8 +1899,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2989:94:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "array",
                                                                 "nativeSrc": "2980:5:1",
@@ -2137,8 +1913,7 @@
                                             "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
                                             "nativeSrc": "2719:370:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "offset",
                                                     "nativeSrc": "2774:6:1",
@@ -2154,8 +1929,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "array",
                                                     "nativeSrc": "2790:5:1",
@@ -2167,27 +1941,21 @@
                                             "src": "2719:370:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "3186:448:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3186:448:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "3232:83:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "3232:83:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
                                                                             "nativeSrc": "3234:77:1",
                                                                             "nodeType": "YulIdentifier",
@@ -2203,13 +1971,10 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "dataEnd",
                                                                             "nativeSrc": "3207:7:1",
@@ -2223,8 +1988,7 @@
                                                                             "src": "3216:9:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "sub",
                                                                         "nativeSrc": "3203:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2243,8 +2007,7 @@
                                                                     "value": "32"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "slt",
                                                                 "nativeSrc": "3199:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2262,19 +2025,15 @@
                                                         "nativeSrc": "3325:302:1",
                                                         "nodeType": "YulBlock",
                                                         "src": "3325:302:1",
-                                                        "statements":
-                                                        [
+                                                        "statements": [
                                                             {
                                                                 "nativeSrc": "3340:45:1",
                                                                 "nodeType": "YulVariableDeclaration",
                                                                 "src": "3340:45:1",
-                                                                "value":
-                                                                {
-                                                                    "arguments":
-                                                                    [
+                                                                "value": {
+                                                                    "arguments": [
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "headStart",
                                                                                     "nativeSrc": "3371:9:1",
@@ -2290,8 +2049,7 @@
                                                                                     "value": "0"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "add",
                                                                                 "nativeSrc": "3367:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -2302,8 +2060,7 @@
                                                                             "src": "3367:17:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "calldataload",
                                                                         "nativeSrc": "3354:12:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2313,8 +2070,7 @@
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3354:31:1"
                                                                 },
-                                                                "variables":
-                                                                [
+                                                                "variables": [
                                                                     {
                                                                         "name": "offset",
                                                                         "nativeSrc": "3344:6:1",
@@ -2325,19 +2081,15 @@
                                                                 ]
                                                             },
                                                             {
-                                                                "body":
-                                                                {
+                                                                "body": {
                                                                     "nativeSrc": "3432:83:1",
                                                                     "nodeType": "YulBlock",
                                                                     "src": "3432:83:1",
-                                                                    "statements":
-                                                                    [
+                                                                    "statements": [
                                                                         {
-                                                                            "expression":
-                                                                            {
+                                                                            "expression": {
                                                                                 "arguments": [],
-                                                                                "functionName":
-                                                                                {
+                                                                                "functionName": {
                                                                                     "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
                                                                                     "nativeSrc": "3434:77:1",
                                                                                     "nodeType": "YulIdentifier",
@@ -2353,10 +2105,8 @@
                                                                         }
                                                                     ]
                                                                 },
-                                                                "condition":
-                                                                {
-                                                                    "arguments":
-                                                                    [
+                                                                "condition": {
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "offset",
                                                                             "nativeSrc": "3404:6:1",
@@ -2372,8 +2122,7 @@
                                                                             "value": "0xffffffffffffffff"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "gt",
                                                                         "nativeSrc": "3401:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2391,13 +2140,10 @@
                                                                 "nativeSrc": "3529:88:1",
                                                                 "nodeType": "YulAssignment",
                                                                 "src": "3529:88:1",
-                                                                "value":
-                                                                {
-                                                                    "arguments":
-                                                                    [
+                                                                "value": {
+                                                                    "arguments": [
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "headStart",
                                                                                     "nativeSrc": "3589:9:1",
@@ -2411,8 +2157,7 @@
                                                                                     "src": "3600:6:1"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "add",
                                                                                 "nativeSrc": "3585:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -2429,8 +2174,7 @@
                                                                             "src": "3609:7:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
                                                                         "nativeSrc": "3539:45:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2440,8 +2184,7 @@
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3539:78:1"
                                                                 },
-                                                                "variableNames":
-                                                                [
+                                                                "variableNames": [
                                                                     {
                                                                         "name": "value0",
                                                                         "nativeSrc": "3529:6:1",
@@ -2457,8 +2200,7 @@
                                             "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
                                             "nativeSrc": "3095:539:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "headStart",
                                                     "nativeSrc": "3156:9:1",
@@ -2474,8 +2216,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "value0",
                                                     "nativeSrc": "3179:6:1",
@@ -2487,18 +2228,14 @@
                                             "src": "3095:539:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "3705:53:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3705:53:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "pos",
                                                                     "nativeSrc": "3722:3:1",
@@ -2506,8 +2243,7 @@
                                                                     "src": "3722:3:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "value",
                                                                             "nativeSrc": "3745:5:1",
@@ -2515,8 +2251,7 @@
                                                                             "src": "3745:5:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "cleanup_t_uint256",
                                                                         "nativeSrc": "3727:17:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2527,8 +2262,7 @@
                                                                     "src": "3727:24:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "3715:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2547,8 +2281,7 @@
                                             "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
                                             "nativeSrc": "3640:118:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "3693:5:1",
@@ -2567,21 +2300,17 @@
                                             "src": "3640:118:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "3862:124:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3862:124:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "3872:26:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "3872:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "headStart",
                                                                     "nativeSrc": "3884:9:1",
@@ -2597,8 +2326,7 @@
                                                                     "value": "32"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "3880:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2608,8 +2336,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "3880:18:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "tail",
                                                                 "nativeSrc": "3872:4:1",
@@ -2619,10 +2346,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "value0",
                                                                     "nativeSrc": "3952:6:1",
@@ -2630,8 +2355,7 @@
                                                                     "src": "3952:6:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "headStart",
                                                                             "nativeSrc": "3965:9:1",
@@ -2647,8 +2371,7 @@
                                                                             "value": "0"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "add",
                                                                         "nativeSrc": "3961:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -2659,8 +2382,7 @@
                                                                     "src": "3961:17:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
                                                                 "nativeSrc": "3908:43:1",
                                                                 "nodeType": "YulIdentifier",
@@ -2679,8 +2401,7 @@
                                             "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
                                             "nativeSrc": "3764:222:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "headStart",
                                                     "nativeSrc": "3834:9:1",
@@ -2696,8 +2417,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "tail",
                                                     "nativeSrc": "3857:4:1",
@@ -2843,8 +2563,7 @@
             }
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3420",
@@ -2854,8 +2573,7 @@
 ",
             "message": "Source file does not specify required compiler version!",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": -1,
                 "file": "a.sol",
                 "start": -1
@@ -2863,10 +2581,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_immutable_references/output.json b/test/cmdlineTests/standard_immutable_references/output.json
index e25a911fff..cfa087bce5 100644
--- a/test/cmdlineTests/standard_immutable_references/output.json
+++ b/test/cmdlineTests/standard_immutable_references/output.json
@@ -1,18 +1,11 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "deployedBytecode":
-                    {
-                        "immutableReferences":
-                        {
-                            "6":
-                            [
+    "contracts": {
+        "a.sol": {
+            "A": {
+                "evm": {
+                    "deployedBytecode": {
+                        "immutableReferences": {
+                            "6": [
                                 {
                                     "length": 32,
                                     "start": 75
@@ -24,10 +17,8 @@
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_import_asm_json/output.json b/test/cmdlineTests/standard_import_asm_json/output.json
index 5b7cdf3bb9..1db2879607 100644
--- a/test/cmdlineTests/standard_import_asm_json/output.json
+++ b/test/cmdlineTests/standard_import_asm_json/output.json
@@ -1,25 +1,19 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "": {
+                "evm": {
                     "assembly": "    /* \"<stdin>\":36:51   */
   0x00
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>",
                         "opcodes":"<OPCODES REMOVED>",
                         "sourceMap":"<SOURCEMAP REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "functionDebugData": {},
                         "immutableReferences": {},
                         "linkReferences": {},
@@ -27,10 +21,8 @@
                         "opcodes": "",
                         "sourceMap": ""
                     },
-                    "legacyAssembly":
-                    {
-                        ".code":
-                        [
+                    "legacyAssembly": {
+                        ".code": [
                             {
                                 "begin": 36,
                                 "end": 51,
@@ -39,8 +31,7 @@
                                 "value": "0"
                             }
                         ],
-                        "sourceList":
-                        [
+                        "sourceList": [
                             "<stdin>"
                         ]
                     }
diff --git a/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json b/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
index 05a6ff7d5e..f0554d8c60 100644
--- a/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
@@ -1,27 +1,19 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {},
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>",
                         "opcodes":"<OPCODES REMOVED>",
                         "sourceMap":"<SOURCEMAP REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "functionDebugData": {},
-                        "immutableReferences":
-                        {
-                            "6":
-                            [
+                        "immutableReferences": {
+                            "6": [
                                 {
                                     "length": 32,
                                     "start": 1
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
index 2a075efd02..489a419331 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
index 2a075efd02..489a419331 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
index 2a075efd02..489a419331 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
index 3495a7411d..135ec60dea 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "No input sources specified.",
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
index 6314f8b056..cccd241d94 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Assembly import error: InvalidOpcode",
diff --git a/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json b/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
index affe4c34e6..9e85128bbd 100644
--- a/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "EVMAssembly import only supports exactly one input file.",
diff --git a/test/cmdlineTests/standard_import_asm_json_link_references/output.json b/test/cmdlineTests/standard_import_asm_json_link_references/output.json
index 864f65a53f..fed476e620 100644
--- a/test/cmdlineTests/standard_import_asm_json_link_references/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_link_references/output.json
@@ -1,30 +1,21 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {},
                         "linkReferences": {},
                         "object": "<BYTECODE REMOVED>",
                         "opcodes":"<OPCODES REMOVED>",
                         "sourceMap": ""
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "functionDebugData": {},
                         "immutableReferences": {},
-                        "linkReferences":
-                        {
-                            "test.sol":
-                            {
-                                "L":
-                                [
+                        "linkReferences": {
+                            "test.sol": {
+                                "L": [
                                     {
                                         "length": 20,
                                         "start": 1
diff --git a/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json b/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
index 2a075efd02..489a419331 100644
--- a/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
+++ b/test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
diff --git a/test/cmdlineTests/standard_import_ast/output.json b/test/cmdlineTests/standard_import_ast/output.json
index 6ecac5ca36..d54da1750b 100644
--- a/test/cmdlineTests/standard_import_ast/output.json
+++ b/test/cmdlineTests/standard_import_ast/output.json
@@ -1,27 +1,20 @@
 {
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
+    "sources": {
+        "A": {
+            "ast": {
                 "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
+                "exportedSymbols": {
+                    "C": [
                         6
                     ]
                 },
                 "id": 7,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
@@ -37,18 +30,15 @@
                         "contractKind": "contract",
                         "fullyImplemented": true,
                         "id": 6,
-                        "linearizedBaseContracts":
-                        [
+                        "linearizedBaseContracts": [
                             6
                         ],
                         "name": "C",
                         "nameLocation": "68:1:0",
                         "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
+                        "nodes": [
                             {
-                                "body":
-                                {
+                                "body": {
                                     "id": 4,
                                     "nodeType": "Block",
                                     "src": "97:2:0",
@@ -62,15 +52,13 @@
                                 "name": "f",
                                 "nameLocation": "81:1:0",
                                 "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
+                                "parameters": {
                                     "id": 2,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
                                     "src": "82:2:0"
                                 },
-                                "returnParameters":
-                                {
+                                "returnParameters": {
                                     "id": 3,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
diff --git a/test/cmdlineTests/standard_import_ast_select_bytecode/output.json b/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
index 0fca3f2715..c060efd971 100644
--- a/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
+++ b/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "test":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "test": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -20,10 +15,8 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_import_with_comments/output.json b/test/cmdlineTests/standard_import_with_comments/output.json
index 6ecac5ca36..d54da1750b 100644
--- a/test/cmdlineTests/standard_import_with_comments/output.json
+++ b/test/cmdlineTests/standard_import_with_comments/output.json
@@ -1,27 +1,20 @@
 {
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
+    "sources": {
+        "A": {
+            "ast": {
                 "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
+                "exportedSymbols": {
+                    "C": [
                         6
                     ]
                 },
                 "id": 7,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
@@ -37,18 +30,15 @@
                         "contractKind": "contract",
                         "fullyImplemented": true,
                         "id": 6,
-                        "linearizedBaseContracts":
-                        [
+                        "linearizedBaseContracts": [
                             6
                         ],
                         "name": "C",
                         "nameLocation": "68:1:0",
                         "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
+                        "nodes": [
                             {
-                                "body":
-                                {
+                                "body": {
                                     "id": 4,
                                     "nodeType": "Block",
                                     "src": "97:2:0",
@@ -62,15 +52,13 @@
                                 "name": "f",
                                 "nameLocation": "81:1:0",
                                 "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
+                                "parameters": {
                                     "id": 2,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
                                     "src": "82:2:0"
                                 },
-                                "returnParameters":
-                                {
+                                "returnParameters": {
                                     "id": 3,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
diff --git a/test/cmdlineTests/standard_import_with_comments_simple/output.json b/test/cmdlineTests/standard_import_with_comments_simple/output.json
index 6ecac5ca36..d54da1750b 100644
--- a/test/cmdlineTests/standard_import_with_comments_simple/output.json
+++ b/test/cmdlineTests/standard_import_with_comments_simple/output.json
@@ -1,27 +1,20 @@
 {
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
+    "sources": {
+        "A": {
+            "ast": {
                 "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
+                "exportedSymbols": {
+                    "C": [
                         6
                     ]
                 },
                 "id": 7,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
@@ -37,18 +30,15 @@
                         "contractKind": "contract",
                         "fullyImplemented": true,
                         "id": 6,
-                        "linearizedBaseContracts":
-                        [
+                        "linearizedBaseContracts": [
                             6
                         ],
                         "name": "C",
                         "nameLocation": "68:1:0",
                         "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
+                        "nodes": [
                             {
-                                "body":
-                                {
+                                "body": {
                                     "id": 4,
                                     "nodeType": "Block",
                                     "src": "97:2:0",
@@ -62,15 +52,13 @@
                                 "name": "f",
                                 "nameLocation": "81:1:0",
                                 "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
+                                "parameters": {
                                     "id": 2,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
                                     "src": "82:2:0"
                                 },
-                                "returnParameters":
-                                {
+                                "returnParameters": {
                                     "id": 3,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
diff --git a/test/cmdlineTests/standard_import_with_invalid_utf8/output.json b/test/cmdlineTests/standard_import_with_invalid_utf8/output.json
index 057e4fe169..e168f8797b 100644
--- a/test/cmdlineTests/standard_import_with_invalid_utf8/output.json
+++ b/test/cmdlineTests/standard_import_with_invalid_utf8/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "parse error at line 12, column 23: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\ud800\"'",
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
index 200b653ff4..91d0e87f36 100644
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -1,32 +1,22 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "irOptimizedAst":
-                {
-                    "code":
-                    {
-                        "block":
-                        {
+    "contracts": {
+        "C": {
+            "C": {
+                "irOptimizedAst": {
+                    "code": {
+                        "block": {
                             "nativeSrc": "44:790:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
-                            "statements":
-                            [
+                            "statements": [
                                 {
                                     "nativeSrc": "44:790:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
+                                            "expression": {
+                                                "arguments": [
                                                     {
                                                         "kind": "number",
                                                         "nativeSrc": "103:2:0",
@@ -36,8 +26,7 @@
                                                         "value": "64"
                                                     },
                                                     {
-                                                        "arguments":
-                                                        [
+                                                        "arguments": [
                                                             {
                                                                 "kind": "number",
                                                                 "nativeSrc": "119:3:0",
@@ -47,8 +36,7 @@
                                                                 "value": "0x80"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "memoryguard",
                                                             "nativeSrc": "107:11:0",
                                                             "nodeType": "YulIdentifier",
@@ -59,8 +47,7 @@
                                                         "src": "56:13:0"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "mstore",
                                                     "nativeSrc": "96:6:0",
                                                     "nodeType": "YulIdentifier",
@@ -75,19 +62,15 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "148:83:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
+                                                        "expression": {
                                                             "arguments": [],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
                                                                 "nativeSrc": "150:77:0",
                                                                 "nodeType": "YulIdentifier",
@@ -103,11 +86,9 @@
                                                     }
                                                 ]
                                             },
-                                            "condition":
-                                            {
+                                            "condition": {
                                                 "arguments": [],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "callvalue",
                                                     "nativeSrc": "136:9:0",
                                                     "nodeType": "YulIdentifier",
@@ -125,11 +106,9 @@
                                             "nativeSrc": "268:30:0",
                                             "nodeType": "YulVariableDeclaration",
                                             "src": "56:13:0",
-                                            "value":
-                                            {
+                                            "value": {
                                                 "arguments": [],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "allocate_unbounded",
                                                     "nativeSrc": "278:18:0",
                                                     "nodeType": "YulIdentifier",
@@ -139,8 +118,7 @@
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "variables":
-                                            [
+                                            "variables": [
                                                 {
                                                     "name": "_1",
                                                     "nativeSrc": "272:2:0",
@@ -151,10 +129,8 @@
                                             ]
                                         },
                                         {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
+                                            "expression": {
+                                                "arguments": [
                                                     {
                                                         "name": "_1",
                                                         "nativeSrc": "316:2:0",
@@ -162,8 +138,7 @@
                                                         "src": "56:13:0"
                                                     },
                                                     {
-                                                        "arguments":
-                                                        [
+                                                        "arguments": [
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
@@ -174,8 +149,7 @@
                                                                 "value": "C_2_deployed"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "dataoffset",
                                                             "nativeSrc": "320:10:0",
                                                             "nodeType": "YulIdentifier",
@@ -186,8 +160,7 @@
                                                         "src": "56:13:0"
                                                     },
                                                     {
-                                                        "arguments":
-                                                        [
+                                                        "arguments": [
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
@@ -198,8 +171,7 @@
                                                                 "value": "C_2_deployed"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "datasize",
                                                             "nativeSrc": "348:8:0",
                                                             "nodeType": "YulIdentifier",
@@ -210,8 +182,7 @@
                                                         "src": "56:13:0"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "codecopy",
                                                     "nativeSrc": "307:8:0",
                                                     "nodeType": "YulIdentifier",
@@ -226,10 +197,8 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
+                                            "expression": {
+                                                "arguments": [
                                                     {
                                                         "name": "_1",
                                                         "nativeSrc": "390:2:0",
@@ -237,8 +206,7 @@
                                                         "src": "56:13:0"
                                                     },
                                                     {
-                                                        "arguments":
-                                                        [
+                                                        "arguments": [
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
@@ -249,8 +217,7 @@
                                                                 "value": "C_2_deployed"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "datasize",
                                                             "nativeSrc": "394:8:0",
                                                             "nodeType": "YulIdentifier",
@@ -261,8 +228,7 @@
                                                         "src": "56:13:0"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "return",
                                                     "nativeSrc": "383:6:0",
                                                     "nodeType": "YulIdentifier",
@@ -279,21 +245,17 @@
                                     ]
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "469:43:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        "statements": [
                                             {
                                                 "nativeSrc": "483:19:0",
                                                 "nodeType": "YulAssignment",
                                                 "src": "56:13:0",
-                                                "value":
-                                                {
-                                                    "arguments":
-                                                    [
+                                                "value": {
+                                                    "arguments": [
                                                         {
                                                             "kind": "number",
                                                             "nativeSrc": "499:2:0",
@@ -303,8 +265,7 @@
                                                             "value": "64"
                                                         }
                                                     ],
-                                                    "functionName":
-                                                    {
+                                                    "functionName": {
                                                         "name": "mload",
                                                         "nativeSrc": "493:5:0",
                                                         "nodeType": "YulIdentifier",
@@ -314,8 +275,7 @@
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
-                                                "variableNames":
-                                                [
+                                                "variableNames": [
                                                     {
                                                         "name": "memPtr",
                                                         "nativeSrc": "483:6:0",
@@ -329,8 +289,7 @@
                                     "name": "allocate_unbounded",
                                     "nativeSrc": "429:83:0",
                                     "nodeType": "YulFunctionDefinition",
-                                    "returnVariables":
-                                    [
+                                    "returnVariables": [
                                         {
                                             "name": "memPtr",
                                             "nativeSrc": "462:6:0",
@@ -342,18 +301,14 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "611:36:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        "statements": [
                                             {
-                                                "expression":
-                                                {
-                                                    "arguments":
-                                                    [
+                                                "expression": {
+                                                    "arguments": [
                                                         {
                                                             "kind": "number",
                                                             "nativeSrc": "632:1:0",
@@ -371,8 +326,7 @@
                                                             "value": "0"
                                                         }
                                                     ],
-                                                    "functionName":
-                                                    {
+                                                    "functionName": {
                                                         "name": "revert",
                                                         "nativeSrc": "625:6:0",
                                                         "nodeType": "YulIdentifier",
@@ -399,29 +353,22 @@
                     },
                     "name": "C_2",
                     "nodeType": "YulObject",
-                    "subObjects":
-                    [
+                    "subObjects": [
                         {
-                            "code":
-                            {
-                                "block":
-                                {
+                            "code": {
+                                "block": {
                                     "nativeSrc": "899:588:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
                                             "nativeSrc": "899:588:0",
                                             "nodeType": "YulBlock",
                                             "src": "-1:-1:0",
-                                            "statements":
-                                            [
+                                            "statements": [
                                                 {
-                                                    "expression":
-                                                    {
-                                                        "arguments":
-                                                        [
+                                                    "expression": {
+                                                        "arguments": [
                                                             {
                                                                 "kind": "number",
                                                                 "nativeSrc": "966:2:0",
@@ -431,8 +378,7 @@
                                                                 "value": "64"
                                                             },
                                                             {
-                                                                "arguments":
-                                                                [
+                                                                "arguments": [
                                                                     {
                                                                         "kind": "number",
                                                                         "nativeSrc": "982:3:0",
@@ -442,8 +388,7 @@
                                                                         "value": "0x80"
                                                                     }
                                                                 ],
-                                                                "functionName":
-                                                                {
+                                                                "functionName": {
                                                                     "name": "memoryguard",
                                                                     "nativeSrc": "970:11:0",
                                                                     "nodeType": "YulIdentifier",
@@ -454,8 +399,7 @@
                                                                 "src": "56:13:0"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "mstore",
                                                             "nativeSrc": "959:6:0",
                                                             "nodeType": "YulIdentifier",
@@ -470,11 +414,9 @@
                                                     "src": "56:13:0"
                                                 },
                                                 {
-                                                    "expression":
-                                                    {
+                                                    "expression": {
                                                         "arguments": [],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
                                                             "nativeSrc": "1001:77:0",
                                                             "nodeType": "YulIdentifier",
@@ -491,18 +433,14 @@
                                             ]
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1432:44:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1457:1:0",
@@ -520,8 +458,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "1450:6:0",
                                                                 "nodeType": "YulIdentifier",
@@ -548,8 +485,7 @@
                             },
                             "name": "C_2_deployed",
                             "nodeType": "YulObject",
-                            "subObjects":
-                            [
+                            "subObjects": [
                                 {
                                     "nodeType": "YulData",
                                     "value": "<BYTECODE REMOVED>"
@@ -561,10 +497,8 @@
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index 88ce648957..849b436b24 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "irOptimized": "/// @use-src 0:\"A\"
 object \"C_7\" {
     code {
@@ -77,10 +74,8 @@ object \"C_7\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_ir_ast_requested/output.json b/test/cmdlineTests/standard_ir_ast_requested/output.json
index f949d7b30c..b2e1c0c7dd 100644
--- a/test/cmdlineTests/standard_ir_ast_requested/output.json
+++ b/test/cmdlineTests/standard_ir_ast_requested/output.json
@@ -1,26 +1,17 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "irAst":
-                {
-                    "code":
-                    {
-                        "block":
-                        {
+    "contracts": {
+        "C": {
+            "C": {
+                "irAst": {
+                    "code": {
+                        "block": {
                             "nativeSrc": "44:790:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
-                            "statements":
-                            [
+                            "statements": [
                                 {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
+                                    "expression": {
+                                        "arguments": [
                                             {
                                                 "kind": "number",
                                                 "nativeSrc": "103:2:0",
@@ -30,8 +21,7 @@
                                                 "value": "64"
                                             },
                                             {
-                                                "arguments":
-                                                [
+                                                "arguments": [
                                                     {
                                                         "kind": "number",
                                                         "nativeSrc": "119:3:0",
@@ -41,8 +31,7 @@
                                                         "value": "128"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "memoryguard",
                                                     "nativeSrc": "107:11:0",
                                                     "nodeType": "YulIdentifier",
@@ -53,8 +42,7 @@
                                                 "src": "56:13:0"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "mstore",
                                             "nativeSrc": "96:6:0",
                                             "nodeType": "YulIdentifier",
@@ -69,19 +57,15 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "148:83:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        "statements": [
                                             {
-                                                "expression":
-                                                {
+                                                "expression": {
                                                     "arguments": [],
-                                                    "functionName":
-                                                    {
+                                                    "functionName": {
                                                         "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
                                                         "nativeSrc": "150:77:0",
                                                         "nodeType": "YulIdentifier",
@@ -97,11 +81,9 @@
                                             }
                                         ]
                                     },
-                                    "condition":
-                                    {
+                                    "condition": {
                                         "arguments": [],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "callvalue",
                                             "nativeSrc": "136:9:0",
                                             "nodeType": "YulIdentifier",
@@ -116,11 +98,9 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "expression":
-                                    {
+                                    "expression": {
                                         "arguments": [],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "constructor_C_2",
                                             "nativeSrc": "241:15:0",
                                             "nodeType": "YulIdentifier",
@@ -138,11 +118,9 @@
                                     "nativeSrc": "268:30:0",
                                     "nodeType": "YulVariableDeclaration",
                                     "src": "56:13:0",
-                                    "value":
-                                    {
+                                    "value": {
                                         "arguments": [],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "allocate_unbounded",
                                             "nativeSrc": "278:18:0",
                                             "nodeType": "YulIdentifier",
@@ -152,8 +130,7 @@
                                         "nodeType": "YulFunctionCall",
                                         "src": "56:13:0"
                                     },
-                                    "variables":
-                                    [
+                                    "variables": [
                                         {
                                             "name": "_1",
                                             "nativeSrc": "272:2:0",
@@ -164,10 +141,8 @@
                                     ]
                                 },
                                 {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
+                                    "expression": {
+                                        "arguments": [
                                             {
                                                 "name": "_1",
                                                 "nativeSrc": "316:2:0",
@@ -175,8 +150,7 @@
                                                 "src": "56:13:0"
                                             },
                                             {
-                                                "arguments":
-                                                [
+                                                "arguments": [
                                                     {
                                                         "hexValue": "435f325f6465706c6f796564",
                                                         "kind": "string",
@@ -187,8 +161,7 @@
                                                         "value": "C_2_deployed"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "dataoffset",
                                                     "nativeSrc": "320:10:0",
                                                     "nodeType": "YulIdentifier",
@@ -199,8 +172,7 @@
                                                 "src": "56:13:0"
                                             },
                                             {
-                                                "arguments":
-                                                [
+                                                "arguments": [
                                                     {
                                                         "hexValue": "435f325f6465706c6f796564",
                                                         "kind": "string",
@@ -211,8 +183,7 @@
                                                         "value": "C_2_deployed"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "datasize",
                                                     "nativeSrc": "348:8:0",
                                                     "nodeType": "YulIdentifier",
@@ -223,8 +194,7 @@
                                                 "src": "56:13:0"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "codecopy",
                                             "nativeSrc": "307:8:0",
                                             "nodeType": "YulIdentifier",
@@ -239,10 +209,8 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
+                                    "expression": {
+                                        "arguments": [
                                             {
                                                 "name": "_1",
                                                 "nativeSrc": "390:2:0",
@@ -250,8 +218,7 @@
                                                 "src": "56:13:0"
                                             },
                                             {
-                                                "arguments":
-                                                [
+                                                "arguments": [
                                                     {
                                                         "hexValue": "435f325f6465706c6f796564",
                                                         "kind": "string",
@@ -262,8 +229,7 @@
                                                         "value": "C_2_deployed"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "datasize",
                                                     "nativeSrc": "394:8:0",
                                                     "nodeType": "YulIdentifier",
@@ -274,8 +240,7 @@
                                                 "src": "56:13:0"
                                             }
                                         ],
-                                        "functionName":
-                                        {
+                                        "functionName": {
                                             "name": "return",
                                             "nativeSrc": "383:6:0",
                                             "nodeType": "YulIdentifier",
@@ -290,21 +255,17 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "469:43:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        "statements": [
                                             {
                                                 "nativeSrc": "483:19:0",
                                                 "nodeType": "YulAssignment",
                                                 "src": "56:13:0",
-                                                "value":
-                                                {
-                                                    "arguments":
-                                                    [
+                                                "value": {
+                                                    "arguments": [
                                                         {
                                                             "kind": "number",
                                                             "nativeSrc": "499:2:0",
@@ -314,8 +275,7 @@
                                                             "value": "64"
                                                         }
                                                     ],
-                                                    "functionName":
-                                                    {
+                                                    "functionName": {
                                                         "name": "mload",
                                                         "nativeSrc": "493:5:0",
                                                         "nodeType": "YulIdentifier",
@@ -325,8 +285,7 @@
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
-                                                "variableNames":
-                                                [
+                                                "variableNames": [
                                                     {
                                                         "name": "memPtr",
                                                         "nativeSrc": "483:6:0",
@@ -340,8 +299,7 @@
                                     "name": "allocate_unbounded",
                                     "nativeSrc": "429:83:0",
                                     "nodeType": "YulFunctionDefinition",
-                                    "returnVariables":
-                                    [
+                                    "returnVariables": [
                                         {
                                             "name": "memPtr",
                                             "nativeSrc": "462:6:0",
@@ -353,18 +311,14 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "611:36:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        "statements": [
                                             {
-                                                "expression":
-                                                {
-                                                    "arguments":
-                                                    [
+                                                "expression": {
+                                                    "arguments": [
                                                         {
                                                             "kind": "number",
                                                             "nativeSrc": "632:1:0",
@@ -382,8 +336,7 @@
                                                             "value": "0"
                                                         }
                                                     ],
-                                                    "functionName":
-                                                    {
+                                                    "functionName": {
                                                         "name": "revert",
                                                         "nativeSrc": "625:6:0",
                                                         "nodeType": "YulIdentifier",
@@ -405,8 +358,7 @@
                                     "src": "56:13:0"
                                 },
                                 {
-                                    "body":
-                                    {
+                                    "body": {
                                         "nativeSrc": "726:59:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
@@ -423,23 +375,17 @@
                     },
                     "name": "C_2",
                     "nodeType": "YulObject",
-                    "subObjects":
-                    [
+                    "subObjects": [
                         {
-                            "code":
-                            {
-                                "block":
-                                {
+                            "code": {
+                                "block": {
                                     "nativeSrc": "899:588:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
+                                            "expression": {
+                                                "arguments": [
                                                     {
                                                         "kind": "number",
                                                         "nativeSrc": "966:2:0",
@@ -449,8 +395,7 @@
                                                         "value": "64"
                                                     },
                                                     {
-                                                        "arguments":
-                                                        [
+                                                        "arguments": [
                                                             {
                                                                 "kind": "number",
                                                                 "nativeSrc": "982:3:0",
@@ -460,8 +405,7 @@
                                                                 "value": "128"
                                                             }
                                                         ],
-                                                        "functionName":
-                                                        {
+                                                        "functionName": {
                                                             "name": "memoryguard",
                                                             "nativeSrc": "970:11:0",
                                                             "nodeType": "YulIdentifier",
@@ -472,8 +416,7 @@
                                                         "src": "56:13:0"
                                                     }
                                                 ],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "mstore",
                                                     "nativeSrc": "959:6:0",
                                                     "nodeType": "YulIdentifier",
@@ -488,11 +431,9 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "expression":
-                                            {
+                                            "expression": {
                                                 "arguments": [],
-                                                "functionName":
-                                                {
+                                                "functionName": {
                                                     "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
                                                     "nativeSrc": "1001:77:0",
                                                     "nodeType": "YulIdentifier",
@@ -507,21 +448,17 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1147:77:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1165:44:0",
                                                         "nodeType": "YulAssignment",
                                                         "src": "56:13:0",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1198:3:0",
@@ -537,8 +474,7 @@
                                                                     "src": "56:13:0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "shr",
                                                                 "nativeSrc": "1194:3:0",
                                                                 "nodeType": "YulIdentifier",
@@ -548,8 +484,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "newValue",
                                                                 "nativeSrc": "1165:8:0",
@@ -563,8 +498,7 @@
                                             "name": "shift_right_224_unsigned",
                                             "nativeSrc": "1094:130:0",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "value",
                                                     "nativeSrc": "1128:5:0",
@@ -573,8 +507,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "newValue",
                                                     "nativeSrc": "1138:8:0",
@@ -586,21 +519,17 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1278:51:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1296:19:0",
                                                         "nodeType": "YulAssignment",
                                                         "src": "56:13:0",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1312:2:0",
@@ -610,8 +539,7 @@
                                                                     "value": "64"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mload",
                                                                 "nativeSrc": "1306:5:0",
                                                                 "nodeType": "YulIdentifier",
@@ -621,8 +549,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "memPtr",
                                                                 "nativeSrc": "1296:6:0",
@@ -636,8 +563,7 @@
                                             "name": "allocate_unbounded",
                                             "nativeSrc": "1238:91:0",
                                             "nodeType": "YulFunctionDefinition",
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "memPtr",
                                                     "nativeSrc": "1271:6:0",
@@ -649,18 +575,14 @@
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1432:44:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "1457:1:0",
@@ -678,8 +600,7 @@
                                                                     "value": "0"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "1450:6:0",
                                                                 "nodeType": "YulIdentifier",
@@ -706,8 +627,7 @@
                             },
                             "name": "C_2_deployed",
                             "nodeType": "YulObject",
-                            "subObjects":
-                            [
+                            "subObjects": [
                                 {
                                     "nodeType": "YulData",
                                     "value": "<BYTECODE REMOVED>"
@@ -719,10 +639,8 @@
             }
         }
     },
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
index ab38f0a589..e359d5ca55 100644
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ b/test/cmdlineTests/standard_ir_requested/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_7\" {
@@ -122,10 +119,8 @@ object \"C_7\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_metadata/output.json b/test/cmdlineTests/standard_metadata/output.json
index 955d30c344..5b9c8504f3 100644
--- a/test/cmdlineTests/standard_metadata/output.json
+++ b/test/cmdlineTests/standard_metadata/output.json
@@ -1,18 +1,13 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
+    "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\":\"cancun\",\"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":
-        {
+    "sources": {
+        "C": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/output.json b/test/cmdlineTests/standard_method_identifiers_requested/output.json
index 35d4f50025..df1e81f732 100644
--- a/test/cmdlineTests/standard_method_identifiers_requested/output.json
+++ b/test/cmdlineTests/standard_method_identifiers_requested/output.json
@@ -1,24 +1,17 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "methodIdentifiers":
-                    {
+    "contracts": {
+        "A": {
+            "C": {
+                "evm": {
+                    "methodIdentifiers": {
                         "f()": "26121ff0"
                     }
                 }
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 f90a33351b..1d3245c204 100644
--- a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
+++ b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
@@ -1,21 +1,15 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "C": {
+                "evm": {
                     "methodIdentifiers": {}
                 }
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 f3a09c9e7b..d18ad81fa7 100644
--- a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
+++ b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
@@ -9,10 +8,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
index 139b0825bc..ffaa2823bf 100644
--- a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
+++ b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6002",
@@ -12,10 +11,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "sources": {
+        "Source": {
             "id": 0
         }
     }
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
index 971973d85c..05b835e569 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.bmcLoopIterations must be an unsigned integer.",
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all/output.json b/test/cmdlineTests/standard_model_checker_contracts_all/output.json
index b4bfd66b84..e9fc1b4cf6 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_all/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 B.constructor()
 B.g(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 137,
                 "file": "Source",
                 "start": 124
@@ -61,8 +59,7 @@ Transaction trace:
 A.constructor()
 A.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 231,
                 "file": "Source",
                 "start": 218
@@ -70,10 +67,8 @@ A.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "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 b4bfd66b84..e9fc1b4cf6 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 B.constructor()
 B.g(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 137,
                 "file": "Source",
                 "start": 124
@@ -61,8 +59,7 @@ Transaction trace:
 A.constructor()
 A.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 231,
                 "file": "Source",
                 "start": 218
@@ -70,10 +67,8 @@ A.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "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 ada440ad38..fe1bdb97dd 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Source contracts must be a non-empty array.",
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 c3b171e99e..e31326ff86 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Contract name cannot be empty.",
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 98dcc1afad..b4495bb222 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Source name cannot be empty.",
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 7ff30950c1..22d5f32de3 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7400",
@@ -37,8 +36,7 @@ Transaction trace:
 B.constructor()
 B.g(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 137,
                 "file": "Source",
                 "start": 124
@@ -71,8 +69,7 @@ Transaction trace:
 A.constructor()
 A.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 231,
                 "file": "Source",
                 "start": 218
@@ -80,10 +77,8 @@ A.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "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 cb18875e1b..fe287f8336 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 B.constructor()
 B.g(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 137,
                 "file": "Source",
                 "start": 124
@@ -61,8 +59,7 @@ Transaction trace:
 A.constructor()
 A.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 231,
                 "file": "Source",
                 "start": 218
@@ -95,8 +92,7 @@ Transaction trace:
 C.constructor()
 C.h(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 165,
                 "file": "Source2",
                 "start": 150
@@ -104,14 +100,11 @@ C.h(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "sources": {
+        "Source": {
             "id": 0
         },
-        "Source2":
-        {
+        "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 b4bfd66b84..e9fc1b4cf6 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 B.constructor()
 B.g(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 137,
                 "file": "Source",
                 "start": 124
@@ -61,8 +59,7 @@ Transaction trace:
 A.constructor()
 A.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 231,
                 "file": "Source",
                 "start": 218
@@ -70,10 +67,8 @@ A.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "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 d38ad1b599..b792b6d93b 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "9134",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "Source":
-        {
+    "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 98365d1bf8..05bab37331 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.contracts is not a JSON object.",
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 567db80afe..d07d645f4a 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Source contracts must be an array.",
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 30d4c2dcf0..90790a859e 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Every contract in settings.modelChecker.contracts must be a string.",
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 b8637143b0..82ee5a1077 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1391",
@@ -12,10 +11,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 a6ce9b3c96..dfba533649 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6002",
@@ -12,10 +11,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 b8637143b0..82ee5a1077 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1391",
@@ -12,10 +11,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 f7ecf690d8..eefa60785b 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1218",
@@ -13,8 +12,7 @@
 ",
             "message": "CHC: Error trying to invoke SMT solver.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 182,
                 "file": "A",
                 "start": 177
@@ -33,8 +31,7 @@
 ",
             "message": "CHC: Error trying to invoke SMT solver.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 189,
                 "file": "A",
                 "start": 184
@@ -62,10 +59,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 a6ce9b3c96..dfba533649 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6002",
@@ -12,10 +11,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 fccd15838f..16fb775130 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1218",
@@ -13,8 +12,7 @@
 ",
             "message": "CHC: Error trying to invoke SMT solver.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 182,
                 "file": "A",
                 "start": 177
@@ -33,8 +31,7 @@
 ",
             "message": "CHC: Error trying to invoke SMT solver.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 189,
                 "file": "A",
                 "start": 184
@@ -52,10 +49,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 457fb1ba0c..dae639c641 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.divModNoSlacks must be a Boolean.",
diff --git a/test/cmdlineTests/standard_model_checker_engine_all/output.json b/test/cmdlineTests/standard_model_checker_engine_all/output.json
index 2a2c394fdd..be51d6b2e5 100644
--- a/test/cmdlineTests/standard_model_checker_engine_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_all/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 C.constructor()
 C.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 119,
                 "file": "A",
                 "start": 106
@@ -36,10 +34,8 @@ C.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 75e679ef47..4727ea0835 100644
--- a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4661",
@@ -17,8 +16,7 @@ Note:
 
 ",
             "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   x = 0
@@ -32,8 +30,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 119,
                 "file": "A",
                 "start": 106
@@ -41,10 +38,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 2a2c394fdd..be51d6b2e5 100644
--- a/test/cmdlineTests/standard_model_checker_engine_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 C.constructor()
 C.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 119,
                 "file": "A",
                 "start": 106
@@ -36,10 +34,8 @@ C.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_model_checker_engine_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_none/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 4e214a37b2..34d69504d5 100644
--- a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid model checker extCalls requested.",
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 7f39934101..16bfff9b77 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 152,
                 "file": "A",
                 "start": 85
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index c6b072a858..858d225e67 100644
--- a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -31,8 +30,7 @@ test.constructor()
 test.g(0)
     e.f() -- untrusted external call",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 254,
                 "file": "A",
                 "start": 240
@@ -40,10 +38,8 @@ test.g(0)
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 4e214a37b2..34d69504d5 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid model checker extCalls requested.",
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
index e869637ed1..5daa6a447a 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.extCalls must be a string.",
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
index 314b66aae4..f3cd0758c0 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1391",
@@ -26,10 +25,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 5a83ba7ac7..d46fdda8a9 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "9302",
@@ -13,8 +12,7 @@
 ",
             "message": "Return value of low-level calls not used.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 143,
                 "file": "A",
                 "start": 132
@@ -51,8 +49,7 @@ State: x = 0
 test.f(0x0)
     _a.call(\"\") -- untrusted external call",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 166,
                 "file": "A",
                 "start": 151
@@ -60,10 +57,8 @@ test.f(0x0)
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 feb586a3e3..bf6b296cdf 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "9302",
@@ -13,8 +12,7 @@
 ",
             "message": "Return value of low-level calls not used.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 143,
                 "file": "A",
                 "start": 132
@@ -50,10 +48,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 45fcfbe984..06b42cb6f4 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid model checker invariants requested.",
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 d1992e464d..c59605d2cd 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Every invariant type in settings.modelChecker.invariants must be a string.",
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 078edfc1d8..eaa736025c 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.invariants must be an array.",
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
index b8e11ced73..16ff42e0c3 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
@@ -1,8 +1,6 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
+    "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)))))
@@ -159,8 +157,7 @@
 "
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2339",
@@ -530,10 +527,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
index f7b4dc7e28..1c9826ad22 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
@@ -1,8 +1,6 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
+    "auxiliaryInputRequested": {
+        "smtlib2queries": {
             "0x8704a7b848b706ef33cbfc06e4f185636f568a29621126b7244355dd0de956bb": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -32,8 +30,7 @@
 "
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6240",
@@ -119,10 +116,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
index 9ef925b205..a9b0df0fb6 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
@@ -1,8 +1,6 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
+    "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)))))
@@ -129,8 +127,7 @@
 "
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2339",
@@ -410,10 +407,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 00c389f7a4..a9f44c912f 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.printQuery must be a Boolean value.",
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
index 42d4b5b2db..d675499f91 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
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
index 42d4b5b2db..d675499f91 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
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
index b8118ba16a..4c57da4607 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index eb6ed6e277..6d9dbb4092 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index b8118ba16a..4c57da4607 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index b8118ba16a..4c57da4607 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index eb6ed6e277..6d9dbb4092 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index b8118ba16a..4c57da4607 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -32,10 +30,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 8482298559..22f863b12c 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -33,8 +31,7 @@
 ",
             "message": "CHC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 130,
                 "file": "A",
                 "start": 116
@@ -53,8 +50,7 @@
 ",
             "message": "CHC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 154,
                 "file": "A",
                 "start": 138
@@ -62,10 +58,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 20ddce1fd5..2788a64a8a 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -33,8 +31,7 @@
 ",
             "message": "BMC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 130,
                 "file": "A",
                 "start": 116
@@ -53,8 +50,7 @@
 ",
             "message": "BMC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 154,
                 "file": "A",
                 "start": 138
@@ -62,10 +58,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 8482298559..22f863b12c 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2018",
@@ -13,8 +12,7 @@
 ",
             "message": "Function state mutability can be restricted to pure",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 162,
                 "file": "A",
                 "start": 81
@@ -33,8 +31,7 @@
 ",
             "message": "CHC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 130,
                 "file": "A",
                 "start": 116
@@ -53,8 +50,7 @@
 ",
             "message": "CHC: Assertion violation check is safe!",
             "severity": "info",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 154,
                 "file": "A",
                 "start": 138
@@ -62,10 +58,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 7c8ccff6e2..b5811ff035 100644
--- a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.showProvedSafe must be a Boolean value.",
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 fb599d21d2..da3b3dcad8 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -22,10 +21,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 fb599d21d2..da3b3dcad8 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -22,10 +21,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 4554ec69e9..67f8df7319 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2788",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 7f0e676cb8..66cdf505c6 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 ecb157f88f..b6153de5eb 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -13,8 +12,7 @@
 ",
             "message": "CHC: Assertion violation might happen here.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 201,
                 "file": "A",
                 "start": 186
@@ -33,15 +31,13 @@ Note:
 
 ",
             "message": "BMC: Assertion violation might happen here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": ""
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 201,
                 "file": "A",
                 "start": 186
@@ -49,10 +45,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 116af8dce2..6c3b57c795 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7812",
@@ -13,15 +12,13 @@ Note:
 
 ",
             "message": "BMC: Assertion violation might happen here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": ""
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 201,
                 "file": "A",
                 "start": 186
@@ -29,10 +26,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 58956287fd..78efcad949 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -13,8 +12,7 @@
 ",
             "message": "CHC: Assertion violation might happen here.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 201,
                 "file": "A",
                 "start": 186
@@ -22,10 +20,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 a9342cddfb..49b97bab57 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.showUnproved must be a Boolean value.",
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
index 23cf80defb..b8f8515b8b 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 23cf80defb..b8f8515b8b 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 23cf80defb..b8f8515b8b 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 23cf80defb..b8f8515b8b 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 23cf80defb..b8f8515b8b 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 23cf80defb..b8f8515b8b 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5724",
@@ -12,10 +11,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 13d327d405..e9eb877ea0 100644
--- 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7737",
@@ -13,8 +12,7 @@
 ",
             "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 127,
                 "file": "A",
                 "start": 116
@@ -22,10 +20,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 13d327d405..e9eb877ea0 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7737",
@@ -13,8 +12,7 @@
 ",
             "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 127,
                 "file": "A",
                 "start": 116
@@ -22,10 +20,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index 13d327d405..e9eb877ea0 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7737",
@@ -13,8 +12,7 @@
 ",
             "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 127,
                 "file": "A",
                 "start": 116
@@ -22,10 +20,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
index 997b005ef7..068c3a872b 100644
--- a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.showUnsupported must be a Boolean value.",
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
index e5d356ce5a..e8de49d1ed 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7649",
@@ -22,10 +21,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 ebeca53f5b..d3bdc6b7eb 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -1,8 +1,6 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
+    "auxiliaryInputRequested": {
+        "smtlib2queries": {
             "0x75b95497d56c30e254a59358d72ddd4e78f9e90db621cfe677e85d05b2252411": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -155,8 +153,7 @@
 "
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -198,10 +195,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 2a2c394fdd..be51d6b2e5 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 C.constructor()
 C.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 119,
                 "file": "A",
                 "start": 106
@@ -36,10 +34,8 @@ C.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 2a2c394fdd..be51d6b2e5 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -27,8 +26,7 @@ Transaction trace:
 C.constructor()
 C.f(0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 119,
                 "file": "A",
                 "start": 106
@@ -36,10 +34,8 @@ C.f(0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 18452ccbc9..9e90ec538d 100644
--- a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4661",
@@ -18,8 +17,7 @@ Note:
 
 ",
             "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -34,8 +32,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -43,10 +40,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 5c43fe6b54..bf4fa66269 100644
--- a/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6328",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -40,10 +38,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 9ee51daba1..6c2c90c988 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1236",
@@ -18,8 +17,7 @@ Note:
 
 ",
             "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -34,8 +32,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 237,
                 "file": "A",
                 "start": 224
@@ -43,10 +40,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 94ba81c2be..9bfdf0b021 100644
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6838",
@@ -13,15 +12,13 @@ Note: Callstack:
 
 ",
             "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Callstack:"
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 165,
                 "file": "A",
                 "start": 159
@@ -29,10 +26,8 @@ Note: Callstack:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 4c967fa5d0..2318e5adfa 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4281",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 216,
                 "file": "A",
                 "start": 211
@@ -69,8 +67,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -107,8 +104,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 275,
                 "file": "A",
                 "start": 266
@@ -145,8 +141,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 289,
                 "file": "A",
                 "start": 283
@@ -165,15 +160,13 @@ Note: Callstack:
 
 ",
             "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Callstack:"
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 165,
                 "file": "A",
                 "start": 159
@@ -197,8 +190,7 @@ Note:
 
 ",
             "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -213,8 +205,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 237,
                 "file": "A",
                 "start": 224
@@ -222,10 +213,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 1be99ca455..e055d38d2e 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6838",
@@ -13,15 +12,13 @@ Note: Callstack:
 
 ",
             "message": "BMC: Condition is always true.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Callstack:"
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 165,
                 "file": "A",
                 "start": 159
@@ -46,8 +43,7 @@ Note:
 
 ",
             "message": "BMC: Division by zero happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = 0
@@ -63,8 +59,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 216,
                 "file": "A",
                 "start": 211
@@ -88,8 +83,7 @@ Note:
 
 ",
             "message": "BMC: Insufficient funds happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -104,8 +98,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 237,
                 "file": "A",
                 "start": 224
@@ -129,8 +122,7 @@ Note:
 
 ",
             "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -145,8 +137,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -154,10 +145,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 c3df366c99..eb39e02712 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4281",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 216,
                 "file": "A",
                 "start": 211
@@ -69,8 +67,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -107,8 +104,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 275,
                 "file": "A",
                 "start": 266
@@ -145,8 +141,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 289,
                 "file": "A",
                 "start": 283
@@ -154,10 +149,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 05ce12ca2c..6ba0e6f820 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3046",
@@ -19,8 +18,7 @@ Note:
 
 ",
             "message": "BMC: Division by zero happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = 0
@@ -36,8 +34,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 216,
                 "file": "A",
                 "start": 211
@@ -45,10 +42,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 5c09175e72..0789c79996 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4281",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 216,
                 "file": "A",
                 "start": 211
@@ -40,10 +38,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 312af9741c..6b5c6e0689 100644
--- a/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.targets must be a non-empty array.",
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 acf3b74ef1..f047ff70a9 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,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 b87480e74b..f5f49fb508 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6368",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 289,
                 "file": "A",
                 "start": 283
@@ -40,10 +38,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 09c1cdb5f1..8d34765cdb 100644
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2661",
@@ -19,8 +18,7 @@ Note:
 
 ",
             "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = 2**256
@@ -36,8 +34,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -45,10 +42,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 b700a938ed..9beb30a35b 100644
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4984",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 2)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -40,10 +38,8 @@ test.f(0x0, 2)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 acf3b74ef1..f047ff70a9 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,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 c670bb4f60..4cccf8456d 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2529",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 275,
                 "file": "A",
                 "start": 266
@@ -40,10 +38,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 c656eda21a..df17886b2f 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4144",
@@ -19,8 +18,7 @@ Note:
 
 ",
             "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = (- 1)
@@ -36,8 +34,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -45,10 +42,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 600d7fe6b8..442f2f47a9 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3944",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -40,10 +38,8 @@ test.f(0x0, 0)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 004b98128e..c80d3e22a8 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4144",
@@ -19,8 +18,7 @@ Note:
 
 ",
             "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = (- 1)
@@ -36,8 +34,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -62,8 +59,7 @@ Note:
 
 ",
             "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = 2**256
@@ -79,8 +75,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -104,8 +99,7 @@ Note:
 
 ",
             "message": "BMC: Assertion violation happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   a = 0
@@ -120,8 +114,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -129,10 +122,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 5afeeaa940..e5719640aa 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3944",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -69,8 +67,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 2)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -107,8 +104,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 1)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "A",
                 "start": 245
@@ -116,10 +112,8 @@ test.f(0x0, 1)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 8a9452a7b8..de02d57c90 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "4144",
@@ -19,8 +18,7 @@ Note:
 
 ",
             "message": "BMC: Underflow (resulting value less than 0) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = (- 1)
@@ -36,8 +34,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -62,8 +59,7 @@ Note:
 
 ",
             "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "message": "Counterexample:
   <result> = 2**256
@@ -79,8 +75,7 @@ Note:
                 }
             ],
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -88,10 +83,8 @@ Note:
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 9a07b669ad..6fb8762e43 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3944",
@@ -31,8 +30,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 0)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 177,
                 "file": "A",
                 "start": 174
@@ -69,8 +67,7 @@ test.constructor()
 State: arr = []
 test.f(0x0, 2)",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 203,
                 "file": "A",
                 "start": 185
@@ -78,10 +75,8 @@ test.f(0x0, 2)",
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 6e2af863ec..fee6f21958 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Every target in settings.modelChecker.targets must be a string.",
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 c1e7759b5c..996d75e709 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.targets must be an array.",
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 d0bf7f56da..e51a852581 100644
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid model checker targets requested.",
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/output.json b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
index 73b1171454..2da324f33a 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -32,10 +31,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 a709ec062c..f813782d74 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2788",
@@ -22,10 +21,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 553a1b93b6..1ff515e25e 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "5840",
@@ -22,10 +21,8 @@
             "type": "Info"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 137562f419..afa05c3a8d 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"atimeout\"",
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 ce630905c6..7fbdfbbe82 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "settings.modelChecker.timeout must be an unsigned integer.",
diff --git a/test/cmdlineTests/standard_no_append_cbor/output.json b/test/cmdlineTests/standard_no_append_cbor/output.json
index 0fca3f2715..c060efd971 100644
--- a/test/cmdlineTests/standard_no_append_cbor/output.json
+++ b/test/cmdlineTests/standard_no_append_cbor/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "test":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "test": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -20,10 +15,8 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
index 0c264f898a..a31841944e 100644
--- a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
+++ b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "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\".",
diff --git a/test/cmdlineTests/standard_no_import_callback/output.json b/test/cmdlineTests/standard_no_import_callback/output.json
index a4e2d8d3a2..3c16f1caa7 100644
--- a/test/cmdlineTests/standard_no_import_callback/output.json
+++ b/test/cmdlineTests/standard_no_import_callback/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "6275",
@@ -13,8 +12,7 @@
 ",
             "message": "Source \"standard_no_import_callback/B.sol\" not found: No import callback.",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 102,
                 "file": "A",
                 "start": 59
diff --git a/test/cmdlineTests/standard_non_utf8_filename/output.json b/test/cmdlineTests/standard_non_utf8_filename/output.json
index a74a83a989..5dc1b6f1b6 100644
--- a/test/cmdlineTests/standard_non_utf8_filename/output.json
+++ b/test/cmdlineTests/standard_non_utf8_filename/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
diff --git a/test/cmdlineTests/standard_non_utf8_filename2/output.json b/test/cmdlineTests/standard_non_utf8_filename2/output.json
index a74a83a989..5dc1b6f1b6 100644
--- a/test/cmdlineTests/standard_non_utf8_filename2/output.json
+++ b/test/cmdlineTests/standard_non_utf8_filename2/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: ill-formed UTF-8 byte; last read: '\"\\xff'; expected string literal",
diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json
index 6ecac5ca36..d54da1750b 100644
--- a/test/cmdlineTests/standard_only_ast_requested/output.json
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
@@ -1,27 +1,20 @@
 {
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
+    "sources": {
+        "A": {
+            "ast": {
                 "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
+                "exportedSymbols": {
+                    "C": [
                         6
                     ]
                 },
                 "id": 7,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
@@ -37,18 +30,15 @@
                         "contractKind": "contract",
                         "fullyImplemented": true,
                         "id": 6,
-                        "linearizedBaseContracts":
-                        [
+                        "linearizedBaseContracts": [
                             6
                         ],
                         "name": "C",
                         "nameLocation": "68:1:0",
                         "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
+                        "nodes": [
                             {
-                                "body":
-                                {
+                                "body": {
                                     "id": 4,
                                     "nodeType": "Block",
                                     "src": "97:2:0",
@@ -62,15 +52,13 @@
                                 "name": "f",
                                 "nameLocation": "81:1:0",
                                 "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
+                                "parameters": {
                                     "id": 2,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
                                     "src": "82:2:0"
                                 },
-                                "returnParameters":
-                                {
+                                "returnParameters": {
                                     "id": 3,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/output.json b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
index da2c31cbee..0f8c3d4eae 100644
--- a/test/cmdlineTests/standard_optimizer_generatedSources/output.json
+++ b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
@@ -1,29 +1,20 @@
 {
-    "contracts":
-    {
-        "a.sol":
-        {
-            "A":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "a.sol": {
+            "A": {
+                "evm": {
+                    "bytecode": {
                         "generatedSources": [],
                         "object": "<BYTECODE REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
-                        "generatedSources":
-                        [
+                    "deployedBytecode": {
+                        "generatedSources": [
                             {
-                                "ast":
-                                {
+                                "ast": {
                                     "nativeSrc": "0:1445:1",
                                     "nodeType": "YulBlock",
                                     "src": "0:1445:1",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
                                             "nativeSrc": "6:3:1",
                                             "nodeType": "YulBlock",
@@ -31,18 +22,14 @@
                                             "statements": []
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "46:95:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "46:95:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "63:1:1",
@@ -52,8 +39,7 @@
                                                                     "value": "0"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "kind": "number",
                                                                             "nativeSrc": "70:3:1",
@@ -71,8 +57,7 @@
                                                                             "value": "0x4e487b71"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "shl",
                                                                         "nativeSrc": "66:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -83,8 +68,7 @@
                                                                     "src": "66:20:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "56:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -99,10 +83,8 @@
                                                         "src": "56:31:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "103:1:1",
@@ -120,8 +102,7 @@
                                                                     "value": "0x41"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "96:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -136,10 +117,8 @@
                                                         "src": "96:15:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "127:1:1",
@@ -157,8 +136,7 @@
                                                                     "value": "0x24"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "revert",
                                                                 "nativeSrc": "120:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -180,19 +158,16 @@
                                             "src": "14:127:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "241:1020:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "241:1020:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "251:12:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "251:12:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "kind": "number",
                                                             "nativeSrc": "261:2:1",
                                                             "nodeType": "YulLiteral",
@@ -200,8 +175,7 @@
                                                             "type": "",
                                                             "value": "32"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "_1",
                                                                 "nativeSrc": "255:2:1",
@@ -212,18 +186,14 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "308:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "308:16:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "kind": "number",
                                                                                 "nativeSrc": "317:1:1",
@@ -241,8 +211,7 @@
                                                                                 "value": "0"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert",
                                                                             "nativeSrc": "310:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -258,13 +227,10 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "dataEnd",
                                                                             "nativeSrc": "283:7:1",
@@ -278,8 +244,7 @@
                                                                             "src": "292:9:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "sub",
                                                                         "nativeSrc": "279:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -296,8 +261,7 @@
                                                                     "src": "304:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "slt",
                                                                 "nativeSrc": "275:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -315,10 +279,8 @@
                                                         "nativeSrc": "333:37:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "333:37:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "headStart",
                                                                     "nativeSrc": "360:9:1",
@@ -326,8 +288,7 @@
                                                                     "src": "360:9:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "calldataload",
                                                                 "nativeSrc": "347:12:1",
                                                                 "nodeType": "YulIdentifier",
@@ -337,8 +298,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "347:23:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "offset",
                                                                 "nativeSrc": "337:6:1",
@@ -352,8 +312,7 @@
                                                         "nativeSrc": "379:28:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "379:28:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "kind": "number",
                                                             "nativeSrc": "389:18:1",
                                                             "nodeType": "YulLiteral",
@@ -361,8 +320,7 @@
                                                             "type": "",
                                                             "value": "0xffffffffffffffff"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "_2",
                                                                 "nativeSrc": "383:2:1",
@@ -373,18 +331,14 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "434:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "434:16:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "kind": "number",
                                                                                 "nativeSrc": "443:1:1",
@@ -402,8 +356,7 @@
                                                                                 "value": "0"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert",
                                                                             "nativeSrc": "436:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -419,10 +372,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "offset",
                                                                     "nativeSrc": "422:6:1",
@@ -436,8 +387,7 @@
                                                                     "src": "430:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "gt",
                                                                 "nativeSrc": "419:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -455,10 +405,8 @@
                                                         "nativeSrc": "459:32:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "459:32:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "headStart",
                                                                     "nativeSrc": "473:9:1",
@@ -472,8 +420,7 @@
                                                                     "src": "484:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "469:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -483,8 +430,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "469:22:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "_3",
                                                                 "nativeSrc": "463:2:1",
@@ -495,18 +441,14 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "539:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "539:16:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "kind": "number",
                                                                                 "nativeSrc": "548:1:1",
@@ -524,8 +466,7 @@
                                                                                 "value": "0"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert",
                                                                             "nativeSrc": "541:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -541,16 +482,12 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "_3",
                                                                                     "nativeSrc": "518:2:1",
@@ -566,8 +503,7 @@
                                                                                     "value": "0x1f"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "add",
                                                                                 "nativeSrc": "514:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -584,8 +520,7 @@
                                                                             "src": "529:7:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "slt",
                                                                         "nativeSrc": "510:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -596,8 +531,7 @@
                                                                     "src": "510:27:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "iszero",
                                                                 "nativeSrc": "503:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -615,10 +549,8 @@
                                                         "nativeSrc": "564:26:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "564:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "_3",
                                                                     "nativeSrc": "587:2:1",
@@ -626,8 +558,7 @@
                                                                     "src": "587:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "calldataload",
                                                                 "nativeSrc": "574:12:1",
                                                                 "nodeType": "YulIdentifier",
@@ -637,8 +568,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "574:16:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "_4",
                                                                 "nativeSrc": "568:2:1",
@@ -649,19 +579,15 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "613:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "613:22:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "panic_error_0x41",
                                                                             "nativeSrc": "615:16:1",
                                                                             "nodeType": "YulIdentifier",
@@ -677,10 +603,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "_4",
                                                                     "nativeSrc": "605:2:1",
@@ -694,8 +618,7 @@
                                                                     "src": "609:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "gt",
                                                                 "nativeSrc": "602:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -713,10 +636,8 @@
                                                         "nativeSrc": "644:20:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "644:20:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "658:1:1",
@@ -732,8 +653,7 @@
                                                                     "src": "661:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "shl",
                                                                 "nativeSrc": "654:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -743,8 +663,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "654:10:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "_5",
                                                                 "nativeSrc": "648:2:1",
@@ -758,10 +677,8 @@
                                                         "nativeSrc": "673:23:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "673:23:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "693:2:1",
@@ -771,8 +688,7 @@
                                                                     "value": "64"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mload",
                                                                 "nativeSrc": "687:5:1",
                                                                 "nodeType": "YulIdentifier",
@@ -782,8 +698,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "687:9:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "memPtr",
                                                                 "nativeSrc": "677:6:1",
@@ -797,10 +712,8 @@
                                                         "nativeSrc": "705:56:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "705:56:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "memPtr",
                                                                     "nativeSrc": "727:6:1",
@@ -808,11 +721,9 @@
                                                                     "src": "727:6:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "name": "_5",
                                                                                     "nativeSrc": "743:2:1",
@@ -828,8 +739,7 @@
                                                                                     "value": "63"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "add",
                                                                                 "nativeSrc": "739:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -840,8 +750,7 @@
                                                                             "src": "739:11:1"
                                                                         },
                                                                         {
-                                                                            "arguments":
-                                                                            [
+                                                                            "arguments": [
                                                                                 {
                                                                                     "kind": "number",
                                                                                     "nativeSrc": "756:2:1",
@@ -851,8 +760,7 @@
                                                                                     "value": "31"
                                                                                 }
                                                                             ],
-                                                                            "functionName":
-                                                                            {
+                                                                            "functionName": {
                                                                                 "name": "not",
                                                                                 "nativeSrc": "752:3:1",
                                                                                 "nodeType": "YulIdentifier",
@@ -863,8 +771,7 @@
                                                                             "src": "752:7:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "and",
                                                                         "nativeSrc": "735:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -875,8 +782,7 @@
                                                                     "src": "735:25:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "723:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -886,8 +792,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "723:38:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "newFreePtr",
                                                                 "nativeSrc": "709:10:1",
@@ -898,19 +803,15 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "820:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "820:22:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
+                                                                    "expression": {
                                                                         "arguments": [],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "panic_error_0x41",
                                                                             "nativeSrc": "822:16:1",
                                                                             "nodeType": "YulIdentifier",
@@ -926,13 +827,10 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
                                                                             "nativeSrc": "779:10:1",
@@ -946,8 +844,7 @@
                                                                             "src": "791:2:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "gt",
                                                                         "nativeSrc": "776:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -958,8 +855,7 @@
                                                                     "src": "776:18:1"
                                                                 },
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
                                                                             "nativeSrc": "799:10:1",
@@ -973,8 +869,7 @@
                                                                             "src": "811:6:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "lt",
                                                                         "nativeSrc": "796:2:1",
                                                                         "nodeType": "YulIdentifier",
@@ -985,8 +880,7 @@
                                                                     "src": "796:22:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "or",
                                                                 "nativeSrc": "773:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1001,10 +895,8 @@
                                                         "src": "770:72:1"
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "kind": "number",
                                                                     "nativeSrc": "858:2:1",
@@ -1020,8 +912,7 @@
                                                                     "src": "862:10:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "851:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1039,15 +930,13 @@
                                                         "nativeSrc": "882:17:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "882:17:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "name": "memPtr",
                                                             "nativeSrc": "893:6:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "893:6:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "dst",
                                                                 "nativeSrc": "886:3:1",
@@ -1058,10 +947,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "memPtr",
                                                                     "nativeSrc": "915:6:1",
@@ -1075,8 +962,7 @@
                                                                     "src": "923:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "908:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1094,10 +980,8 @@
                                                         "nativeSrc": "935:22:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "935:22:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "memPtr",
                                                                     "nativeSrc": "946:6:1",
@@ -1111,8 +995,7 @@
                                                                     "src": "954:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "942:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1122,8 +1005,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "942:15:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "dst",
                                                                 "nativeSrc": "935:3:1",
@@ -1136,13 +1018,10 @@
                                                         "nativeSrc": "966:34:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "966:34:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
-                                                                    "arguments":
-                                                                    [
+                                                                    "arguments": [
                                                                         {
                                                                             "name": "_3",
                                                                             "nativeSrc": "988:2:1",
@@ -1156,8 +1035,7 @@
                                                                             "src": "992:2:1"
                                                                         }
                                                                     ],
-                                                                    "functionName":
-                                                                    {
+                                                                    "functionName": {
                                                                         "name": "add",
                                                                         "nativeSrc": "984:3:1",
                                                                         "nodeType": "YulIdentifier",
@@ -1174,8 +1052,7 @@
                                                                     "src": "997:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "980:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1185,8 +1062,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "980:20:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "srcEnd",
                                                                 "nativeSrc": "970:6:1",
@@ -1197,18 +1073,14 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "1032:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1032:16:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "kind": "number",
                                                                                 "nativeSrc": "1041:1:1",
@@ -1226,8 +1098,7 @@
                                                                                 "value": "0"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "revert",
                                                                             "nativeSrc": "1034:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1243,10 +1114,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "srcEnd",
                                                                     "nativeSrc": "1015:6:1",
@@ -1260,8 +1129,7 @@
                                                                     "src": "1023:7:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "gt",
                                                                 "nativeSrc": "1012:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1279,10 +1147,8 @@
                                                         "nativeSrc": "1057:22:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "1057:22:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "_3",
                                                                     "nativeSrc": "1072:2:1",
@@ -1296,8 +1162,7 @@
                                                                     "src": "1076:2:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "1068:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1307,8 +1172,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1068:11:1"
                                                         },
-                                                        "variables":
-                                                        [
+                                                        "variables": [
                                                             {
                                                                 "name": "src",
                                                                 "nativeSrc": "1061:3:1",
@@ -1319,18 +1183,14 @@
                                                         ]
                                                     },
                                                     {
-                                                        "body":
-                                                        {
+                                                        "body": {
                                                             "nativeSrc": "1144:86:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1144:86:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
-                                                                    "expression":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "expression": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "dst",
                                                                                 "nativeSrc": "1165:3:1",
@@ -1338,8 +1198,7 @@
                                                                                 "src": "1165:3:1"
                                                                             },
                                                                             {
-                                                                                "arguments":
-                                                                                [
+                                                                                "arguments": [
                                                                                     {
                                                                                         "name": "src",
                                                                                         "nativeSrc": "1183:3:1",
@@ -1347,8 +1206,7 @@
                                                                                         "src": "1183:3:1"
                                                                                     }
                                                                                 ],
-                                                                                "functionName":
-                                                                                {
+                                                                                "functionName": {
                                                                                     "name": "calldataload",
                                                                                     "nativeSrc": "1170:12:1",
                                                                                     "nodeType": "YulIdentifier",
@@ -1359,8 +1217,7 @@
                                                                                 "src": "1170:17:1"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "mstore",
                                                                             "nativeSrc": "1158:6:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1378,10 +1235,8 @@
                                                                     "nativeSrc": "1201:19:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "1201:19:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "value": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "dst",
                                                                                 "nativeSrc": "1212:3:1",
@@ -1395,8 +1250,7 @@
                                                                                 "src": "1217:2:1"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "add",
                                                                             "nativeSrc": "1208:3:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1406,8 +1260,7 @@
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1208:12:1"
                                                                     },
-                                                                    "variableNames":
-                                                                    [
+                                                                    "variableNames": [
                                                                         {
                                                                             "name": "dst",
                                                                             "nativeSrc": "1201:3:1",
@@ -1418,10 +1271,8 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "condition":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "condition": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "src",
                                                                     "nativeSrc": "1099:3:1",
@@ -1435,8 +1286,7 @@
                                                                     "src": "1104:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "lt",
                                                                 "nativeSrc": "1096:2:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1448,21 +1298,17 @@
                                                         },
                                                         "nativeSrc": "1088:142:1",
                                                         "nodeType": "YulForLoop",
-                                                        "post":
-                                                        {
+                                                        "post": {
                                                             "nativeSrc": "1112:23:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1112:23:1",
-                                                            "statements":
-                                                            [
+                                                            "statements": [
                                                                 {
                                                                     "nativeSrc": "1114:19:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "1114:19:1",
-                                                                    "value":
-                                                                    {
-                                                                        "arguments":
-                                                                        [
+                                                                    "value": {
+                                                                        "arguments": [
                                                                             {
                                                                                 "name": "src",
                                                                                 "nativeSrc": "1125:3:1",
@@ -1476,8 +1322,7 @@
                                                                                 "src": "1130:2:1"
                                                                             }
                                                                         ],
-                                                                        "functionName":
-                                                                        {
+                                                                        "functionName": {
                                                                             "name": "add",
                                                                             "nativeSrc": "1121:3:1",
                                                                             "nodeType": "YulIdentifier",
@@ -1487,8 +1332,7 @@
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1121:12:1"
                                                                     },
-                                                                    "variableNames":
-                                                                    [
+                                                                    "variableNames": [
                                                                         {
                                                                             "name": "src",
                                                                             "nativeSrc": "1114:3:1",
@@ -1499,8 +1343,7 @@
                                                                 }
                                                             ]
                                                         },
-                                                        "pre":
-                                                        {
+                                                        "pre": {
                                                             "nativeSrc": "1092:3:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1092:3:1",
@@ -1512,15 +1355,13 @@
                                                         "nativeSrc": "1239:16:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1239:16:1",
-                                                        "value":
-                                                        {
+                                                        "value": {
                                                             "name": "memPtr",
                                                             "nativeSrc": "1249:6:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "1249:6:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "value0",
                                                                 "nativeSrc": "1239:6:1",
@@ -1534,8 +1375,7 @@
                                             "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
                                             "nativeSrc": "146:1115:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "headStart",
                                                     "nativeSrc": "207:9:1",
@@ -1551,8 +1391,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "value0",
                                                     "nativeSrc": "230:6:1",
@@ -1564,21 +1403,17 @@
                                             "src": "146:1115:1"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "nativeSrc": "1367:76:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1367:76:1",
-                                                "statements":
-                                                [
+                                                "statements": [
                                                     {
                                                         "nativeSrc": "1377:26:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1377:26:1",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "value": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "headStart",
                                                                     "nativeSrc": "1389:9:1",
@@ -1594,8 +1429,7 @@
                                                                     "value": "32"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "add",
                                                                 "nativeSrc": "1385:3:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1605,8 +1439,7 @@
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1385:18:1"
                                                         },
-                                                        "variableNames":
-                                                        [
+                                                        "variableNames": [
                                                             {
                                                                 "name": "tail",
                                                                 "nativeSrc": "1377:4:1",
@@ -1616,10 +1449,8 @@
                                                         ]
                                                     },
                                                     {
-                                                        "expression":
-                                                        {
-                                                            "arguments":
-                                                            [
+                                                        "expression": {
+                                                            "arguments": [
                                                                 {
                                                                     "name": "headStart",
                                                                     "nativeSrc": "1419:9:1",
@@ -1633,8 +1464,7 @@
                                                                     "src": "1430:6:1"
                                                                 }
                                                             ],
-                                                            "functionName":
-                                                            {
+                                                            "functionName": {
                                                                 "name": "mstore",
                                                                 "nativeSrc": "1412:6:1",
                                                                 "nodeType": "YulIdentifier",
@@ -1653,8 +1483,7 @@
                                             "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
                                             "nativeSrc": "1266:177:1",
                                             "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
+                                            "parameters": [
                                                 {
                                                     "name": "headStart",
                                                     "nativeSrc": "1336:9:1",
@@ -1670,8 +1499,7 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "returnVariables":
-                                            [
+                                            "returnVariables": [
                                                 {
                                                     "name": "tail",
                                                     "nativeSrc": "1358:4:1",
@@ -1737,10 +1565,8 @@
             }
         }
     },
-    "sources":
-    {
-        "a.sol":
-        {
+    "sources": {
+        "a.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json b/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json
index 2601dea6c3..10ba5e3961 100644
--- a/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json
+++ b/test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.optimizer.details.peephole\" must be Boolean",
diff --git a/test/cmdlineTests/standard_optimizer_invalid_details/output.json b/test/cmdlineTests/standard_optimizer_invalid_details/output.json
index c7dfaf3142..79b0de4e80 100644
--- a/test/cmdlineTests/standard_optimizer_invalid_details/output.json
+++ b/test/cmdlineTests/standard_optimizer_invalid_details/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"notThere\"",
diff --git a/test/cmdlineTests/standard_optimizer_no_yul/output.json b/test/cmdlineTests/standard_optimizer_no_yul/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_no_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_no_yul/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yul/output.json b/test/cmdlineTests/standard_optimizer_yul/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_yul/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails/output.json b/test/cmdlineTests/standard_optimizer_yulDetails/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json
index 86a0c86986..c658301e9a 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.optimizer.details.yulDetails\" must be an object",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
index 725822763a..c461a1485b 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_metadata/output.json
@@ -1,18 +1,13 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"A\":\"C\"},\"evmVersion\":\"cancun\",\"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\":{\"A\":{\"keccak256\":\"0xb284c39999cb85b80be315a6e9e322adf67a783c66e91ba4439168694580a66d\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://098cee915fad095b8a996813768bd7d5e8c9e40c405e8c43d0572bb7bbc17334\",\"dweb:/ipfs/QmZmUzvSryrrD7pJ9S32iQnEWn4QBL4J1NdbQqL2Xc3yTr\"]}},\"version\":1}"
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
index 725822763a..c461a1485b 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_empty_sequence_whitespaces_metadata/output.json
@@ -1,18 +1,13 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"A\":\"C\"},\"evmVersion\":\"cancun\",\"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\":{\"A\":{\"keccak256\":\"0xb284c39999cb85b80be315a6e9e322adf67a783c66e91ba4439168694580a66d\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://098cee915fad095b8a996813768bd7d5e8c9e40c405e8c43d0572bb7bbc17334\",\"dweb:/ipfs/QmZmUzvSryrrD7pJ9S32iQnEWn4QBL4J1NdbQqL2Xc3yTr\"]}},\"version\":1}"
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json
index d4f6ef3a7e..267a8c3609 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation",
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 f44ca7e2e5..ea101d2e18 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup sequence delimiter cannot be placed inside the brackets",
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 16cba14d70..595049f41c 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many cleanup sequence delimiters",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json
index e06e14205d..25fc97e47e 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Brackets nested too deep",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
index e0b6a26c1b..322a7e25b9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
index e0b6a26c1b..322a7e25b9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_empty_string/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
index e0b6a26c1b..322a7e25b9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul_whitespaces/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted. Note that the empty optimizer sequence is properly denoted by \":\".",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json
index d6f9a9df85..a1e5151c1d 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.optimizer.details.optimizerSteps\" must be a string",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json
index 316529b0d9..3f93509f27 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json
index 316529b0d9..3f93509f27 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
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
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index acf3b74ef1..f047ff70a9 100644
--- 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
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index acf3b74ef1..f047ff70a9 100644
--- 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
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index acf3b74ef1..f047ff70a9 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index acf3b74ef1..f047ff70a9 100644
--- 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
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
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
index acf3b74ef1..f047ff70a9 100644
--- 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
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "A":
-        {
+    "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 2470015e1f..1da39084e7 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Only optimizerSteps can be set in yulDetails when Yul optimizer is disabled.",
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
index 51d12668fb..e0c8397535 100644
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3644",
@@ -13,8 +12,7 @@
 ",
             "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":
-            {
+            "sourceLocation": {
                 "end": 258,
                 "file": "C",
                 "start": 244
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 d47ded5d40..d6357a5b16 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
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "8297",
@@ -13,8 +12,7 @@
 ",
             "message": "The \"immutable\" keyword can only be used for state variables.",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 259,
                 "file": "C",
                 "start": 243
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
index 2f3aaae442..2dcecead01 100644
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7407",
@@ -13,8 +12,7 @@
 ",
             "message": "Type uint256 is not implicitly convertible to expected type string storage ref.",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 235,
                 "file": "C",
                 "start": 234
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
index aae6d02f6b..09f4afc4ef 100644
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C":
-            {
-                "abi":
-                [
+    "contracts": {
+        "C": {
+            "C": {
+                "abi": [
                     {
                         "inputs": [],
                         "stateMutability": "nonpayable",
@@ -15,8 +11,7 @@
                     {
                         "inputs": [],
                         "name": "x",
-                        "outputs":
-                        [
+                        "outputs": [
                             {
                                 "internalType": "uint256",
                                 "name": "",
@@ -27,27 +22,22 @@
                         "type": "function"
                     }
                 ],
-                "devdoc":
-                {
+                "devdoc": {
                     "kind": "dev",
                     "methods": {},
                     "version": 1
                 },
-                "evm":
-                {
-                    "methodIdentifiers":
-                    {
+                "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\":\"cancun\",\"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":
-                {
+                "storageLayout": {
                     "storage": [],
                     "types": null
                 },
-                "userdoc":
-                {
+                "userdoc": {
                     "kind": "user",
                     "methods": {},
                     "version": 1
@@ -55,8 +45,7 @@
             }
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "1284",
@@ -68,29 +57,22 @@
             "type": "CodeGenerationError"
         }
     ],
-    "sources":
-    {
-        "C":
-        {
-            "ast":
-            {
+    "sources": {
+        "C": {
+            "ast": {
                 "absolutePath": "C",
-                "exportedSymbols":
-                {
-                    "C":
-                    [
+                "exportedSymbols": {
+                    "C": [
                         15
                     ]
                 },
                 "id": 16,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             "*"
                         ],
@@ -105,15 +87,13 @@
                         "contractKind": "contract",
                         "fullyImplemented": true,
                         "id": 15,
-                        "linearizedBaseContracts":
-                        [
+                        "linearizedBaseContracts": [
                             15
                         ],
                         "name": "C",
                         "nameLocation": "65:1:0",
                         "nodeType": "ContractDefinition",
-                        "nodes":
-                        [
+                        "nodes": [
                             {
                                 "constant": false,
                                 "functionSelector": "0c55699c",
@@ -126,19 +106,16 @@
                                 "src": "228:23:0",
                                 "stateVariable": true,
                                 "storageLocation": "default",
-                                "typeDescriptions":
-                                {
+                                "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                 },
-                                "typeName":
-                                {
+                                "typeName": {
                                     "id": 2,
                                     "name": "uint",
                                     "nodeType": "ElementaryTypeName",
                                     "src": "228:4:0",
-                                    "typeDescriptions":
-                                    {
+                                    "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                     }
@@ -146,39 +123,33 @@
                                 "visibility": "public"
                             },
                             {
-                                "body":
-                                {
+                                "body": {
                                     "id": 13,
                                     "nodeType": "Block",
                                     "src": "272:46:0",
-                                    "statements":
-                                    [
+                                    "statements": [
                                         {
-                                            "expression":
-                                            {
+                                            "expression": {
                                                 "id": 8,
                                                 "isConstant": false,
                                                 "isLValue": false,
                                                 "isPure": false,
                                                 "lValueRequested": false,
-                                                "leftHandSide":
-                                                {
+                                                "leftHandSide": {
                                                     "id": 6,
                                                     "name": "x",
                                                     "nodeType": "Identifier",
                                                     "overloadedDeclarations": [],
                                                     "referencedDeclaration": 3,
                                                     "src": "282:1:0",
-                                                    "typeDescriptions":
-                                                    {
+                                                    "typeDescriptions": {
                                                         "typeIdentifier": "t_uint256",
                                                         "typeString": "uint256"
                                                     }
                                                 },
                                                 "nodeType": "Assignment",
                                                 "operator": "=",
-                                                "rightHandSide":
-                                                {
+                                                "rightHandSide": {
                                                     "hexValue": "30",
                                                     "id": 7,
                                                     "isConstant": false,
@@ -188,16 +159,14 @@
                                                     "lValueRequested": false,
                                                     "nodeType": "Literal",
                                                     "src": "286:1:0",
-                                                    "typeDescriptions":
-                                                    {
+                                                    "typeDescriptions": {
                                                         "typeIdentifier": "t_rational_0_by_1",
                                                         "typeString": "int_const 0"
                                                     },
                                                     "value": "0"
                                                 },
                                                 "src": "282:5:0",
-                                                "typeDescriptions":
-                                                {
+                                                "typeDescriptions": {
                                                     "typeIdentifier": "t_uint256",
                                                     "typeString": "uint256"
                                                 }
@@ -207,15 +176,13 @@
                                             "src": "282:5:0"
                                         },
                                         {
-                                            "body":
-                                            {
+                                            "body": {
                                                 "id": 11,
                                                 "nodeType": "Block",
                                                 "src": "310:2:0",
                                                 "statements": []
                                             },
-                                            "condition":
-                                            {
+                                            "condition": {
                                                 "hexValue": "74727565",
                                                 "id": 10,
                                                 "isConstant": false,
@@ -225,8 +192,7 @@
                                                 "lValueRequested": false,
                                                 "nodeType": "Literal",
                                                 "src": "304:4:0",
-                                                "typeDescriptions":
-                                                {
+                                                "typeDescriptions": {
                                                     "typeIdentifier": "t_bool",
                                                     "typeString": "bool"
                                                 },
@@ -245,15 +211,13 @@
                                 "name": "",
                                 "nameLocation": "-1:-1:-1",
                                 "nodeType": "FunctionDefinition",
-                                "parameters":
-                                {
+                                "parameters": {
                                     "id": 4,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
                                     "src": "269:2:0"
                                 },
-                                "returnParameters":
-                                {
+                                "returnParameters": {
                                     "id": 5,
                                     "nodeType": "ParameterList",
                                     "parameters": [],
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/output.json b/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
index 8c1f6c0dbe..6730d772ee 100644
--- a/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
+++ b/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "7858",
@@ -13,8 +12,7 @@
 ",
             "message": "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 121,
                 "file": "C",
                 "start": 120
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json b/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
index 1982561ef2..1be9f4b0d0 100644
--- a/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
+++ b/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
@@ -1,20 +1,15 @@
 {
-    "sources":
-    {
-        "/lib/L.sol":
-        {
-            "ast":
-            {
+    "sources": {
+        "/lib/L.sol": {
+            "ast": {
                 "absolutePath": "/lib/L.sol",
                 "id": 2,
                 "license": "GPL-2.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
@@ -27,20 +22,16 @@
             },
             "id": 0
         },
-        "/project/../C.sol":
-        {
-            "ast":
-            {
+        "/project/../C.sol": {
+            "ast": {
                 "absolutePath": "/project/../C.sol",
                 "id": 5,
                 "license": "GPL-2.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 3,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             ">=",
                             "0.0"
diff --git a/test/cmdlineTests/standard_raw_utf16_filename/output.json b/test/cmdlineTests/standard_raw_utf16_filename/output.json
index a370472f25..cebd87943a 100644
--- a/test/cmdlineTests/standard_raw_utf16_filename/output.json
+++ b/test/cmdlineTests/standard_raw_utf16_filename/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "parse error at line 5, column 4: syntax error while parsing object key - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"<U+0000>'; expected string literal",
diff --git a/test/cmdlineTests/standard_secondary_source_location/output.json b/test/cmdlineTests/standard_secondary_source_location/output.json
index 6423769aab..ea47eeaade 100644
--- a/test/cmdlineTests/standard_secondary_source_location/output.json
+++ b/test/cmdlineTests/standard_secondary_source_location/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "3364",
@@ -22,8 +21,7 @@ Note: Second constructor call is here:
 
 ",
             "message": "Base constructor arguments given twice.",
-            "secondarySourceLocations":
-            [
+            "secondarySourceLocations": [
                 {
                     "end": 112,
                     "file": "A",
@@ -38,8 +36,7 @@ Note: Second constructor call is here:
                 }
             ],
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 160,
                 "file": "A",
                 "start": 139
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
index 6907d4780f..3bddad8292 100644
--- a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
+++ b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
@@ -1,20 +1,15 @@
 {
-    "sources":
-    {
-        "C":
-        {
-            "ast":
-            {
+    "sources": {
+        "C": {
+            "ast": {
                 "absolutePath": "C",
                 "id": 4,
                 "license": "GPL-3.0",
                 "nodeType": "SourceUnit",
-                "nodes":
-                [
+                "nodes": [
                     {
                         "id": 1,
-                        "literals":
-                        [
+                        "literals": [
                             "solidity",
                             "*"
                         ],
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
index 3719530963..1699ed8808 100644
--- a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
+++ b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Requested output selection conflicts with \"settings.stopAfter\".",
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
index 5b64763be8..264cd37be9 100644
--- 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
@@ -1,8 +1,6 @@
 {
-    "sources":
-    {
-        "C":
-        {
+    "sources": {
+        "C": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/output.json b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
index 87db5f4db7..e9db1135d7 100644
--- a/test/cmdlineTests/standard_urls_existing_and_missing/output.json
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
@@ -9,10 +8,8 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "url_not_found.sol":
-        {
+    "sources": {
+        "url_not_found.sol": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/standard_urls_missing/output.json b/test/cmdlineTests/standard_urls_missing/output.json
index 267618ee93..7e2bb3dd59 100644
--- a/test/cmdlineTests/standard_urls_missing/output.json
+++ b/test/cmdlineTests/standard_urls_missing/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
index 3e459c56f9..0105ea9729 100644
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ b/test/cmdlineTests/standard_viair_requested/output.json
@@ -1,19 +1,13 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "C": {
+                "evm": {
+                    "bytecode": {
                         "generatedSources": [],
                         "object": "<BYTECODE REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 },
@@ -81,17 +75,13 @@ object \"C_3\" {
 
 "
             },
-            "D":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+            "D": {
+                "evm": {
+                    "bytecode": {
                         "generatedSources": [],
                         "object": "<BYTECODE REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "object": "<BYTECODE REMOVED>"
                     }
                 },
@@ -299,8 +289,7 @@ object \"D_16\" {
             }
         }
     },
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "errorCode": "2072",
@@ -313,8 +302,7 @@ object \"D_16\" {
 ",
             "message": "Unused local variable.",
             "severity": "warning",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 131,
                 "file": "A",
                 "start": 128
@@ -322,10 +310,8 @@ object \"D_16\" {
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
+    "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 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/output.json b/test/cmdlineTests/standard_wrong_key_metadata/output.json
index 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata/output.json
+++ b/test/cmdlineTests/standard_wrong_key_metadata/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/output.json b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
index 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer/output.json
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_key_root/output.json b/test/cmdlineTests/standard_wrong_key_root/output.json
index 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_root/output.json
+++ b/test/cmdlineTests/standard_wrong_key_root/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_key_settings/output.json b/test/cmdlineTests/standard_wrong_key_settings/output.json
index 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_settings/output.json
+++ b/test/cmdlineTests/standard_wrong_key_settings/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_key_source/output.json b/test/cmdlineTests/standard_wrong_key_source/output.json
index 1e846d19c7..e1ac73e8fd 100644
--- a/test/cmdlineTests/standard_wrong_key_source/output.json
+++ b/test/cmdlineTests/standard_wrong_key_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Unknown key \"key1\"",
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
index 877ecad4dc..efe3d722e6 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"auxiliaryInput\" must be an object",
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 c28238145e..ec3c7a8044 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"auxiliaryInput.smtlib2responses\" must be an object.",
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 6676998c6c..0cbceafdad 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,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"smtlib2Responses.abc\" must be a string.",
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/output.json b/test/cmdlineTests/standard_wrong_type_metadata/output.json
index df9f8cae37..38b2ffca6a 100644
--- a/test/cmdlineTests/standard_wrong_type_metadata/output.json
+++ b/test/cmdlineTests/standard_wrong_type_metadata/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.metadata\" must be an object",
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/output.json b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
index d7ce30326b..c6bc5cc3fa 100644
--- a/test/cmdlineTests/standard_wrong_type_optimizer/output.json
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.optimizer\" must be an object",
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/output.json b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
index d7d8f563fd..346590a7cd 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.outputSelection\" must be an object",
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 5a35419ef9..dbb4af9971 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
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 888efc75b0..4a73858342 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.outputSelection.fileA\" must be an object",
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 5a35419ef9..dbb4af9971 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/output.json b/test/cmdlineTests/standard_wrong_type_remappings/output.json
index b94919077e..a4c3270486 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings/output.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.remappings\" must be an array of strings.",
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
index d083c85be3..75162fd057 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.remappings\" must be an array of strings",
diff --git a/test/cmdlineTests/standard_wrong_type_root/output.json b/test/cmdlineTests/standard_wrong_type_root/output.json
index da8fefdf59..59f7778b13 100644
--- a/test/cmdlineTests/standard_wrong_type_root/output.json
+++ b/test/cmdlineTests/standard_wrong_type_root/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Input is not a JSON object.",
diff --git a/test/cmdlineTests/standard_wrong_type_settings/output.json b/test/cmdlineTests/standard_wrong_type_settings/output.json
index a25071c858..d75283112a 100644
--- a/test/cmdlineTests/standard_wrong_type_settings/output.json
+++ b/test/cmdlineTests/standard_wrong_type_settings/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings\" must be an object",
diff --git a/test/cmdlineTests/standard_wrong_type_source/output.json b/test/cmdlineTests/standard_wrong_type_source/output.json
index 98496c6433..0da063fb1c 100644
--- a/test/cmdlineTests/standard_wrong_type_source/output.json
+++ b/test/cmdlineTests/standard_wrong_type_source/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"sources.A\" must be an object",
diff --git a/test/cmdlineTests/standard_wrong_type_sources/output.json b/test/cmdlineTests/standard_wrong_type_sources/output.json
index 3f5f51fceb..abf248c00e 100644
--- a/test/cmdlineTests/standard_wrong_type_sources/output.json
+++ b/test/cmdlineTests/standard_wrong_type_sources/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"sources\" is not a JSON object.",
diff --git a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json b/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
index 7135c98562..def6ad69e0 100644
--- a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
+++ b/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "\"settings.metadata.useLiteralContent\" must be Boolean",
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index c1b22726fb..8d2ab00747 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "object": {
+                "evm": {
                     "assembly": "    /* \"A\":38:39   */
   0x00
     /* \"A\":11:19   */
@@ -20,8 +16,7 @@
     /* \"A\":0:42   */
   stop
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -49,29 +44,21 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
+    "sources": {
+        "A": {
+            "ast": {
+                "code": {
+                    "block": {
                         "nativeSrc": "0:42:0",
                         "nodeType": "YulBlock",
                         "src": "0:42:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "2:17:0",
                                 "nodeType": "YulVariableDeclaration",
                                 "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "kind": "number",
                                             "nativeSrc": "17:1:0",
@@ -81,8 +68,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "mload",
                                         "nativeSrc": "11:5:0",
                                         "nodeType": "YulIdentifier",
@@ -92,8 +78,7 @@
                                     "nodeType": "YulFunctionCall",
                                     "src": "11:8:0"
                                 },
-                                "variables":
-                                [
+                                "variables": [
                                     {
                                         "name": "x",
                                         "nativeSrc": "6:1:0",
@@ -104,13 +89,10 @@
                                 ]
                             },
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
-                                            "arguments":
-                                            [
+                                            "arguments": [
                                                 {
                                                     "name": "x",
                                                     "nativeSrc": "31:1:0",
@@ -126,8 +108,7 @@
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "add",
                                                 "nativeSrc": "27:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -146,8 +127,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "sstore",
                                         "nativeSrc": "20:6:0",
                                         "nodeType": "YulIdentifier",
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 9d675a0691..c994baf4fc 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C_6_deployed": {
+                "evm": {
                     "assembly": "    /* \"input.sol\":60:101   */
   mstore(0x40, 0x80)
   tag_2
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 8cbbd326c7..54b37f8ef8 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
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C_6_deployed": {
+                "evm": {
                     "assembly": "    /* \"input.sol\":60:101 */
   mstore(0x40, 0x80)
   tag_2
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 d1e4cff4cb..5b8cc709fb 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "C":
-        {
-            "C_6_deployed":
-            {
-                "evm":
-                {
+    "contracts": {
+        "C": {
+            "C_6_deployed": {
+                "evm": {
                     "assembly": "  mstore(0x40, 0x80)
   tag_2
   tag_1
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json
index fb7f199a75..7f48fd4e93 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "To use 'snippet' with settings.debug.debugInfo you must select also 'location'.",
diff --git a/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json b/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
index 9fff562796..bbe178353f 100644
--- a/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
+++ b/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
diff --git a/test/cmdlineTests/standard_yul_immutable_references/output.json b/test/cmdlineTests/standard_yul_immutable_references/output.json
index 1f75e8ad20..7bfbb076a3 100644
--- a/test/cmdlineTests/standard_yul_immutable_references/output.json
+++ b/test/cmdlineTests/standard_yul_immutable_references/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "YulTest":
-            {
-                "evm":
-                {
-                    "bytecode":
-                    {
+    "contracts": {
+        "A": {
+            "YulTest": {
+                "evm": {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -16,14 +11,11 @@
                         "opcodes":"<OPCODES REMOVED>",
                         "sourceMap":"<SOURCEMAP REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
-                        "immutableReferences":
-                        {
-                            "test":
-                            [
+                        "immutableReferences": {
+                            "test": [
                                 {
                                     "length": 32,
                                     "start": 1
diff --git a/test/cmdlineTests/standard_yul_multiple_files/output.json b/test/cmdlineTests/standard_yul_multiple_files/output.json
index cdef28c267..88f390204e 100644
--- a/test/cmdlineTests/standard_yul_multiple_files/output.json
+++ b/test/cmdlineTests/standard_yul_multiple_files/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Yul mode only supports exactly one input file.",
diff --git a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json b/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
index cdef28c267..88f390204e 100644
--- a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
+++ b/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Yul mode only supports exactly one input file.",
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index 1404cd3aa7..87d0cab8f4 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "NamedObject":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "NamedObject": {
+                "evm": {
                     "assembly": "    /* \"A\":80:81   */
   0x00
     /* \"A\":39:61   */
@@ -21,8 +17,7 @@
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -52,29 +47,21 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
+    "sources": {
+        "A": {
+            "ast": {
+                "code": {
+                    "block": {
                         "nativeSrc": "28:56:0",
                         "nodeType": "YulBlock",
                         "src": "28:56:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "30:31:0",
                                 "nodeType": "YulVariableDeclaration",
                                 "src": "30:31:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "hexValue": "446174614e616d65",
                                             "kind": "string",
@@ -85,8 +72,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                                             "value": "DataName"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "dataoffset",
                                         "nativeSrc": "39:10:0",
                                         "nodeType": "YulIdentifier",
@@ -96,8 +82,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                                     "nodeType": "YulFunctionCall",
                                     "src": "39:22:0"
                                 },
-                                "variables":
-                                [
+                                "variables": [
                                     {
                                         "name": "x",
                                         "nativeSrc": "34:1:0",
@@ -108,13 +93,10 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                                 ]
                             },
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
-                                            "arguments":
-                                            [
+                                            "arguments": [
                                                 {
                                                     "name": "x",
                                                     "nativeSrc": "73:1:0",
@@ -130,8 +112,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "add",
                                                 "nativeSrc": "69:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -150,8 +131,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "sstore",
                                         "nativeSrc": "62:6:0",
                                         "nodeType": "YulIdentifier",
@@ -171,8 +151,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                 },
                 "name": "NamedObject",
                 "nodeType": "YulObject",
-                "subObjects":
-                [
+                "subObjects": [
                     {
                         "nodeType": "YulData",
                         "value": "616263"
diff --git a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json b/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
index 98522145a6..fea1aa169a 100644
--- a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
+++ b/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "TypeError: Unknown data object \"NamedObject.\".
@@ -12,8 +11,7 @@
 ",
             "message": "Unknown data object \"NamedObject.\".",
             "severity": "error",
-            "sourceLocation":
-            {
+            "sourceLocation": {
                 "end": 64,
                 "file": "A",
                 "start": 50
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index 6803c322d1..c6e98130d2 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "NamedObject":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "NamedObject": {
+                "evm": {
                     "assembly": "    /* \"A\":80:81   */
   0x00
     /* \"A\":39:61   */
@@ -29,8 +25,7 @@ sub_0: assembly {
       revert
 }
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -38,8 +33,7 @@ sub_0: assembly {
                         "opcodes":"<OPCODES REMOVED>",
                         "sourceMap":"<SOURCEMAP REMOVED>"
                     },
-                    "deployedBytecode":
-                    {
+                    "deployedBytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "immutableReferences": {},
@@ -76,29 +70,21 @@ sub_0: assembly {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
+    "sources": {
+        "A": {
+            "ast": {
+                "code": {
+                    "block": {
                         "nativeSrc": "28:56:0",
                         "nodeType": "YulBlock",
                         "src": "28:56:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "30:31:0",
                                 "nodeType": "YulVariableDeclaration",
                                 "src": "30:31:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "hexValue": "446174614e616d65",
                                             "kind": "string",
@@ -109,8 +95,7 @@ sub_0: assembly {
                                             "value": "DataName"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "dataoffset",
                                         "nativeSrc": "39:10:0",
                                         "nodeType": "YulIdentifier",
@@ -120,8 +105,7 @@ sub_0: assembly {
                                     "nodeType": "YulFunctionCall",
                                     "src": "39:22:0"
                                 },
-                                "variables":
-                                [
+                                "variables": [
                                     {
                                         "name": "x",
                                         "nativeSrc": "34:1:0",
@@ -132,13 +116,10 @@ sub_0: assembly {
                                 ]
                             },
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
-                                            "arguments":
-                                            [
+                                            "arguments": [
                                                 {
                                                     "name": "x",
                                                     "nativeSrc": "73:1:0",
@@ -154,8 +135,7 @@ sub_0: assembly {
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "add",
                                                 "nativeSrc": "69:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -174,8 +154,7 @@ sub_0: assembly {
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "sstore",
                                         "nativeSrc": "62:6:0",
                                         "nodeType": "YulIdentifier",
@@ -195,27 +174,21 @@ sub_0: assembly {
                 },
                 "name": "NamedObject",
                 "nodeType": "YulObject",
-                "subObjects":
-                [
+                "subObjects": [
                     {
                         "nodeType": "YulData",
                         "value": "616263"
                     },
                     {
-                        "code":
-                        {
-                            "block":
-                            {
+                        "code": {
+                            "block": {
                                 "nativeSrc": "135:16:0",
                                 "nodeType": "YulBlock",
                                 "src": "135:16:0",
-                                "statements":
-                                [
+                                "statements": [
                                     {
-                                        "expression":
-                                        {
-                                            "arguments":
-                                            [
+                                        "expression": {
+                                            "arguments": [
                                                 {
                                                     "kind": "number",
                                                     "nativeSrc": "144:1:0",
@@ -233,8 +206,7 @@ sub_0: assembly {
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "revert",
                                                 "nativeSrc": "137:6:0",
                                                 "nodeType": "YulIdentifier",
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 85a34261f0..1c72379c61 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "object": {
+                "evm": {
                     "assembly": "    /* \"A\":38:39   */
   0x00
     /* \"A\":11:19   */
@@ -17,8 +13,7 @@
     /* \"A\":0:42   */
   stop
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -46,29 +41,21 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
+    "sources": {
+        "A": {
+            "ast": {
+                "code": {
+                    "block": {
                         "nativeSrc": "0:42:0",
                         "nodeType": "YulBlock",
                         "src": "0:42:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "2:17:0",
                                 "nodeType": "YulVariableDeclaration",
                                 "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "kind": "number",
                                             "nativeSrc": "17:1:0",
@@ -78,8 +65,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "mload",
                                         "nativeSrc": "11:5:0",
                                         "nodeType": "YulIdentifier",
@@ -89,8 +75,7 @@
                                     "nodeType": "YulFunctionCall",
                                     "src": "11:8:0"
                                 },
-                                "variables":
-                                [
+                                "variables": [
                                     {
                                         "name": "x",
                                         "nativeSrc": "6:1:0",
@@ -101,13 +86,10 @@
                                 ]
                             },
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
-                                            "arguments":
-                                            [
+                                            "arguments": [
                                                 {
                                                     "name": "x",
                                                     "nativeSrc": "31:1:0",
@@ -123,8 +105,7 @@
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "add",
                                                 "nativeSrc": "27:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -143,8 +124,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "sstore",
                                         "nativeSrc": "20:6:0",
                                         "nodeType": "YulIdentifier",
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index d580ef6ae0..c443b2863f 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "object": {
+                "evm": {
                     "assembly": "    /* \"A\":17:18   */
   0x00
     /* \"A\":11:19   */
@@ -17,8 +13,7 @@
     /* \"A\":0:42   */
   stop
 ",
-                    "bytecode":
-                    {
+                    "bytecode": {
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
@@ -41,29 +36,21 @@
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "code":
-                {
-                    "block":
-                    {
+    "sources": {
+        "A": {
+            "ast": {
+                "code": {
+                    "block": {
                         "nativeSrc": "0:42:0",
                         "nodeType": "YulBlock",
                         "src": "0:42:0",
-                        "statements":
-                        [
+                        "statements": [
                             {
                                 "nativeSrc": "2:17:0",
                                 "nodeType": "YulVariableDeclaration",
                                 "src": "2:17:0",
-                                "value":
-                                {
-                                    "arguments":
-                                    [
+                                "value": {
+                                    "arguments": [
                                         {
                                             "kind": "number",
                                             "nativeSrc": "17:1:0",
@@ -73,8 +60,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "mload",
                                         "nativeSrc": "11:5:0",
                                         "nodeType": "YulIdentifier",
@@ -84,8 +70,7 @@
                                     "nodeType": "YulFunctionCall",
                                     "src": "11:8:0"
                                 },
-                                "variables":
-                                [
+                                "variables": [
                                     {
                                         "name": "x",
                                         "nativeSrc": "6:1:0",
@@ -96,13 +81,10 @@
                                 ]
                             },
                             {
-                                "expression":
-                                {
-                                    "arguments":
-                                    [
+                                "expression": {
+                                    "arguments": [
                                         {
-                                            "arguments":
-                                            [
+                                            "arguments": [
                                                 {
                                                     "name": "x",
                                                     "nativeSrc": "31:1:0",
@@ -118,8 +100,7 @@
                                                     "value": "0"
                                                 }
                                             ],
-                                            "functionName":
-                                            {
+                                            "functionName": {
                                                 "name": "add",
                                                 "nativeSrc": "27:3:0",
                                                 "nodeType": "YulIdentifier",
@@ -138,8 +119,7 @@
                                             "value": "0"
                                         }
                                     ],
-                                    "functionName":
-                                    {
+                                    "functionName": {
                                         "name": "sstore",
                                         "nativeSrc": "20:6:0",
                                         "nodeType": "YulIdentifier",
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 a97057c889..e76d039f5e 100644
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
+++ b/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
@@ -1,6 +1,5 @@
 {
-    "errors":
-    [
+    "errors": [
         {
             "component": "general",
             "formattedMessage": "Cannot import url (\"in.yul\"): File not found. Searched the following locations: \"\".",
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
index e10ef0c172..9d89edfb4a 100644
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "object": {
+                "evm": {
                     "assembly": "    /* \"A\":16:17   */
   0x01
     /* \"A\":27:28   */
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
index 8d58cf3204..f0752b812b 100644
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
@@ -1,12 +1,8 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "object":
-            {
-                "evm":
-                {
+    "contracts": {
+        "A": {
+            "object": {
+                "evm": {
                     "assembly": "    /* \"A\":16:17   */
   0x01
     /* \"A\":27:28   */
diff --git a/test/cmdlineTests/stop_after_parsing_ast/output b/test/cmdlineTests/stop_after_parsing_ast/output
index 1639418604..6cca9557da 100644
--- a/test/cmdlineTests/stop_after_parsing_ast/output
+++ b/test/cmdlineTests/stop_after_parsing_ast/output
@@ -7,12 +7,10 @@ JSON AST (compact format):
     "id": 4,
     "license": "GPL-3.0",
     "nodeType": "SourceUnit",
-    "nodes":
-    [
+    "nodes": [
         {
             "id": 1,
-            "literals":
-            [
+            "literals": [
                 "solidity",
                 "*"
             ],
diff --git a/test/cmdlineTests/storage_layout_bytes/output.json b/test/cmdlineTests/storage_layout_bytes/output.json
index c2ca7813c6..67091e974e 100644
--- a/test/cmdlineTests/storage_layout_bytes/output.json
+++ b/test/cmdlineTests/storage_layout_bytes/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 4,
                             "contract": "fileA:A",
@@ -26,10 +21,8 @@
                             "type": "t_bytes_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "t_bytes_storage":
-                        {
+                    "types": {
+                        "t_bytes_storage": {
                             "encoding": "bytes",
                             "label": "bytes",
                             "numberOfBytes": "32"
@@ -39,10 +32,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "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 fa7ed04bad..f4468c411d 100644
--- a/test/cmdlineTests/storage_layout_dyn_array/output.json
+++ b/test/cmdlineTests/storage_layout_dyn_array/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 4,
                             "contract": "fileA:A",
@@ -26,30 +21,25 @@
                             "type": "t_array(t_bool)dyn_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "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":
-                        {
+                        "t_array(t_uint256)dyn_storage": {
                             "base": "t_uint256",
                             "encoding": "dynamic_array",
                             "label": "uint256[]",
                             "numberOfBytes": "32"
                         },
-                        "t_bool":
-                        {
+                        "t_bool": {
                             "encoding": "inplace",
                             "label": "bool",
                             "numberOfBytes": "1"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -59,10 +49,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/storage_layout_many/output.json b/test/cmdlineTests/storage_layout_many/output.json
index 68cb006824..fa1b6f13e2 100644
--- a/test/cmdlineTests/storage_layout_many/output.json
+++ b/test/cmdlineTests/storage_layout_many/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 15,
                             "contract": "fileA:A",
@@ -74,68 +69,57 @@
                             "type": "t_bytes_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_array(t_uint256)2_storage":
-                        {
+                        "t_array(t_uint256)2_storage": {
                             "base": "t_uint256",
                             "encoding": "inplace",
                             "label": "uint256[2]",
                             "numberOfBytes": "64"
                         },
-                        "t_array(t_uint256)dyn_storage":
-                        {
+                        "t_array(t_uint256)dyn_storage": {
                             "base": "t_uint256",
                             "encoding": "dynamic_array",
                             "label": "uint256[]",
                             "numberOfBytes": "32"
                         },
-                        "t_bool":
-                        {
+                        "t_bool": {
                             "encoding": "inplace",
                             "label": "bool",
                             "numberOfBytes": "1"
                         },
-                        "t_bytes_storage":
-                        {
+                        "t_bytes_storage": {
                             "encoding": "bytes",
                             "label": "bytes",
                             "numberOfBytes": "32"
                         },
-                        "t_mapping(t_address,t_bool)":
-                        {
+                        "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))":
-                        {
+                        "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":
-                        {
+                        "t_string_storage": {
                             "encoding": "bytes",
                             "label": "string",
                             "numberOfBytes": "32"
                         },
-                        "t_struct(S)13_storage":
-                        {
+                        "t_struct(S)13_storage": {
                             "encoding": "inplace",
                             "label": "struct A.S",
-                            "members":
-                            [
+                            "members": [
                                 {
                                     "astId": 3,
                                     "contract": "fileA:A",
@@ -171,14 +155,12 @@
                             ],
                             "numberOfBytes": "128"
                         },
-                        "t_uint128":
-                        {
+                        "t_uint128": {
                             "encoding": "inplace",
                             "label": "uint128",
                             "numberOfBytes": "16"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -188,10 +170,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/storage_layout_mapping/output.json b/test/cmdlineTests/storage_layout_mapping/output.json
index 8d13fb34b4..9fb9f847c5 100644
--- a/test/cmdlineTests/storage_layout_mapping/output.json
+++ b/test/cmdlineTests/storage_layout_mapping/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 3,
                             "contract": "fileA:A",
@@ -34,38 +29,32 @@
                             "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_bool":
-                        {
+                        "t_bool": {
                             "encoding": "inplace",
                             "label": "bool",
                             "numberOfBytes": "1"
                         },
-                        "t_mapping(t_address,t_bool)":
-                        {
+                        "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))":
-                        {
+                        "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":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -75,10 +64,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/storage_layout_smoke/output.json b/test/cmdlineTests/storage_layout_smoke/output.json
index 9fe46bb673..e2eaee5004 100644
--- a/test/cmdlineTests/storage_layout_smoke/output.json
+++ b/test/cmdlineTests/storage_layout_smoke/output.json
@@ -1,22 +1,16 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
                     "storage": [],
                     "types": null
                 }
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "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 fc4e422a5e..2b94484591 100644
--- a/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
+++ b/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
@@ -1,26 +1,19 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
                     "storage": [],
                     "types": null
                 }
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         },
-        "fileB":
-        {
+        "fileB": {
             "id": 1
         }
     }
diff --git a/test/cmdlineTests/storage_layout_string/output.json b/test/cmdlineTests/storage_layout_string/output.json
index 20c6f64ccd..2fcb974dbd 100644
--- a/test/cmdlineTests/storage_layout_string/output.json
+++ b/test/cmdlineTests/storage_layout_string/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 4,
                             "contract": "fileA:A",
@@ -26,10 +21,8 @@
                             "type": "t_string_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "t_string_storage":
-                        {
+                    "types": {
+                        "t_string_storage": {
                             "encoding": "bytes",
                             "label": "string",
                             "numberOfBytes": "32"
@@ -39,10 +32,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/storage_layout_struct/output.json b/test/cmdlineTests/storage_layout_struct/output.json
index f682d9634a..1fadb220e8 100644
--- a/test/cmdlineTests/storage_layout_struct/output.json
+++ b/test/cmdlineTests/storage_layout_struct/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 15,
                             "contract": "fileA:A",
@@ -42,34 +37,28 @@
                             "type": "t_address"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_array(t_uint256)2_storage":
-                        {
+                        "t_array(t_uint256)2_storage": {
                             "base": "t_uint256",
                             "encoding": "inplace",
                             "label": "uint256[2]",
                             "numberOfBytes": "64"
                         },
-                        "t_array(t_uint256)dyn_storage":
-                        {
+                        "t_array(t_uint256)dyn_storage": {
                             "base": "t_uint256",
                             "encoding": "dynamic_array",
                             "label": "uint256[]",
                             "numberOfBytes": "32"
                         },
-                        "t_struct(S)13_storage":
-                        {
+                        "t_struct(S)13_storage": {
                             "encoding": "inplace",
                             "label": "struct A.S",
-                            "members":
-                            [
+                            "members": [
                                 {
                                     "astId": 3,
                                     "contract": "fileA:A",
@@ -105,8 +94,7 @@
                             ],
                             "numberOfBytes": "160"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -116,10 +104,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "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 7731bd2230..f91a9a0cd3 100644
--- a/test/cmdlineTests/storage_layout_struct_packed/output.json
+++ b/test/cmdlineTests/storage_layout_struct_packed/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 15,
                             "contract": "fileA:A",
@@ -42,34 +37,28 @@
                             "type": "t_address"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_array(t_uint256)2_storage":
-                        {
+                        "t_array(t_uint256)2_storage": {
                             "base": "t_uint256",
                             "encoding": "inplace",
                             "label": "uint256[2]",
                             "numberOfBytes": "64"
                         },
-                        "t_array(t_uint256)dyn_storage":
-                        {
+                        "t_array(t_uint256)dyn_storage": {
                             "base": "t_uint256",
                             "encoding": "dynamic_array",
                             "label": "uint256[]",
                             "numberOfBytes": "32"
                         },
-                        "t_struct(S)13_storage":
-                        {
+                        "t_struct(S)13_storage": {
                             "encoding": "inplace",
                             "label": "struct A.S",
-                            "members":
-                            [
+                            "members": [
                                 {
                                     "astId": 3,
                                     "contract": "fileA:A",
@@ -105,14 +94,12 @@
                             ],
                             "numberOfBytes": "128"
                         },
-                        "t_uint128":
-                        {
+                        "t_uint128": {
                             "encoding": "inplace",
                             "label": "uint128",
                             "numberOfBytes": "16"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -122,10 +109,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/storage_layout_user_defined/output b/test/cmdlineTests/storage_layout_user_defined/output
index f79b8413e6..bb7819c66f 100644
--- a/test/cmdlineTests/storage_layout_user_defined/output
+++ b/test/cmdlineTests/storage_layout_user_defined/output
@@ -2,8 +2,7 @@
 ======= storage_layout_user_defined/input.sol:C =======
 Contract Storage Layout:
 {
-  "storage":
-  [
+  "storage": [
     {
       "astId": 7,
       "contract": "storage_layout_user_defined/input.sol:C",
@@ -69,16 +68,13 @@ Contract Storage Layout:
       "type": "t_userDefinedValueType(MyInt8)4"
     }
   ],
-  "types":
-  {
-    "t_userDefinedValueType(MyInt128)2":
-    {
+  "types": {
+    "t_userDefinedValueType(MyInt128)2": {
       "encoding": "inplace",
       "label": "MyInt128",
       "numberOfBytes": "16"
     },
-    "t_userDefinedValueType(MyInt8)4":
-    {
+    "t_userDefinedValueType(MyInt8)4": {
       "encoding": "inplace",
       "label": "MyInt8",
       "numberOfBytes": "1"
diff --git a/test/cmdlineTests/storage_layout_value_types/output.json b/test/cmdlineTests/storage_layout_value_types/output.json
index 10fbd762b5..b737adc973 100644
--- a/test/cmdlineTests/storage_layout_value_types/output.json
+++ b/test/cmdlineTests/storage_layout_value_types/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 3,
                             "contract": "fileA:A",
@@ -42,23 +37,19 @@
                             "type": "t_array(t_uint256)2_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_array(t_uint256)2_storage":
-                        {
+                        "t_array(t_uint256)2_storage": {
                             "base": "t_uint256",
                             "encoding": "inplace",
                             "label": "uint256[2]",
                             "numberOfBytes": "64"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
@@ -68,10 +59,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "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 eefb69e667..cea9bc81c6 100644
--- a/test/cmdlineTests/storage_layout_value_types_packed/output.json
+++ b/test/cmdlineTests/storage_layout_value_types_packed/output.json
@@ -1,14 +1,9 @@
 {
-    "contracts":
-    {
-        "fileA":
-        {
-            "A":
-            {
-                "storageLayout":
-                {
-                    "storage":
-                    [
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
                         {
                             "astId": 3,
                             "contract": "fileA:A",
@@ -50,35 +45,29 @@
                             "type": "t_array(t_uint256)2_storage"
                         }
                     ],
-                    "types":
-                    {
-                        "t_address":
-                        {
+                    "types": {
+                        "t_address": {
                             "encoding": "inplace",
                             "label": "address",
                             "numberOfBytes": "20"
                         },
-                        "t_array(t_uint256)2_storage":
-                        {
+                        "t_array(t_uint256)2_storage": {
                             "base": "t_uint256",
                             "encoding": "inplace",
                             "label": "uint256[2]",
                             "numberOfBytes": "64"
                         },
-                        "t_uint128":
-                        {
+                        "t_uint128": {
                             "encoding": "inplace",
                             "label": "uint128",
                             "numberOfBytes": "16"
                         },
-                        "t_uint256":
-                        {
+                        "t_uint256": {
                             "encoding": "inplace",
                             "label": "uint256",
                             "numberOfBytes": "32"
                         },
-                        "t_uint64":
-                        {
+                        "t_uint64": {
                             "encoding": "inplace",
                             "label": "uint64",
                             "numberOfBytes": "8"
@@ -88,10 +77,8 @@
             }
         }
     },
-    "sources":
-    {
-        "fileA":
-        {
+    "sources": {
+        "fileA": {
             "id": 0
         }
     }
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/output b/test/cmdlineTests/strict_asm_ast_compact_json/output
index 98afddcfa9..b4c6dc1424 100644
--- a/test/cmdlineTests/strict_asm_ast_compact_json/output
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/output
@@ -3,26 +3,20 @@
 AST:
 
 {
-    "code":
-    {
-        "block":
-        {
+    "code": {
+        "block": {
             "nativeSrc": "60:246:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
-            "statements":
-            [
+            "statements": [
                 {
                     "nativeSrc": "60:246:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
-                    "statements":
-                    [
+                    "statements": [
                         {
-                            "expression":
-                            {
-                                "arguments":
-                                [
+                            "expression": {
+                                "arguments": [
                                     {
                                         "kind": "number",
                                         "nativeSrc": "122:2:0",
@@ -40,8 +34,7 @@ AST:
                                         "value": "128"
                                     }
                                 ],
-                                "functionName":
-                                {
+                                "functionName": {
                                     "name": "mstore",
                                     "nativeSrc": "115:6:0",
                                     "nodeType": "YulIdentifier",
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index edb76c0cd4..6847228b53 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
@@ -217,10 +214,8 @@ object \"C_11\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 bfe775ca40..2e077e8594 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
@@ -147,10 +144,8 @@ object \"C_11\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 f4b14aadcf..d2044189a8 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,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
@@ -160,10 +157,8 @@ object \"C_11\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 36d6cfd954..20644f3a3b 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
@@ -221,10 +218,8 @@ object \"C_11\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "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 5568fc7a0d..a120fa4c9b 100644
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ b/test/cmdlineTests/yul_string_format_hex/output.json
@@ -1,10 +1,7 @@
 {
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
+    "contracts": {
+        "A": {
+            "C": {
                 "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
@@ -160,10 +157,8 @@ object \"C_11\" {
             }
         }
     },
-    "sources":
-    {
-        "A":
-        {
+    "sources": {
+        "A": {
             "id": 0
         }
     }
diff --git a/test/libsolidity/ABIJson/basic_test.sol b/test/libsolidity/ABIJson/basic_test.sol
index 37c833bcfa..8f60eb7282 100644
--- a/test/libsolidity/ABIJson/basic_test.sol
+++ b/test/libsolidity/ABIJson/basic_test.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -14,8 +13,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ABIJson/constructor_abi.sol b/test/libsolidity/ABIJson/constructor_abi.sol
index ae07c94011..406927f0ae 100644
--- a/test/libsolidity/ABIJson/constructor_abi.sol
+++ b/test/libsolidity/ABIJson/constructor_abi.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "param1",
diff --git a/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol b/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol
index d412e755ac..c3ba37b0e7 100644
--- a/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol
+++ b/test/libsolidity/ABIJson/empty_name_input_parameter_with_named_one.sol
@@ -9,8 +9,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "",
@@ -23,8 +22,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "ret_k",
diff --git a/test/libsolidity/ABIJson/empty_name_return_parameters.sol b/test/libsolidity/ABIJson/empty_name_return_parameters.sol
index 1415276fdc..56c4de8a24 100644
--- a/test/libsolidity/ABIJson/empty_name_return_parameters.sol
+++ b/test/libsolidity/ABIJson/empty_name_return_parameters.sol
@@ -7,8 +7,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "k",
@@ -16,8 +15,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "",
diff --git a/test/libsolidity/ABIJson/errors.sol b/test/libsolidity/ABIJson/errors.sol
index 91c76ce6f4..86b16dd851 100644
--- a/test/libsolidity/ABIJson/errors.sol
+++ b/test/libsolidity/ABIJson/errors.sol
@@ -13,8 +13,7 @@ contract X {
 //     :X
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "",
@@ -25,8 +24,7 @@ contract X {
 //     "type": "error"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -42,8 +40,7 @@ contract X {
 //     "type": "error"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -59,11 +56,9 @@ contract X {
 //     "type": "error"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "x",
diff --git a/test/libsolidity/ABIJson/errors_referenced.sol b/test/libsolidity/ABIJson/errors_referenced.sol
index ecb5b1003e..a624bda105 100644
--- a/test/libsolidity/ABIJson/errors_referenced.sol
+++ b/test/libsolidity/ABIJson/errors_referenced.sol
@@ -34,8 +34,7 @@ contract X is C {
 //     :D
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "",
@@ -61,8 +60,7 @@ contract X is C {
 //     "type": "error"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "",
@@ -78,8 +76,7 @@ contract X is C {
 //     "type": "error"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "x",
diff --git a/test/libsolidity/ABIJson/event_emited_in_base_contract.sol b/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
index f9c3d2019c..043b92d555 100644
--- a/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
+++ b/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
@@ -18,8 +18,7 @@ contract C is B {}
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint8",
@@ -37,8 +36,7 @@ contract C is B {}
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint8",
@@ -56,8 +54,7 @@ contract C is B {}
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint8",
diff --git a/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol b/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
index 30c1156697..1603519c0c 100644
--- a/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
+++ b/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
@@ -17,8 +17,7 @@ contract D {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "address",
@@ -36,8 +35,7 @@ contract D {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -50,8 +48,7 @@ contract D {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "address",
@@ -64,8 +61,7 @@ contract D {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "address",
@@ -77,8 +73,7 @@ contract D {
 //     "type": "event"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "address",
 //         "name": "sender",
@@ -97,8 +92,7 @@ contract D {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
diff --git a/test/libsolidity/ABIJson/event_file_level.sol b/test/libsolidity/ABIJson/event_file_level.sol
index 5b5c39a82c..65e260d666 100644
--- a/test/libsolidity/ABIJson/event_file_level.sol
+++ b/test/libsolidity/ABIJson/event_file_level.sol
@@ -32,8 +32,7 @@ contract D is C {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -64,8 +63,7 @@ contract D is C {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -78,8 +76,7 @@ contract D is C {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "string",
diff --git a/test/libsolidity/ABIJson/event_structs.sol b/test/libsolidity/ABIJson/event_structs.sol
index 83431907a7..6c1ec3b174 100644
--- a/test/libsolidity/ABIJson/event_structs.sol
+++ b/test/libsolidity/ABIJson/event_structs.sol
@@ -9,11 +9,9 @@ contract C {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256[2]",
 //             "name": "x",
@@ -26,16 +24,14 @@ contract C {
 //         "type": "tuple"
 //       },
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "a",
 //             "type": "uint256"
 //           },
 //           {
-//             "components":
-//             [
+//             "components": [
 //               {
 //                 "internalType": "uint256[2]",
 //                 "name": "x",
diff --git a/test/libsolidity/ABIJson/events.sol b/test/libsolidity/ABIJson/events.sol
index bab6a74365..8c8cfc4a23 100644
--- a/test/libsolidity/ABIJson/events.sol
+++ b/test/libsolidity/ABIJson/events.sol
@@ -10,8 +10,7 @@ contract test {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -36,8 +35,7 @@ contract test {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -55,8 +53,7 @@ contract test {
 //     "type": "event"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -64,8 +61,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ABIJson/events_indirect.sol b/test/libsolidity/ABIJson/events_indirect.sol
index 86368028cc..0d11f79ecf 100644
--- a/test/libsolidity/ABIJson/events_indirect.sol
+++ b/test/libsolidity/ABIJson/events_indirect.sol
@@ -15,8 +15,7 @@ contract test {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -35,8 +34,7 @@ contract test {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
@@ -60,8 +58,7 @@ contract test {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": false,
 //         "internalType": "uint256",
diff --git a/test/libsolidity/ABIJson/function_type.sol b/test/libsolidity/ABIJson/function_type.sol
index 51e36b92b5..ab20bbb14e 100644
--- a/test/libsolidity/ABIJson/function_type.sol
+++ b/test/libsolidity/ABIJson/function_type.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "function (uint256) external returns (uint256)",
 //         "name": "x",
diff --git a/test/libsolidity/ABIJson/function_type_extended.sol b/test/libsolidity/ABIJson/function_type_extended.sol
index 6257bb4c47..cac235d6cf 100644
--- a/test/libsolidity/ABIJson/function_type_extended.sol
+++ b/test/libsolidity/ABIJson/function_type_extended.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "function (contract test) external returns (contract test[])",
 //         "name": "x",
diff --git a/test/libsolidity/ABIJson/global_struct.sol b/test/libsolidity/ABIJson/global_struct.sol
index 11ce8246fe..960cda2323 100644
--- a/test/libsolidity/ABIJson/global_struct.sol
+++ b/test/libsolidity/ABIJson/global_struct.sol
@@ -8,11 +8,9 @@ contract C {
 //     :C
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "a",
@@ -30,11 +28,9 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "a",
diff --git a/test/libsolidity/ABIJson/inherited.sol b/test/libsolidity/ABIJson/inherited.sol
index cdd8296d8e..681cc892b8 100644
--- a/test/libsolidity/ABIJson/inherited.sol
+++ b/test/libsolidity/ABIJson/inherited.sol
@@ -11,8 +11,7 @@ contract Derived is Base {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "bytes32",
@@ -24,8 +23,7 @@ contract Derived is Base {
 //     "type": "event"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "p",
@@ -33,8 +31,7 @@ contract Derived is Base {
 //       }
 //     ],
 //     "name": "baseFunction",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "i",
@@ -51,8 +48,7 @@ contract Derived is Base {
 // [
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "bytes32",
@@ -65,8 +61,7 @@ contract Derived is Base {
 //   },
 //   {
 //     "anonymous": false,
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "indexed": true,
 //         "internalType": "uint256",
@@ -78,8 +73,7 @@ contract Derived is Base {
 //     "type": "event"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "p",
@@ -87,8 +81,7 @@ contract Derived is Base {
 //       }
 //     ],
 //     "name": "baseFunction",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "i",
@@ -99,8 +92,7 @@ contract Derived is Base {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "bytes32",
 //         "name": "p",
@@ -108,8 +100,7 @@ contract Derived is Base {
 //       }
 //     ],
 //     "name": "derivedFunction",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "bytes32",
 //         "name": "i",
diff --git a/test/libsolidity/ABIJson/library_function.sol b/test/libsolidity/ABIJson/library_function.sol
index 5fe404e95b..2a27729fc9 100644
--- a/test/libsolidity/ABIJson/library_function.sol
+++ b/test/libsolidity/ABIJson/library_function.sol
@@ -12,8 +12,7 @@ library test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256[]",
 //         "name": "c",
@@ -26,8 +25,7 @@ library test {
 //       }
 //     ],
 //     "name": "f1",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256[]",
 //         "name": "e",
diff --git a/test/libsolidity/ABIJson/mapping.sol b/test/libsolidity/ABIJson/mapping.sol
index e84b716f2a..1c5e29fd87 100644
--- a/test/libsolidity/ABIJson/mapping.sol
+++ b/test/libsolidity/ABIJson/mapping.sol
@@ -7,8 +7,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "address",
 //         "name": "owner",
@@ -21,8 +20,7 @@ contract test {
 //       }
 //     ],
 //     "name": "allowance",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "value",
@@ -33,8 +31,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "bytes32",
 //         "name": "",
@@ -42,8 +39,7 @@ contract test {
 //       }
 //     ],
 //     "name": "commits",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "address",
 //         "name": "sender",
@@ -54,8 +50,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "bytes32",
 //         "name": "",
@@ -63,8 +58,7 @@ contract test {
 //       }
 //     ],
 //     "name": "something",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "bytes32",
 //         "name": "",
diff --git a/test/libsolidity/ABIJson/multiple_methods.sol b/test/libsolidity/ABIJson/multiple_methods.sol
index f4738e6ea1..6ff81c4a6b 100644
--- a/test/libsolidity/ABIJson/multiple_methods.sol
+++ b/test/libsolidity/ABIJson/multiple_methods.sol
@@ -6,8 +6,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -15,8 +14,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
@@ -27,8 +25,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "b",
@@ -36,8 +33,7 @@ contract test {
 //       }
 //     ],
 //     "name": "g",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "e",
diff --git a/test/libsolidity/ABIJson/multiple_methods_order.sol b/test/libsolidity/ABIJson/multiple_methods_order.sol
index 606c80db3c..fdc9b6d643 100644
--- a/test/libsolidity/ABIJson/multiple_methods_order.sol
+++ b/test/libsolidity/ABIJson/multiple_methods_order.sol
@@ -7,8 +7,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "b",
@@ -16,8 +15,7 @@ contract test {
 //       }
 //     ],
 //     "name": "c",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "e",
@@ -28,8 +26,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -37,8 +34,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ABIJson/multiple_params.sol b/test/libsolidity/ABIJson/multiple_params.sol
index e223fc3eb5..9657905c98 100644
--- a/test/libsolidity/ABIJson/multiple_params.sol
+++ b/test/libsolidity/ABIJson/multiple_params.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -19,8 +18,7 @@ contract test {
 //       }
 //     ],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ABIJson/payable_constructor_abi.sol b/test/libsolidity/ABIJson/payable_constructor_abi.sol
index 579e83efb1..aa74e2a3f3 100644
--- a/test/libsolidity/ABIJson/payable_constructor_abi.sol
+++ b/test/libsolidity/ABIJson/payable_constructor_abi.sol
@@ -5,8 +5,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "param1",
diff --git a/test/libsolidity/ABIJson/pure_function.sol b/test/libsolidity/ABIJson/pure_function.sol
index c98431eb2a..38c51ebf52 100644
--- a/test/libsolidity/ABIJson/pure_function.sol
+++ b/test/libsolidity/ABIJson/pure_function.sol
@@ -6,8 +6,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint32",
 //         "name": "a",
@@ -15,8 +14,7 @@ contract test {
 //       }
 //     ],
 //     "name": "boo",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "b",
@@ -27,8 +25,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -41,8 +38,7 @@ contract test {
 //       }
 //     ],
 //     "name": "foo",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ABIJson/return_param_in_abi.sol b/test/libsolidity/ABIJson/return_param_in_abi.sol
index 23995d62a3..754c474a0a 100644
--- a/test/libsolidity/ABIJson/return_param_in_abi.sol
+++ b/test/libsolidity/ABIJson/return_param_in_abi.sol
@@ -11,8 +11,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "enum test.ActionChoices",
 //         "name": "param",
@@ -25,8 +24,7 @@ contract test {
 //   {
 //     "inputs": [],
 //     "name": "ret",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "enum test.ActionChoices",
 //         "name": "",
diff --git a/test/libsolidity/ABIJson/return_structs.sol b/test/libsolidity/ABIJson/return_structs.sol
index 9a1e493d50..a0bcb84b4c 100644
--- a/test/libsolidity/ABIJson/return_structs.sol
+++ b/test/libsolidity/ABIJson/return_structs.sol
@@ -11,24 +11,21 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "x",
 //         "type": "uint256"
 //       },
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "a",
 //             "type": "uint256"
 //           },
 //           {
-//             "components":
-//             [
+//             "components": [
 //               {
 //                 "internalType": "uint256[2]",
 //                 "name": "x",
diff --git a/test/libsolidity/ABIJson/return_structs_with_contracts.sol b/test/libsolidity/ABIJson/return_structs_with_contracts.sol
index 135c3295f7..9c8e81d148 100644
--- a/test/libsolidity/ABIJson/return_structs_with_contracts.sol
+++ b/test/libsolidity/ABIJson/return_structs_with_contracts.sol
@@ -10,11 +10,9 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "f",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "contract C[]",
 //             "name": "x",
diff --git a/test/libsolidity/ABIJson/structs_and_arrays.sol b/test/libsolidity/ABIJson/structs_and_arrays.sol
index b2c6bc0ad9..a4f1bc4d6b 100644
--- a/test/libsolidity/ABIJson/structs_and_arrays.sol
+++ b/test/libsolidity/ABIJson/structs_and_arrays.sol
@@ -6,8 +6,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "string",
 //         "name": "a",
diff --git a/test/libsolidity/ABIJson/structs_in_libraries.sol b/test/libsolidity/ABIJson/structs_in_libraries.sol
index 3f278337f0..edc76327a7 100644
--- a/test/libsolidity/ABIJson/structs_in_libraries.sol
+++ b/test/libsolidity/ABIJson/structs_in_libraries.sol
@@ -9,19 +9,16 @@ library L {
 //     :L
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
-//         "components":
-//         [
+//         "components": [
 //           {
 //             "internalType": "uint256",
 //             "name": "a",
 //             "type": "uint256"
 //           },
 //           {
-//             "components":
-//             [
+//             "components": [
 //               {
 //                 "internalType": "uint256[2]",
 //                 "name": "x",
diff --git a/test/libsolidity/ABIJson/user_defined_value_type.sol b/test/libsolidity/ABIJson/user_defined_value_type.sol
index 3bd034e6a9..d20ff9903c 100644
--- a/test/libsolidity/ABIJson/user_defined_value_type.sol
+++ b/test/libsolidity/ABIJson/user_defined_value_type.sol
@@ -33,8 +33,7 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "myAddress",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "C.MyAddress",
 //         "name": "",
@@ -47,8 +46,7 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "myByte1",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "MyByte1",
 //         "name": "",
@@ -61,8 +59,7 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "myBytes32",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "C.MyBytes32",
 //         "name": "",
@@ -75,8 +72,7 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "myInt",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "MyInt",
 //         "name": "",
@@ -89,8 +85,7 @@ contract C {
 //   {
 //     "inputs": [],
 //     "name": "myUInt8",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "C.MyUInt8",
 //         "name": "",
@@ -101,8 +96,7 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "C.MyAddress",
 //         "name": "a",
@@ -115,8 +109,7 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "MyByte1",
 //         "name": "a",
@@ -129,8 +122,7 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "C.MyBytes32",
 //         "name": "a",
@@ -143,8 +135,7 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "MyInt",
 //         "name": "a",
@@ -157,8 +148,7 @@ contract C {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "C.MyUInt8",
 //         "name": "a",
diff --git a/test/libsolidity/ABIJson/view_function.sol b/test/libsolidity/ABIJson/view_function.sol
index d5f54ecdee..88f03d6365 100644
--- a/test/libsolidity/ABIJson/view_function.sol
+++ b/test/libsolidity/ABIJson/view_function.sol
@@ -6,8 +6,7 @@ contract test {
 //     :test
 // [
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint32",
 //         "name": "a",
@@ -15,8 +14,7 @@ contract test {
 //       }
 //     ],
 //     "name": "boo",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "b",
@@ -27,8 +25,7 @@ contract test {
 //     "type": "function"
 //   },
 //   {
-//     "inputs":
-//     [
+//     "inputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "a",
@@ -41,8 +38,7 @@ contract test {
 //       }
 //     ],
 //     "name": "foo",
-//     "outputs":
-//     [
+//     "outputs": [
 //       {
 //         "internalType": "uint256",
 //         "name": "d",
diff --git a/test/libsolidity/ASTJSON/abstract_contract.json b/test/libsolidity/ASTJSON/abstract_contract.json
index 48c20b4358..fb82b35b29 100644
--- a/test/libsolidity/ASTJSON/abstract_contract.json
+++ b/test/libsolidity/ASTJSON/abstract_contract.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": true,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "18:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "37:4:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "34:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/abstract_contract.sol b/test/libsolidity/ASTJSON/abstract_contract.sol
index 3ef96612f5..bddbc17793 100644
--- a/test/libsolidity/ASTJSON/abstract_contract.sol
+++ b/test/libsolidity/ASTJSON/abstract_contract.sol
@@ -2,4 +2,5 @@ abstract contract C {
 	constructor() {
 	}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json b/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
index d9ba04e6cf..fedcbd99e8 100644
--- a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
+++ b/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": true,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "18:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "37:4:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "34:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index adf79823ec..3e8c7955a2 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       39
     ]
   },
   "id": 40,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 39,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         39
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "functionSelector": "97682884",
@@ -40,46 +35,39 @@
           "src": "17:44:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
             "typeString": "mapping(address => address payable)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 3,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 1,
               "name": "address",
               "nodeType": "ElementaryTypeName",
               "src": "25:7:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
               }
             },
             "nodeType": "Mapping",
             "src": "17:35:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
               "typeString": "mapping(address => address payable)"
             },
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 2,
               "name": "address",
               "nodeType": "ElementaryTypeName",
               "src": "36:15:1",
               "stateMutability": "payable",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_address_payable",
                 "typeString": "address payable"
               }
@@ -88,20 +76,16 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 37,
             "nodeType": "Block",
             "src": "134:122:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   12
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 12,
@@ -113,20 +97,17 @@
                     "src": "144:17:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 11,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
                       "src": "144:15:1",
                       "stateMutability": "payable",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_address_payable",
                         "typeString": "address payable"
                       }
@@ -135,33 +116,28 @@
                   }
                 ],
                 "id": 16,
-                "initialValue":
-                {
-                  "baseExpression":
-                  {
+                "initialValue": {
+                  "baseExpression": {
                     "id": 13,
                     "name": "m",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 4,
                     "src": "164:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
                       "typeString": "mapping(address => address payable)"
                     }
                   },
                   "id": 15,
-                  "indexExpression":
-                  {
+                  "indexExpression": {
                     "id": 14,
                     "name": "arg",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 6,
                     "src": "166:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     }
@@ -172,8 +148,7 @@
                   "lValueRequested": false,
                   "nodeType": "IndexAccess",
                   "src": "164:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address_payable",
                     "typeString": "address payable"
                   }
@@ -182,46 +157,40 @@
                 "src": "144:26:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 19,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftHandSide":
-                  {
+                  "leftHandSide": {
                     "id": 17,
                     "name": "r",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 9,
                     "src": "180:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     }
                   },
                   "nodeType": "Assignment",
                   "operator": "=",
-                  "rightHandSide":
-                  {
+                  "rightHandSide": {
                     "id": 18,
                     "name": "arg",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 6,
                     "src": "184:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     }
                   },
                   "src": "180:7:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address_payable",
                     "typeString": "address payable"
                   }
@@ -231,12 +200,10 @@
                 "src": "180:7:1"
               },
               {
-                "assignments":
-                [
+                "assignments": [
                   22
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 22,
@@ -248,20 +215,17 @@
                     "src": "197:9:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 21,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
                       "src": "197:7:1",
                       "stateMutability": "nonpayable",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
@@ -270,10 +234,8 @@
                   }
                 ],
                 "id": 27,
-                "initialValue":
-                {
-                  "arguments":
-                  [
+                "initialValue": {
+                  "arguments": [
                     {
                       "id": 25,
                       "name": "this",
@@ -281,17 +243,14 @@
                       "overloadedDeclarations": [],
                       "referencedDeclaration": -28,
                       "src": "217:4:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_contract$_C_$39",
                         "typeString": "contract C"
                       }
                     }
                   ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
+                  "expression": {
+                    "argumentTypes": [
                       {
                         "typeIdentifier": "t_contract$_C_$39",
                         "typeString": "contract C"
@@ -304,13 +263,11 @@
                     "lValueRequested": false,
                     "nodeType": "ElementaryTypeNameExpression",
                     "src": "209:7:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_type$_t_address_$",
                       "typeString": "type(address)"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 23,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
@@ -329,8 +286,7 @@
                   "nodeType": "FunctionCall",
                   "src": "209:13:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
@@ -339,40 +295,34 @@
                 "src": "197:25:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 35,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftHandSide":
-                  {
-                    "baseExpression":
-                    {
+                  "leftHandSide": {
+                    "baseExpression": {
                       "id": 28,
                       "name": "m",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 4,
                       "src": "232:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
                         "typeString": "mapping(address => address payable)"
                       }
                     },
                     "id": 30,
-                    "indexExpression":
-                    {
+                    "indexExpression": {
                       "id": 29,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 22,
                       "src": "234:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
@@ -383,18 +333,15 @@
                     "lValueRequested": true,
                     "nodeType": "IndexAccess",
                     "src": "232:4:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     }
                   },
                   "nodeType": "Assignment",
                   "operator": "=",
-                  "rightHandSide":
-                  {
-                    "arguments":
-                    [
+                  "rightHandSide": {
+                    "arguments": [
                       {
                         "hexValue": "30",
                         "id": 33,
@@ -405,18 +352,15 @@
                         "lValueRequested": false,
                         "nodeType": "Literal",
                         "src": "247:1:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
                           "typeString": "int_const 0"
                         },
                         "value": "0"
                       }
                     ],
-                    "expression":
-                    {
-                      "argumentTypes":
-                      [
+                    "expression": {
+                      "argumentTypes": [
                         {
                           "typeIdentifier": "t_rational_0_by_1",
                           "typeString": "int_const 0"
@@ -429,13 +373,11 @@
                       "lValueRequested": false,
                       "nodeType": "ElementaryTypeNameExpression",
                       "src": "239:8:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_type$_t_address_payable_$",
                         "typeString": "type(address payable)"
                       },
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 31,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
@@ -455,15 +397,13 @@
                     "nodeType": "FunctionCall",
                     "src": "239:10:1",
                     "tryCall": false,
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_address_payable",
                       "typeString": "address payable"
                     }
                   },
                   "src": "232:17:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address_payable",
                     "typeString": "address payable"
                   }
@@ -482,12 +422,10 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -499,20 +437,17 @@
                 "src": "78:19:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_address_payable",
                   "typeString": "address payable"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "78:15:1",
                   "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address_payable",
                     "typeString": "address payable"
                   }
@@ -522,12 +457,10 @@
             ],
             "src": "77:21:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 10,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 9,
@@ -539,20 +472,17 @@
                 "src": "115:17:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_address_payable",
                   "typeString": "address payable"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 8,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "115:15:1",
                   "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address_payable",
                     "typeString": "address payable"
                   }
diff --git a/test/libsolidity/ASTJSON/address_payable.sol b/test/libsolidity/ASTJSON/address_payable.sol
index f9ebb124eb..28c9c8a20d 100644
--- a/test/libsolidity/ASTJSON/address_payable.sol
+++ b/test/libsolidity/ASTJSON/address_payable.sol
@@ -7,4 +7,5 @@ contract C {
         m[c] = payable(0);
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index 02b809cc96..84e60f1cdd 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 40,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 4,
@@ -26,13 +24,11 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 3,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 1,
               "name": "address",
               "nodeType": "ElementaryTypeName",
@@ -44,8 +40,7 @@
             "typeDescriptions": {},
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 2,
               "name": "address",
               "nodeType": "ElementaryTypeName",
@@ -57,20 +52,16 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 37,
             "nodeType": "Block",
             "src": "134:122:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   12
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 12,
@@ -82,8 +73,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 11,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
@@ -95,10 +85,8 @@
                   }
                 ],
                 "id": 16,
-                "initialValue":
-                {
-                  "baseExpression":
-                  {
+                "initialValue": {
+                  "baseExpression": {
                     "id": 13,
                     "name": "m",
                     "nodeType": "Identifier",
@@ -107,8 +95,7 @@
                     "typeDescriptions": {}
                   },
                   "id": 15,
-                  "indexExpression":
-                  {
+                  "indexExpression": {
                     "id": 14,
                     "name": "arg",
                     "nodeType": "Identifier",
@@ -124,11 +111,9 @@
                 "src": "144:26:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 19,
-                  "leftHandSide":
-                  {
+                  "leftHandSide": {
                     "id": 17,
                     "name": "r",
                     "nodeType": "Identifier",
@@ -138,8 +123,7 @@
                   },
                   "nodeType": "Assignment",
                   "operator": "=",
-                  "rightHandSide":
-                  {
+                  "rightHandSide": {
                     "id": 18,
                     "name": "arg",
                     "nodeType": "Identifier",
@@ -155,12 +139,10 @@
                 "src": "180:7:1"
               },
               {
-                "assignments":
-                [
+                "assignments": [
                   22
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 22,
@@ -172,8 +154,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 21,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
@@ -185,10 +166,8 @@
                   }
                 ],
                 "id": 27,
-                "initialValue":
-                {
-                  "arguments":
-                  [
+                "initialValue": {
+                  "arguments": [
                     {
                       "id": 25,
                       "name": "this",
@@ -198,14 +177,12 @@
                       "typeDescriptions": {}
                     }
                   ],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 24,
                     "nodeType": "ElementaryTypeNameExpression",
                     "src": "209:7:1",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 23,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
@@ -225,13 +202,10 @@
                 "src": "197:25:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 35,
-                  "leftHandSide":
-                  {
-                    "baseExpression":
-                    {
+                  "leftHandSide": {
+                    "baseExpression": {
                       "id": 28,
                       "name": "m",
                       "nodeType": "Identifier",
@@ -240,8 +214,7 @@
                       "typeDescriptions": {}
                     },
                     "id": 30,
-                    "indexExpression":
-                    {
+                    "indexExpression": {
                       "id": 29,
                       "name": "c",
                       "nodeType": "Identifier",
@@ -255,10 +228,8 @@
                   },
                   "nodeType": "Assignment",
                   "operator": "=",
-                  "rightHandSide":
-                  {
-                    "arguments":
-                    [
+                  "rightHandSide": {
+                    "arguments": [
                       {
                         "hexValue": "30",
                         "id": 33,
@@ -269,14 +240,12 @@
                         "value": "0"
                       }
                     ],
-                    "expression":
-                    {
+                    "expression": {
                       "id": 32,
                       "nodeType": "ElementaryTypeNameExpression",
                       "src": "239:8:1",
                       "typeDescriptions": {},
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 31,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
@@ -309,12 +278,10 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -326,8 +293,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
@@ -340,12 +306,10 @@
             ],
             "src": "77:21:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 10,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 9,
@@ -357,8 +321,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 8,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/array_type_name.json b/test/libsolidity/ASTJSON/array_type_name.json
index 1cd97e1765..e87f505f01 100644
--- a/test/libsolidity/ASTJSON/array_type_name.json
+++ b/test/libsolidity/ASTJSON/array_type_name.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       4
     ]
   },
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 4,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         4
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -39,21 +34,17 @@
           "src": "13:8:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
             "typeString": "uint256[]"
           },
-          "typeName":
-          {
-            "baseType":
-            {
+          "typeName": {
+            "baseType": {
               "id": 1,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "13:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
               }
@@ -61,8 +52,7 @@
             "id": 2,
             "nodeType": "ArrayTypeName",
             "src": "13:6:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
               "typeString": "uint256[]"
             }
diff --git a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json b/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
index 1e0b72ca07..6c61e8d7d0 100644
--- a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
+++ b/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -26,10 +24,8 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
-            "baseType":
-            {
+          "typeName": {
+            "baseType": {
               "id": 1,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/assembly/call.json b/test/libsolidity/ASTJSON/assembly/call.json
index d92cf05fe8..6d5ffe9b6f 100644
--- a/test/libsolidity/ASTJSON/assembly/call.json
+++ b/test/libsolidity/ASTJSON/assembly/call.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,39 +16,30 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:59:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:34:1",
                   "nodeType": "YulBlock",
                   "src": "56:34:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
-                            "arguments":
-                            [
+                            "arguments": [
                               {
                                 "kind": "number",
                                 "nativeSrc": "67:1:1",
@@ -109,8 +97,7 @@
                                 "value": "6"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "call",
                               "nativeSrc": "62:4:1",
                               "nodeType": "YulIdentifier",
@@ -121,8 +108,7 @@
                             "src": "62:25:1"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "pop",
                           "nativeSrc": "58:3:1",
                           "nodeType": "YulIdentifier",
@@ -154,15 +140,13 @@
           "name": "j",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/call.sol b/test/libsolidity/ASTJSON/assembly/call.sol
index 1735fd7f7e..09d1ce1843 100644
--- a/test/libsolidity/ASTJSON/assembly/call.sol
+++ b/test/libsolidity/ASTJSON/assembly/call.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { pop(call(0, 1, 2, 3, 4, 5, 6)) }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
index 803a1e4f5f..1e7c5b1f8e 100644
--- a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,32 +12,24 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:59:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:34:1",
                   "nodeType": "YulBlock",
                   "src": "56:34:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
-                        "arguments":
-                        [
+                      "expression": {
+                        "arguments": [
                           {
-                            "arguments":
-                            [
+                            "arguments": [
                               {
                                 "kind": "number",
                                 "nativeSrc": "67:1:1",
@@ -96,8 +87,7 @@
                                 "value": "6"
                               }
                             ],
-                            "functionName":
-                            {
+                            "functionName": {
                               "name": "call",
                               "nativeSrc": "62:4:1",
                               "nodeType": "YulIdentifier",
@@ -108,8 +98,7 @@
                             "src": "62:25:1"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "pop",
                           "nativeSrc": "58:3:1",
                           "nodeType": "YulIdentifier",
@@ -140,15 +129,13 @@
           "name": "j",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.json b/test/libsolidity/ASTJSON/assembly/empty_block.json
index 3ec3c2eec0..1829d057d9 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,31 +16,25 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:31:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:6:1",
                   "nodeType": "YulBlock",
                   "src": "61:6:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "63:2:1",
                       "nodeType": "YulBlock",
@@ -68,15 +59,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.sol b/test/libsolidity/ASTJSON/assembly/empty_block.sol
index 33bb796ea6..23c2babbe3 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block.sol
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { {} }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
index ee8e7b7330..92404c15f0 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,24 +12,19 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:31:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:6:1",
                   "nodeType": "YulBlock",
                   "src": "61:6:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "63:2:1",
                       "nodeType": "YulBlock",
@@ -54,15 +48,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
index 9d64279da8..b9435a41ce 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,37 +16,30 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "39:30:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "52:14:1",
                   "nodeType": "YulBlock",
                   "src": "52:14:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "57:5:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "57:5:1",
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "61:1:1",
@@ -77,15 +67,13 @@
           "name": "f",
           "nameLocation": "23:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "24:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
index 5b396dd441..bfc5ff95fd 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
@@ -5,4 +5,5 @@ contract C {
 		}
 	}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
index 5f12f280ba..bba11cc633 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,30 +12,24 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "39:30:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "52:14:1",
                   "nodeType": "YulBlock",
                   "src": "52:14:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "57:5:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "57:5:1",
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "61:1:1",
@@ -63,15 +56,13 @@
           "name": "f",
           "nameLocation": "23:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "24:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/function.json b/test/libsolidity/ASTJSON/assembly/function.json
index a3b908ac18..c409d615e9 100644
--- a/test/libsolidity/ASTJSON/assembly/function.json
+++ b/test/libsolidity/ASTJSON/assembly/function.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,47 +16,36 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:68:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:43:1",
                   "nodeType": "YulBlock",
                   "src": "61:43:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "76:22:1",
                         "nodeType": "YulBlock",
                         "src": "76:22:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
-                              "arguments":
-                              [
+                            "expression": {
+                              "arguments": [
                                 {
-                                  "arguments":
-                                  [
+                                  "arguments": [
                                     {
                                       "kind": "number",
                                       "nativeSrc": "92:2:1",
@@ -69,8 +55,7 @@
                                       "value": "20"
                                     }
                                   ],
-                                  "functionName":
-                                  {
+                                  "functionName": {
                                     "name": "blockhash",
                                     "nativeSrc": "82:9:1",
                                     "nodeType": "YulIdentifier",
@@ -81,8 +66,7 @@
                                   "src": "82:13:1"
                                 }
                               ],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "pop",
                                 "nativeSrc": "78:3:1",
                                 "nodeType": "YulIdentifier",
@@ -104,11 +88,9 @@
                       "src": "63:35:1"
                     },
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "g",
                           "nativeSrc": "99:1:1",
                           "nodeType": "YulIdentifier",
@@ -140,15 +122,13 @@
           "name": "h",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/function.sol b/test/libsolidity/ASTJSON/assembly/function.sol
index 1edf2f2de2..6020f1f513 100644
--- a/test/libsolidity/ASTJSON/assembly/function.sol
+++ b/test/libsolidity/ASTJSON/assembly/function.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { function g() { pop(blockhash(20)) } g() }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
index 04f5c2721b..2e681ed63f 100644
--- a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,40 +12,30 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:68:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:43:1",
                   "nodeType": "YulBlock",
                   "src": "61:43:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "76:22:1",
                         "nodeType": "YulBlock",
                         "src": "76:22:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
-                              "arguments":
-                              [
+                            "expression": {
+                              "arguments": [
                                 {
-                                  "arguments":
-                                  [
+                                  "arguments": [
                                     {
                                       "kind": "number",
                                       "nativeSrc": "92:2:1",
@@ -56,8 +45,7 @@
                                       "value": "20"
                                     }
                                   ],
-                                  "functionName":
-                                  {
+                                  "functionName": {
                                     "name": "blockhash",
                                     "nativeSrc": "82:9:1",
                                     "nodeType": "YulIdentifier",
@@ -68,8 +56,7 @@
                                   "src": "82:13:1"
                                 }
                               ],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "pop",
                                 "nativeSrc": "78:3:1",
                                 "nodeType": "YulIdentifier",
@@ -91,11 +78,9 @@
                       "src": "63:35:1"
                     },
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "g",
                           "nativeSrc": "99:1:1",
                           "nodeType": "YulIdentifier",
@@ -126,15 +111,13 @@
           "name": "h",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/leave.json b/test/libsolidity/ASTJSON/assembly/leave.json
index 51c94f542c..e7fbf9f6f6 100644
--- a/test/libsolidity/ASTJSON/assembly/leave.json
+++ b/test/libsolidity/ASTJSON/assembly/leave.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,39 +16,31 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:51:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:26:1",
                   "nodeType": "YulBlock",
                   "src": "56:26:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "71:9:1",
                         "nodeType": "YulBlock",
                         "src": "71:9:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
                             "nativeSrc": "73:5:1",
                             "nodeType": "YulLeave",
@@ -82,15 +71,13 @@
           "name": "l",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/leave.sol b/test/libsolidity/ASTJSON/assembly/leave.sol
index 39f1cafedb..5ae4a9e0dd 100644
--- a/test/libsolidity/ASTJSON/assembly/leave.sol
+++ b/test/libsolidity/ASTJSON/assembly/leave.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { function f() { leave } }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
index ee34743eac..c71ffd3fed 100644
--- a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,32 +12,25 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:51:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:26:1",
                   "nodeType": "YulBlock",
                   "src": "56:26:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "71:9:1",
                         "nodeType": "YulBlock",
                         "src": "71:9:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
                             "nativeSrc": "73:5:1",
                             "nodeType": "YulLeave",
@@ -68,15 +60,13 @@
           "name": "l",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/loop.json b/test/libsolidity/ASTJSON/assembly/loop.json
index d3d20992d7..01efb79e6b 100644
--- a/test/libsolidity/ASTJSON/assembly/loop.json
+++ b/test/libsolidity/ASTJSON/assembly/loop.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,39 +16,31 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:74:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:49:1",
                   "nodeType": "YulBlock",
                   "src": "61:49:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "90:18:1",
                         "nodeType": "YulBlock",
                         "src": "90:18:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
                             "nativeSrc": "92:5:1",
                             "nodeType": "YulBreak",
@@ -64,8 +53,7 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
+                      "condition": {
                         "kind": "number",
                         "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
@@ -75,21 +63,16 @@
                       },
                       "nativeSrc": "63:45:1",
                       "nodeType": "YulForLoop",
-                      "post":
-                      {
+                      "post": {
                         "nativeSrc": "72:17:1",
                         "nodeType": "YulBlock",
                         "src": "72:17:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
-                              "arguments":
-                              [
+                            "expression": {
+                              "arguments": [
                                 {
-                                  "arguments":
-                                  [
+                                  "arguments": [
                                     {
                                       "kind": "number",
                                       "nativeSrc": "84:1:1",
@@ -99,8 +82,7 @@
                                       "value": "0"
                                     }
                                   ],
-                                  "functionName":
-                                  {
+                                  "functionName": {
                                     "name": "sload",
                                     "nativeSrc": "78:5:1",
                                     "nodeType": "YulIdentifier",
@@ -111,8 +93,7 @@
                                   "src": "78:8:1"
                                 }
                               ],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "pop",
                                 "nativeSrc": "74:3:1",
                                 "nodeType": "YulIdentifier",
@@ -128,8 +109,7 @@
                           }
                         ]
                       },
-                      "pre":
-                      {
+                      "pre": {
                         "nativeSrc": "67:2:1",
                         "nodeType": "YulBlock",
                         "src": "67:2:1",
@@ -155,15 +135,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/loop.sol b/test/libsolidity/ASTJSON/assembly/loop.sol
index baa45e62c4..bba8d282f6 100644
--- a/test/libsolidity/ASTJSON/assembly/loop.sol
+++ b/test/libsolidity/ASTJSON/assembly/loop.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { for {} 1 { pop(sload(0)) } { break continue } }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
index 24dbbdc4ea..8fecb9dfd3 100644
--- a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,32 +12,25 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:74:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:49:1",
                   "nodeType": "YulBlock",
                   "src": "61:49:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "90:18:1",
                         "nodeType": "YulBlock",
                         "src": "90:18:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
                             "nativeSrc": "92:5:1",
                             "nodeType": "YulBreak",
@@ -51,8 +43,7 @@
                           }
                         ]
                       },
-                      "condition":
-                      {
+                      "condition": {
                         "kind": "number",
                         "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
@@ -62,21 +53,16 @@
                       },
                       "nativeSrc": "63:45:1",
                       "nodeType": "YulForLoop",
-                      "post":
-                      {
+                      "post": {
                         "nativeSrc": "72:17:1",
                         "nodeType": "YulBlock",
                         "src": "72:17:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "expression":
-                            {
-                              "arguments":
-                              [
+                            "expression": {
+                              "arguments": [
                                 {
-                                  "arguments":
-                                  [
+                                  "arguments": [
                                     {
                                       "kind": "number",
                                       "nativeSrc": "84:1:1",
@@ -86,8 +72,7 @@
                                       "value": "0"
                                     }
                                   ],
-                                  "functionName":
-                                  {
+                                  "functionName": {
                                     "name": "sload",
                                     "nativeSrc": "78:5:1",
                                     "nodeType": "YulIdentifier",
@@ -98,8 +83,7 @@
                                   "src": "78:8:1"
                                 }
                               ],
-                              "functionName":
-                              {
+                              "functionName": {
                                 "name": "pop",
                                 "nativeSrc": "74:3:1",
                                 "nodeType": "YulIdentifier",
@@ -115,8 +99,7 @@
                           }
                         ]
                       },
-                      "pre":
-                      {
+                      "pre": {
                         "nativeSrc": "67:2:1",
                         "nodeType": "YulBlock",
                         "src": "67:2:1",
@@ -141,15 +124,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
index 3c9fd53ec0..c4c2b0ae44 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       8
     ]
   },
   "id": 9,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,42 +16,33 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 8,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         8
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 6,
             "nodeType": "Block",
             "src": "57:95:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "72:76:1",
                   "nodeType": "YulBlock",
                   "src": "72:76:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "94:35:1",
                         "nodeType": "YulBlock",
                         "src": "94:35:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "body":
-                            {
+                            "body": {
                               "nativeSrc": "118:3:1",
                               "nodeType": "YulBlock",
                               "src": "118:3:1",
@@ -76,8 +64,7 @@
                       "nativeSrc": "136:6:1",
                       "nodeType": "YulAssignment",
                       "src": "136:6:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "141:1:1",
                         "nodeType": "YulLiteral",
@@ -85,8 +72,7 @@
                         "type": "",
                         "value": "2"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "x",
                           "nativeSrc": "136:1:1",
@@ -98,8 +84,7 @@
                   ]
                 },
                 "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
+                "externalReferences": [
                   {
                     "declaration": 3,
                     "isOffset": false,
@@ -122,19 +107,16 @@
           "name": "f",
           "nameLocation": "24:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "25:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 3,
@@ -146,19 +128,16 @@
                 "src": "49:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 2,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "49:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.sol b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
index 42479fa94a..396efa0bf8 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.sol
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
@@ -8,4 +8,5 @@ contract C {
     }
   }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
index b924b42cfd..acb05ca869 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 9,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,35 +12,27 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 6,
             "nodeType": "Block",
             "src": "57:95:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "72:76:1",
                   "nodeType": "YulBlock",
                   "src": "72:76:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "body":
-                      {
+                      "body": {
                         "nativeSrc": "94:35:1",
                         "nodeType": "YulBlock",
                         "src": "94:35:1",
-                        "statements":
-                        [
+                        "statements": [
                           {
-                            "body":
-                            {
+                            "body": {
                               "nativeSrc": "118:3:1",
                               "nodeType": "YulBlock",
                               "src": "118:3:1",
@@ -63,8 +54,7 @@
                       "nativeSrc": "136:6:1",
                       "nodeType": "YulAssignment",
                       "src": "136:6:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "141:1:1",
                         "nodeType": "YulLiteral",
@@ -72,8 +62,7 @@
                         "type": "",
                         "value": "2"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "x",
                           "nativeSrc": "136:1:1",
@@ -99,19 +88,16 @@
           "name": "f",
           "nameLocation": "24:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "25:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 3,
@@ -123,8 +109,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 2,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.json b/test/libsolidity/ASTJSON/assembly/slot_offset.json
index 799239b3af..8599bf3a89 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       12
     ]
   },
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,20 +16,17 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 12,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         12
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "canonicalName": "C.S",
           "id": 3,
-          "members":
-          [
+          "members": [
             {
               "constant": false,
               "id": 2,
@@ -44,19 +38,16 @@
               "src": "28:6:1",
               "stateVariable": false,
               "storageLocation": "default",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
               },
-              "typeName":
-              {
+              "typeName": {
                 "id": 1,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
                 "src": "28:4:1",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
@@ -82,21 +73,17 @@
           "src": "42:3:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_struct$_S_$3_storage",
             "typeString": "struct C.S"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 5,
             "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
+            "pathNode": {
               "id": 4,
               "name": "S",
-              "nameLocations":
-              [
+              "nameLocations": [
                 "42:1:1"
               ],
               "nodeType": "IdentifierPath",
@@ -105,8 +92,7 @@
             },
             "referencedDeclaration": 3,
             "src": "42:1:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_struct$_S_$3_storage_ptr",
               "typeString": "struct C.S"
             }
@@ -114,34 +100,28 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "76:70:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "95:45:1",
                   "nodeType": "YulBlock",
                   "src": "95:45:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "97:17:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "97:17:1",
-                      "value":
-                      {
+                      "value": {
                         "name": "s.offset",
                         "nativeSrc": "106:8:1",
                         "nodeType": "YulIdentifier",
                         "src": "106:8:1"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "101:1:1",
@@ -155,10 +135,8 @@
                       "nativeSrc": "115:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "115:23:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
+                      "value": {
+                        "arguments": [
                           {
                             "name": "s.slot",
                             "nativeSrc": "128:6:1",
@@ -174,8 +152,7 @@
                             "value": "2"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "mul",
                           "nativeSrc": "124:3:1",
                           "nodeType": "YulIdentifier",
@@ -185,8 +162,7 @@
                         "nodeType": "YulFunctionCall",
                         "src": "124:14:1"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "y",
                           "nativeSrc": "119:1:1",
@@ -199,8 +175,7 @@
                   ]
                 },
                 "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
+                "externalReferences": [
                   {
                     "declaration": 6,
                     "isOffset": true,
@@ -232,15 +207,13 @@
           "name": "e",
           "nameLocation": "60:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "61:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 8,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.sol b/test/libsolidity/ASTJSON/assembly/slot_offset.sol
index 0cc2b07c11..d3c8f75542 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.sol
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.sol
@@ -5,4 +5,5 @@ contract C {
         assembly { let x := s.offset let y := mul(s.slot, 2) }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
index ef8dc8b0ad..5363931c4a 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,12 +12,10 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 3,
-          "members":
-          [
+          "members": [
             {
               "constant": false,
               "id": 2,
@@ -30,8 +27,7 @@
               "stateVariable": false,
               "storageLocation": "default",
               "typeDescriptions": {},
-              "typeName":
-              {
+              "typeName": {
                 "id": 1,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
@@ -58,16 +54,13 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 5,
             "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
+            "pathNode": {
               "id": 4,
               "name": "S",
-              "nameLocations":
-              [
+              "nameLocations": [
                 "42:1:1"
               ],
               "nodeType": "IdentifierPath",
@@ -79,34 +72,28 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "76:70:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "95:45:1",
                   "nodeType": "YulBlock",
                   "src": "95:45:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "97:17:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "97:17:1",
-                      "value":
-                      {
+                      "value": {
                         "name": "s.offset",
                         "nativeSrc": "106:8:1",
                         "nodeType": "YulIdentifier",
                         "src": "106:8:1"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "101:1:1",
@@ -120,10 +107,8 @@
                       "nativeSrc": "115:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "115:23:1",
-                      "value":
-                      {
-                        "arguments":
-                        [
+                      "value": {
+                        "arguments": [
                           {
                             "name": "s.slot",
                             "nativeSrc": "128:6:1",
@@ -139,8 +124,7 @@
                             "value": "2"
                           }
                         ],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "mul",
                           "nativeSrc": "124:3:1",
                           "nodeType": "YulIdentifier",
@@ -150,8 +134,7 @@
                         "nodeType": "YulFunctionCall",
                         "src": "124:14:1"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "y",
                           "nativeSrc": "119:1:1",
@@ -178,15 +161,13 @@
           "name": "e",
           "nameLocation": "60:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "61:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 8,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.json b/test/libsolidity/ASTJSON/assembly/stringlit.json
index ab27a3d16f..2a27e55b2c 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,37 +16,30 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:43:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:18:1",
                   "nodeType": "YulBlock",
                   "src": "56:18:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "58:14:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "58:14:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "616263",
                         "kind": "string",
                         "nativeSrc": "67:5:1",
@@ -58,8 +48,7 @@
                         "type": "",
                         "value": "abc"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "62:1:1",
@@ -87,15 +76,13 @@
           "name": "m",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.sol b/test/libsolidity/ASTJSON/assembly/stringlit.sol
index 6f5278ac17..e382095ad0 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit.sol
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { let x := "abc" }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
index 3cb2a90728..3d021620e1 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,30 +12,24 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "37:43:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "56:18:1",
                   "nodeType": "YulBlock",
                   "src": "56:18:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "58:14:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "58:14:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "616263",
                         "kind": "string",
                         "nativeSrc": "67:5:1",
@@ -45,8 +38,7 @@
                         "type": "",
                         "value": "abc"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "x",
                           "nativeSrc": "62:1:1",
@@ -73,15 +65,13 @@
           "name": "m",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/switch.json b/test/libsolidity/ASTJSON/assembly/switch.json
index 99c69e048b..1a418931bc 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ b/test/libsolidity/ASTJSON/assembly/switch.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,37 +16,30 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:154:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:129:1",
                   "nodeType": "YulBlock",
                   "src": "61:129:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "75:10:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "75:10:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
@@ -57,8 +47,7 @@
                         "type": "",
                         "value": "0"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "v",
                           "nativeSrc": "79:1:1",
@@ -69,22 +58,18 @@
                       ]
                     },
                     {
-                      "cases":
-                      [
+                      "cases": [
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "139:10:1",
                             "nodeType": "YulBlock",
                             "src": "139:10:1",
-                            "statements":
-                            [
+                            "statements": [
                               {
                                 "nativeSrc": "141:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "141:6:1",
-                                "value":
-                                {
+                                "value": {
                                   "kind": "number",
                                   "nativeSrc": "146:1:1",
                                   "nodeType": "YulLiteral",
@@ -92,8 +77,7 @@
                                   "type": "",
                                   "value": "1"
                                 },
-                                "variableNames":
-                                [
+                                "variableNames": [
                                   {
                                     "name": "v",
                                     "nativeSrc": "141:1:1",
@@ -107,8 +91,7 @@
                           "nativeSrc": "132:17:1",
                           "nodeType": "YulCase",
                           "src": "132:17:1",
-                          "value":
-                          {
+                          "value": {
                             "kind": "number",
                             "nativeSrc": "137:1:1",
                             "nodeType": "YulLiteral",
@@ -118,19 +101,16 @@
                           }
                         },
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "170:10:1",
                             "nodeType": "YulBlock",
                             "src": "170:10:1",
-                            "statements":
-                            [
+                            "statements": [
                               {
                                 "nativeSrc": "172:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "172:6:1",
-                                "value":
-                                {
+                                "value": {
                                   "kind": "number",
                                   "nativeSrc": "177:1:1",
                                   "nodeType": "YulLiteral",
@@ -138,8 +118,7 @@
                                   "type": "",
                                   "value": "2"
                                 },
-                                "variableNames":
-                                [
+                                "variableNames": [
                                   {
                                     "name": "v",
                                     "nativeSrc": "172:1:1",
@@ -156,11 +135,9 @@
                           "value": "default"
                         }
                       ],
-                      "expression":
-                      {
+                      "expression": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "calldatasize",
                           "nativeSrc": "105:12:1",
                           "nodeType": "YulIdentifier",
@@ -192,15 +169,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/switch.sol b/test/libsolidity/ASTJSON/assembly/switch.sol
index a7a23d26aa..c04d311b09 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.sol
+++ b/test/libsolidity/ASTJSON/assembly/switch.sol
@@ -8,4 +8,5 @@ contract C {
         }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.json b/test/libsolidity/ASTJSON/assembly/switch_default.json
index 07f804f3cb..9d016e2610 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,37 +16,29 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:58:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:33:1",
                   "nodeType": "YulBlock",
                   "src": "61:33:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "cases":
-                      [
+                      "cases": [
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "79:2:1",
                             "nodeType": "YulBlock",
                             "src": "79:2:1",
@@ -58,8 +47,7 @@
                           "nativeSrc": "72:9:1",
                           "nodeType": "YulCase",
                           "src": "72:9:1",
-                          "value":
-                          {
+                          "value": {
                             "kind": "number",
                             "nativeSrc": "77:1:1",
                             "nodeType": "YulLiteral",
@@ -69,8 +57,7 @@
                           }
                         },
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "90:2:1",
                             "nodeType": "YulBlock",
                             "src": "90:2:1",
@@ -82,8 +69,7 @@
                           "value": "default"
                         }
                       ],
-                      "expression":
-                      {
+                      "expression": {
                         "kind": "number",
                         "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
@@ -113,15 +99,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.sol b/test/libsolidity/ASTJSON/assembly/switch_default.sol
index 0760bb7dfd..1f61896fe2 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default.sol
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.sol
@@ -3,4 +3,5 @@ contract C {
         assembly { switch 0 case 0 {} default {} }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
index 2ec3027708..22523b478e 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,30 +12,23 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:58:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:33:1",
                   "nodeType": "YulBlock",
                   "src": "61:33:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "cases":
-                      [
+                      "cases": [
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "79:2:1",
                             "nodeType": "YulBlock",
                             "src": "79:2:1",
@@ -45,8 +37,7 @@
                           "nativeSrc": "72:9:1",
                           "nodeType": "YulCase",
                           "src": "72:9:1",
-                          "value":
-                          {
+                          "value": {
                             "kind": "number",
                             "nativeSrc": "77:1:1",
                             "nodeType": "YulLiteral",
@@ -56,8 +47,7 @@
                           }
                         },
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "90:2:1",
                             "nodeType": "YulBlock",
                             "src": "90:2:1",
@@ -69,8 +59,7 @@
                           "value": "default"
                         }
                       ],
-                      "expression":
-                      {
+                      "expression": {
                         "kind": "number",
                         "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
@@ -99,15 +88,13 @@
           "name": "g",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
index 2412ea48dd..dc16d43f91 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,30 +12,24 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "42:154:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "61:129:1",
                   "nodeType": "YulBlock",
                   "src": "61:129:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "75:10:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "75:10:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
@@ -44,8 +37,7 @@
                         "type": "",
                         "value": "0"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "v",
                           "nativeSrc": "79:1:1",
@@ -56,22 +48,18 @@
                       ]
                     },
                     {
-                      "cases":
-                      [
+                      "cases": [
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "139:10:1",
                             "nodeType": "YulBlock",
                             "src": "139:10:1",
-                            "statements":
-                            [
+                            "statements": [
                               {
                                 "nativeSrc": "141:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "141:6:1",
-                                "value":
-                                {
+                                "value": {
                                   "kind": "number",
                                   "nativeSrc": "146:1:1",
                                   "nodeType": "YulLiteral",
@@ -79,8 +67,7 @@
                                   "type": "",
                                   "value": "1"
                                 },
-                                "variableNames":
-                                [
+                                "variableNames": [
                                   {
                                     "name": "v",
                                     "nativeSrc": "141:1:1",
@@ -94,8 +81,7 @@
                           "nativeSrc": "132:17:1",
                           "nodeType": "YulCase",
                           "src": "132:17:1",
-                          "value":
-                          {
+                          "value": {
                             "kind": "number",
                             "nativeSrc": "137:1:1",
                             "nodeType": "YulLiteral",
@@ -105,19 +91,16 @@
                           }
                         },
                         {
-                          "body":
-                          {
+                          "body": {
                             "nativeSrc": "170:10:1",
                             "nodeType": "YulBlock",
                             "src": "170:10:1",
-                            "statements":
-                            [
+                            "statements": [
                               {
                                 "nativeSrc": "172:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "172:6:1",
-                                "value":
-                                {
+                                "value": {
                                   "kind": "number",
                                   "nativeSrc": "177:1:1",
                                   "nodeType": "YulLiteral",
@@ -125,8 +108,7 @@
                                   "type": "",
                                   "value": "2"
                                 },
-                                "variableNames":
-                                [
+                                "variableNames": [
                                   {
                                     "name": "v",
                                     "nativeSrc": "172:1:1",
@@ -143,11 +125,9 @@
                           "value": "default"
                         }
                       ],
-                      "expression":
-                      {
+                      "expression": {
                         "arguments": [],
-                        "functionName":
-                        {
+                        "functionName": {
                           "name": "calldatasize",
                           "nativeSrc": "105:12:1",
                           "nodeType": "YulIdentifier",
@@ -178,15 +158,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.json b/test/libsolidity/ASTJSON/assembly/var_access.json
index ae7845815f..86bc76fa78 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       9
     ]
   },
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 9,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         9
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "42:51:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "52:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
                       "src": "52:4:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
@@ -79,19 +67,16 @@
                 "src": "52:6:1"
               },
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "77:10:1",
                   "nodeType": "YulBlock",
                   "src": "77:10:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "79:6:1",
                       "nodeType": "YulAssignment",
                       "src": "79:6:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
@@ -99,8 +84,7 @@
                         "type": "",
                         "value": "7"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "x",
                           "nativeSrc": "79:1:1",
@@ -112,8 +96,7 @@
                   ]
                 },
                 "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
+                "externalReferences": [
                   {
                     "declaration": 4,
                     "isOffset": false,
@@ -136,15 +119,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.sol b/test/libsolidity/ASTJSON/assembly/var_access.sol
index e4b7423fde..768f38c334 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access.sol
+++ b/test/libsolidity/ASTJSON/assembly/var_access.sol
@@ -4,4 +4,5 @@ contract C {
         assembly { x := 7 }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
index ca3fcf92c9..129104bbcd 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "42:51:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
@@ -57,19 +50,16 @@
                 "src": "52:6:1"
               },
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "77:10:1",
                   "nodeType": "YulBlock",
                   "src": "77:10:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "79:6:1",
                       "nodeType": "YulAssignment",
                       "src": "79:6:1",
-                      "value":
-                      {
+                      "value": {
                         "kind": "number",
                         "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
@@ -77,8 +67,7 @@
                         "type": "",
                         "value": "7"
                       },
-                      "variableNames":
-                      [
+                      "variableNames": [
                         {
                           "name": "x",
                           "nativeSrc": "79:1:1",
@@ -104,15 +93,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
index 07886a1663..f94345ffcd 100644
--- a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
+++ b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
@@ -1,28 +1,22 @@
 [
 {
   "absolutePath": "L",
-  "exportedSymbols":
-  {
-    "L":
-    [
+  "exportedSymbols": {
+    "L": [
       78
     ],
-    "free1":
-    [
+    "free1": [
       65
     ],
-    "free2":
-    [
+    "free2": [
       69
     ]
   },
   "id": 79,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "body":
-      {
+      "body": {
         "id": 64,
         "nodeType": "Block",
         "src": "17:2:1",
@@ -35,15 +29,13 @@
       "name": "free1",
       "nameLocation": "9:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 62,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "14:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 63,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -56,8 +48,7 @@
       "visibility": "internal"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 68,
         "nodeType": "Block",
         "src": "37:2:1",
@@ -70,15 +61,13 @@
       "name": "free2",
       "nameLocation": "29:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 66,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "34:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 67,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -98,18 +87,15 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 78,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         78
       ],
       "name": "L",
       "nameLocation": "48:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 72,
             "nodeType": "Block",
             "src": "78:2:1",
@@ -122,15 +108,13 @@
           "name": "g",
           "nameLocation": "65:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 70,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "66:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 71,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -143,8 +127,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 76,
             "nodeType": "Block",
             "src": "107:2:1",
@@ -157,15 +140,13 @@
           "name": "h",
           "nameLocation": "94:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 74,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "95:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 75,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -188,33 +169,26 @@
 },
 {
   "absolutePath": "A",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       22
     ],
-    "B":
-    [
+    "B": [
       37
     ],
-    "L":
-    [
+    "L": [
       78
     ],
-    "free1":
-    [
+    "free1": [
       65
     ],
-    "free2":
-    [
+    "free2": [
       69
     ]
   },
   "id": 38,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "absolutePath": "L",
       "file": "L",
@@ -235,49 +209,39 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 22,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "69": 1,
         "73": 2,
         "77": 3
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         22
       ],
       "name": "A",
       "nameLocation": "21:1:2",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 20,
             "nodeType": "Block",
             "src": "49:60:2",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 4,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 78,
                           "src": "60:1:2",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$78_$",
                             "typeString": "type(library L)"
                           }
@@ -292,8 +256,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 73,
                         "src": "60:3:2",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -307,8 +270,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "59:5:2",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -324,8 +286,7 @@
                   "nodeType": "FunctionCall",
                   "src": "59:7:2",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -335,14 +296,11 @@
                 "src": "59:7:2"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 10,
                         "name": "free2",
@@ -350,8 +308,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 69,
                         "src": "77:5:2",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -365,8 +322,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "76:7:2",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -382,8 +338,7 @@
                   "nodeType": "FunctionCall",
                   "src": "76:9:2",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -393,25 +348,20 @@
                 "src": "76:9:2"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 14,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 78,
                           "src": "96:1:2",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$78_$",
                             "typeString": "type(library L)"
                           }
@@ -426,8 +376,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 77,
                         "src": "96:3:2",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -441,8 +390,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "95:5:2",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -458,8 +406,7 @@
                   "nodeType": "FunctionCall",
                   "src": "95:7:2",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -478,15 +425,13 @@
           "name": "f",
           "nameLocation": "38:1:2",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "39:2:2"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -512,48 +457,38 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 37,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "69": 1,
         "77": 2
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         37
       ],
       "name": "B",
       "nameLocation": "121:1:2",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 35,
             "nodeType": "Block",
             "src": "149:43:2",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 25,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 78,
                           "src": "160:1:2",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$78_$",
                             "typeString": "type(library L)"
                           }
@@ -568,8 +503,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 77,
                         "src": "160:3:2",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -583,8 +517,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "159:5:2",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -600,8 +533,7 @@
                   "nodeType": "FunctionCall",
                   "src": "159:7:2",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -611,14 +543,11 @@
                 "src": "159:7:2"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 31,
                         "name": "free2",
@@ -626,8 +555,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 69,
                         "src": "177:5:2",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -641,8 +569,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "176:7:2",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -658,8 +585,7 @@
                   "nodeType": "FunctionCall",
                   "src": "176:9:2",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -678,15 +604,13 @@
           "name": "f",
           "nameLocation": "138:1:2",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 23,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "139:2:2"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 24,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -709,29 +633,23 @@
 },
 {
   "absolutePath": "C",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       60
     ],
-    "L":
-    [
+    "L": [
       78
     ],
-    "free1":
-    [
+    "free1": [
       65
     ],
-    "free2":
-    [
+    "free2": [
       69
     ]
   },
   "id": 61,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "absolutePath": "L",
       "file": "L",
@@ -752,49 +670,39 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 60,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "69": 1,
         "73": 2,
         "77": 3
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         60
       ],
       "name": "C",
       "nameLocation": "21:1:3",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 58,
             "nodeType": "Block",
             "src": "49:60:3",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 42,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 78,
                           "src": "60:1:3",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$78_$",
                             "typeString": "type(library L)"
                           }
@@ -809,8 +717,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 73,
                         "src": "60:3:3",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -824,8 +731,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "59:5:3",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -841,8 +747,7 @@
                   "nodeType": "FunctionCall",
                   "src": "59:7:3",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -852,14 +757,11 @@
                 "src": "59:7:3"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 48,
                         "name": "free2",
@@ -867,8 +769,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 69,
                         "src": "77:5:3",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -882,8 +783,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "76:7:3",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -899,8 +799,7 @@
                   "nodeType": "FunctionCall",
                   "src": "76:9:3",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -910,25 +809,20 @@
                 "src": "76:9:3"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 52,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 78,
                           "src": "96:1:3",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$78_$",
                             "typeString": "type(library L)"
                           }
@@ -943,8 +837,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 77,
                         "src": "96:3:3",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -958,8 +851,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "95:5:3",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -975,8 +867,7 @@
                   "nodeType": "FunctionCall",
                   "src": "95:7:3",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -995,15 +886,13 @@
           "name": "f",
           "nameLocation": "38:1:3",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 40,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "39:2:3"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 41,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
index 6e0b28c82a..bf32229021 100644
--- a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
+++ b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
@@ -1,5 +1,4 @@
 ==== Source: L ====
-
 function free1() {}
 function free2() {}
 library L {
@@ -8,7 +7,6 @@ library L {
 }
 
 ==== Source: A ====
-
 import "L";
 contract A {
     function f() public {
@@ -25,7 +23,6 @@ contract B {
 }
 
 ==== Source: C ====
-
 import "L";
 contract C {
     function f() public {
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
index d452f2d99f..cbbc962c02 100644
--- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
+++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
@@ -1,39 +1,30 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       128
     ],
-    "D":
-    [
+    "D": [
       141
     ],
-    "L":
-    [
+    "L": [
       53
     ],
-    "free1":
-    [
+    "free1": [
       4
     ],
-    "free2":
-    [
+    "free2": [
       8
     ],
-    "free3":
-    [
+    "free3": [
       12
     ]
   },
   "id": 142,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "body":
-      {
+      "body": {
         "id": 3,
         "nodeType": "Block",
         "src": "17:2:1",
@@ -46,15 +37,13 @@
       "name": "free1",
       "nameLocation": "9:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 1,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "14:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 2,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -67,8 +56,7 @@
       "visibility": "internal"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 7,
         "nodeType": "Block",
         "src": "37:2:1",
@@ -81,15 +69,13 @@
       "name": "free2",
       "nameLocation": "29:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 5,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "34:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 6,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -102,8 +88,7 @@
       "visibility": "internal"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 11,
         "nodeType": "Block",
         "src": "57:2:1",
@@ -116,15 +101,13 @@
       "name": "free3",
       "nameLocation": "49:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 9,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "54:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 10,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -144,25 +127,21 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 53,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "20": 3,
         "24": 4,
         "4": 1,
         "8": 2
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         53
       ],
       "name": "L",
       "nameLocation": "68:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 15,
             "nodeType": "Block",
             "src": "100:2:1",
@@ -176,15 +155,13 @@
           "name": "ext",
           "nameLocation": "85:3:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "88:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -197,8 +174,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 19,
             "nodeType": "Block",
             "src": "132:2:1",
@@ -211,15 +187,13 @@
           "name": "inr1",
           "nameLocation": "116:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 17,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "120:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 18,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -232,8 +206,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 23,
             "nodeType": "Block",
             "src": "164:2:1",
@@ -246,15 +219,13 @@
           "name": "inr2",
           "nameLocation": "148:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 21,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "152:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 22,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -267,8 +238,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 27,
             "nodeType": "Block",
             "src": "196:2:1",
@@ -281,15 +251,13 @@
           "name": "inr3",
           "nameLocation": "180:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 25,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "184:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 26,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -302,24 +270,20 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 39,
             "nodeType": "Block",
             "src": "228:51:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "id": 31,
                   "name": "free1",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 4,
                   "src": "238:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -329,16 +293,14 @@
                 "src": "238:5:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 33,
                   "name": "inr1",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 20,
                   "src": "253:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -348,18 +310,15 @@
                 "src": "253:4:1"
               },
               {
-                "expression":
-                {
-                  "expression":
-                  {
+                "expression": {
+                  "expression": {
                     "id": 35,
                     "name": "L",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 53,
                     "src": "267:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_type$_t_contract$_L_$53_$",
                       "typeString": "type(library L)"
                     }
@@ -374,8 +333,7 @@
                   "nodeType": "MemberAccess",
                   "referencedDeclaration": 16,
                   "src": "267:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -394,15 +352,13 @@
           "name": "access",
           "nameLocation": "212:6:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 29,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "218:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 30,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -415,22 +371,17 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 51,
             "nodeType": "Block",
             "src": "313:44:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 43,
                         "name": "free2",
@@ -438,8 +389,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 8,
                         "src": "324:5:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -453,8 +403,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "323:7:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -470,8 +419,7 @@
                   "nodeType": "FunctionCall",
                   "src": "323:9:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -481,14 +429,11 @@
                 "src": "323:9:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 47,
                         "name": "inr2",
@@ -496,8 +441,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 24,
                         "src": "343:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -511,8 +455,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "342:6:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -528,8 +471,7 @@
                   "nodeType": "FunctionCall",
                   "src": "342:8:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -548,15 +490,13 @@
           "name": "expression",
           "nameLocation": "293:10:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 41,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "303:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 42,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -582,8 +522,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 128,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "20": 3,
         "24": 4,
         "4": 1,
@@ -591,18 +530,15 @@
         "73": 6,
         "8": 2
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         128
       ],
       "name": "C",
       "nameLocation": "369:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 56,
             "nodeType": "Block",
             "src": "402:2:1",
@@ -616,15 +552,13 @@
           "name": "ext1",
           "nameLocation": "386:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 54,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "390:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 55,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -637,8 +571,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 60,
             "nodeType": "Block",
             "src": "434:2:1",
@@ -652,15 +585,13 @@
           "name": "ext2",
           "nameLocation": "418:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 58,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "422:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 59,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -673,8 +604,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 64,
             "nodeType": "Block",
             "src": "466:2:1",
@@ -688,15 +618,13 @@
           "name": "ext3",
           "nameLocation": "450:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 62,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "454:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 63,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -709,8 +637,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 68,
             "nodeType": "Block",
             "src": "498:2:1",
@@ -723,15 +650,13 @@
           "name": "inr1",
           "nameLocation": "482:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 66,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "486:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 67,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -744,8 +669,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 72,
             "nodeType": "Block",
             "src": "530:2:1",
@@ -758,15 +682,13 @@
           "name": "inr2",
           "nameLocation": "514:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 70,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "518:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 71,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -779,8 +701,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 76,
             "nodeType": "Block",
             "src": "562:2:1",
@@ -793,15 +714,13 @@
           "name": "inr3",
           "nameLocation": "546:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 74,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "550:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 75,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -814,26 +733,21 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 96,
             "nodeType": "Block",
             "src": "594:86:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
-                  "expression":
-                  {
+                "expression": {
+                  "expression": {
                     "id": 80,
                     "name": "this",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": -28,
                     "src": "604:4:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_contract$_C_$128",
                       "typeString": "contract C"
                     }
@@ -848,8 +762,7 @@
                   "nodeType": "MemberAccess",
                   "referencedDeclaration": 57,
                   "src": "604:9:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
                     "typeString": "function () external"
                   }
@@ -859,16 +772,14 @@
                 "src": "604:9:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 84,
                   "name": "inr1",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 69,
                   "src": "623:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -878,16 +789,14 @@
                 "src": "623:4:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 86,
                   "name": "free1",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 4,
                   "src": "637:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -897,18 +806,15 @@
                 "src": "637:5:1"
               },
               {
-                "expression":
-                {
-                  "expression":
-                  {
+                "expression": {
+                  "expression": {
                     "id": 88,
                     "name": "L",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 53,
                     "src": "652:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_type$_t_contract$_L_$53_$",
                       "typeString": "type(library L)"
                     }
@@ -923,8 +829,7 @@
                   "nodeType": "MemberAccess",
                   "referencedDeclaration": 20,
                   "src": "652:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -934,18 +839,15 @@
                 "src": "652:6:1"
               },
               {
-                "expression":
-                {
-                  "expression":
-                  {
+                "expression": {
+                  "expression": {
                     "id": 92,
                     "name": "L",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 53,
                     "src": "668:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_type$_t_contract$_L_$53_$",
                       "typeString": "type(library L)"
                     }
@@ -960,8 +862,7 @@
                   "nodeType": "MemberAccess",
                   "referencedDeclaration": 16,
                   "src": "668:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
                     "typeString": "function ()"
                   }
@@ -980,15 +881,13 @@
           "name": "access",
           "nameLocation": "578:6:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 78,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "584:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 79,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -1001,33 +900,26 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 126,
             "nodeType": "Block",
             "src": "714:106:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 100,
                           "name": "this",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": -28,
                           "src": "725:4:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_contract$_C_$128",
                             "typeString": "contract C"
                           }
@@ -1042,8 +934,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 61,
                         "src": "725:9:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
                           "typeString": "function () external"
                         }
@@ -1057,8 +948,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "724:11:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
                       "typeString": "function () external"
                     }
@@ -1074,8 +964,7 @@
                   "nodeType": "FunctionCall",
                   "src": "724:13:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1085,14 +974,11 @@
                 "src": "724:13:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 106,
                         "name": "inr2",
@@ -1100,8 +986,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 73,
                         "src": "748:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -1115,8 +1000,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "747:6:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1132,8 +1016,7 @@
                   "nodeType": "FunctionCall",
                   "src": "747:8:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1143,14 +1026,11 @@
                 "src": "747:8:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
                         "id": 110,
                         "name": "free2",
@@ -1158,8 +1038,7 @@
                         "overloadedDeclarations": [],
                         "referencedDeclaration": 8,
                         "src": "766:5:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -1173,8 +1052,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "765:7:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1190,8 +1068,7 @@
                   "nodeType": "FunctionCall",
                   "src": "765:9:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1201,25 +1078,20 @@
                 "src": "765:9:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 114,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 53,
                           "src": "785:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$53_$",
                             "typeString": "type(library L)"
                           }
@@ -1234,8 +1106,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 24,
                         "src": "785:6:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -1249,8 +1120,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "784:8:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1266,8 +1136,7 @@
                   "nodeType": "FunctionCall",
                   "src": "784:10:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1277,25 +1146,20 @@
                 "src": "784:10:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "components":
-                    [
+                    "components": [
                       {
-                        "expression":
-                        {
+                        "expression": {
                           "id": 120,
                           "name": "L",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 53,
                           "src": "805:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_contract$_L_$53_$",
                             "typeString": "type(library L)"
                           }
@@ -1310,8 +1174,7 @@
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": 16,
                         "src": "805:5:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
                           "typeString": "function ()"
                         }
@@ -1325,8 +1188,7 @@
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
                     "src": "804:7:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1342,8 +1204,7 @@
                   "nodeType": "FunctionCall",
                   "src": "804:9:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1362,15 +1223,13 @@
           "name": "expression",
           "nameLocation": "694:10:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 98,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "704:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 99,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -1390,15 +1249,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 129,
             "name": "C",
-            "nameLocations":
-            [
+            "nameLocations": [
               "837:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -1415,8 +1271,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 141,
-      "internalFunctionIDs":
-      {
+      "internalFunctionIDs": {
         "20": 3,
         "24": 4,
         "4": 1,
@@ -1424,30 +1279,24 @@
         "73": 6,
         "8": 2
       },
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         141,
         128
       ],
       "name": "D",
       "nameLocation": "832:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 139,
             "nodeType": "Block",
             "src": "859:47:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 133,
                     "name": "access",
@@ -1455,8 +1304,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 97,
                     "src": "869:6:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1472,8 +1320,7 @@
                   "nodeType": "FunctionCall",
                   "src": "869:8:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1483,11 +1330,9 @@
                 "src": "869:8:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 136,
                     "name": "expression",
@@ -1495,8 +1340,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 127,
                     "src": "887:10:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -1512,8 +1356,7 @@
                   "nodeType": "FunctionCall",
                   "src": "887:12:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -1531,15 +1374,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 131,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "856:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 132,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/base_constructor_call.json b/test/libsolidity/ASTJSON/base_constructor_call.json
index 2c3c68c40d..408cb94770 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call.json
@@ -1,20 +1,16 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       7
     ],
-    "C":
-    [
+    "C": [
       17
     ]
   },
   "id": 18,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -23,18 +19,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 7,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         7
       ],
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "31:2:1",
@@ -47,12 +40,10 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -64,19 +55,16 @@
                 "src": "25:4:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "25:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -86,8 +74,7 @@
             ],
             "src": "24:6:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -107,15 +94,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 8,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "50:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -132,19 +116,16 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 17,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         17,
         7
       ],
       "name": "C",
       "nameLocation": "45:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 15,
             "nodeType": "Block",
             "src": "73:2:1",
@@ -153,11 +134,9 @@
           "id": 16,
           "implemented": true,
           "kind": "constructor",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "32",
                   "id": 12,
@@ -168,8 +147,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "70:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_2_by_1",
                     "typeString": "int_const 2"
                   },
@@ -178,12 +156,10 @@
               ],
               "id": 13,
               "kind": "baseConstructorSpecifier",
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 11,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "68:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -197,15 +173,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "65:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
index 730a05178c..07a57a9db7 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 18,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "31:2:1",
@@ -30,12 +27,10 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -47,8 +42,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -60,8 +54,7 @@
             ],
             "src": "24:6:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -78,15 +71,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 8,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "50:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -103,11 +93,9 @@
       "name": "C",
       "nameLocation": "45:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 15,
             "nodeType": "Block",
             "src": "73:2:1",
@@ -116,11 +104,9 @@
           "id": 16,
           "implemented": true,
           "kind": "constructor",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "32",
                   "id": 12,
@@ -132,12 +118,10 @@
                 }
               ],
               "id": 13,
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 11,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "68:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -150,15 +134,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "65:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/constructor.json b/test/libsolidity/ASTJSON/constructor.json
index 53e622b5dd..2c18d73f24 100644
--- a/test/libsolidity/ASTJSON/constructor.json
+++ b/test/libsolidity/ASTJSON/constructor.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "28:4:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "25:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/constructor.sol b/test/libsolidity/ASTJSON/constructor.sol
index b48aa1be34..b2b1c64604 100644
--- a/test/libsolidity/ASTJSON/constructor.sol
+++ b/test/libsolidity/ASTJSON/constructor.sol
@@ -2,4 +2,5 @@ contract C {
 	constructor() {
 	}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/constructor_parseOnly.json b/test/libsolidity/ASTJSON/constructor_parseOnly.json
index 9b1d4cfc44..4645d6d3be 100644
--- a/test/libsolidity/ASTJSON/constructor_parseOnly.json
+++ b/test/libsolidity/ASTJSON/constructor_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "28:4:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "25:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/contract_dep_order.json b/test/libsolidity/ASTJSON/contract_dep_order.json
index 67eff600b6..3969576174 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order.json
@@ -1,32 +1,25 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       1
     ],
-    "B":
-    [
+    "B": [
       4
     ],
-    "C":
-    [
+    "C": [
       7
     ],
-    "D":
-    [
+    "D": [
       10
     ],
-    "E":
-    [
+    "E": [
       13
     ]
   },
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -35,8 +28,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 1,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         1
       ],
       "name": "A",
@@ -50,15 +42,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 2,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "29:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -75,8 +64,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 4,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         4,
         1
       ],
@@ -91,15 +79,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 5,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "49:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -116,8 +101,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 7,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         7,
         4,
         1
@@ -133,15 +117,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 8,
             "name": "C",
-            "nameLocations":
-            [
+            "nameLocations": [
               "69:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -158,8 +139,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 10,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         10,
         7,
         4,
@@ -176,15 +156,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 11,
             "name": "D",
-            "nameLocations":
-            [
+            "nameLocations": [
               "89:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -201,8 +178,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 13,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         13,
         10,
         7,
diff --git a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
index ba8c377cf7..022d93b9e8 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -20,15 +19,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 2,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "29:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -52,15 +48,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 5,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "49:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -84,15 +77,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 8,
             "name": "C",
-            "nameLocations":
-            [
+            "nameLocations": [
               "69:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -116,15 +106,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 11,
             "name": "D",
-            "nameLocations":
-            [
+            "nameLocations": [
               "89:1:1"
             ],
             "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/documentation.json b/test/libsolidity/ASTJSON/documentation.json
index 43224bc64d..9558eb3fc4 100644
--- a/test/libsolidity/ASTJSON/documentation.json
+++ b/test/libsolidity/ASTJSON/documentation.json
@@ -1,25 +1,21 @@
 [
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       2
     ]
   },
   "id": 3,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
       "canonicalName": "C",
       "contractDependencies": [],
       "contractKind": "contract",
-      "documentation":
-      {
+      "documentation": {
         "id": 1,
         "nodeType": "StructuredDocumentation",
         "src": "0:27:1",
@@ -27,8 +23,7 @@
       },
       "fullyImplemented": true,
       "id": 2,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         2
       ],
       "name": "C",
@@ -45,25 +40,21 @@
 },
 {
   "absolutePath": "b",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
       "canonicalName": "C",
       "contractDependencies": [],
       "contractKind": "contract",
-      "documentation":
-      {
+      "documentation": {
         "id": 4,
         "nodeType": "StructuredDocumentation",
         "src": "0:61:2",
@@ -71,8 +62,7 @@
       },
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
@@ -89,17 +79,14 @@
 },
 {
   "absolutePath": "c",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       23
     ]
   },
   "id": 24,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -108,19 +95,16 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 23,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         23
       ],
       "name": "C",
       "nameLocation": "9:1:3",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
-          "documentation":
-          {
+          "documentation": {
             "id": 7,
             "nodeType": "StructuredDocumentation",
             "src": "15:32:3",
@@ -136,19 +120,16 @@
           "src": "48:17:3",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 8,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "48:4:3",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
@@ -157,8 +138,7 @@
         },
         {
           "anonymous": false,
-          "documentation":
-          {
+          "documentation": {
             "id": 10,
             "nodeType": "StructuredDocumentation",
             "src": "69:26:3",
@@ -169,8 +149,7 @@
           "name": "Evt",
           "nameLocation": "102:3:3",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -179,13 +158,11 @@
           "src": "96:12:3"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 16,
             "nodeType": "Block",
             "src": "153:6:3",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 15,
                 "nodeType": "PlaceholderStatement",
@@ -193,8 +170,7 @@
               }
             ]
           },
-          "documentation":
-          {
+          "documentation": {
             "id": 13,
             "nodeType": "StructuredDocumentation",
             "src": "111:26:3",
@@ -204,8 +180,7 @@
           "name": "mod",
           "nameLocation": "147:3:3",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -216,15 +191,13 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 21,
             "nodeType": "Block",
             "src": "209:2:3",
             "statements": []
           },
-          "documentation":
-          {
+          "documentation": {
             "id": 18,
             "nodeType": "StructuredDocumentation",
             "src": "162:25:3",
@@ -238,15 +211,13 @@
           "name": "fn",
           "nameLocation": "197:2:3",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "199:2:3"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 20,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -262,8 +233,7 @@
       "scope": 24,
       "src": "0:213:3",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         12
       ]
     }
diff --git a/test/libsolidity/ASTJSON/documentation.sol b/test/libsolidity/ASTJSON/documentation.sol
index 6bbf4042af..471b7a4761 100644
--- a/test/libsolidity/ASTJSON/documentation.sol
+++ b/test/libsolidity/ASTJSON/documentation.sol
@@ -1,19 +1,17 @@
 ==== Source: a ====
-
 /**This contract is empty*/ contract C {}
 
 ==== Source: b ====
-
 /**This contract is empty
  and has a line-breaking comment.*/
 contract C {}
 
 ==== Source: c ====
-
 contract C {
   /** Some comment on state var.*/ uint public state;
   /** Some comment on Evt.*/ event Evt();
   /** Some comment on mod.*/ modifier mod() { _; }
   /** Some comment on fn.*/ function fn() public {}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.json b/test/libsolidity/ASTJSON/documentation_local_variable.json
index 62d76e782c..1e22c91616 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       41
     ]
   },
   "id": 42,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 41,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         41
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 26,
             "nodeType": "Block",
             "src": "42:330:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   5
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 5,
@@ -54,19 +45,16 @@
                     "src": "109:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 4,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
                       "src": "109:4:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
@@ -76,8 +64,7 @@
                 ],
                 "documentation": "Documentation for x; will appear in ast json",
                 "id": 7,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "31",
                   "id": 6,
                   "isConstant": false,
@@ -87,8 +74,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "118:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_1_by_1",
                     "typeString": "int_const 1"
                   },
@@ -98,20 +84,16 @@
                 "src": "109:10:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "id": 24,
                   "nodeType": "Block",
                   "src": "270:96:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "assignments":
-                      [
+                      "assignments": [
                         21
                       ],
-                      "declarations":
-                      [
+                      "declarations": [
                         {
                           "constant": false,
                           "id": 21,
@@ -123,19 +105,16 @@
                           "src": "345:6:1",
                           "stateVariable": false,
                           "storageLocation": "default",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "typeName":
-                          {
+                          "typeName": {
                             "id": 20,
                             "name": "uint",
                             "nodeType": "ElementaryTypeName",
                             "src": "345:4:1",
-                            "typeDescriptions":
-                            {
+                            "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
@@ -145,8 +124,7 @@
                       ],
                       "documentation": "documentation for j; will appear in ast json",
                       "id": 23,
-                      "initialValue":
-                      {
+                      "initialValue": {
                         "hexValue": "30",
                         "id": 22,
                         "isConstant": false,
@@ -156,8 +134,7 @@
                         "lValueRequested": false,
                         "nodeType": "Literal",
                         "src": "354:1:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
                           "typeString": "int_const 0"
                         },
@@ -168,10 +145,8 @@
                     }
                   ]
                 },
-                "condition":
-                {
-                  "commonType":
-                  {
+                "condition": {
+                  "commonType": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   },
@@ -180,24 +155,21 @@
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 13,
                     "name": "i",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 10,
                     "src": "236:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3130",
                     "id": 14,
                     "isConstant": false,
@@ -207,29 +179,24 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "240:2:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_10_by_1",
                       "typeString": "int_const 10"
                     },
                     "value": "10"
                   },
                   "src": "236:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
                   }
                 },
                 "id": 25,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     10
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 10,
@@ -241,19 +208,16 @@
                       "src": "212:6:1",
                       "stateVariable": false,
                       "storageLocation": "default",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 9,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "212:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -262,8 +226,7 @@
                     }
                   ],
                   "id": 12,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 11,
                     "isConstant": false,
@@ -273,8 +236,7 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "221:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
                       "typeString": "int_const 0"
                     },
@@ -284,10 +246,8 @@
                   "src": "212:10:1"
                 },
                 "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 17,
                     "isConstant": false,
                     "isLValue": false,
@@ -297,22 +257,19 @@
                     "operator": "++",
                     "prefix": true,
                     "src": "256:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 16,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 10,
                       "src": "258:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
@@ -334,15 +291,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -355,8 +310,7 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 39,
             "nodeType": "Block",
             "src": "662:2:1",
@@ -370,12 +324,10 @@
           "name": "g",
           "nameLocation": "386:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 37,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 30,
@@ -387,19 +339,16 @@
                 "src": "463:11:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 29,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "463:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -417,19 +366,16 @@
                 "src": "550:11:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 32,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "550:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -447,19 +393,16 @@
                 "src": "637:11:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 35,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "637:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -469,8 +412,7 @@
             ],
             "src": "387:267:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 38,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json b/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
index 8725838394..97939eaa15 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 42,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 26,
             "nodeType": "Block",
             "src": "42:330:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   5
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 5,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 4,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
@@ -54,8 +47,7 @@
                 ],
                 "documentation": "Documentation for x; will appear in ast json",
                 "id": 7,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "31",
                   "id": 6,
                   "kind": "number",
@@ -68,20 +60,16 @@
                 "src": "109:10:1"
               },
               {
-                "body":
-                {
+                "body": {
                   "id": 24,
                   "nodeType": "Block",
                   "src": "270:96:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "assignments":
-                      [
+                      "assignments": [
                         21
                       ],
-                      "declarations":
-                      [
+                      "declarations": [
                         {
                           "constant": false,
                           "id": 21,
@@ -93,8 +81,7 @@
                           "stateVariable": false,
                           "storageLocation": "default",
                           "typeDescriptions": {},
-                          "typeName":
-                          {
+                          "typeName": {
                             "id": 20,
                             "name": "uint",
                             "nodeType": "ElementaryTypeName",
@@ -106,8 +93,7 @@
                       ],
                       "documentation": "documentation for j; will appear in ast json",
                       "id": 23,
-                      "initialValue":
-                      {
+                      "initialValue": {
                         "hexValue": "30",
                         "id": 22,
                         "kind": "number",
@@ -121,12 +107,10 @@
                     }
                   ]
                 },
-                "condition":
-                {
+                "condition": {
                   "commonType": {},
                   "id": 15,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 13,
                     "name": "i",
                     "nodeType": "Identifier",
@@ -136,8 +120,7 @@
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3130",
                     "id": 14,
                     "kind": "number",
@@ -150,14 +133,11 @@
                   "typeDescriptions": {}
                 },
                 "id": 25,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     10
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 10,
@@ -169,8 +149,7 @@
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {},
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 9,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
@@ -181,8 +160,7 @@
                     }
                   ],
                   "id": 12,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 11,
                     "kind": "number",
@@ -194,17 +172,14 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "212:10:1"
                 },
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 17,
                     "nodeType": "UnaryOperation",
                     "operator": "++",
                     "prefix": true,
                     "src": "256:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 16,
                       "name": "i",
                       "nodeType": "Identifier",
@@ -230,15 +205,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -250,8 +223,7 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 39,
             "nodeType": "Block",
             "src": "662:2:1",
@@ -264,12 +236,10 @@
           "name": "g",
           "nameLocation": "386:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 37,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 30,
@@ -281,8 +251,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 29,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -302,8 +271,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 32,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -323,8 +291,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 35,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -336,8 +303,7 @@
             ],
             "src": "387:267:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 38,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.json b/test/libsolidity/ASTJSON/documentation_on_statements.json
index cc4a1ef3c1..350d786867 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       27
     ]
   },
   "id": 28,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 27,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         27
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 2,
@@ -39,19 +34,16 @@
           "src": "45:6:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "45:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
@@ -59,47 +51,39 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 25,
             "nodeType": "Block",
             "src": "99:229:1",
-            "statements":
-            [
+            "statements": [
               {
-                "body":
-                {
+                "body": {
                   "id": 21,
                   "nodeType": "Block",
                   "src": "156:66:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "id": 19,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
-                        "leftHandSide":
-                        {
+                        "leftHandSide": {
                           "id": 17,
                           "name": "x",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 5,
                           "src": "205:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "Assignment",
                         "operator": "*=",
-                        "rightHandSide":
-                        {
+                        "rightHandSide": {
                           "hexValue": "32",
                           "id": 18,
                           "isConstant": false,
@@ -109,16 +93,14 @@
                           "lValueRequested": false,
                           "nodeType": "Literal",
                           "src": "210:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_rational_2_by_1",
                             "typeString": "int_const 2"
                           },
                           "value": "2"
                         },
                         "src": "205:6:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -129,10 +111,8 @@
                     }
                   ]
                 },
-                "condition":
-                {
-                  "commonType":
-                  {
+                "condition": {
+                  "commonType": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   },
@@ -141,24 +121,21 @@
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 11,
                     "name": "i",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 8,
                     "src": "143:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3230",
                     "id": 12,
                     "isConstant": false,
@@ -168,29 +145,24 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "147:2:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_20_by_1",
                       "typeString": "int_const 20"
                     },
                     "value": "20"
                   },
                   "src": "143:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
                   }
                 },
                 "id": 22,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     8
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 8,
@@ -202,19 +174,16 @@
                       "src": "131:6:1",
                       "stateVariable": false,
                       "storageLocation": "default",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 7,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "131:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -223,8 +192,7 @@
                     }
                   ],
                   "id": 10,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 9,
                     "isConstant": false,
@@ -234,8 +202,7 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "140:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
                       "typeString": "int_const 0"
                     },
@@ -245,10 +212,8 @@
                   "src": "131:10:1"
                 },
                 "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 15,
                     "isConstant": false,
                     "isLValue": false,
@@ -258,22 +223,19 @@
                     "operator": "++",
                     "prefix": false,
                     "src": "151:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 14,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 8,
                       "src": "151:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
@@ -286,16 +248,14 @@
                 "src": "126:96:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 23,
                   "name": "x",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 5,
                   "src": "320:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -315,19 +275,16 @@
           "name": "f",
           "nameLocation": "66:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "67:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 6,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 5,
@@ -339,19 +296,16 @@
                 "src": "91:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 4,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "91:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json b/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
index 3872027cbb..e266c2e5b3 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 28,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 2,
@@ -26,8 +24,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
@@ -37,27 +34,21 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 25,
             "nodeType": "Block",
             "src": "99:229:1",
-            "statements":
-            [
+            "statements": [
               {
-                "body":
-                {
+                "body": {
                   "id": 21,
                   "nodeType": "Block",
                   "src": "156:66:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "id": 19,
-                        "leftHandSide":
-                        {
+                        "leftHandSide": {
                           "id": 17,
                           "name": "x",
                           "nodeType": "Identifier",
@@ -67,8 +58,7 @@
                         },
                         "nodeType": "Assignment",
                         "operator": "*=",
-                        "rightHandSide":
-                        {
+                        "rightHandSide": {
                           "hexValue": "32",
                           "id": 18,
                           "kind": "number",
@@ -86,12 +76,10 @@
                     }
                   ]
                 },
-                "condition":
-                {
+                "condition": {
                   "commonType": {},
                   "id": 13,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 11,
                     "name": "i",
                     "nodeType": "Identifier",
@@ -101,8 +89,7 @@
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3230",
                     "id": 12,
                     "kind": "number",
@@ -115,14 +102,11 @@
                   "typeDescriptions": {}
                 },
                 "id": 22,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     8
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 8,
@@ -134,8 +118,7 @@
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {},
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 7,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
@@ -146,8 +129,7 @@
                     }
                   ],
                   "id": 10,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 9,
                     "kind": "number",
@@ -159,17 +141,14 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "131:10:1"
                 },
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 15,
                     "nodeType": "UnaryOperation",
                     "operator": "++",
                     "prefix": false,
                     "src": "151:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 14,
                       "name": "i",
                       "nodeType": "Identifier",
@@ -187,8 +166,7 @@
                 "src": "126:96:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 23,
                   "name": "x",
                   "nodeType": "Identifier",
@@ -209,19 +187,16 @@
           "name": "f",
           "nameLocation": "66:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "67:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 6,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 5,
@@ -233,8 +208,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 4,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/documentation_parseOnly.json b/test/libsolidity/ASTJSON/documentation_parseOnly.json
index 7f446279b6..c6215818d6 100644
--- a/test/libsolidity/ASTJSON/documentation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_parseOnly.json
@@ -3,15 +3,13 @@
   "absolutePath": "a",
   "id": 3,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "contract",
-      "documentation":
-      {
+      "documentation": {
         "id": 1,
         "nodeType": "StructuredDocumentation",
         "src": "0:27:1",
@@ -33,15 +31,13 @@
   "absolutePath": "b",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "contract",
-      "documentation":
-      {
+      "documentation": {
         "id": 4,
         "nodeType": "StructuredDocumentation",
         "src": "0:61:2",
@@ -63,8 +59,7 @@
   "absolutePath": "c",
   "id": 24,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -74,8 +69,7 @@
       "name": "C",
       "nameLocation": "9:1:3",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 9,
@@ -87,8 +81,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 8,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
@@ -99,8 +92,7 @@
         },
         {
           "anonymous": false,
-          "documentation":
-          {
+          "documentation": {
             "id": 10,
             "nodeType": "StructuredDocumentation",
             "src": "69:26:3",
@@ -110,8 +102,7 @@
           "name": "Evt",
           "nameLocation": "102:3:3",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -120,13 +111,11 @@
           "src": "96:12:3"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 16,
             "nodeType": "Block",
             "src": "153:6:3",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 15,
                 "nodeType": "PlaceholderStatement",
@@ -134,8 +123,7 @@
               }
             ]
           },
-          "documentation":
-          {
+          "documentation": {
             "id": 13,
             "nodeType": "StructuredDocumentation",
             "src": "111:26:3",
@@ -145,8 +133,7 @@
           "name": "mod",
           "nameLocation": "147:3:3",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -157,15 +144,13 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 21,
             "nodeType": "Block",
             "src": "209:2:3",
             "statements": []
           },
-          "documentation":
-          {
+          "documentation": {
             "id": 18,
             "nodeType": "StructuredDocumentation",
             "src": "162:25:3",
@@ -178,15 +163,13 @@
           "name": "fn",
           "nameLocation": "197:2:3",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "199:2:3"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 20,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/documentation_triple.json b/test/libsolidity/ASTJSON/documentation_triple.json
index cd44bd4eb6..bc3c3d8878 100644
--- a/test/libsolidity/ASTJSON/documentation_triple.json
+++ b/test/libsolidity/ASTJSON/documentation_triple.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       28
     ]
   },
   "id": 29,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,19 +16,16 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 28,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         28
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
-          "documentation":
-          {
+          "documentation": {
             "id": 1,
             "nodeType": "StructuredDocumentation",
             "src": "17:8:1",
@@ -46,19 +40,16 @@
           "src": "30:6:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 2,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "30:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
@@ -66,48 +57,40 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 26,
             "nodeType": "Block",
             "src": "84:181:1",
-            "statements":
-            [
+            "statements": [
               {
-                "body":
-                {
+                "body": {
                   "id": 22,
                   "nodeType": "Block",
                   "src": "142:75:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "documentation": "tee\n s \"t\" 3",
-                      "expression":
-                      {
+                      "expression": {
                         "id": 20,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
-                        "leftHandSide":
-                        {
+                        "leftHandSide": {
                           "id": 18,
                           "name": "x",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
                           "referencedDeclaration": 6,
                           "src": "200:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "Assignment",
                         "operator": "*=",
-                        "rightHandSide":
-                        {
+                        "rightHandSide": {
                           "hexValue": "32",
                           "id": 19,
                           "isConstant": false,
@@ -117,16 +100,14 @@
                           "lValueRequested": false,
                           "nodeType": "Literal",
                           "src": "205:1:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_rational_2_by_1",
                             "typeString": "int_const 2"
                           },
                           "value": "2"
                         },
                         "src": "200:6:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -137,10 +118,8 @@
                     }
                   ]
                 },
-                "condition":
-                {
-                  "commonType":
-                  {
+                "condition": {
+                  "commonType": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   },
@@ -149,24 +128,21 @@
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 12,
                     "name": "i",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 9,
                     "src": "129:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3230",
                     "id": 13,
                     "isConstant": false,
@@ -176,30 +152,25 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "133:2:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_20_by_1",
                       "typeString": "int_const 20"
                     },
                     "value": "20"
                   },
                   "src": "129:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
                   }
                 },
                 "documentation": "test2",
                 "id": 23,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     9
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 9,
@@ -211,19 +182,16 @@
                       "src": "117:6:1",
                       "stateVariable": false,
                       "storageLocation": "default",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 8,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "117:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -232,8 +200,7 @@
                     }
                   ],
                   "id": 11,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 10,
                     "isConstant": false,
@@ -243,8 +210,7 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "126:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
                       "typeString": "int_const 0"
                     },
@@ -254,10 +220,8 @@
                   "src": "117:10:1"
                 },
                 "isSimpleCounterLoop": true,
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 16,
                     "isConstant": false,
                     "isLValue": false,
@@ -267,22 +231,19 @@
                     "operator": "++",
                     "prefix": false,
                     "src": "137:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 15,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 9,
                       "src": "137:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
@@ -296,16 +257,14 @@
               },
               {
                 "documentation": "tes \"t4\" ",
-                "expression":
-                {
+                "expression": {
                   "id": 24,
                   "name": "x",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 6,
                   "src": "257:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -325,19 +284,16 @@
           "name": "f",
           "nameLocation": "51:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "52:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -349,19 +305,16 @@
                 "src": "76:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "76:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
diff --git a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json b/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
index 5ccc2631ca..7f24ded911 100644
--- a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 29,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -26,8 +24,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 2,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
@@ -37,28 +34,22 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 26,
             "nodeType": "Block",
             "src": "84:181:1",
-            "statements":
-            [
+            "statements": [
               {
-                "body":
-                {
+                "body": {
                   "id": 22,
                   "nodeType": "Block",
                   "src": "142:75:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "documentation": "tee\n s \"t\" 3",
-                      "expression":
-                      {
+                      "expression": {
                         "id": 20,
-                        "leftHandSide":
-                        {
+                        "leftHandSide": {
                           "id": 18,
                           "name": "x",
                           "nodeType": "Identifier",
@@ -68,8 +59,7 @@
                         },
                         "nodeType": "Assignment",
                         "operator": "*=",
-                        "rightHandSide":
-                        {
+                        "rightHandSide": {
                           "hexValue": "32",
                           "id": 19,
                           "kind": "number",
@@ -87,12 +77,10 @@
                     }
                   ]
                 },
-                "condition":
-                {
+                "condition": {
                   "commonType": {},
                   "id": 14,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "id": 12,
                     "name": "i",
                     "nodeType": "Identifier",
@@ -102,8 +90,7 @@
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "<",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "3230",
                     "id": 13,
                     "kind": "number",
@@ -117,14 +104,11 @@
                 },
                 "documentation": "test2",
                 "id": 23,
-                "initializationExpression":
-                {
-                  "assignments":
-                  [
+                "initializationExpression": {
+                  "assignments": [
                     9
                   ],
-                  "declarations":
-                  [
+                  "declarations": [
                     {
                       "constant": false,
                       "id": 9,
@@ -136,8 +120,7 @@
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {},
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 8,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
@@ -148,8 +131,7 @@
                     }
                   ],
                   "id": 11,
-                  "initialValue":
-                  {
+                  "initialValue": {
                     "hexValue": "30",
                     "id": 10,
                     "kind": "number",
@@ -161,17 +143,14 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "117:10:1"
                 },
-                "loopExpression":
-                {
-                  "expression":
-                  {
+                "loopExpression": {
+                  "expression": {
                     "id": 16,
                     "nodeType": "UnaryOperation",
                     "operator": "++",
                     "prefix": false,
                     "src": "137:3:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 15,
                       "name": "i",
                       "nodeType": "Identifier",
@@ -190,8 +169,7 @@
               },
               {
                 "documentation": "tes \"t4\" ",
-                "expression":
-                {
+                "expression": {
                   "id": 24,
                   "name": "x",
                   "nodeType": "Identifier",
@@ -212,19 +190,16 @@
           "name": "f",
           "nameLocation": "51:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "52:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -236,8 +211,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/enum_natspec.json b/test/libsolidity/ASTJSON/enum_natspec.json
index f3cc7b8df8..e55e3705d2 100644
--- a/test/libsolidity/ASTJSON/enum_natspec.json
+++ b/test/libsolidity/ASTJSON/enum_natspec.json
@@ -1,28 +1,23 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Color":
-    [
+  "exportedSymbols": {
+    "Color": [
       4
     ]
   },
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "Color",
-      "documentation":
-      {
+      "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":
-      [
+      "members": [
         {
           "id": 2,
           "name": "Red",
diff --git a/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json b/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
index b5a38af6c4..723df77c1f 100644
--- a/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
@@ -2,19 +2,16 @@
   "absolutePath": "a",
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "documentation":
-      {
+      "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":
-      [
+      "members": [
         {
           "id": 2,
           "name": "Red",
diff --git a/test/libsolidity/ASTJSON/enum_value.json b/test/libsolidity/ASTJSON/enum_value.json
index 31615f657b..de507a79ef 100644
--- a/test/libsolidity/ASTJSON/enum_value.json
+++ b/test/libsolidity/ASTJSON/enum_value.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       4
     ]
   },
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,20 +16,17 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 4,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         4
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "canonicalName": "C.E",
           "id": 3,
-          "members":
-          [
+          "members": [
             {
               "id": 1,
               "name": "A",
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.json b/test/libsolidity/ASTJSON/enum_value_declaration.json
index acdcc736e2..324911fa90 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration.json
@@ -1,25 +1,20 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       3
     ],
-    "f":
-    [
+    "f": [
       13
     ]
   },
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "A",
       "id": 3,
-      "members":
-      [
+      "members": [
         {
           "id": 1,
           "name": "X",
@@ -41,26 +36,21 @@
       "src": "0:15:1"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 12,
         "nodeType": "Block",
         "src": "46:15:1",
-        "statements":
-        [
+        "statements": [
           {
-            "expression":
-            {
-              "expression":
-              {
+            "expression": {
+              "expression": {
                 "id": 9,
                 "name": "A",
                 "nodeType": "Identifier",
                 "overloadedDeclarations": [],
                 "referencedDeclaration": 3,
                 "src": "55:1:1",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_type$_t_enum$_A_$3_$",
                   "typeString": "type(enum A)"
                 }
@@ -75,8 +65,7 @@
               "nodeType": "MemberAccess",
               "referencedDeclaration": 1,
               "src": "55:3:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_enum$_A_$3",
                 "typeString": "enum A"
               }
@@ -95,19 +84,16 @@
       "name": "f",
       "nameLocation": "25:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "26:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 8,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 7,
@@ -119,21 +105,17 @@
             "src": "43:1:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_enum$_A_$3",
               "typeString": "enum A"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 6,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 5,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "43:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -142,8 +124,7 @@
               },
               "referencedDeclaration": 3,
               "src": "43:1:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_enum$_A_$3",
                 "typeString": "enum A"
               }
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
index 8fa574fa74..93499e8156 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
@@ -2,12 +2,10 @@
   "absolutePath": "a",
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 3,
-      "members":
-      [
+      "members": [
         {
           "id": 1,
           "name": "X",
@@ -29,18 +27,14 @@
       "src": "0:15:1"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 12,
         "nodeType": "Block",
         "src": "46:15:1",
-        "statements":
-        [
+        "statements": [
           {
-            "expression":
-            {
-              "expression":
-              {
+            "expression": {
+              "expression": {
                 "id": 9,
                 "name": "A",
                 "nodeType": "Identifier",
@@ -68,19 +62,16 @@
       "name": "f",
       "nameLocation": "25:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "26:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 8,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 7,
@@ -92,16 +83,13 @@
             "stateVariable": false,
             "storageLocation": "default",
             "typeDescriptions": {},
-            "typeName":
-            {
+            "typeName": {
               "id": 6,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 5,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "43:1:1"
                 ],
                 "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/enum_value_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_parseOnly.json
index 006e2db360..564c71273e 100644
--- a/test/libsolidity/ASTJSON/enum_value_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_value_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,12 +12,10 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 3,
-          "members":
-          [
+          "members": [
             {
               "id": 1,
               "name": "A",
diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.json b/test/libsolidity/ASTJSON/event_aggregated_contract.json
index e312320c12..d1bf17c75b 100644
--- a/test/libsolidity/ASTJSON/event_aggregated_contract.json
+++ b/test/libsolidity/ASTJSON/event_aggregated_contract.json
@@ -1,20 +1,16 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       10
     ],
-    "D":
-    [
+    "D": [
       30
     ]
   },
   "id": 31,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -23,15 +19,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 10,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         10
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "ffae15ba29768297c9b951e2e14bc33dc84599d1572acc234266fc70392babc8",
@@ -39,8 +33,7 @@
           "name": "e",
           "nameLocation": "23:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -49,19 +42,15 @@
           "src": "17:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 8,
             "nodeType": "Block",
             "src": "52:25:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 5,
                     "name": "e",
@@ -69,8 +58,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 2,
                     "src": "67:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -86,8 +74,7 @@
                   "nodeType": "FunctionCall",
                   "src": "67:3:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -106,15 +93,13 @@
           "name": "f",
           "nameLocation": "41:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "42:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -130,8 +115,7 @@
       "scope": 31,
       "src": "0:79:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2
       ]
     },
@@ -139,22 +123,19 @@
       "abstract": false,
       "baseContracts": [],
       "canonicalName": "D",
-      "contractDependencies":
-      [
+      "contractDependencies": [
         10
       ],
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 30,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         30
       ],
       "name": "D",
       "nameLocation": "89:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 13,
@@ -166,21 +147,17 @@
           "src": "97:3:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_contract$_C_$10",
             "typeString": "contract C"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 12,
             "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
+            "pathNode": {
               "id": 11,
               "name": "C",
-              "nameLocations":
-              [
+              "nameLocations": [
                 "97:1:1"
               ],
               "nodeType": "IdentifierPath",
@@ -189,8 +166,7 @@
             },
             "referencedDeclaration": 10,
             "src": "97:1:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_contract$_C_$10",
               "typeString": "contract C"
             }
@@ -198,42 +174,35 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 28,
             "nodeType": "Block",
             "src": "120:43:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "id": 21,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftHandSide":
-                  {
+                  "leftHandSide": {
                     "id": 16,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 13,
                     "src": "130:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_contract$_C_$10",
                       "typeString": "contract C"
                     }
                   },
                   "nodeType": "Assignment",
                   "operator": "=",
-                  "rightHandSide":
-                  {
+                  "rightHandSide": {
                     "arguments": [],
-                    "expression":
-                    {
+                    "expression": {
                       "argumentTypes": [],
                       "id": 19,
                       "isConstant": false,
@@ -242,21 +211,17 @@
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
                       "src": "134:5:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_C_$10_$",
                         "typeString": "function () returns (contract C)"
                       },
-                      "typeName":
-                      {
+                      "typeName": {
                         "id": 18,
                         "nodeType": "UserDefinedTypeName",
-                        "pathNode":
-                        {
+                        "pathNode": {
                           "id": 17,
                           "name": "C",
-                          "nameLocations":
-                          [
+                          "nameLocations": [
                             "138:1:1"
                           ],
                           "nodeType": "IdentifierPath",
@@ -265,8 +230,7 @@
                         },
                         "referencedDeclaration": 10,
                         "src": "138:1:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_contract$_C_$10",
                           "typeString": "contract C"
                         }
@@ -283,15 +247,13 @@
                     "nodeType": "FunctionCall",
                     "src": "134:7:1",
                     "tryCall": false,
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_contract$_C_$10",
                       "typeString": "contract C"
                     }
                   },
                   "src": "130:11:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_contract$_C_$10",
                     "typeString": "contract C"
                   }
@@ -301,22 +263,18 @@
                 "src": "130:11:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "expression":
-                    {
+                    "expression": {
                       "id": 23,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 13,
                       "src": "151:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_contract$_C_$10",
                         "typeString": "contract C"
                       }
@@ -331,8 +289,7 @@
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": 9,
                     "src": "151:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
                       "typeString": "function () external"
                     }
@@ -348,8 +305,7 @@
                   "nodeType": "FunctionCall",
                   "src": "151:5:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -367,15 +323,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "117:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 15,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/event_definition.json b/test/libsolidity/ASTJSON/event_definition.json
index b59164fcb0..cdbe3041eb 100644
--- a/test/libsolidity/ASTJSON/event_definition.json
+++ b/test/libsolidity/ASTJSON/event_definition.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       3
     ]
   },
   "id": 4,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 3,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         3
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
@@ -35,8 +30,7 @@
           "name": "E",
           "nameLocation": "19:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -48,8 +42,7 @@
       "scope": 4,
       "src": "0:25:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2
       ]
     }
diff --git a/test/libsolidity/ASTJSON/event_definition_parseOnly.json b/test/libsolidity/ASTJSON/event_definition_parseOnly.json
index 9116b3d2da..25745fdc6e 100644
--- a/test/libsolidity/ASTJSON/event_definition_parseOnly.json
+++ b/test/libsolidity/ASTJSON/event_definition_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 4,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,16 +12,14 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "id": 2,
           "name": "E",
           "nameLocation": "19:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
index 6b183b4931..40bb3bae44 100644
--- a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
+++ b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
@@ -1,24 +1,19 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "B":
-    [
+  "exportedSymbols": {
+    "B": [
       16
     ],
-    "C":
-    [
+    "C": [
       19
     ],
-    "L":
-    [
+    "L": [
       5
     ]
   },
   "id": 20,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -27,15 +22,13 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "L",
       "nameLocation": "10:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "870e3024466c178150e2490c7cfb455e33c0db877113af040f89189d07946664",
@@ -43,12 +36,10 @@
           "name": "E",
           "nameLocation": "20:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -61,19 +52,16 @@
                 "src": "22:5:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint8",
                   "typeString": "uint8"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint8",
                   "nodeType": "ElementaryTypeName",
                   "src": "22:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint8",
                     "typeString": "uint8"
                   }
@@ -89,8 +77,7 @@
       "scope": 20,
       "src": "0:31:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         4
       ]
     },
@@ -102,28 +89,22 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 16,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         16
       ],
       "name": "B",
       "nameLocation": "41:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 14,
             "nodeType": "Block",
             "src": "63:28:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
-                  "arguments":
-                  [
+                "eventCall": {
+                  "arguments": [
                     {
                       "hexValue": "30",
                       "id": 11,
@@ -134,33 +115,28 @@
                       "lValueRequested": false,
                       "nodeType": "Literal",
                       "src": "82:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
                         "typeString": "int_const 0"
                       },
                       "value": "0"
                     }
                   ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
+                  "expression": {
+                    "argumentTypes": [
                       {
                         "typeIdentifier": "t_rational_0_by_1",
                         "typeString": "int_const 0"
                       }
                     ],
-                    "expression":
-                    {
+                    "expression": {
                       "id": 8,
                       "name": "L",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 5,
                       "src": "78:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_type$_t_contract$_L_$5_$",
                         "typeString": "type(library L)"
                       }
@@ -175,8 +151,7 @@
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": 4,
                     "src": "78:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_event_nonpayable$_t_uint8_$returns$__$",
                       "typeString": "function (uint8)"
                     }
@@ -192,8 +167,7 @@
                   "nodeType": "FunctionCall",
                   "src": "78:6:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -211,15 +185,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "60:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -235,22 +207,18 @@
       "scope": 20,
       "src": "32:61:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         4
       ]
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 17,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "108:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -267,8 +235,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 19,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         19,
         16
       ],
@@ -279,8 +246,7 @@
       "scope": 20,
       "src": "94:18:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         4
       ]
     }
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
index 2d70e2f9fe..92de58cf8b 100644
--- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
+++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
@@ -1,20 +1,16 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ],
-    "D":
-    [
+    "D": [
       19
     ]
   },
   "id": 20,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -23,15 +19,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "bd1155618a34fd53d1a2de9f705f42f3582842cba0b985b25c59888d86e0c929",
@@ -39,12 +33,10 @@
           "name": "E",
           "nameLocation": "23:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -57,20 +49,17 @@
                 "src": "25:22:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "25:7:1",
                   "stateMutability": "nonpayable",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
@@ -86,8 +75,7 @@
       "scope": 20,
       "src": "0:51:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         4
       ]
     },
@@ -99,39 +87,31 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 19,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         19
       ],
       "name": "D",
       "nameLocation": "61:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 17,
             "nodeType": "Block",
             "src": "106:37:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
-                  "arguments":
-                  [
+                "eventCall": {
+                  "arguments": [
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "id": 13,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
                         "referencedDeclaration": -15,
                         "src": "125:3:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
@@ -145,32 +125,27 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "src": "125:10:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     }
                   ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
+                  "expression": {
+                    "argumentTypes": [
                       {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     ],
-                    "expression":
-                    {
+                    "expression": {
                       "id": 10,
                       "name": "C",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 5,
                       "src": "121:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_type$_t_contract$_C_$5_$",
                         "typeString": "type(contract C)"
                       }
@@ -185,8 +160,7 @@
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": 4,
                     "src": "121:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                       "typeString": "function (address)"
                     }
@@ -202,8 +176,7 @@
                   "nodeType": "FunctionCall",
                   "src": "121:15:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -222,12 +195,10 @@
           "name": "test",
           "nameLocation": "78:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 8,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 7,
@@ -239,20 +210,17 @@
                 "src": "83:14:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 6,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "83:7:1",
                   "stateMutability": "nonpayable",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
@@ -262,8 +230,7 @@
             ],
             "src": "82:16:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 9,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -279,8 +246,7 @@
       "scope": 20,
       "src": "52:93:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         4
       ]
     }
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
index b6c0ca5e03..60ccdff44c 100644
--- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
+++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 20,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,20 +12,17 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "id": 4,
           "name": "E",
           "nameLocation": "23:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -39,8 +35,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
@@ -69,24 +64,18 @@
       "name": "D",
       "nameLocation": "61:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 17,
             "nodeType": "Block",
             "src": "106:37:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
-                  "arguments":
-                  [
+                "eventCall": {
+                  "arguments": [
                     {
-                      "expression":
-                      {
+                      "expression": {
                         "id": 13,
                         "name": "msg",
                         "nodeType": "Identifier",
@@ -102,10 +91,8 @@
                       "typeDescriptions": {}
                     }
                   ],
-                  "expression":
-                  {
-                    "expression":
-                    {
+                  "expression": {
+                    "expression": {
                       "id": 10,
                       "name": "C",
                       "nodeType": "Identifier",
@@ -141,12 +128,10 @@
           "name": "test",
           "nameLocation": "78:4:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 8,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 7,
@@ -158,8 +143,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 6,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
@@ -172,8 +156,7 @@
             ],
             "src": "82:16:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 9,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/event_inheritance.json b/test/libsolidity/ASTJSON/event_inheritance.json
index afa79e916c..d9a78da03a 100644
--- a/test/libsolidity/ASTJSON/event_inheritance.json
+++ b/test/libsolidity/ASTJSON/event_inheritance.json
@@ -1,24 +1,19 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "B":
-    [
+  "exportedSymbols": {
+    "B": [
       3
     ],
-    "C":
-    [
+    "C": [
       8
     ],
-    "D":
-    [
+    "D": [
       13
     ]
   },
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -27,15 +22,13 @@
       "contractKind": "interface",
       "fullyImplemented": true,
       "id": 3,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         3
       ],
       "name": "B",
       "nameLocation": "10:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "dbec0351ad6bb0c1f07ea56e236e3e692fde2259f0165fd422f241da339b7e4f",
@@ -43,8 +36,7 @@
           "name": "EB",
           "nameLocation": "24:2:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -56,22 +48,18 @@
       "scope": 14,
       "src": "0:31:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2
       ]
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 4,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "46:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -88,16 +76,14 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 8,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         8,
         3
       ],
       "name": "C",
       "nameLocation": "41:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "a08b3367d3fa83ea27f8951ffb5d9d160cbfadbd80816b47f677e7699d76f5a0",
@@ -105,8 +91,7 @@
           "name": "EC",
           "nameLocation": "60:2:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -118,23 +103,19 @@
       "scope": 14,
       "src": "32:35:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2,
         7
       ]
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 9,
             "name": "C",
-            "nameLocations":
-            [
+            "nameLocations": [
               "82:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -151,8 +132,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 13,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         13,
         8,
         3
@@ -160,8 +140,7 @@
       "name": "D",
       "nameLocation": "77:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "caa54b91a2314ab89b39714b1cd283762e53a2f59cfb997d6770e2824c39db0d",
@@ -169,8 +148,7 @@
           "name": "ED",
           "nameLocation": "96:2:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -182,8 +160,7 @@
       "scope": 14,
       "src": "68:35:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2,
         7,
         12
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 6fe58c39c1..a229105700 100644
--- a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
+++ b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
@@ -1,4 +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
index 3ff426cb22..44c1fb5368 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
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 8,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,20 +12,17 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "id": 6,
           "name": "E",
           "nameLocation": "23:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 5,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 4,
@@ -39,19 +35,16 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 3,
                   "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
+                  "parameterTypes": {
                     "id": 1,
                     "nodeType": "ParameterList",
                     "parameters": [],
                     "src": "33:2:1"
                   },
-                  "returnParameterTypes":
-                  {
+                  "returnParameterTypes": {
                     "id": 2,
                     "nodeType": "ParameterList",
                     "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.sol b/test/libsolidity/ASTJSON/fail_after_parsing.sol
index 882b4c9502..052900e93c 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing.sol
+++ b/test/libsolidity/ASTJSON/fail_after_parsing.sol
@@ -1,15 +1,12 @@
 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
index f1d9586174..6f841649c8 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 30,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 3,
       "implemented": false,
@@ -12,15 +11,13 @@
       "name": "g",
       "nameLocation": "9:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 1,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "10:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 2,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -40,12 +37,10 @@
       "name": "I",
       "nameLocation": "31:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 7,
-          "members":
-          [
+          "members": [
             {
               "constant": false,
               "id": 6,
@@ -57,16 +52,13 @@
               "stateVariable": false,
               "storageLocation": "default",
               "typeDescriptions": {},
-              "typeName":
-              {
+              "typeName": {
                 "id": 5,
                 "nodeType": "UserDefinedTypeName",
-                "pathNode":
-                {
+                "pathNode": {
                   "id": 4,
                   "name": "S",
-                  "nameLocations":
-                  [
+                  "nameLocations": [
                     "50:1:1"
                   ],
                   "nodeType": "IdentifierPath",
@@ -85,20 +77,16 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 27,
             "nodeType": "Block",
             "src": "85:88:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   15
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 15,
@@ -110,16 +98,13 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 14,
                       "nodeType": "UserDefinedTypeName",
-                      "pathNode":
-                      {
+                      "pathNode": {
                         "id": 13,
                         "name": "error",
-                        "nameLocations":
-                        [
+                        "nameLocations": [
                           "95:5:1"
                         ],
                         "nodeType": "IdentifierPath",
@@ -136,11 +121,9 @@
                 "src": "95:7:1"
               },
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 17,
                     "name": "E",
                     "nodeType": "Identifier",
@@ -161,15 +144,13 @@
                 "src": "112:8:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 21,
                   "nodeType": "UnaryOperation",
                   "operator": "++",
                   "prefix": true,
                   "src": "130:3:1",
-                  "subExpression":
-                  {
+                  "subExpression": {
                     "id": 20,
                     "name": "c",
                     "nodeType": "Identifier",
@@ -184,12 +165,10 @@
                 "src": "130:3:1"
               },
               {
-                "assignments":
-                [
+                "assignments": [
                   24
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 24,
@@ -201,8 +180,7 @@
                     "stateVariable": false,
                     "storageLocation": "calldata",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 23,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
@@ -213,8 +191,7 @@
                   }
                 ],
                 "id": 26,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "3132332e34",
                   "id": 25,
                   "kind": "number",
@@ -235,12 +212,10 @@
           "name": "f",
           "nameLocation": "70:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 10,
@@ -252,16 +227,13 @@
                 "stateVariable": false,
                 "storageLocation": "storage",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 9,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 8,
                     "name": "E",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "72:1:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -275,8 +247,7 @@
             ],
             "src": "71:13:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 12,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback.json b/test/libsolidity/ASTJSON/fallback.json
index f68c72ce66..93646f2afa 100644
--- a/test/libsolidity/ASTJSON/fallback.json
+++ b/test/libsolidity/ASTJSON/fallback.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "43:5:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback.sol b/test/libsolidity/ASTJSON/fallback.sol
index 170e77958c..219d85db59 100644
--- a/test/libsolidity/ASTJSON/fallback.sol
+++ b/test/libsolidity/ASTJSON/fallback.sol
@@ -2,4 +2,5 @@ contract C {
   fallback() external payable {
   }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
index f41559d2a6..5504719ecb 100644
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       9
     ]
   },
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 9,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         9
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "42:5:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -64,8 +56,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "78:5:1",
@@ -78,15 +69,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 5,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "58:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
index 7eb712582d..89acccf5a6 100644
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
@@ -4,4 +4,5 @@ contract C {
   fallback() external payable {
   }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
index 215bf3a83b..34260824fe 100644
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "42:5:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -50,8 +45,7 @@
           "visibility": "external"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "78:5:1",
@@ -64,15 +58,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 5,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "58:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback_parseOnly.json b/test/libsolidity/ASTJSON/fallback_parseOnly.json
index eb81fafbe9..6991b32b41 100644
--- a/test/libsolidity/ASTJSON/fallback_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "43:5:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback_payable.json b/test/libsolidity/ASTJSON/fallback_payable.json
index 7903517645..e3eacc1ecc 100644
--- a/test/libsolidity/ASTJSON/fallback_payable.json
+++ b/test/libsolidity/ASTJSON/fallback_payable.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "34:2:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/fallback_payable.sol b/test/libsolidity/ASTJSON/fallback_payable.sol
index 7eff747af3..d66d378aff 100644
--- a/test/libsolidity/ASTJSON/fallback_payable.sol
+++ b/test/libsolidity/ASTJSON/fallback_payable.sol
@@ -1,4 +1,5 @@
 contract C {
 	fallback() external {}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json b/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
index e1810828a3..f14d2f1ed6 100644
--- a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "34:2:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/function_type.json b/test/libsolidity/ASTJSON/function_type.json
index e1a5156cf7..563b65438c 100644
--- a/test/libsolidity/ASTJSON/function_type.json
+++ b/test/libsolidity/ASTJSON/function_type.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       17
     ]
   },
   "id": 18,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 17,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         17
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 15,
             "nodeType": "Block",
             "src": "127:2:1",
@@ -44,12 +38,10 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -61,28 +53,23 @@
                 "src": "24:44:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_function_external_payable$__$returns$_t_uint256_$",
                   "typeString": "function () payable external returns (uint256)"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
+                  "parameterTypes": {
                     "id": 1,
                     "nodeType": "ParameterList",
                     "parameters": [],
                     "src": "32:2:1"
                   },
-                  "returnParameterTypes":
-                  {
+                  "returnParameterTypes": {
                     "id": 4,
                     "nodeType": "ParameterList",
-                    "parameters":
-                    [
+                    "parameters": [
                       {
                         "constant": false,
                         "id": 3,
@@ -94,19 +81,16 @@
                         "src": "61:4:1",
                         "stateVariable": false,
                         "storageLocation": "default",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 2,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
                           "src": "61:4:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
@@ -118,8 +102,7 @@
                   },
                   "src": "24:44:1",
                   "stateMutability": "payable",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_external_payable$__$returns$_t_uint256_$",
                     "typeString": "function () payable external returns (uint256)"
                   },
@@ -130,12 +113,10 @@
             ],
             "src": "23:46:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 13,
@@ -147,28 +128,23 @@
                 "src": "86:40:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                   "typeString": "function () view external returns (uint256)"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 12,
                   "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
+                  "parameterTypes": {
                     "id": 8,
                     "nodeType": "ParameterList",
                     "parameters": [],
                     "src": "94:2:1"
                   },
-                  "returnParameterTypes":
-                  {
+                  "returnParameterTypes": {
                     "id": 11,
                     "nodeType": "ParameterList",
-                    "parameters":
-                    [
+                    "parameters": [
                       {
                         "constant": false,
                         "id": 10,
@@ -180,19 +156,16 @@
                         "src": "120:4:1",
                         "stateVariable": false,
                         "storageLocation": "default",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 9,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
                           "src": "120:4:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
@@ -204,8 +177,7 @@
                   },
                   "src": "86:40:1",
                   "stateMutability": "view",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                     "typeString": "function () view external returns (uint256)"
                   },
diff --git a/test/libsolidity/ASTJSON/function_type_parseOnly.json b/test/libsolidity/ASTJSON/function_type_parseOnly.json
index 64b09d5d9d..765c51780e 100644
--- a/test/libsolidity/ASTJSON/function_type_parseOnly.json
+++ b/test/libsolidity/ASTJSON/function_type_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 18,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 15,
             "nodeType": "Block",
             "src": "127:2:1",
@@ -30,12 +27,10 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 6,
@@ -47,23 +42,19 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 5,
                   "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
+                  "parameterTypes": {
                     "id": 1,
                     "nodeType": "ParameterList",
                     "parameters": [],
                     "src": "32:2:1"
                   },
-                  "returnParameterTypes":
-                  {
+                  "returnParameterTypes": {
                     "id": 4,
                     "nodeType": "ParameterList",
-                    "parameters":
-                    [
+                    "parameters": [
                       {
                         "constant": false,
                         "id": 3,
@@ -75,8 +66,7 @@
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {},
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 2,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
@@ -98,12 +88,10 @@
             ],
             "src": "23:46:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 13,
@@ -115,23 +103,19 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 12,
                   "nodeType": "FunctionTypeName",
-                  "parameterTypes":
-                  {
+                  "parameterTypes": {
                     "id": 8,
                     "nodeType": "ParameterList",
                     "parameters": [],
                     "src": "94:2:1"
                   },
-                  "returnParameterTypes":
-                  {
+                  "returnParameterTypes": {
                     "id": 11,
                     "nodeType": "ParameterList",
-                    "parameters":
-                    [
+                    "parameters": [
                       {
                         "constant": false,
                         "id": 10,
@@ -143,8 +127,7 @@
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {},
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 9,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/global_enum.json b/test/libsolidity/ASTJSON/global_enum.json
index 0b673cffbf..17a92954f5 100644
--- a/test/libsolidity/ASTJSON/global_enum.json
+++ b/test/libsolidity/ASTJSON/global_enum.json
@@ -1,21 +1,17 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "E":
-    [
+  "exportedSymbols": {
+    "E": [
       2
     ]
   },
   "id": 3,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "E",
       "id": 2,
-      "members":
-      [
+      "members": [
         {
           "id": 1,
           "name": "A",
diff --git a/test/libsolidity/ASTJSON/global_enum_parseOnly.json b/test/libsolidity/ASTJSON/global_enum_parseOnly.json
index 887d5997cd..c390db5b37 100644
--- a/test/libsolidity/ASTJSON/global_enum_parseOnly.json
+++ b/test/libsolidity/ASTJSON/global_enum_parseOnly.json
@@ -2,12 +2,10 @@
   "absolutePath": "a",
   "id": 3,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 2,
-      "members":
-      [
+      "members": [
         {
           "id": 1,
           "name": "A",
diff --git a/test/libsolidity/ASTJSON/global_struct.json b/test/libsolidity/ASTJSON/global_struct.json
index 2c14a5e414..f7f937d04b 100644
--- a/test/libsolidity/ASTJSON/global_struct.json
+++ b/test/libsolidity/ASTJSON/global_struct.json
@@ -1,21 +1,17 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "S":
-    [
+  "exportedSymbols": {
+    "S": [
       3
     ]
   },
   "id": 4,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "S",
       "id": 3,
-      "members":
-      [
+      "members": [
         {
           "constant": false,
           "id": 2,
@@ -27,19 +23,16 @@
           "src": "11:9:1",
           "stateVariable": false,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint256",
             "nodeType": "ElementaryTypeName",
             "src": "11:7:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
diff --git a/test/libsolidity/ASTJSON/global_struct_parseOnly.json b/test/libsolidity/ASTJSON/global_struct_parseOnly.json
index 418cb79faf..5f90ab8a10 100644
--- a/test/libsolidity/ASTJSON/global_struct_parseOnly.json
+++ b/test/libsolidity/ASTJSON/global_struct_parseOnly.json
@@ -2,12 +2,10 @@
   "absolutePath": "a",
   "id": 4,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 3,
-      "members":
-      [
+      "members": [
         {
           "constant": false,
           "id": 2,
@@ -19,8 +17,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint256",
             "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/indirect_event.json b/test/libsolidity/ASTJSON/indirect_event.json
index fcbe817562..691e814e51 100644
--- a/test/libsolidity/ASTJSON/indirect_event.json
+++ b/test/libsolidity/ASTJSON/indirect_event.json
@@ -1,21 +1,17 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       25
     ],
-    "L":
-    [
+    "L": [
       10
     ]
   },
   "id": 26,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -24,15 +20,13 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 10,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         10
       ],
       "name": "L",
       "nameLocation": "44:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
@@ -40,8 +34,7 @@
           "name": "E",
           "nameLocation": "58:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -50,19 +43,15 @@
           "src": "52:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 8,
             "nodeType": "Block",
             "src": "89:13:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 5,
                     "name": "E",
@@ -70,8 +59,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 2,
                     "src": "96:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -87,8 +75,7 @@
                   "nodeType": "FunctionCall",
                   "src": "96:3:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -106,15 +93,13 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "77:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -130,8 +115,7 @@
       "scope": 26,
       "src": "36:68:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2
       ]
     },
@@ -143,15 +127,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 25,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         25
       ],
       "name": "C",
       "nameLocation": "114:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "eventSelector": "70a5d861ef9816388422765f41d618eb3abdf490acb37354b539729e37b09f0e",
@@ -159,8 +141,7 @@
           "name": "H",
           "nameLocation": "128:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -169,30 +150,24 @@
           "src": "122:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 23,
             "nodeType": "Block",
             "src": "157:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
-                    "expression":
-                    {
+                    "expression": {
                       "id": 15,
                       "name": "L",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 10,
                       "src": "159:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_type$_t_contract$_L_$10_$",
                         "typeString": "type(library L)"
                       }
@@ -207,8 +182,7 @@
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": 9,
                     "src": "159:3:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -224,8 +198,7 @@
                   "nodeType": "FunctionCall",
                   "src": "159:5:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -235,11 +208,9 @@
                 "src": "159:5:1"
               },
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 20,
                     "name": "H",
@@ -247,8 +218,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 12,
                     "src": "171:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                       "typeString": "function ()"
                     }
@@ -264,8 +234,7 @@
                   "nodeType": "FunctionCall",
                   "src": "171:3:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -284,15 +253,13 @@
           "name": "g",
           "nameLocation": "146:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "147:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -308,8 +275,7 @@
       "scope": 26,
       "src": "105:74:1",
       "usedErrors": [],
-      "usedEvents":
-      [
+      "usedEvents": [
         2,
         12
       ]
diff --git a/test/libsolidity/ASTJSON/indirect_event_parseOnly.json b/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
index 17ca036d32..82ce0cd15f 100644
--- a/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
+++ b/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
@@ -3,8 +3,7 @@
   "id": 26,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -14,16 +13,14 @@
       "name": "L",
       "nameLocation": "44:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "id": 2,
           "name": "E",
           "nameLocation": "58:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -32,19 +29,15 @@
           "src": "52:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 8,
             "nodeType": "Block",
             "src": "89:13:1",
-            "statements":
-            [
+            "statements": [
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 5,
                     "name": "E",
                     "nodeType": "Identifier",
@@ -73,15 +66,13 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "77:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -106,16 +97,14 @@
       "name": "C",
       "nameLocation": "114:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "anonymous": false,
           "id": 12,
           "name": "H",
           "nameLocation": "128:1:1",
           "nodeType": "EventDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -124,21 +113,16 @@
           "src": "122:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 23,
             "nodeType": "Block",
             "src": "157:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
-                    "expression":
-                    {
+                  "expression": {
+                    "expression": {
                       "id": 15,
                       "name": "L",
                       "nodeType": "Identifier",
@@ -166,11 +150,9 @@
                 "src": "159:5:1"
               },
               {
-                "eventCall":
-                {
+                "eventCall": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 20,
                     "name": "H",
                     "nodeType": "Identifier",
@@ -199,15 +181,13 @@
           "name": "g",
           "nameLocation": "146:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "147:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 14,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier.json b/test/libsolidity/ASTJSON/inheritance_specifier.json
index ae210c9496..4365a9e435 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier.json
@@ -1,20 +1,16 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C1":
-    [
+  "exportedSymbols": {
+    "C1": [
       1
     ],
-    "C2":
-    [
+    "C2": [
       4
     ]
   },
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -23,8 +19,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 1,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         1
       ],
       "name": "C1",
@@ -38,15 +33,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 2,
             "name": "C1",
-            "nameLocations":
-            [
+            "nameLocations": [
               "30:2:1"
             ],
             "nodeType": "IdentifierPath",
@@ -63,8 +55,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 4,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         4,
         1
       ],
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
index 171391b36d..a334485a98 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 5,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -20,15 +19,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 2,
             "name": "C1",
-            "nameLocations":
-            [
+            "nameLocations": [
               "30:2:1"
             ],
             "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/license.json b/test/libsolidity/ASTJSON/license.json
index 4c0882637f..f12ed7e3e0 100644
--- a/test/libsolidity/ASTJSON/license.json
+++ b/test/libsolidity/ASTJSON/license.json
@@ -1,17 +1,14 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       1
     ]
   },
   "id": 2,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -20,8 +17,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 1,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         1
       ],
       "name": "C",
diff --git a/test/libsolidity/ASTJSON/license_parseOnly.json b/test/libsolidity/ASTJSON/license_parseOnly.json
index f2958f15ff..def7f2c623 100644
--- a/test/libsolidity/ASTJSON/license_parseOnly.json
+++ b/test/libsolidity/ASTJSON/license_parseOnly.json
@@ -3,8 +3,7 @@
   "id": 2,
   "license": "GPL-3.0",
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
index 9bcd5e8fd9..f5a6aad081 100644
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
+++ b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
+  "exportedSymbols": {
+    "c": [
       11
     ]
   },
   "id": 12,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 11,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         11
       ],
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 9,
             "nodeType": "Block",
             "src": "33:19:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "35:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
                       "src": "35:4:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
@@ -75,10 +63,8 @@
                   }
                 ],
                 "id": 8,
-                "initialValue":
-                {
-                  "commonType":
-                  {
+                "initialValue": {
+                  "commonType": {
                     "typeIdentifier": "t_rational_5_by_1",
                     "typeString": "int_const 5"
                   },
@@ -87,8 +73,7 @@
                   "isLValue": false,
                   "isPure": true,
                   "lValueRequested": false,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "hexValue": "32",
                     "id": 5,
                     "isConstant": false,
@@ -98,8 +83,7 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "44:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_2_by_1",
                       "typeString": "int_const 2"
                     },
@@ -107,8 +91,7 @@
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "+",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "33",
                     "id": 6,
                     "isConstant": false,
@@ -118,16 +101,14 @@
                     "lValueRequested": false,
                     "nodeType": "Literal",
                     "src": "48:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_rational_3_by_1",
                       "typeString": "int_const 3"
                     },
                     "value": "3"
                   },
                   "src": "44:5:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_5_by_1",
                     "typeString": "int_const 5"
                   }
@@ -145,15 +126,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
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 2cb372dd26..56587809e8 100644
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 12,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 9,
             "nodeType": "Block",
             "src": "33:19:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
@@ -53,12 +46,10 @@
                   }
                 ],
                 "id": 8,
-                "initialValue":
-                {
+                "initialValue": {
                   "commonType": {},
                   "id": 7,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "hexValue": "32",
                     "id": 5,
                     "kind": "number",
@@ -69,8 +60,7 @@
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "+",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "hexValue": "33",
                     "id": 6,
                     "kind": "number",
@@ -94,15 +84,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier.json b/test/libsolidity/ASTJSON/long_type_name_identifier.json
index c22aeb40c2..d3e76eaac4 100644
--- a/test/libsolidity/ASTJSON/long_type_name_identifier.json
+++ b/test/libsolidity/ASTJSON/long_type_name_identifier.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
+  "exportedSymbols": {
+    "c": [
       15
     ]
   },
   "id": 16,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 15,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         15
       ],
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -39,21 +34,17 @@
           "src": "13:8:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
             "typeString": "uint256[]"
           },
-          "typeName":
-          {
-            "baseType":
-            {
+          "typeName": {
+            "baseType": {
               "id": 1,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "13:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
               }
@@ -61,8 +52,7 @@
             "id": 2,
             "nodeType": "ArrayTypeName",
             "src": "13:6:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
               "typeString": "uint256[]"
             }
@@ -70,20 +60,16 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 13,
             "nodeType": "Block",
             "src": "43:25:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   10
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 10,
@@ -95,21 +81,17 @@
                     "src": "45:16:1",
                     "stateVariable": false,
                     "storageLocation": "storage",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                       "typeString": "uint256[]"
                     },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
+                    "typeName": {
+                      "baseType": {
                         "id": 8,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "45:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -117,8 +99,7 @@
                       "id": 9,
                       "nodeType": "ArrayTypeName",
                       "src": "45:6:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                         "typeString": "uint256[]"
                       }
@@ -127,16 +108,14 @@
                   }
                 ],
                 "id": 12,
-                "initialValue":
-                {
+                "initialValue": {
                   "id": 11,
                   "name": "a",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
                   "referencedDeclaration": 3,
                   "src": "64:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint256_$dyn_storage",
                     "typeString": "uint256[] storage ref"
                   }
@@ -154,15 +133,13 @@
           "name": "f",
           "nameLocation": "32:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "33:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 5,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json b/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
index 1bf50bed60..597bd383bb 100644
--- a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
+++ b/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 16,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -26,10 +24,8 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
-            "baseType":
-            {
+          "typeName": {
+            "baseType": {
               "id": 1,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
@@ -44,20 +40,16 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 13,
             "nodeType": "Block",
             "src": "43:25:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   10
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 10,
@@ -69,10 +61,8 @@
                     "stateVariable": false,
                     "storageLocation": "storage",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
+                    "typeName": {
+                      "baseType": {
                         "id": 8,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
@@ -88,8 +78,7 @@
                   }
                 ],
                 "id": 12,
-                "initialValue":
-                {
+                "initialValue": {
                   "id": 11,
                   "name": "a",
                   "nodeType": "Identifier",
@@ -109,15 +98,13 @@
           "name": "f",
           "nameLocation": "32:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 4,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "33:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 5,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
index 81bf19db1a..c1b9cfc480 100644
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       23
     ]
   },
   "id": 24,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,20 +16,17 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 23,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         23
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "canonicalName": "C.E",
           "id": 4,
-          "members":
-          [
+          "members": [
             {
               "id": 1,
               "name": "A",
@@ -71,26 +65,21 @@
           "src": "40:20:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
             "typeString": "mapping(contract C => bool)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 8,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 6,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 5,
                 "name": "C",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "48:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -99,29 +88,25 @@
               },
               "referencedDeclaration": 23,
               "src": "48:1:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_contract$_C_$23",
                 "typeString": "contract C"
               }
             },
             "nodeType": "Mapping",
             "src": "40:18:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
               "typeString": "mapping(contract C => bool)"
             },
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 7,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
               "src": "53:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
               }
@@ -140,45 +125,38 @@
           "src": "66:26:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
             "typeString": "mapping(address => bool)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 12,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 10,
               "name": "address",
               "nodeType": "ElementaryTypeName",
               "src": "74:7:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
               }
             },
             "nodeType": "Mapping",
             "src": "66:24:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
               "typeString": "mapping(address => bool)"
             },
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 11,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
               "src": "85:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
               }
@@ -197,26 +175,21 @@
           "src": "98:20:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_enum$_E_$4_$_t_bool_$",
             "typeString": "mapping(enum C.E => bool)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 17,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 15,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 14,
                 "name": "E",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "106:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -225,29 +198,25 @@
               },
               "referencedDeclaration": 4,
               "src": "106:1:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_enum$_E_$4",
                 "typeString": "enum C.E"
               }
             },
             "nodeType": "Mapping",
             "src": "98:18:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_enum$_E_$4_$_t_bool_$",
               "typeString": "mapping(enum C.E => bool)"
             },
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 16,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
               "src": "111:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
               }
@@ -266,45 +235,38 @@
           "src": "124:46:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
             "typeString": "mapping(address => uint256)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 21,
             "keyName": "keyAddress",
             "keyNameLocation": "140:10:1",
-            "keyType":
-            {
+            "keyType": {
               "id": 19,
               "name": "address",
               "nodeType": "ElementaryTypeName",
               "src": "132:7:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
               }
             },
             "nodeType": "Mapping",
             "src": "124:44:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
               "typeString": "mapping(address => uint256)"
             },
             "valueName": "value",
             "valueNameLocation": "162:5:1",
-            "valueType":
-            {
+            "valueType": {
               "id": 20,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
               "src": "154:7:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
               }
diff --git a/test/libsolidity/ASTJSON/mappings.sol b/test/libsolidity/ASTJSON/mappings.sol
index 5412ca601e..05912d21f7 100644
--- a/test/libsolidity/ASTJSON/mappings.sol
+++ b/test/libsolidity/ASTJSON/mappings.sol
@@ -5,4 +5,5 @@ contract C {
     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 84cfb4004a..4edc75ffde 100644
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mappings_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 24,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,12 +12,10 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 4,
-          "members":
-          [
+          "members": [
             {
               "id": 1,
               "name": "A",
@@ -57,21 +54,17 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 8,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 6,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 5,
                 "name": "C",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "48:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -85,8 +78,7 @@
             "typeDescriptions": {},
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 7,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
@@ -107,13 +99,11 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 12,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 10,
               "name": "address",
               "nodeType": "ElementaryTypeName",
@@ -125,8 +115,7 @@
             "typeDescriptions": {},
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 11,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
@@ -147,21 +136,17 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 17,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 15,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 14,
                 "name": "E",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "106:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -175,8 +160,7 @@
             "typeDescriptions": {},
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 16,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
@@ -197,13 +181,11 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 21,
             "keyName": "keyAddress",
             "keyNameLocation": "140:10:1",
-            "keyType":
-            {
+            "keyType": {
               "id": 19,
               "name": "address",
               "nodeType": "ElementaryTypeName",
@@ -215,8 +197,7 @@
             "typeDescriptions": {},
             "valueName": "value",
             "valueNameLocation": "162:5:1",
-            "valueType":
-            {
+            "valueType": {
               "id": 20,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/modifier_definition.json b/test/libsolidity/ASTJSON/modifier_definition.json
index 30ebcb7c20..485e0f0c1b 100644
--- a/test/libsolidity/ASTJSON/modifier_definition.json
+++ b/test/libsolidity/ASTJSON/modifier_definition.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       14
     ]
   },
   "id": 15,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,23 +16,19 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 14,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         14
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "32:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 4,
                 "nodeType": "PlaceholderStatement",
@@ -47,12 +40,10 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -64,19 +55,16 @@
                 "src": "24:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "24:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -91,8 +79,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 12,
             "nodeType": "Block",
             "src": "64:2:1",
@@ -102,11 +89,9 @@
           "id": 13,
           "implemented": true,
           "kind": "function",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "31",
                   "id": 9,
@@ -117,8 +102,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "54:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_1_by_1",
                     "typeString": "int_const 1"
                   },
@@ -127,12 +111,10 @@
               ],
               "id": 10,
               "kind": "modifierInvocation",
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 8,
                 "name": "M",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "52:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -146,15 +128,13 @@
           "name": "F",
           "nameLocation": "48:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "49:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
index f8067952a2..22ed7bdc66 100644
--- a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 15,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,16 +12,13 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "32:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 4,
                 "nodeType": "PlaceholderStatement",
@@ -34,12 +30,10 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -51,8 +45,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -69,8 +62,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 12,
             "nodeType": "Block",
             "src": "64:2:1",
@@ -79,11 +71,9 @@
           "id": 13,
           "implemented": true,
           "kind": "function",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "31",
                   "id": 9,
@@ -95,12 +85,10 @@
                 }
               ],
               "id": 10,
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 8,
                 "name": "M",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "52:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -113,15 +101,13 @@
           "name": "F",
           "nameLocation": "48:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "49:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/modifier_invocation.json b/test/libsolidity/ASTJSON/modifier_invocation.json
index 30ebcb7c20..485e0f0c1b 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       14
     ]
   },
   "id": 15,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,23 +16,19 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 14,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         14
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "32:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 4,
                 "nodeType": "PlaceholderStatement",
@@ -47,12 +40,10 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -64,19 +55,16 @@
                 "src": "24:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "24:4:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -91,8 +79,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 12,
             "nodeType": "Block",
             "src": "64:2:1",
@@ -102,11 +89,9 @@
           "id": 13,
           "implemented": true,
           "kind": "function",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "31",
                   "id": 9,
@@ -117,8 +102,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "54:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_1_by_1",
                     "typeString": "int_const 1"
                   },
@@ -127,12 +111,10 @@
               ],
               "id": 10,
               "kind": "modifierInvocation",
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 8,
                 "name": "M",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "52:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -146,15 +128,13 @@
           "name": "F",
           "nameLocation": "48:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "49:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
index f8067952a2..22ed7bdc66 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 15,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,16 +12,13 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 5,
             "nodeType": "Block",
             "src": "32:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 4,
                 "nodeType": "PlaceholderStatement",
@@ -34,12 +30,10 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 3,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 2,
@@ -51,8 +45,7 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 1,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
@@ -69,8 +62,7 @@
           "visibility": "internal"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 12,
             "nodeType": "Block",
             "src": "64:2:1",
@@ -79,11 +71,9 @@
           "id": 13,
           "implemented": true,
           "kind": "function",
-          "modifiers":
-          [
+          "modifiers": [
             {
-              "arguments":
-              [
+              "arguments": [
                 {
                   "hexValue": "31",
                   "id": 9,
@@ -95,12 +85,10 @@
                 }
               ],
               "id": 10,
-              "modifierName":
-              {
+              "modifierName": {
                 "id": 8,
                 "name": "M",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "52:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -113,15 +101,13 @@
           "name": "F",
           "nameLocation": "48:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "49:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/mutability.json b/test/libsolidity/ASTJSON/mutability.json
index b6318d84e5..cb7ace3b32 100644
--- a/test/libsolidity/ASTJSON/mutability.json
+++ b/test/libsolidity/ASTJSON/mutability.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       10
     ]
   },
   "id": 11,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,15 +16,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 10,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         10
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "functionSelector": "0dbe671f",
@@ -40,25 +35,21 @@
           "src": "17:27:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "17:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
           },
-          "value":
-          {
+          "value": {
             "hexValue": "34",
             "id": 2,
             "isConstant": false,
@@ -68,8 +59,7 @@
             "lValueRequested": false,
             "nodeType": "Literal",
             "src": "43:1:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_rational_4_by_1",
               "typeString": "int_const 4"
             },
@@ -89,25 +79,21 @@
           "src": "50:26:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 4,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "50:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
           },
-          "value":
-          {
+          "value": {
             "hexValue": "32",
             "id": 5,
             "isConstant": false,
@@ -117,8 +103,7 @@
             "lValueRequested": false,
             "nodeType": "Literal",
             "src": "75:1:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_rational_2_by_1",
               "typeString": "int_const 2"
             },
@@ -138,25 +123,21 @@
           "src": "82:17:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 7,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "82:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
           },
-          "value":
-          {
+          "value": {
             "hexValue": "33",
             "id": 8,
             "isConstant": false,
@@ -166,8 +147,7 @@
             "lValueRequested": false,
             "nodeType": "Literal",
             "src": "98:1:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_rational_3_by_1",
               "typeString": "int_const 3"
             },
diff --git a/test/libsolidity/ASTJSON/mutability.sol b/test/libsolidity/ASTJSON/mutability.sol
index 3f67c29e09..7688186e77 100644
--- a/test/libsolidity/ASTJSON/mutability.sol
+++ b/test/libsolidity/ASTJSON/mutability.sol
@@ -4,4 +4,5 @@ contract C
     uint public constant b = 2;
     uint public c = 3;
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/mutability_parseOnly.json b/test/libsolidity/ASTJSON/mutability_parseOnly.json
index 637f8e1141..74ae78f84c 100644
--- a/test/libsolidity/ASTJSON/mutability_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mutability_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 11,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,8 +12,7 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 3,
@@ -26,16 +24,14 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 1,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "17:4:1",
             "typeDescriptions": {}
           },
-          "value":
-          {
+          "value": {
             "hexValue": "34",
             "id": 2,
             "kind": "number",
@@ -57,16 +53,14 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 4,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "50:4:1",
             "typeDescriptions": {}
           },
-          "value":
-          {
+          "value": {
             "hexValue": "32",
             "id": 5,
             "kind": "number",
@@ -88,16 +82,14 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 7,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "82:4:1",
             "typeDescriptions": {}
           },
-          "value":
-          {
+          "value": {
             "hexValue": "33",
             "id": 8,
             "kind": "number",
diff --git a/test/libsolidity/ASTJSON/non_utf8.json b/test/libsolidity/ASTJSON/non_utf8.json
index 0058e56eb3..b13ab7f8a1 100644
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ b/test/libsolidity/ASTJSON/non_utf8.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       15
     ]
   },
   "id": 16,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 15,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         15
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 13,
             "nodeType": "Block",
             "src": "33:45:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "35:15:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_string_memory_ptr",
                       "typeString": "string"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
                       "src": "35:6:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_string_storage_ptr",
                         "typeString": "string"
                       }
@@ -75,13 +63,10 @@
                   }
                 ],
                 "id": 12,
-                "initialValue":
-                {
-                  "arguments":
-                  [
+                "initialValue": {
+                  "arguments": [
                     {
-                      "arguments":
-                      [
+                      "arguments": [
                         {
                           "hexValue": "ff",
                           "id": 9,
@@ -92,17 +77,14 @@
                           "lValueRequested": false,
                           "nodeType": "Literal",
                           "src": "66:7:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
                             "typeString": "literal_string hex\"ff\""
                           }
                         }
                       ],
-                      "expression":
-                      {
-                        "argumentTypes":
-                        [
+                      "expression": {
+                        "argumentTypes": [
                           {
                             "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
                             "typeString": "literal_string hex\"ff\""
@@ -115,13 +97,11 @@
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
                         "src": "60:5:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_bytes_storage_ptr_$",
                           "typeString": "type(bytes storage pointer)"
                         },
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 7,
                           "name": "bytes",
                           "nodeType": "ElementaryTypeName",
@@ -140,17 +120,14 @@
                       "nodeType": "FunctionCall",
                       "src": "60:14:1",
                       "tryCall": false,
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_bytes_memory_ptr",
                         "typeString": "bytes memory"
                       }
                     }
                   ],
-                  "expression":
-                  {
-                    "argumentTypes":
-                    [
+                  "expression": {
+                    "argumentTypes": [
                       {
                         "typeIdentifier": "t_bytes_memory_ptr",
                         "typeString": "bytes memory"
@@ -163,13 +140,11 @@
                     "lValueRequested": false,
                     "nodeType": "ElementaryTypeNameExpression",
                     "src": "53:6:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_type$_t_string_storage_ptr_$",
                       "typeString": "type(string storage pointer)"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 5,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
@@ -188,8 +163,7 @@
                   "nodeType": "FunctionCall",
                   "src": "53:22:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_string_memory_ptr",
                     "typeString": "string memory"
                   }
@@ -207,15 +181,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
index bbc350f96d..34a99dba34 100644
--- a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
+++ b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 16,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 13,
             "nodeType": "Block",
             "src": "33:45:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "memory",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
@@ -53,13 +46,10 @@
                   }
                 ],
                 "id": 12,
-                "initialValue":
-                {
-                  "arguments":
-                  [
+                "initialValue": {
+                  "arguments": [
                     {
-                      "arguments":
-                      [
+                      "arguments": [
                         {
                           "hexValue": "ff",
                           "id": 9,
@@ -69,14 +59,12 @@
                           "typeDescriptions": {}
                         }
                       ],
-                      "expression":
-                      {
+                      "expression": {
                         "id": 8,
                         "nodeType": "ElementaryTypeNameExpression",
                         "src": "60:5:1",
                         "typeDescriptions": {},
-                        "typeName":
-                        {
+                        "typeName": {
                           "id": 7,
                           "name": "bytes",
                           "nodeType": "ElementaryTypeName",
@@ -93,14 +81,12 @@
                       "typeDescriptions": {}
                     }
                   ],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 6,
                     "nodeType": "ElementaryTypeNameExpression",
                     "src": "53:6:1",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 5,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
@@ -128,15 +114,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/not_existing_import.sol b/test/libsolidity/ASTJSON/not_existing_import.sol
index ad3c100c49..6353c7527b 100644
--- a/test/libsolidity/ASTJSON/not_existing_import.sol
+++ b/test/libsolidity/ASTJSON/not_existing_import.sol
@@ -4,5 +4,5 @@ contract C is NotExisting.X
 	NotExisting.SomeStruct public myStruct;
 	constructor() {}
 }
+
 // ----
-// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
index ea08150fd3..04c5c69ab1 100644
--- a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+++ b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 12,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "absolutePath": "notexisting.sol",
       "file": "notexisting.sol",
@@ -16,15 +15,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 2,
             "name": "NotExisting.X",
-            "nameLocations":
-            [
+            "nameLocations": [
               "55:11:1",
               "67:1:1"
             ],
@@ -42,8 +38,7 @@
       "name": "C",
       "nameLocation": "50:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "constant": false,
           "id": 6,
@@ -55,16 +50,13 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 5,
             "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
+            "pathNode": {
               "id": 4,
               "name": "NotExisting.SomeStruct",
-              "nameLocations":
-              [
+              "nameLocations": [
                 "72:11:1",
                 "84:10:1"
               ],
@@ -77,8 +69,7 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 9,
             "nodeType": "Block",
             "src": "127:2:1",
@@ -91,15 +82,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "124:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 8,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/override.json b/test/libsolidity/ASTJSON/override.json
index 35d36eac4e..927d0d4981 100644
--- a/test/libsolidity/ASTJSON/override.json
+++ b/test/libsolidity/ASTJSON/override.json
@@ -1,24 +1,19 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       5
     ],
-    "B":
-    [
+    "B": [
       16
     ],
-    "C":
-    [
+    "C": [
       29
     ]
   },
   "id": 30,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -27,18 +22,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "44:2:1",
@@ -52,15 +44,13 @@
           "name": "faa",
           "nameLocation": "23:3:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "26:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -80,15 +70,12 @@
     },
     {
       "abstract": true,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 6,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "72:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -105,16 +92,14 @@
       "contractKind": "contract",
       "fullyImplemented": false,
       "id": 16,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         16,
         5
       ],
       "name": "B",
       "nameLocation": "67:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "functionSelector": "c2985578",
           "id": 10,
@@ -124,15 +109,13 @@
           "name": "foo",
           "nameLocation": "86:3:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 8,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "89:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 9,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -145,12 +128,10 @@
           "visibility": "public"
         },
         {
-          "baseFunctions":
-          [
+          "baseFunctions": [
             4
           ],
-          "body":
-          {
+          "body": {
             "id": 14,
             "nodeType": "Block",
             "src": "148:2:1",
@@ -164,22 +145,19 @@
           "name": "faa",
           "nameLocation": "118:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 12,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "139:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "121:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -199,15 +177,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 17,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "167:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -224,8 +199,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 29,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         29,
         16,
         5
@@ -233,15 +207,12 @@
       "name": "C",
       "nameLocation": "162:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "baseFunctions":
-          [
+          "baseFunctions": [
             10
           ],
-          "body":
-          {
+          "body": {
             "id": 22,
             "nodeType": "Block",
             "src": "203:3:1",
@@ -255,22 +226,19 @@
           "name": "foo",
           "nameLocation": "181:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 20,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "194:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "184:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 21,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -283,12 +251,10 @@
           "visibility": "public"
         },
         {
-          "baseFunctions":
-          [
+          "baseFunctions": [
             15
           ],
-          "body":
-          {
+          "body": {
             "id": 27,
             "nodeType": "Block",
             "src": "239:3:1",
@@ -302,22 +268,19 @@
           "name": "faa",
           "nameLocation": "217:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 25,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "230:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 24,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "220:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 26,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/override.sol b/test/libsolidity/ASTJSON/override.sol
index a032449857..1aaa58c600 100644
--- a/test/libsolidity/ASTJSON/override.sol
+++ b/test/libsolidity/ASTJSON/override.sol
@@ -9,4 +9,5 @@ contract C is B {
 	function foo() public override { }
 	function faa() public override { }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/override_parseOnly.json b/test/libsolidity/ASTJSON/override_parseOnly.json
index 3a927f5f2f..7b9bcd268a 100644
--- a/test/libsolidity/ASTJSON/override_parseOnly.json
+++ b/test/libsolidity/ASTJSON/override_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 30,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "44:2:1",
@@ -30,15 +27,13 @@
           "name": "faa",
           "nameLocation": "23:3:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "26:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -56,15 +51,12 @@
     },
     {
       "abstract": true,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 6,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "72:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -81,8 +73,7 @@
       "name": "B",
       "nameLocation": "67:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 10,
           "implemented": false,
@@ -91,15 +82,13 @@
           "name": "foo",
           "nameLocation": "86:3:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 8,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "89:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 9,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -111,8 +100,7 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 14,
             "nodeType": "Block",
             "src": "148:2:1",
@@ -125,22 +113,19 @@
           "name": "faa",
           "nameLocation": "118:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 12,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "139:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 11,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "121:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -158,15 +143,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 17,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "167:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -183,11 +165,9 @@
       "name": "C",
       "nameLocation": "162:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 22,
             "nodeType": "Block",
             "src": "203:3:1",
@@ -200,22 +180,19 @@
           "name": "foo",
           "nameLocation": "181:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 20,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "194:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "184:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 21,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -227,8 +204,7 @@
           "visibility": "public"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 27,
             "nodeType": "Block",
             "src": "239:3:1",
@@ -241,22 +217,19 @@
           "name": "faa",
           "nameLocation": "217:3:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 25,
             "nodeType": "OverrideSpecifier",
             "overrides": [],
             "src": "230:8:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 24,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "220:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 26,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/placeholder_statement.json b/test/libsolidity/ASTJSON/placeholder_statement.json
index 96a46c1484..dbc9bdd1db 100644
--- a/test/libsolidity/ASTJSON/placeholder_statement.json
+++ b/test/libsolidity/ASTJSON/placeholder_statement.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,23 +16,19 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "24:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 2,
                 "nodeType": "PlaceholderStatement",
@@ -47,8 +40,7 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json b/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
index 8af1704024..58610047d2 100644
--- a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
+++ b/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,16 +12,13 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "24:6:1",
-            "statements":
-            [
+            "statements": [
               {
                 "id": 2,
                 "nodeType": "PlaceholderStatement",
@@ -34,8 +30,7 @@
           "name": "M",
           "nameLocation": "22:1:1",
           "nodeType": "ModifierDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
index b1ac937a24..a962a1cc1f 100644
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
@@ -3,12 +3,10 @@
   "experimentalSolidity": true,
   "id": 2,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 1,
-      "literals":
-      [
+      "literals": [
         "experimental",
         "solidity"
       ],
diff --git a/test/libsolidity/ASTJSON/receive_ether.json b/test/libsolidity/ASTJSON/receive_ether.json
index 2790493993..d02c84a498 100644
--- a/test/libsolidity/ASTJSON/receive_ether.json
+++ b/test/libsolidity/ASTJSON/receive_ether.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       5
     ]
   },
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,18 +16,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "42:5:1",
@@ -43,15 +37,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/receive_ether.sol b/test/libsolidity/ASTJSON/receive_ether.sol
index 1e59dc1317..f75a43b2df 100644
--- a/test/libsolidity/ASTJSON/receive_ether.sol
+++ b/test/libsolidity/ASTJSON/receive_ether.sol
@@ -2,4 +2,5 @@ contract C {
   receive() external payable {
   }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json b/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
index f9aede155e..9f0c4f60a8 100644
--- a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
+++ b/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 6,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "42:5:1",
@@ -30,15 +27,13 @@
           "name": "",
           "nameLocation": "-1:-1:-1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "22:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/short_type_name.json b/test/libsolidity/ASTJSON/short_type_name.json
index 1c1138cbaf..f5b8bcf06c 100644
--- a/test/libsolidity/ASTJSON/short_type_name.json
+++ b/test/libsolidity/ASTJSON/short_type_name.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
+  "exportedSymbols": {
+    "c": [
       11
     ]
   },
   "id": 12,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 11,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         11
       ],
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 9,
             "nodeType": "Block",
             "src": "33:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   7
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 7,
@@ -54,21 +45,17 @@
                     "src": "35:15:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                       "typeString": "uint256[]"
                     },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
+                    "typeName": {
+                      "baseType": {
                         "id": 5,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
                         "src": "35:4:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
@@ -76,8 +63,7 @@
                       "id": 6,
                       "nodeType": "ArrayTypeName",
                       "src": "35:6:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                         "typeString": "uint256[]"
                       }
@@ -99,15 +85,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
index 3c4acfa775..27e1919c2f 100644
--- a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
+++ b/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 12,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 9,
             "nodeType": "Block",
             "src": "33:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   7
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 7,
@@ -41,10 +35,8 @@
                     "stateVariable": false,
                     "storageLocation": "memory",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
+                    "typeName": {
+                      "baseType": {
                         "id": 5,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
@@ -72,15 +64,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref.json b/test/libsolidity/ASTJSON/short_type_name_ref.json
index 447b1e5b77..59ce1f39da 100644
--- a/test/libsolidity/ASTJSON/short_type_name_ref.json
+++ b/test/libsolidity/ASTJSON/short_type_name_ref.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "c":
-    [
+  "exportedSymbols": {
+    "c": [
       12
     ]
   },
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 12,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         12
       ],
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "33:25:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   8
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 8,
@@ -54,23 +45,18 @@
                     "src": "35:20:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptr",
                       "typeString": "uint256[][]"
                     },
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "baseType":
-                        {
+                    "typeName": {
+                      "baseType": {
+                        "baseType": {
                           "id": 5,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
                           "src": "35:4:1",
-                          "typeDescriptions":
-                          {
+                          "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
@@ -78,8 +64,7 @@
                         "id": 6,
                         "nodeType": "ArrayTypeName",
                         "src": "35:6:1",
-                        "typeDescriptions":
-                        {
+                        "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                           "typeString": "uint256[]"
                         }
@@ -87,8 +72,7 @@
                       "id": 7,
                       "nodeType": "ArrayTypeName",
                       "src": "35:8:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_array$_t_uint256_$dyn_storage_$dyn_storage_ptr",
                         "typeString": "uint256[][]"
                       }
@@ -110,15 +94,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
index 07c782d47b..9a7e6fccf7 100644
--- a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
+++ b/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "c",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "33:25:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   8
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 8,
@@ -41,12 +35,9 @@
                     "stateVariable": false,
                     "storageLocation": "memory",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "baseType":
-                      {
-                        "baseType":
-                        {
+                    "typeName": {
+                      "baseType": {
+                        "baseType": {
                           "id": 5,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
@@ -79,15 +70,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/smoke.json b/test/libsolidity/ASTJSON/smoke.json
index d3b114bbcb..d1fc5b13b3 100644
--- a/test/libsolidity/ASTJSON/smoke.json
+++ b/test/libsolidity/ASTJSON/smoke.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       1
     ]
   },
   "id": 2,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,8 +16,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 1,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         1
       ],
       "name": "C",
diff --git a/test/libsolidity/ASTJSON/smoke_parseOnly.json b/test/libsolidity/ASTJSON/smoke_parseOnly.json
index 1160fea91e..22b597ce9d 100644
--- a/test/libsolidity/ASTJSON/smoke_parseOnly.json
+++ b/test/libsolidity/ASTJSON/smoke_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 2,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
diff --git a/test/libsolidity/ASTJSON/source_location.json b/test/libsolidity/ASTJSON/source_location.json
index caeaf027ab..526069063b 100644
--- a/test/libsolidity/ASTJSON/source_location.json
+++ b/test/libsolidity/ASTJSON/source_location.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       12
     ]
   },
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 12,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         12
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "33:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "35:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
                       "src": "35:4:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
@@ -75,8 +63,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "32",
                   "id": 5,
                   "isConstant": false,
@@ -86,8 +73,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "44:1:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_rational_2_by_1",
                     "typeString": "int_const 2"
                   },
@@ -97,8 +83,7 @@
                 "src": "35:10:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 8,
                   "isConstant": false,
                   "isLValue": false,
@@ -108,22 +93,19 @@
                   "operator": "++",
                   "prefix": false,
                   "src": "47:3:1",
-                  "subExpression":
-                  {
+                  "subExpression": {
                     "id": 7,
                     "name": "x",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 4,
                     "src": "47:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
@@ -142,15 +124,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/source_location_parseOnly.json b/test/libsolidity/ASTJSON/source_location_parseOnly.json
index ec25111bd3..877092a045 100644
--- a/test/libsolidity/ASTJSON/source_location_parseOnly.json
+++ b/test/libsolidity/ASTJSON/source_location_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 13,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 10,
             "nodeType": "Block",
             "src": "33:20:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
@@ -53,8 +46,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "32",
                   "id": 5,
                   "kind": "number",
@@ -67,15 +59,13 @@
                 "src": "35:10:1"
               },
               {
-                "expression":
-                {
+                "expression": {
                   "id": 8,
                   "nodeType": "UnaryOperation",
                   "operator": "++",
                   "prefix": false,
                   "src": "47:3:1",
-                  "subExpression":
-                  {
+                  "subExpression": {
                     "id": 7,
                     "name": "x",
                     "nodeType": "Identifier",
@@ -98,15 +88,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/string.json b/test/libsolidity/ASTJSON/string.json
index c7706e3bfc..d4b37e2e16 100644
--- a/test/libsolidity/ASTJSON/string.json
+++ b/test/libsolidity/ASTJSON/string.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       9
     ]
   },
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 9,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         9
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "33:36:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "35:15:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_string_memory_ptr",
                       "typeString": "string"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
                       "src": "35:6:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_string_storage_ptr",
                         "typeString": "string"
                       }
@@ -75,8 +63,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "48656c6c6f20576f726c64",
                   "id": 5,
                   "isConstant": false,
@@ -86,8 +73,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "53:13:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_stringliteral_592fa743889fc7f92ac2a37bb1f5ba1daf2a5c84741ca0e0061d243a2e6707ba",
                     "typeString": "literal_string \"Hello World\""
                   },
@@ -106,15 +92,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/string_parseOnly.json b/test/libsolidity/ASTJSON/string_parseOnly.json
index 5f97eb1f91..4f8006e572 100644
--- a/test/libsolidity/ASTJSON/string_parseOnly.json
+++ b/test/libsolidity/ASTJSON/string_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "33:36:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "memory",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
@@ -53,8 +46,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "48656c6c6f20576f726c64",
                   "id": 5,
                   "kind": "string",
@@ -75,15 +67,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/struct_natspec.json b/test/libsolidity/ASTJSON/struct_natspec.json
index d8b38a8033..0a17909df6 100644
--- a/test/libsolidity/ASTJSON/struct_natspec.json
+++ b/test/libsolidity/ASTJSON/struct_natspec.json
@@ -1,28 +1,23 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Example":
-    [
+  "exportedSymbols": {
+    "Example": [
       8
     ]
   },
   "id": 9,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "Example",
-      "documentation":
-      {
+      "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":
-      [
+      "members": [
         {
           "constant": false,
           "id": 3,
@@ -34,19 +29,16 @@
           "src": "133:11:1",
           "stateVariable": false,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_string_storage_ptr",
             "typeString": "string"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 2,
             "name": "string",
             "nodeType": "ElementaryTypeName",
             "src": "133:6:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_string_storage_ptr",
               "typeString": "string"
             }
@@ -64,19 +56,16 @@
           "src": "150:10:1",
           "stateVariable": false,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_bool",
             "typeString": "bool"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 4,
             "name": "bool",
             "nodeType": "ElementaryTypeName",
             "src": "150:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_bool",
               "typeString": "bool"
             }
@@ -94,19 +83,16 @@
           "src": "166:13:1",
           "stateVariable": false,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_uint256",
             "typeString": "uint256"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 6,
             "name": "uint256",
             "nodeType": "ElementaryTypeName",
             "src": "166:7:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
diff --git a/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json b/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
index b80aaf377c..6ba465580b 100644
--- a/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
+++ b/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
@@ -2,19 +2,16 @@
   "absolutePath": "a",
   "id": 9,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "documentation":
-      {
+      "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":
-      [
+      "members": [
         {
           "constant": false,
           "id": 3,
@@ -26,8 +23,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 2,
             "name": "string",
             "nodeType": "ElementaryTypeName",
@@ -47,8 +43,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 4,
             "name": "bool",
             "nodeType": "ElementaryTypeName",
@@ -68,8 +63,7 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 6,
             "name": "uint256",
             "nodeType": "ElementaryTypeName",
diff --git a/test/libsolidity/ASTJSON/two_base_functions.json b/test/libsolidity/ASTJSON/two_base_functions.json
index 0ed997a32f..132a7a9071 100644
--- a/test/libsolidity/ASTJSON/two_base_functions.json
+++ b/test/libsolidity/ASTJSON/two_base_functions.json
@@ -1,24 +1,19 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "A":
-    [
+  "exportedSymbols": {
+    "A": [
       5
     ],
-    "B":
-    [
+    "B": [
       10
     ],
-    "C":
-    [
+    "C": [
       22
     ]
   },
   "id": 23,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -27,18 +22,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 5,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         5
       ],
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "45:2:1",
@@ -52,15 +44,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -86,18 +76,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 10,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         10
       ],
       "name": "B",
       "nameLocation": "59:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 8,
             "nodeType": "Block",
             "src": "95:2:1",
@@ -111,15 +98,13 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "77:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -139,15 +124,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 11,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "114:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -159,12 +141,10 @@
           "src": "114:1:1"
         },
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 13,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "117:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -181,8 +161,7 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 22,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         22,
         10,
         5
@@ -190,16 +169,13 @@
       "name": "C",
       "nameLocation": "109:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "baseFunctions":
-          [
+          "baseFunctions": [
             4,
             9
           ],
-          "body":
-          {
+          "body": {
             "id": 20,
             "nodeType": "Block",
             "src": "160:2:1",
@@ -213,17 +189,14 @@
           "name": "f",
           "nameLocation": "134:1:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 18,
             "nodeType": "OverrideSpecifier",
-            "overrides":
-            [
+            "overrides": [
               {
                 "id": 16,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "154:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -233,8 +206,7 @@
               {
                 "id": 17,
                 "name": "B",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "157:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -244,15 +216,13 @@
             ],
             "src": "145:14:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 15,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "135:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/two_base_functions.sol b/test/libsolidity/ASTJSON/two_base_functions.sol
index 0a00bcc145..89c8e207a5 100644
--- a/test/libsolidity/ASTJSON/two_base_functions.sol
+++ b/test/libsolidity/ASTJSON/two_base_functions.sol
@@ -7,4 +7,5 @@ contract B {
 contract C is A, B {
     function f() public override(A, B) {}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
index e448be836b..2e9691ac98 100644
--- a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 23,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,11 +12,9 @@
       "name": "A",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 3,
             "nodeType": "Block",
             "src": "45:2:1",
@@ -30,15 +27,13 @@
           "name": "f",
           "nameLocation": "26:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "27:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -63,11 +58,9 @@
       "name": "B",
       "nameLocation": "59:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 8,
             "nodeType": "Block",
             "src": "95:2:1",
@@ -80,15 +73,13 @@
           "name": "f",
           "nameLocation": "76:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 6,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "77:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 7,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -106,15 +97,12 @@
     },
     {
       "abstract": false,
-      "baseContracts":
-      [
+      "baseContracts": [
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 11,
             "name": "A",
-            "nameLocations":
-            [
+            "nameLocations": [
               "114:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -125,12 +113,10 @@
           "src": "114:1:1"
         },
         {
-          "baseName":
-          {
+          "baseName": {
             "id": 13,
             "name": "B",
-            "nameLocations":
-            [
+            "nameLocations": [
               "117:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -147,11 +133,9 @@
       "name": "C",
       "nameLocation": "109:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 20,
             "nodeType": "Block",
             "src": "160:2:1",
@@ -164,17 +148,14 @@
           "name": "f",
           "nameLocation": "134:1:1",
           "nodeType": "FunctionDefinition",
-          "overrides":
-          {
+          "overrides": {
             "id": 18,
             "nodeType": "OverrideSpecifier",
-            "overrides":
-            [
+            "overrides": [
               {
                 "id": 16,
                 "name": "A",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "154:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -183,8 +164,7 @@
               {
                 "id": 17,
                 "name": "B",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "157:1:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -193,15 +173,13 @@
             ],
             "src": "145:14:1"
           },
-          "parameters":
-          {
+          "parameters": {
             "id": 15,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "135:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 19,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/unicode.json b/test/libsolidity/ASTJSON/unicode.json
index 0ff1426f17..2521e690e7 100644
--- a/test/libsolidity/ASTJSON/unicode.json
+++ b/test/libsolidity/ASTJSON/unicode.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       9
     ]
   },
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,30 +16,24 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 9,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         9
       ],
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "33:42:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -54,19 +45,16 @@
                     "src": "35:15:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_string_memory_ptr",
                       "typeString": "string"
                     },
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
                       "src": "35:6:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_string_storage_ptr",
                         "typeString": "string"
                       }
@@ -75,8 +63,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "48656c6c6f20f09f9883",
                   "id": 5,
                   "isConstant": false,
@@ -86,8 +73,7 @@
                   "lValueRequested": false,
                   "nodeType": "Literal",
                   "src": "53:19:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_stringliteral_cd7a99177cebb3d14b8cc54e313dbf76867c71cd6fbb9a33ce3870dc80e9992b",
                     "typeString": "literal_string hex\"48656c6c6f20f09f9883\""
                   },
@@ -106,15 +92,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/unicode_parseOnly.json b/test/libsolidity/ASTJSON/unicode_parseOnly.json
index c8fb780c40..0567c08a08 100644
--- a/test/libsolidity/ASTJSON/unicode_parseOnly.json
+++ b/test/libsolidity/ASTJSON/unicode_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 10,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,23 +12,18 @@
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 7,
             "nodeType": "Block",
             "src": "33:42:1",
-            "statements":
-            [
+            "statements": [
               {
-                "assignments":
-                [
+                "assignments": [
                   4
                 ],
-                "declarations":
-                [
+                "declarations": [
                   {
                     "constant": false,
                     "id": 4,
@@ -41,8 +35,7 @@
                     "stateVariable": false,
                     "storageLocation": "memory",
                     "typeDescriptions": {},
-                    "typeName":
-                    {
+                    "typeName": {
                       "id": 3,
                       "name": "string",
                       "nodeType": "ElementaryTypeName",
@@ -53,8 +46,7 @@
                   }
                 ],
                 "id": 6,
-                "initialValue":
-                {
+                "initialValue": {
                   "hexValue": "48656c6c6f20f09f9883",
                   "id": 5,
                   "kind": "unicodeString",
@@ -75,15 +67,13 @@
           "name": "f",
           "nameLocation": "22:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "23:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index cff59a5efc..9db7b6a983 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -1,32 +1,26 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       19
     ],
-    "X":
-    [
+    "X": [
       2
     ],
-    "f":
-    [
+    "f": [
       9
     ]
   },
   "id": 20,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "errorSelector": "c1599bd9",
       "id": 2,
       "name": "X",
       "nameLocation": "6:1:1",
       "nodeType": "ErrorDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 1,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -35,19 +29,15 @@
       "src": "0:10:1"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 8,
         "nodeType": "Block",
         "src": "29:15:1",
-        "statements":
-        [
+        "statements": [
           {
-            "errorCall":
-            {
+            "errorCall": {
               "arguments": [],
-              "expression":
-              {
+              "expression": {
                 "argumentTypes": [],
                 "id": 5,
                 "name": "X",
@@ -55,8 +45,7 @@
                 "overloadedDeclarations": [],
                 "referencedDeclaration": 2,
                 "src": "38:1:1",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_function_error_pure$__$returns$_t_error_$",
                   "typeString": "function () pure returns (error)"
                 }
@@ -72,8 +61,7 @@
               "nodeType": "FunctionCall",
               "src": "38:3:1",
               "tryCall": false,
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_error",
                 "typeString": "error"
               }
@@ -91,15 +79,13 @@
       "name": "f",
       "nameLocation": "20:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 3,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "21:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -119,23 +105,20 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 19,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         19
       ],
       "name": "C",
       "nameLocation": "54:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "errorSelector": "2bc80f3a",
           "id": 11,
           "name": "T",
           "nameLocation": "68:1:1",
           "nodeType": "ErrorDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -144,19 +127,15 @@
           "src": "62:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 17,
             "nodeType": "Block",
             "src": "97:8:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "argumentTypes": [],
                     "id": 14,
                     "name": "f",
@@ -164,8 +143,7 @@
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 9,
                     "src": "99:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_function_internal_pure$__$returns$__$",
                       "typeString": "function () pure"
                     }
@@ -181,8 +159,7 @@
                   "nodeType": "FunctionCall",
                   "src": "99:3:1",
                   "tryCall": false,
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_tuple$__$",
                     "typeString": "tuple()"
                   }
@@ -201,15 +178,13 @@
           "name": "h",
           "nameLocation": "86:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 12,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "87:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -224,8 +199,7 @@
       ],
       "scope": 20,
       "src": "45:62:1",
-      "usedErrors":
-      [
+      "usedErrors": [
         2,
         11
       ],
diff --git a/test/libsolidity/ASTJSON/used_errors.sol b/test/libsolidity/ASTJSON/used_errors.sol
index 97f7a27f48..24c03982fe 100644
--- a/test/libsolidity/ASTJSON/used_errors.sol
+++ b/test/libsolidity/ASTJSON/used_errors.sol
@@ -4,4 +4,5 @@ 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 115ea2aee5..402291f29d 100644
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
@@ -2,15 +2,13 @@
   "absolutePath": "a",
   "id": 20,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 2,
       "name": "X",
       "nameLocation": "6:1:1",
       "nodeType": "ErrorDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 1,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -19,19 +17,15 @@
       "src": "0:10:1"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 8,
         "nodeType": "Block",
         "src": "29:15:1",
-        "statements":
-        [
+        "statements": [
           {
-            "errorCall":
-            {
+            "errorCall": {
               "arguments": [],
-              "expression":
-              {
+              "expression": {
                 "id": 5,
                 "name": "X",
                 "nodeType": "Identifier",
@@ -60,15 +54,13 @@
       "name": "f",
       "nameLocation": "20:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 3,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "21:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -88,15 +80,13 @@
       "name": "C",
       "nameLocation": "54:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 11,
           "name": "T",
           "nameLocation": "68:1:1",
           "nodeType": "ErrorDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
@@ -105,19 +95,15 @@
           "src": "62:10:1"
         },
         {
-          "body":
-          {
+          "body": {
             "id": 17,
             "nodeType": "Block",
             "src": "97:8:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
+                "expression": {
                   "arguments": [],
-                  "expression":
-                  {
+                  "expression": {
                     "id": 14,
                     "name": "f",
                     "nodeType": "Identifier",
@@ -146,15 +132,13 @@
           "name": "h",
           "nameLocation": "86:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 12,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "87:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
index adf1172f05..51f8ee553b 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@@ -1,28 +1,22 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       27
     ],
-    "MyAddress":
-    [
+    "MyAddress": [
       2
     ],
-    "MyUInt":
-    [
+    "MyUInt": [
       4
     ],
-    "f":
-    [
+    "f": [
       16
     ]
   },
   "id": 28,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "MyAddress",
       "id": 2,
@@ -30,15 +24,13 @@
       "nameLocation": "5:9:1",
       "nodeType": "UserDefinedValueTypeDefinition",
       "src": "0:26:1",
-      "underlyingType":
-      {
+      "underlyingType": {
         "id": 1,
         "name": "address",
         "nodeType": "ElementaryTypeName",
         "src": "18:7:1",
         "stateMutability": "nonpayable",
-        "typeDescriptions":
-        {
+        "typeDescriptions": {
           "typeIdentifier": "t_address",
           "typeString": "address"
         }
@@ -51,34 +43,28 @@
       "nameLocation": "32:6:1",
       "nodeType": "UserDefinedValueTypeDefinition",
       "src": "27:20:1",
-      "underlyingType":
-      {
+      "underlyingType": {
         "id": 3,
         "name": "uint",
         "nodeType": "ElementaryTypeName",
         "src": "42:4:1",
-        "typeDescriptions":
-        {
+        "typeDescriptions": {
           "typeIdentifier": "t_uint256",
           "typeString": "uint256"
         }
       }
     },
     {
-      "body":
-      {
+      "body": {
         "id": 15,
         "nodeType": "Block",
         "src": "61:34:1",
-        "statements":
-        [
+        "statements": [
           {
-            "assignments":
-            [
+            "assignments": [
               9
             ],
-            "declarations":
-            [
+            "declarations": [
               {
                 "constant": false,
                 "id": 9,
@@ -90,21 +76,17 @@
                 "src": "67:11:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_userDefinedValueType$_MyAddress_$2",
                   "typeString": "MyAddress"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 8,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 7,
                     "name": "MyAddress",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "67:9:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -113,8 +95,7 @@
                   },
                   "referencedDeclaration": 2,
                   "src": "67:9:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_MyAddress_$2",
                     "typeString": "MyAddress"
                   }
@@ -127,12 +108,10 @@
             "src": "67:11:1"
           },
           {
-            "assignments":
-            [
+            "assignments": [
               13
             ],
-            "declarations":
-            [
+            "declarations": [
               {
                 "constant": false,
                 "id": 13,
@@ -144,21 +123,17 @@
                 "src": "84:8:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_userDefinedValueType$_MyUInt_$4",
                   "typeString": "MyUInt"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 12,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 11,
                     "name": "MyUInt",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "84:6:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -167,8 +142,7 @@
                   },
                   "referencedDeclaration": 4,
                   "src": "84:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_MyUInt_$4",
                     "typeString": "MyUInt"
                   }
@@ -189,15 +163,13 @@
       "name": "f",
       "nameLocation": "57:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 5,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "58:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 6,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -217,15 +189,13 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 27,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         27
       ],
       "name": "C",
       "nameLocation": "105:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "canonicalName": "C.MyAddress",
           "id": 18,
@@ -233,15 +203,13 @@
           "nameLocation": "118:9:1",
           "nodeType": "UserDefinedValueTypeDefinition",
           "src": "113:26:1",
-          "underlyingType":
-          {
+          "underlyingType": {
             "id": 17,
             "name": "address",
             "nodeType": "ElementaryTypeName",
             "src": "131:7:1",
             "stateMutability": "nonpayable",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_address",
               "typeString": "address"
             }
@@ -254,14 +222,12 @@
           "nameLocation": "149:6:1",
           "nodeType": "UserDefinedValueTypeDefinition",
           "src": "144:20:1",
-          "underlyingType":
-          {
+          "underlyingType": {
             "id": 19,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
             "src": "159:4:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             }
@@ -279,26 +245,21 @@
           "src": "169:37:1",
           "stateVariable": true,
           "storageLocation": "default",
-          "typeDescriptions":
-          {
+          "typeDescriptions": {
             "typeIdentifier": "t_mapping$_t_userDefinedValueType$_MyAddress_$18_$_t_userDefinedValueType$_MyUInt_$20_$",
             "typeString": "mapping(C.MyAddress => C.MyUInt)"
           },
-          "typeName":
-          {
+          "typeName": {
             "id": 25,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 22,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 21,
                 "name": "MyAddress",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "177:9:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -307,31 +268,26 @@
               },
               "referencedDeclaration": 18,
               "src": "177:9:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_MyAddress_$18",
                 "typeString": "C.MyAddress"
               }
             },
             "nodeType": "Mapping",
             "src": "169:28:1",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_mapping$_t_userDefinedValueType$_MyAddress_$18_$_t_userDefinedValueType$_MyUInt_$20_$",
               "typeString": "mapping(C.MyAddress => C.MyUInt)"
             },
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 24,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 23,
                 "name": "MyUInt",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "190:6:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -340,8 +296,7 @@
               },
               "referencedDeclaration": 20,
               "src": "190:6:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_MyUInt_$20",
                 "typeString": "C.MyUInt"
               }
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.sol b/test/libsolidity/ASTJSON/userDefinedValueType.sol
index d5ef2e00b9..f1124f8cd6 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.sol
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.sol
@@ -9,4 +9,5 @@ contract C {
     type MyUInt is uint;
     mapping(MyAddress => MyUInt) public m;
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
index 90e48a9827..c3bb96ddd4 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
@@ -2,16 +2,14 @@
   "absolutePath": "a",
   "id": 28,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "id": 2,
       "name": "MyAddress",
       "nameLocation": "5:9:1",
       "nodeType": "UserDefinedValueTypeDefinition",
       "src": "0:26:1",
-      "underlyingType":
-      {
+      "underlyingType": {
         "id": 1,
         "name": "address",
         "nodeType": "ElementaryTypeName",
@@ -26,8 +24,7 @@
       "nameLocation": "32:6:1",
       "nodeType": "UserDefinedValueTypeDefinition",
       "src": "27:20:1",
-      "underlyingType":
-      {
+      "underlyingType": {
         "id": 3,
         "name": "uint",
         "nodeType": "ElementaryTypeName",
@@ -36,20 +33,16 @@
       }
     },
     {
-      "body":
-      {
+      "body": {
         "id": 15,
         "nodeType": "Block",
         "src": "61:34:1",
-        "statements":
-        [
+        "statements": [
           {
-            "assignments":
-            [
+            "assignments": [
               9
             ],
-            "declarations":
-            [
+            "declarations": [
               {
                 "constant": false,
                 "id": 9,
@@ -61,16 +54,13 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 8,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 7,
                     "name": "MyAddress",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "67:9:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -87,12 +77,10 @@
             "src": "67:11:1"
           },
           {
-            "assignments":
-            [
+            "assignments": [
               13
             ],
-            "declarations":
-            [
+            "declarations": [
               {
                 "constant": false,
                 "id": 13,
@@ -104,16 +92,13 @@
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
-                "typeName":
-                {
+                "typeName": {
                   "id": 12,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 11,
                     "name": "MyUInt",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "84:6:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -138,15 +123,13 @@
       "name": "f",
       "nameLocation": "57:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 5,
         "nodeType": "ParameterList",
         "parameters": [],
         "src": "58:2:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 6,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -166,16 +149,14 @@
       "name": "C",
       "nameLocation": "105:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "id": 18,
           "name": "MyAddress",
           "nameLocation": "118:9:1",
           "nodeType": "UserDefinedValueTypeDefinition",
           "src": "113:26:1",
-          "underlyingType":
-          {
+          "underlyingType": {
             "id": 17,
             "name": "address",
             "nodeType": "ElementaryTypeName",
@@ -190,8 +171,7 @@
           "nameLocation": "149:6:1",
           "nodeType": "UserDefinedValueTypeDefinition",
           "src": "144:20:1",
-          "underlyingType":
-          {
+          "underlyingType": {
             "id": 19,
             "name": "uint",
             "nodeType": "ElementaryTypeName",
@@ -210,21 +190,17 @@
           "stateVariable": false,
           "storageLocation": "default",
           "typeDescriptions": {},
-          "typeName":
-          {
+          "typeName": {
             "id": 25,
             "keyName": "",
             "keyNameLocation": "-1:-1:-1",
-            "keyType":
-            {
+            "keyType": {
               "id": 22,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 21,
                 "name": "MyAddress",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "177:9:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -238,16 +214,13 @@
             "typeDescriptions": {},
             "valueName": "",
             "valueNameLocation": "-1:-1:-1",
-            "valueType":
-            {
+            "valueType": {
               "id": 24,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 23,
                 "name": "MyUInt",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "190:6:1"
                 ],
                 "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.json b/test/libsolidity/ASTJSON/user_defined_operator.json
index ed72de49dd..b39d2e07ea 100644
--- a/test/libsolidity/ASTJSON/user_defined_operator.json
+++ b/test/libsolidity/ASTJSON/user_defined_operator.json
@@ -1,28 +1,22 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       49
     ],
-    "I8":
-    [
+    "I8": [
       2
     ],
-    "sub":
-    [
+    "sub": [
       20
     ],
-    "unsub":
-    [
+    "unsub": [
       30
     ]
   },
   "id": 50,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "canonicalName": "I8",
       "id": 2,
@@ -30,29 +24,24 @@
       "nameLocation": "5:2:1",
       "nodeType": "UserDefinedValueTypeDefinition",
       "src": "0:16:1",
-      "underlyingType":
-      {
+      "underlyingType": {
         "id": 1,
         "name": "int8",
         "nodeType": "ElementaryTypeName",
         "src": "11:4:1",
-        "typeDescriptions":
-        {
+        "typeDescriptions": {
           "typeIdentifier": "t_int8",
           "typeString": "int8"
         }
       }
     },
     {
-      "functionList":
-      [
+      "functionList": [
         {
-          "definition":
-          {
+          "definition": {
             "id": 3,
             "name": "sub",
-            "nameLocations":
-            [
+            "nameLocations": [
               "24:3:1"
             ],
             "nodeType": "IdentifierPath",
@@ -62,12 +51,10 @@
           "operator": "-"
         },
         {
-          "definition":
-          {
+          "definition": {
             "id": 4,
             "name": "unsub",
-            "nameLocations":
-            [
+            "nameLocations": [
               "34:5:1"
             ],
             "nodeType": "IdentifierPath",
@@ -81,16 +68,13 @@
       "id": 7,
       "nodeType": "UsingForDirective",
       "src": "17:43:1",
-      "typeName":
-      {
+      "typeName": {
         "id": 6,
         "nodeType": "UserDefinedTypeName",
-        "pathNode":
-        {
+        "pathNode": {
           "id": 5,
           "name": "I8",
-          "nameLocations":
-          [
+          "nameLocations": [
             "50:2:1"
           ],
           "nodeType": "IdentifierPath",
@@ -99,16 +83,14 @@
         },
         "referencedDeclaration": 2,
         "src": "50:2:1",
-        "typeDescriptions":
-        {
+        "typeDescriptions": {
           "typeIdentifier": "t_userDefinedValueType$_I8_$2",
           "typeString": "I8"
         }
       }
     },
     {
-      "body":
-      {
+      "body": {
         "id": 19,
         "nodeType": "Block",
         "src": "100:2:1",
@@ -121,12 +103,10 @@
       "name": "sub",
       "nameLocation": "70:3:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 14,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 10,
@@ -138,21 +118,17 @@
             "src": "74:2:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_userDefinedValueType$_I8_$2",
               "typeString": "I8"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 9,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 8,
                 "name": "I8",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "74:2:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -161,8 +137,7 @@
               },
               "referencedDeclaration": 2,
               "src": "74:2:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                 "typeString": "I8"
               }
@@ -180,21 +155,17 @@
             "src": "78:2:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_userDefinedValueType$_I8_$2",
               "typeString": "I8"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 12,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 11,
                 "name": "I8",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "78:2:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -203,8 +174,7 @@
               },
               "referencedDeclaration": 2,
               "src": "78:2:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                 "typeString": "I8"
               }
@@ -214,12 +184,10 @@
         ],
         "src": "73:8:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 18,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 17,
@@ -231,21 +199,17 @@
             "src": "96:2:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_userDefinedValueType$_I8_$2",
               "typeString": "I8"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 16,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 15,
                 "name": "I8",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "96:2:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -254,8 +218,7 @@
               },
               "referencedDeclaration": 2,
               "src": "96:2:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                 "typeString": "I8"
               }
@@ -272,8 +235,7 @@
       "visibility": "internal"
     },
     {
-      "body":
-      {
+      "body": {
         "id": 29,
         "nodeType": "Block",
         "src": "140:2:1",
@@ -286,12 +248,10 @@
       "name": "unsub",
       "nameLocation": "112:5:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 24,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 23,
@@ -303,21 +263,17 @@
             "src": "118:2:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_userDefinedValueType$_I8_$2",
               "typeString": "I8"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 22,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 21,
                 "name": "I8",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "118:2:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -326,8 +282,7 @@
               },
               "referencedDeclaration": 2,
               "src": "118:2:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                 "typeString": "I8"
               }
@@ -337,12 +292,10 @@
         ],
         "src": "117:4:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 28,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 27,
@@ -354,21 +307,17 @@
             "src": "136:2:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_userDefinedValueType$_I8_$2",
               "typeString": "I8"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 26,
               "nodeType": "UserDefinedTypeName",
-              "pathNode":
-              {
+              "pathNode": {
                 "id": 25,
                 "name": "I8",
-                "nameLocations":
-                [
+                "nameLocations": [
                   "136:2:1"
                 ],
                 "nodeType": "IdentifierPath",
@@ -377,8 +326,7 @@
               },
               "referencedDeclaration": 2,
               "src": "136:2:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                 "typeString": "I8"
               }
@@ -402,28 +350,22 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 49,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         49
       ],
       "name": "C",
       "nameLocation": "152:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 47,
             "nodeType": "Block",
             "src": "208:30:1",
-            "statements":
-            [
+            "statements": [
               {
-                "expression":
-                {
-                  "commonType":
-                  {
+                "expression": {
+                  "commonType": {
                     "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                     "typeString": "I8"
                   },
@@ -433,8 +375,7 @@
                   "isLValue": false,
                   "isPure": false,
                   "lValueRequested": false,
-                  "leftExpression":
-                  {
+                  "leftExpression": {
                     "function": 30,
                     "id": 43,
                     "isConstant": false,
@@ -445,45 +386,39 @@
                     "operator": "-",
                     "prefix": true,
                     "src": "225:2:1",
-                    "subExpression":
-                    {
+                    "subExpression": {
                       "id": 42,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
                       "referencedDeclaration": 33,
                       "src": "226:1:1",
-                      "typeDescriptions":
-                      {
+                      "typeDescriptions": {
                         "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                         "typeString": "I8"
                       }
                     },
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                       "typeString": "I8"
                     }
                   },
                   "nodeType": "BinaryOperation",
                   "operator": "-",
-                  "rightExpression":
-                  {
+                  "rightExpression": {
                     "id": 44,
                     "name": "b",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 36,
                     "src": "230:1:1",
-                    "typeDescriptions":
-                    {
+                    "typeDescriptions": {
                       "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                       "typeString": "I8"
                     }
                   },
                   "src": "225:6:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                     "typeString": "I8"
                   }
@@ -503,12 +438,10 @@
           "name": "f",
           "nameLocation": "169:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 37,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 33,
@@ -520,21 +453,17 @@
                 "src": "171:4:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                   "typeString": "I8"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 32,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 31,
                     "name": "I8",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "171:2:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -543,8 +472,7 @@
                   },
                   "referencedDeclaration": 2,
                   "src": "171:2:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                     "typeString": "I8"
                   }
@@ -562,21 +490,17 @@
                 "src": "177:4:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                   "typeString": "I8"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 35,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 34,
                     "name": "I8",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "177:2:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -585,8 +509,7 @@
                   },
                   "referencedDeclaration": 2,
                   "src": "177:2:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                     "typeString": "I8"
                   }
@@ -596,12 +519,10 @@
             ],
             "src": "170:12:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 41,
             "nodeType": "ParameterList",
-            "parameters":
-            [
+            "parameters": [
               {
                 "constant": false,
                 "id": 40,
@@ -613,21 +534,17 @@
                 "src": "204:2:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions":
-                {
+                "typeDescriptions": {
                   "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                   "typeString": "I8"
                 },
-                "typeName":
-                {
+                "typeName": {
                   "id": 39,
                   "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
+                  "pathNode": {
                     "id": 38,
                     "name": "I8",
-                    "nameLocations":
-                    [
+                    "nameLocations": [
                       "204:2:1"
                     ],
                     "nodeType": "IdentifierPath",
@@ -636,8 +553,7 @@
                   },
                   "referencedDeclaration": 2,
                   "src": "204:2:1",
-                  "typeDescriptions":
-                  {
+                  "typeDescriptions": {
                     "typeIdentifier": "t_userDefinedValueType$_I8_$2",
                     "typeString": "I8"
                   }
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.sol b/test/libsolidity/ASTJSON/user_defined_operator.sol
index bfbdf7b9bf..df5d0ed326 100644
--- a/test/libsolidity/ASTJSON/user_defined_operator.sol
+++ b/test/libsolidity/ASTJSON/user_defined_operator.sol
@@ -7,4 +7,5 @@ contract C {
         return -a - b;
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
index f3094980ff..b62ec8e865 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@@ -1,34 +1,26 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "C":
-    [
+  "exportedSymbols": {
+    "C": [
       13
     ],
-    "L":
-    [
+    "L": [
       4
     ],
-    "f":
-    [
+    "f": [
       10
     ]
   },
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "functionList":
-      [
+      "functionList": [
         {
-          "function":
-          {
+          "function": {
             "id": 1,
             "name": "f",
-            "nameLocations":
-            [
+            "nameLocations": [
               "7:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -41,14 +33,12 @@
       "id": 3,
       "nodeType": "UsingForDirective",
       "src": "0:19:1",
-      "typeName":
-      {
+      "typeName": {
         "id": 2,
         "name": "uint",
         "nodeType": "ElementaryTypeName",
         "src": "14:4:1",
-        "typeDescriptions":
-        {
+        "typeDescriptions": {
           "typeIdentifier": "t_uint256",
           "typeString": "uint256"
         }
@@ -62,8 +52,7 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 4,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         4
       ],
       "name": "L",
@@ -76,8 +65,7 @@
       "usedEvents": []
     },
     {
-      "body":
-      {
+      "body": {
         "id": 9,
         "nodeType": "Block",
         "src": "50:2:1",
@@ -90,12 +78,10 @@
       "name": "f",
       "nameLocation": "42:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 7,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 6,
@@ -107,19 +93,16 @@
             "src": "44:4:1",
             "stateVariable": false,
             "storageLocation": "default",
-            "typeDescriptions":
-            {
+            "typeDescriptions": {
               "typeIdentifier": "t_uint256",
               "typeString": "uint256"
             },
-            "typeName":
-            {
+            "typeName": {
               "id": 5,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "44:4:1",
-              "typeDescriptions":
-              {
+              "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
               }
@@ -129,8 +112,7 @@
         ],
         "src": "43:6:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 8,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -150,24 +132,20 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 13,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         13
       ],
       "name": "C",
       "nameLocation": "62:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "global": false,
           "id": 12,
-          "libraryName":
-          {
+          "libraryName": {
             "id": 11,
             "name": "L",
-            "nameLocations":
-            [
+            "nameLocations": [
               "72:1:1"
             ],
             "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
index 9360227d43..4858081c23 100644
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
@@ -2,18 +2,14 @@
   "absolutePath": "a",
   "id": 14,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
-      "functionList":
-      [
+      "functionList": [
         {
-          "function":
-          {
+          "function": {
             "id": 1,
             "name": "f",
-            "nameLocations":
-            [
+            "nameLocations": [
               "7:1:1"
             ],
             "nodeType": "IdentifierPath",
@@ -25,8 +21,7 @@
       "id": 3,
       "nodeType": "UsingForDirective",
       "src": "0:19:1",
-      "typeName":
-      {
+      "typeName": {
         "id": 2,
         "name": "uint",
         "nodeType": "ElementaryTypeName",
@@ -49,8 +44,7 @@
       "usedEvents": []
     },
     {
-      "body":
-      {
+      "body": {
         "id": 9,
         "nodeType": "Block",
         "src": "50:2:1",
@@ -63,12 +57,10 @@
       "name": "f",
       "nameLocation": "42:1:1",
       "nodeType": "FunctionDefinition",
-      "parameters":
-      {
+      "parameters": {
         "id": 7,
         "nodeType": "ParameterList",
-        "parameters":
-        [
+        "parameters": [
           {
             "constant": false,
             "id": 6,
@@ -80,8 +72,7 @@
             "stateVariable": false,
             "storageLocation": "default",
             "typeDescriptions": {},
-            "typeName":
-            {
+            "typeName": {
               "id": 5,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
@@ -93,8 +84,7 @@
         ],
         "src": "43:6:1"
       },
-      "returnParameters":
-      {
+      "returnParameters": {
         "id": 8,
         "nodeType": "ParameterList",
         "parameters": [],
@@ -114,17 +104,14 @@
       "name": "C",
       "nameLocation": "62:1:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
           "global": false,
           "id": 12,
-          "libraryName":
-          {
+          "libraryName": {
             "id": 11,
             "name": "L",
-            "nameLocations":
-            [
+            "nameLocations": [
               "72:1:1"
             ],
             "nodeType": "IdentifierPath",
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.json b/test/libsolidity/ASTJSON/yul_hex_literal.json
index 0498289c67..22d8c6d8e9 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.json
@@ -1,16 +1,13 @@
 {
   "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "Sample":
-    [
+  "exportedSymbols": {
+    "Sample": [
       6
     ]
   },
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -19,37 +16,30 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 6,
-      "linearizedBaseContracts":
-      [
+      "linearizedBaseContracts": [
         6
       ],
       "name": "Sample",
       "nameLocation": "9:6:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "47:167:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "66:142:1",
                   "nodeType": "YulBlock",
                   "src": "66:142:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "80:15:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "80:15:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "74657374",
                         "kind": "string",
                         "nativeSrc": "89:6:1",
@@ -58,8 +48,7 @@
                         "type": "",
                         "value": "test"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "a",
                           "nativeSrc": "84:1:1",
@@ -73,8 +62,7 @@
                       "nativeSrc": "108:54:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "108:54:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "112233445566778899aabbccddeeff6677889900",
                         "kind": "string",
                         "nativeSrc": "117:45:1",
@@ -82,8 +70,7 @@
                         "src": "117:45:1",
                         "type": ""
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "b",
                           "nativeSrc": "112:1:1",
@@ -97,8 +84,7 @@
                       "nativeSrc": "175:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "175:23:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "1234abcd",
                         "kind": "string",
                         "nativeSrc": "184:14:1",
@@ -106,8 +92,7 @@
                         "src": "184:14:1",
                         "type": ""
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "c",
                           "nativeSrc": "179:1:1",
@@ -135,15 +120,13 @@
           "name": "f",
           "nameLocation": "31:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "32:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.sol b/test/libsolidity/ASTJSON/yul_hex_literal.sol
index c3b57a8fe8..f441866c1d 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal.sol
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.sol
@@ -7,4 +7,5 @@ contract Sample {
         }
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
index 023c13cc74..d26e2e2969 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
@@ -2,8 +2,7 @@
   "absolutePath": "a",
   "id": 7,
   "nodeType": "SourceUnit",
-  "nodes":
-  [
+  "nodes": [
     {
       "abstract": false,
       "baseContracts": [],
@@ -13,30 +12,24 @@
       "name": "Sample",
       "nameLocation": "9:6:1",
       "nodeType": "ContractDefinition",
-      "nodes":
-      [
+      "nodes": [
         {
-          "body":
-          {
+          "body": {
             "id": 4,
             "nodeType": "Block",
             "src": "47:167:1",
-            "statements":
-            [
+            "statements": [
               {
-                "AST":
-                {
+                "AST": {
                   "nativeSrc": "66:142:1",
                   "nodeType": "YulBlock",
                   "src": "66:142:1",
-                  "statements":
-                  [
+                  "statements": [
                     {
                       "nativeSrc": "80:15:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "80:15:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "74657374",
                         "kind": "string",
                         "nativeSrc": "89:6:1",
@@ -45,8 +38,7 @@
                         "type": "",
                         "value": "test"
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "a",
                           "nativeSrc": "84:1:1",
@@ -60,8 +52,7 @@
                       "nativeSrc": "108:54:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "108:54:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "112233445566778899aabbccddeeff6677889900",
                         "kind": "string",
                         "nativeSrc": "117:45:1",
@@ -69,8 +60,7 @@
                         "src": "117:45:1",
                         "type": ""
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "b",
                           "nativeSrc": "112:1:1",
@@ -84,8 +74,7 @@
                       "nativeSrc": "175:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "175:23:1",
-                      "value":
-                      {
+                      "value": {
                         "hexValue": "1234abcd",
                         "kind": "string",
                         "nativeSrc": "184:14:1",
@@ -93,8 +82,7 @@
                         "src": "184:14:1",
                         "type": ""
                       },
-                      "variables":
-                      [
+                      "variables": [
                         {
                           "name": "c",
                           "nativeSrc": "179:1:1",
@@ -121,15 +109,13 @@
           "name": "f",
           "nameLocation": "31:1:1",
           "nodeType": "FunctionDefinition",
-          "parameters":
-          {
+          "parameters": {
             "id": 1,
             "nodeType": "ParameterList",
             "parameters": [],
             "src": "32:2:1"
           },
-          "returnParameters":
-          {
+          "returnParameters": {
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
diff --git a/test/libsolutil/JSON.cpp b/test/libsolutil/JSON.cpp
index 91e6771acc..7b5528fffe 100644
--- a/test/libsolutil/JSON.cpp
+++ b/test/libsolutil/JSON.cpp
@@ -91,8 +91,7 @@ BOOST_AUTO_TEST_CASE(json_pretty_print)
 	"{\n"
 	"  \"1\": 1,\n"
 	"  \"2\": \"2\",\n"
-	"  \"3\":\n"
-	"  {\n"
+	"  \"3\": {\n"
 	"    \"3.1\": \"3.1\",\n"
 	"    \"3.2\": 2\n"
 	"  },\n"

From 2572e1345ed4cc94e96b15945717c4cfed87c19f Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 23 Apr 2024 13:20:38 +0200
Subject: [PATCH 0838/1140] SMTChecker: Fix equality of array literals

There are two kinds of array literals in Solidity: string literals
(arrays of characters/bytes) and proper array literals (e.g., [1,2,3]).
While array literals cannot be directly tested for equality in Solidity,
it is possible to compute hash of these values and compare hashes.
The expectation is that hashes of the same array literals would be the
same, but previously SMTChecker returned false positive in this case,
saying that they don't have to be equal.

The reason for the false positive was the following.
We represent Solidity array literal as a tuple `(elements, length)` where
`length` is an integer representing the actualy length of the array
literal, and `elements` are an SMT-LIB array, where the first `length`
elements represent the actual content of the array literal.
However, SMT-LIB arrays are infinite objects (more like functions from
indices to elements). Previously, we left the part after `length`-th
element unspecified. For the solver this meant that two array literals
equal at the Solidity level were represented with two different SMT-LIB
arrays.

The proposed solution is to always start from a constant-zero array, and
use store operations to build an SMT-LIB array that matches the Solidity
array literal.
---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             | 21 ++++++++++++++++-
 .../model_checker_invariants_all/err          |  2 +-
 .../err                                       |  2 +-
 .../abi/abi_encode_packed_string_literal.sol  | 20 +++++++---------
 ...code_packed_string_literal_no_unproved.sol | 20 +++++++---------
 .../abi/abi_encode_string_literal.sol         | 17 ++++++--------
 ...bi_encode_with_selector_string_literal.sol | 21 ++++++++---------
 .../abi/abi_encode_with_sig_array_slice.sol   |  7 ++----
 .../abi/abi_encode_with_sig_array_slice_2.sol |  7 ++----
 .../abi_encode_with_sig_string_literal.sol    | 20 +++++++---------
 .../crypto/crypto_functions_same_array.sol    | 23 +++++++++++++++++++
 .../crypto_functions_same_string_literal.sol  | 23 +++++++++++++++++++
 .../external_calls/call_mutex_unsafe.sol      |  4 ++--
 .../smtCheckerTests/types/array_literal_3.sol |  2 +-
 15 files changed, 116 insertions(+), 74 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_array.sol
 create mode 100644 test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_string_literal.sol

diff --git a/Changelog.md b/Changelog.md
index 59284486b3..b924b1ccde 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 Bugfixes:
  * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
+ * SMTChecker: Fix false positive when comparing hashes of same array or string literals.
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using an empty tuple in a conditional operator.
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 61aad0e8f5..c92c5399a6 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -1296,8 +1296,27 @@ void SMTEncoder::addArrayLiteralAssertions(
 )
 {
 	m_context.addAssertion(_symArray.length() == _elementValues.size());
+
+	// Assert to the solver that _elementValues are exactly the elements at the beginning of the array.
+	// Since we create new symbolic representation for every array literal in the source file, we want to ensure that
+	// representations of two equal literals are also equal. For this reason we always start from constant-zero array.
+	// This ensures SMT-LIB arrays (which are infinite) are also equal beyond the length of the Solidity array literal.
+	auto type = _symArray.type();
+	smtAssert(type);
+	auto valueType = [&]() {
+		if (auto const* arrayType = dynamic_cast<ArrayType const*>(type))
+			return arrayType->baseType();
+		if (smt::isStringLiteral(*type))
+			return TypeProvider::stringMemory()->baseType();
+		smtAssert(false);
+	}();
+	auto tupleSort = std::dynamic_pointer_cast<smtutil::TupleSort>(smt::smtSort(*type));
+	auto sortSort = std::make_shared<smtutil::SortSort>(tupleSort->components.front());
+	smtutil::Expression arrayExpr = smtutil::Expression::const_array(smtutil::Expression(sortSort), smt::zeroValue(valueType));
+	smtAssert(arrayExpr.sort->kind == smtutil::Kind::Array);
 	for (size_t i = 0; i < _elementValues.size(); i++)
-		m_context.addAssertion(smtutil::Expression::select(_symArray.elements(), i) == _elementValues[i]);
+		arrayExpr = smtutil::Expression::store(arrayExpr, smtutil::Expression(i), _elementValues[i]);
+	m_context.addAssertion(_symArray.elements() == arrayExpr);
 }
 
 void SMTEncoder::bytesToFixedBytesAssertions(
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 347f40325d..7ec97678e9 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -9,6 +9,6 @@ Info: CHC: 1 verification condition(s) proved safe! Enable the model checker opt
 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:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
+(((!(x <= 0) || !(<errorCode> >= 1)) && (!(x <= 0) || !(x' >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index c6d149f15a..11ee3a702f 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -9,6 +9,6 @@ Info: CHC: 1 verification condition(s) proved safe! Enable the model checker opt
 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:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
+(((!(x <= 0) || !(<errorCode> >= 1)) && (!(x <= 0) || !(x' >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x == 0)
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 08c48cbd99..47b15369c0 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
@@ -2,18 +2,16 @@ contract C {
 	function abiencodePackedStringLiteral() public pure {
 		bytes memory b1 = abi.encodePacked("");
 		bytes memory b2 = abi.encodePacked("");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
+		assert(b1.length == b2.length); // should hold
 
 		bytes memory b3 = abi.encodePacked(bytes(""));
-		assert(b1.length == b3.length); // should fail
+		assert(b1.length == b3.length); // should hold
 
 		bytes memory b4 = abi.encodePacked(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
+		assert(b1.length == b4.length); // should fail
 
 		bytes memory b5 = abi.encodePacked(string(""));
-		assert(b1.length == b5.length); // should fail
+		assert(b1.length == b5.length); // should hold, but currently fails due to abstraction
 
 		bytes memory b6 = abi.encode("");
 		assert(b1.length == b6.length); // should fail
@@ -21,10 +19,8 @@ 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()
-// 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()
+// Warning 6328: (354-384): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (454-484): CHC: Assertion violation happens here.\nCounterexample:\n\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (580-610): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// 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_string_literal_no_unproved.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
index f800276261..581e649fcb 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
@@ -2,18 +2,16 @@ contract C {
 	function abiencodePackedStringLiteral() public pure {
 		bytes memory b1 = abi.encodePacked("");
 		bytes memory b2 = abi.encodePacked("");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
+		assert(b1.length == b2.length); // should hold
 
 		bytes memory b3 = abi.encodePacked(bytes(""));
-		assert(b1.length == b3.length); // should fail
+		assert(b1.length == b3.length); // should hold
 
 		bytes memory b4 = abi.encodePacked(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
+		assert(b1.length == b4.length); // should fail
 
 		bytes memory b5 = abi.encodePacked(string(""));
-		assert(b1.length == b5.length); // should fail
+		assert(b1.length == b5.length); // should hold, but fails due to abstraction
 
 		bytes memory b6 = abi.encode("");
 		assert(b1.length == b6.length); // should fail
@@ -22,10 +20,8 @@ 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()
-// 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()
+// Warning 6328: (354-384): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (454-484): CHC: Assertion violation happens here.\nCounterexample:\n\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (570-600): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// 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_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
index b55952ee74..77d3cfb83b 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
@@ -2,25 +2,22 @@ contract C {
 	function abiEncodeStringLiteral() public pure {
 		bytes memory b1 = abi.encode("");
 		bytes memory b2 = abi.encode("");
-		// should hold, but currently fails due to string literal abstraction
+		// should hold
 		assert(b1.length == b2.length);
 
 		bytes memory b3 = abi.encode(bytes(""));
-		assert(b1.length == b3.length); // should fail
+		assert(b1.length == b3.length); // should hold
 
 		bytes memory b4 = abi.encode(bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
+		assert(b1.length == b4.length); // should fail
 
 		bytes memory b5 = abi.encode(string(""));
-		assert(b1.length == b5.length); // should fail
+		assert(b1.length == b5.length); // should hold, but currently fails due to abstraction
 	}
 }
 // ====
 // 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()
-// 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()
+// Warning 6328: (326-356): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
+// Warning 6328: (420-450): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
+// 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_with_selector_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
index 6d1ab3066c..dd183263a4 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
@@ -2,18 +2,17 @@ contract C {
 	function abiEncodeStringLiteral(bytes4 sel) public pure {
 		bytes memory b1 = abi.encodeWithSelector(sel, "");
 		bytes memory b2 = abi.encodeWithSelector(sel, "");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
+
+		assert(b1.length == b2.length); // should hold
 
 		bytes memory b3 = abi.encodeWithSelector(sel, bytes(""));
-		assert(b1.length == b3.length); // should fail
+		assert(b1.length == b3.length); // should hold
 
 		bytes memory b4 = abi.encodeWithSelector(sel, bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
+		assert(b1.length == b4.length); // should fail
 
 		bytes memory b5 = abi.encodeWithSelector(sel, string(""));
-		assert(b1.length == b5.length); // should fail
+		assert(b1.length == b5.length); // should hold, but currently fails due to abstraction
 
 		bytes memory b6 = abi.encodeWithSelector(0xcafecafe, bytes24(""));
 		assert(b4.length == b6.length); // should fail
@@ -21,10 +20,8 @@ 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)
-// 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)
+// Warning 6328: (403-433): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (514-544): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (673-703): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// 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_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
index fad7437448..b2d1b4acc6 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,10 +24,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (334-364): CHC: Assertion violation happens here.
+// Warning 6328: (334-364): CHC: Assertion violation happens here.\nCounterexample:\n\ndata = [0x4f]\nb2 = [0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(sig, [0x4f]) -- counterexample incomplete; parameter name used instead of value
 // 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.
+// 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/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index 41e71ee5bf..4c21a02a6b 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,10 +24,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (335-365): CHC: Assertion violation happens here.
+// Warning 6328: (335-365): CHC: Assertion violation happens here.\nCounterexample:\n\ndata = [36]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(sig, [36]) -- counterexample incomplete; parameter name used instead of value
 // 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.
+// 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/abi/abi_encode_with_sig_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
index de218cfaa6..ca782442b6 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
@@ -2,18 +2,16 @@ contract C {
 	function abiEncodeStringLiteral(string memory sig) public pure {
 		bytes memory b1 = abi.encodeWithSignature(sig, "");
 		bytes memory b2 = abi.encodeWithSignature(sig, "");
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b2.length);
+		assert(b1.length == b2.length); // should hold
 
 		bytes memory b3 = abi.encodeWithSignature(sig, bytes(""));
-		assert(b1.length == b3.length); // should fail
+		assert(b1.length == b3.length); // should hold
 
 		bytes memory b4 = abi.encodeWithSignature(sig, bytes24(""));
-		// should hold, but currently fails due to string literal abstraction
-		assert(b1.length == b4.length);
+		assert(b1.length == b4.length); // should fail
 
 		bytes memory b5 = abi.encodeWithSignature(sig, string(""));
-		assert(b1.length == b5.length); // should fail
+		assert(b1.length == b5.length); // should hold, but currently fails due to abstraction
 
 		bytes memory b6 = abi.encodeWithSelector("f()", bytes24(""));
 		assert(b4.length == b6.length); // should fail
@@ -21,10 +19,8 @@ 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)
-// 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)
+// Warning 6328: (413-443): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (525-555): CHC: Assertion violation happens here.\nCounterexample:\n\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (679-709): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig) -- counterexample incomplete; parameter name used instead of value
+// 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/crypto/crypto_functions_same_array.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_array.sol
new file mode 100644
index 0000000000..b0e3b9565a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_array.sol
@@ -0,0 +1,23 @@
+contract C {
+	function c1() public pure {
+		bytes32 k1 = keccak256(abi.encode([1]));
+		bytes32 k2 = keccak256(abi.encode([1]));
+		assert(k1 == k2);
+	}
+
+        function c2() public pure {
+		bytes32 s1 = sha256(abi.encode([1,2]));
+		bytes32 s2 = sha256(abi.encode([1,2]));
+		assert(s1 == s2);
+	}
+
+        function c3() public pure {
+		bytes32 r1 = ripemd160(abi.encode([1,2,3]));
+		bytes32 r2 = ripemd160(abi.encode([1,2,3]));
+		assert(r1 == r2);
+	}
+}
+// ====
+// 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/crypto/crypto_functions_same_string_literal.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_string_literal.sol
new file mode 100644
index 0000000000..9e5123ab5b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_string_literal.sol
@@ -0,0 +1,23 @@
+contract C {
+	function c1() public pure {
+		bytes32 k1 = keccak256("1");
+		bytes32 k2 = keccak256("1");
+		assert(k1 == k2);
+	}
+
+        function c2() public pure {
+		bytes32 s1 = sha256("10");
+		bytes32 s2 = sha256("10");
+		assert(s1 == s2);
+	}
+
+        function c3() public pure {
+		bytes32 r1 = ripemd160("100");
+		bytes32 r2 = ripemd160("100");
+		assert(r1 == r2);
+	}
+}
+// ====
+// 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/external_calls/call_mutex_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
index e8c17d3eb0..d2fefcd5f7 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: no
+// 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 = 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
+// 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
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
index cdaff2bf44..b4655f394f 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
@@ -11,5 +11,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: no
 // ----
-// Warning 6328: (168-188): CHC: Assertion violation happens here.
+// Warning 6328: (168-188): 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.

From 9599d85eb042318fbd8d31565f5e5be7b09fc9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 12 Feb 2024 13:24:01 +0100
Subject: [PATCH 0839/1140] Optimizer docs: Style corrections

- Add missing backticks.
- Use consistent style for step naming (capitalized, without spaces, without backticks).
- Correct minor text errors like missing plurals.
---
 docs/internals/optimizer.rst | 183 ++++++++++++++++++-----------------
 1 file changed, 92 insertions(+), 91 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index c1b959a8ab..604560554a 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -295,11 +295,11 @@ backtracking.
 All components of the Yul-based optimizer module are explained below.
 The following transformation steps are the main components:
 
-- SSA Transform
-- Common Subexpression Eliminator
-- Expression Simplifier
-- Unused Assign Eliminator
-- Full Inliner
+- SSATransform
+- CommonSubexpressionEliminator
+- ExpressionSimplifier
+- UnusedAssignEliminator
+- FullInliner
 
 .. _optimizer-steps:
 
@@ -313,7 +313,7 @@ on the individual steps and their sequence below.
 Abbreviation Full name
 ============ ===============================
 ``f``        :ref:`block-flattener`
-``l``        :ref:`circular-reference-pruner`
+``l``        :ref:`circular-references-pruner`
 ``c``        :ref:`common-subexpression-eliminator`
 ``C``        :ref:`conditional-simplifier`
 ``U``        :ref:`conditional-unsimplifier`
@@ -336,8 +336,8 @@ Abbreviation Full name
 ``L``        :ref:`load-resolver`
 ``M``        :ref:`loop-invariant-code-motion`
 ``m``        :ref:`rematerialiser`
-``V``        :ref:`SSA-reverser`
-``a``        :ref:`SSA-transform`
+``V``        :ref:`ssa-reverser`
+``a``        :ref:`ssa-transform`
 ``t``        :ref:`structural-simplifier`
 ``r``        :ref:`unused-assign-eliminator`
 ``p``        :ref:`unused-function-parameter-pruner`
@@ -416,7 +416,7 @@ and functions can be optimized in isolation without having to traverse the AST c
 FunctionGrouper
 ^^^^^^^^^^^^^^^
 
-The function grouper has to be applied after the disambiguator and the function hoister.
+The function grouper has to be applied after the Disambiguator and the FunctionHoister.
 Its effect is that all topmost elements that are not function definitions are moved
 into a single block which is the first statement of the root block.
 
@@ -429,14 +429,14 @@ After this step, a program has the following normal form:
 Where ``I`` is a (potentially empty) block that does not contain any function definitions (not even recursively)
 and ``F`` is a list of function definitions such that no function contains a function definition.
 
-The benefit of this stage is that we always know where the list of function begins.
+The benefit of this stage is that we always know where the list of functions begins.
 
 .. _for-loop-condition-into-body:
 
 ForLoopConditionIntoBody
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-This transformation moves the loop-iteration condition of a for-loop into loop body.
+This transformation moves the loop-iteration condition of a ``for`` loop into loop body.
 We need this transformation because :ref:`expression-splitter` will not
 apply to iteration condition expressions (the ``C`` in the following example).
 
@@ -455,7 +455,7 @@ is transformed to
         Body...
     }
 
-This transformation can also be useful when paired with ``LoopInvariantCodeMotion``, since
+This transformation can also be useful when paired with LoopInvariantCodeMotion, since
 invariants in the loop-invariant conditions can then be taken outside the loop.
 
 .. _for-loop-init-rewriter:
@@ -463,7 +463,7 @@ invariants in the loop-invariant conditions can then be taken outside the loop.
 ForLoopInitRewriter
 ^^^^^^^^^^^^^^^^^^^
 
-This transformation moves the initialization part of a for-loop to before
+This transformation moves the initialization part of a ``for`` loop to before
 the loop:
 
 .. code-block:: text
@@ -482,7 +482,7 @@ is transformed to
     }
 
 This eases the rest of the optimization process because we can ignore
-the complicated scoping rules of the for loop initialization block.
+the complicated scoping rules of the ``for`` loop initialization block.
 
 .. _var-decl-initializer:
 
@@ -600,7 +600,7 @@ and it is also easier to perform function call inlining. Furthermore, it is simp
 to replace individual parts of expressions or re-organize the "expression tree".
 The drawback is that such code is much harder to read for humans.
 
-.. _SSA-transform:
+.. _ssa-transform:
 
 SSATransform
 ^^^^^^^^^^^^
@@ -645,19 +645,19 @@ are not modified) perform the following transforms:
 Furthermore, always record the current value of ``i`` used for ``a`` and replace each
 reference to ``a`` by ``a_i``.
 The current value mapping is cleared for a variable ``a`` at the end of each block
-in which it was assigned to and at the end of the for loop init block if it is assigned
-inside the for loop body or post block.
+in which it was assigned to and at the end of the ``for`` loop init block if it is assigned
+inside the ``for`` loop body or post block.
 If a variable's value is cleared according to the rule above and the variable is declared outside
 the block, a new SSA variable will be created at the location where control flow joins,
 this includes the beginning of loop post/body block and the location right after
-If/Switch/ForLoop/Block statement.
+``if``/``switch``/``for``/block statement.
 
-After this stage, the Unused Assign Eliminator is recommended to remove the unnecessary
+After this stage, the UnusedAssignEliminator is recommended to remove the unnecessary
 intermediate assignments.
 
-This stage provides best results if the Expression Splitter and the Common Subexpression Eliminator
+This stage provides best results if the ExpressionSplitter and the CommonSubexpressionEliminator
 are run right before it, because then it does not generate excessive amounts of variables.
-On the other hand, the Common Subexpression Eliminator could be more efficient if run after the
+On the other hand, the CommonSubexpressionEliminator could be more efficient if run after the
 SSA transform.
 
 .. _unused-assign-eliminator:
@@ -691,7 +691,7 @@ The SSA transform converts this snippet to the following:
         sstore(a_3, 1)
     }
 
-The Unused Assign Eliminator removes all the three assignments to ``a``, because
+The UnusedAssignEliminator removes all the three assignments to ``a``, because
 the value of ``a`` is not used and thus turn this
 snippet into strict SSA form:
 
@@ -716,7 +716,7 @@ mapping from assignment statements to the three states
 value will be used later by a reference to the variable.
 
 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
+(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".
@@ -731,7 +731,7 @@ Conflicting values are resolved in the following way:
 - "unused", "used" -> "used"
 - "undecided", "used" -> "used"
 
-For for-loops, the condition, body and post-part are visited twice, taking
+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.
@@ -757,13 +757,13 @@ and thus
 
 .. code-block:: none
 
-    max(s, f(s), f(f(s))) = max(s, f(s), f(f(s)), f(f(f(s))), ...).
+    max(s, f(s), f(f(s))) = max(s, f(s), f(f(s)), f(f(f(s))), ...)
 
 In summary, running the loop at most twice is enough because there are only three
 different states.
 
-For switch statements that have a "default"-case, there is no control-flow
-part that skips the switch.
+For ``switch`` statements that have a default case, there is no control-flow
+part that skips the ``switch``.
 
 When a variable goes out of scope, all statements still in the "undecided"
 state are changed to "unused", unless the variable is the return
@@ -793,7 +793,7 @@ The following parts make an expression non-movable:
 DataflowAnalyzer
 ^^^^^^^^^^^^^^^^
 
-The Dataflow Analyzer is not an optimizer step itself but is used as a tool
+The DataflowAnalyzer is not an optimizer step itself but is used as a tool
 by other components. While traversing the AST, it tracks the current value of
 each variable, as long as that value is a movable expression.
 It records the variables that are part of the expression
@@ -804,7 +804,7 @@ of the currently stored expression for ``b``.
 
 At control-flow joins, knowledge about variables is cleared if they have or would be assigned
 in any of the control-flow paths. For instance, upon entering a
-for loop, all variables are cleared that will be assigned during the
+``for`` loop, all variables are cleared that will be assigned during the
 body or the post block.
 
 Expression-Scale Simplifications
@@ -818,7 +818,7 @@ and hopefully simpler expressions.
 CommonSubexpressionEliminator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This step uses the Dataflow Analyzer and replaces subexpressions that
+This step uses the DataflowAnalyzer and replaces subexpressions that
 syntactically match the current value of a variable by a reference to
 that variable. This is an equivalence transform because such subexpressions have
 to be movable.
@@ -828,24 +828,24 @@ current value if the value is an identifier.
 
 The combination of the two rules above allow to compute a local value
 numbering, which means that if two variables have the same
-value, one of them will always be unused. The Unused Pruner or the
-Unused Assign Eliminator will then be able to fully eliminate such
+value, one of them will always be unused. The UnusedPruner or the
+UnusedAssignEliminator will then be able to fully eliminate such
 variables.
 
-This step is especially efficient if the expression splitter is run
+This step is especially efficient if the ExpressionSplitter is run
 before. If the code is in pseudo-SSA form,
 the values of variables are available for a longer time and thus we
 have a higher chance of expressions to be replaceable.
 
-The expression simplifier will be able to perform better replacements
-if the common subexpression eliminator was run right before it.
+The ExpressionSimplifier will be able to perform better replacements
+if the CommonSubexpressionEliminator was run right before it.
 
 .. _expression-simplifier:
 
 ExpressionSimplifier
 ^^^^^^^^^^^^^^^^^^^^
 
-The ExpressionSimplifier uses the Dataflow Analyzer and makes use
+The ExpressionSimplifier uses the DataflowAnalyzer and makes use
 of a list of equivalence transforms on expressions like ``X + 0 -> X``
 to simplify the code.
 
@@ -857,7 +857,7 @@ even when the code is in pseudo-SSA form.
 Some of the patterns like ``X - X -> 0`` can only be applied as long
 as the expression ``X`` is movable, because otherwise it would remove its potential side-effects.
 Since variable references are always movable, even if their current
-value might not be, the Expression Simplifier is again more powerful
+value might not be, the ExpressionSimplifier is again more powerful
 in split or pseudo-SSA form.
 
 .. _literal-rematerialiser:
@@ -877,12 +877,12 @@ currently stored in storage resp. memory, if known.
 
 Works best if the code is in SSA form.
 
-Prerequisite: Disambiguator, ForLoopInitRewriter.
+Prerequisites: Disambiguator, ForLoopInitRewriter.
 
 Statement-Scale Simplifications
 -------------------------------
 
-.. _circular-reference-pruner:
+.. _circular-references-pruner:
 
 CircularReferencesPruner
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -895,7 +895,7 @@ neither externally referenced nor referenced from the outermost context.
 ConditionalSimplifier
 ^^^^^^^^^^^^^^^^^^^^^
 
-The Conditional Simplifier inserts assignments to condition variables if the value can be determined
+The ConditionalSimplifier inserts assignments to condition variables if the value can be determined
 from the control-flow.
 
 Destroys SSA form.
@@ -906,12 +906,12 @@ we cannot assign a specific value.
 
 Current features:
 
-- switch cases: insert "<condition> := <caseLabel>"
-- after if statement with terminating control-flow, insert "<condition> := 0"
+- ``switch`` cases: insert ``<condition> := <caseLabel>``
+- after ``if`` statement with terminating control-flow, insert ``<condition> := 0``
 
 Future features:
 
-- allow replacements by "1"
+- 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.
@@ -923,7 +923,7 @@ Prerequisite: Disambiguator.
 ConditionalUnsimplifier
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-Reverse of Conditional Simplifier.
+Reverse of ConditionalSimplifier.
 
 .. _control-flow-simplifier:
 
@@ -932,14 +932,14 @@ ControlFlowSimplifier
 
 Simplifies several control-flow structures:
 
-- replace if with empty body with pop(condition)
-- remove empty default switch case
-- remove empty switch case if no default case exists
-- replace switch with no cases with pop(expression)
-- turn switch with single case into if
-- replace switch with only default case with pop(expression) and body
-- replace switch with const expr with matching case body
-- replace ``for`` with terminating control flow and without other break/continue by ``if``
+- replace ``if`` with empty body with ``pop(condition)``
+- remove empty default ``switch`` case
+- remove empty ``switch`` case if no default case exists
+- replace ``switch`` with no cases with ``pop(expression)``
+- turn ``switch`` with single case into ``if``
+- replace ``switch`` with only default case with ``pop(expression)`` and body
+- replace ``switch`` with const expr with matching case body
+- replace ``for`` with terminating control flow and without other ``break``/``continue`` by ``if``
 - remove ``leave`` at the end of a function.
 
 None of these operations depend on the data flow. The StructuralSimplifier
@@ -949,6 +949,7 @@ The ControlFlowSimplifier does record the presence or absence of ``break``
 and ``continue`` statements during its traversal.
 
 Prerequisite: Disambiguator, FunctionHoister, ForLoopInitRewriter.
+
 Important: Introduces EVM opcodes and thus can only be used on EVM code for now.
 
 .. _dead-code-eliminator:
@@ -959,15 +960,16 @@ 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, revert or by a call to a user-defined function that recurses infinitely.
+``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.
 
-Because variables declared in a for loop's init block have their scope extended to the loop body,
+Because variables declared in a ``for`` loop's init block have their scope extended to the loop body,
 we require ForLoopInitRewriter to run before this step.
 
-Prerequisite: ForLoopInitRewriter, Function Hoister, Function Grouper
+Prerequisites: ForLoopInitRewriter, FunctionHoister, FunctionGrouper.
 
 .. _equal-store-eliminator:
 
@@ -978,12 +980,12 @@ 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
+This simple step is effective if run after the SSATransform and the
+CommonSubexpressionEliminator, because SSA will make sure that the variables
+will not change and the CommonSubexpressionEliminator re-uses exactly the same
 variable if the value is known to be the same.
 
-Prerequisites: Disambiguator, ForLoopInitRewriter
+Prerequisites: Disambiguator, ForLoopInitRewriter.
 
 .. _unused-pruner:
 
@@ -992,8 +994,8 @@ UnusedPruner
 
 This step removes the definitions of all functions that are never referenced.
 
-It also removes the declaration of variables that are never referenced.
-If the declaration assigns a value that is not movable, the expression is retained,
+It also removes declarations of variables that are never referenced.
+If a declaration assigns a value that is not movable, the expression is retained,
 but its value is discarded.
 
 All movable expression statements (expressions that are not assigned) are removed.
@@ -1006,22 +1008,22 @@ StructuralSimplifier
 This is a general step that performs various kinds of simplifications on
 a structural level:
 
-- replace if statement with empty body by ``pop(condition)``
-- replace if statement with true condition by its body
-- remove if statement with false condition
-- turn switch with single case into if
-- replace switch with only default case by ``pop(expression)`` and body
-- replace switch with literal expression by matching case body
-- replace for loop with false condition by its initialization part
+- replace ``if`` statement with empty body by ``pop(condition)``
+- replace ``if`` statement with true condition by its body
+- remove ``if`` statement with false condition
+- turn ``switch`` with single case into ``if``
+- replace ``switch`` with only default case by ``pop(expression)`` and body
+- replace ``switch`` with literal expression by matching case body
+- replace ``for`` loop with false condition by its initialization part
 
-This component uses the Dataflow Analyzer.
+This component uses the DataflowAnalyzer.
 
 .. _block-flattener:
 
 BlockFlattener
 ^^^^^^^^^^^^^^
 
-This stage eliminates nested blocks by inserting the statement in the
+This stage eliminates nested blocks by inserting the statements in the
 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.
@@ -1062,10 +1064,9 @@ This optimization moves movable SSA variable declarations outside the loop.
 Only statements at the top level in a loop's body or post block are considered, i.e variable
 declarations inside conditional branches will not be moved out of the loop.
 
-Requirements:
+ExpressionSplitter and SSATransform should be run upfront to obtain better results.
 
-- The Disambiguator, ForLoopInitRewriter and FunctionHoister must be run upfront.
-- Expression splitter and SSA transform should be run upfront to obtain better result.
+Prerequisites: Disambiguator, ForLoopInitRewriter, FunctionHoister.
 
 
 Function-Level Optimizations
@@ -1092,7 +1093,7 @@ function ``f_1`` that takes only one argument, i.e.,
 Other optimization steps will be able to make more simplifications to the function. The
 optimization step is mainly useful for functions that would not be inlined.
 
-Prerequisites: Disambiguator, FunctionHoister
+Prerequisites: Disambiguator, FunctionHoister.
 
 LiteralRematerialiser is recommended as a prerequisite, even though it's not required for
 correctness.
@@ -1122,7 +1123,7 @@ 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
+.. index:: ! UnusedStoreEliminator
 .. _unused-store-eliminator:
 
 UnusedStoreEliminator
@@ -1149,7 +1150,7 @@ For example, the following code
         sstore(c, 3)
     }
 
-will be transformed into the code below after the Unused Store Eliminator step is run
+will be transformed into the code below after the UnusedStoreEliminator step is run
 
 .. code-block:: yul
 
@@ -1159,7 +1160,7 @@ will be transformed into the code below after the Unused Store Eliminator step i
         sstore(c, 3)
     }
 
-For memory store operations, things are generally simpler, at least in the outermost yul block as all such
+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 paths lead to a memory overwrite.
@@ -1177,8 +1178,8 @@ If two functions are syntactically equivalent, while allowing variable
 renaming but not any re-ordering, then any reference to one of the
 functions is replaced by the other.
 
-The actual removal of the function is performed by the Unused Pruner.
 
+The actual removal of the function is performed by the UnusedPruner.
 
 Function Inlining
 -----------------
@@ -1199,7 +1200,7 @@ Furthermore, for all parameters, all of the following need to be true:
 
 - The argument is movable.
 - The parameter is either referenced less than twice in the function body, or the argument is rather cheap
-  ("cost" of at most 1, like a constant up to 0xff).
+  ("cost" of at most 1, like a constant up to ``0xff``).
 
 Example: The function to be inlined has the form of ``function f(...) -> r { r := E }`` where
 ``E`` is an expression that does not reference ``r`` and all arguments in the function call are movable expressions.
@@ -1255,7 +1256,7 @@ variables as much as possible.
 ExpressionJoiner
 ^^^^^^^^^^^^^^^^
 
-This is the opposite operation of the expression splitter. It turns a sequence of
+This is the opposite operation of the ExpressionSplitter. It turns a sequence of
 variable declarations that have exactly one reference into a complex expression.
 This stage fully preserves the order of function calls and opcode executions.
 It does not make use of any information concerning the commutativity of the opcodes;
@@ -1275,21 +1276,21 @@ Because of that, the snippet ``let x := add(0, 2) let y := mul(x, 3)`` is
 transformed to ``let y := mul(add(0, 2), 3)``, even though the ``add`` opcode
 would be executed after the evaluation of the literal ``3``.
 
-.. _SSA-reverser:
+.. _ssa-reverser:
 
 SSAReverser
 ^^^^^^^^^^^
 
-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.
+This is a tiny step that helps in reversing the effects of the SSATransform
+if it is combined with the CommonSubexpressionEliminator and the
+UnusedPruner.
 
 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.
 
-The SSA transform rewrites
+The SSATransform rewrites
 
 .. code-block:: yul
 
@@ -1307,7 +1308,7 @@ to
     a := a_2
 
 The problem is that instead of ``a``, the variable ``a_1`` is used
-whenever ``a`` was referenced. The SSA transform changes statements
+whenever ``a`` was referenced. The SSATransform changes statements
 of this form by just swapping out the declaration and the assignment. The above
 snippet is turned into
 
@@ -1320,10 +1321,10 @@ snippet is turned into
     let a_2 := a
 
 This is a very simple equivalence transform, but when we now run the
-Common Subexpression Eliminator, it will replace all occurrences of ``a_1``
-by ``a`` (until ``a`` is re-assigned). The Unused Pruner will then
+CommonSubexpressionEliminator, it will replace all occurrences of ``a_1``
+by ``a`` (until ``a`` is re-assigned). The UnusedPruner will then
 eliminate the variable ``a_1`` altogether and thus fully reverse the
-SSA transform.
+SSATransform.
 
 .. _stack-compressor:
 
@@ -1354,9 +1355,9 @@ is comparatively cheap to evaluate. Furthermore, it is only semantically equival
 the value of the expression did not change between the point of assignment and the
 point of use. The main benefit of this stage is that it can save stack slots if it
 leads to a variable being eliminated completely (see below), but it can also
-save a DUP opcode on the EVM if the expression is very cheap.
+save a ``DUP`` opcode on the EVM if the expression is very cheap.
 
-The Rematerialiser uses the Dataflow Analyzer to track the current values of variables,
+The Rematerialiser uses the DataflowAnalyzer to track the current values of variables,
 which are always movable.
 If the value is very cheap or the variable was explicitly requested to be eliminated,
 the variable reference is replaced by its current value.

From e6f48c2d5f8da82e595b691747d2f97a6822acaf Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 9 May 2024 20:46:38 +0200
Subject: [PATCH 0840/1140] Fix python version for Windows builds

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 34e2e33933..38bcaea7b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1728,8 +1728,8 @@ jobs:
       - run: git config --global core.autocrlf false
       - checkout
       - run:
-          name: Force install python3.12.2
-          command: choco install python3 --pre --force --version=3.12.2
+          name: Force install python3.12
+          command: choco install python312 --pre --force
       - run:
           name: Create a symlink for python3
           command: ln -s /c/ProgramData/chocolatey/bin/python3.12 /c/ProgramData/chocolatey/bin/python3

From e446713b917d50ea37dc05a280d7c582402d2d3c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 9 May 2024 20:18:03 +0200
Subject: [PATCH 0841/1140] Fix archlinux build by disabling test

---
 test/yulPhaser/AlgorithmRunner.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/yulPhaser/AlgorithmRunner.cpp b/test/yulPhaser/AlgorithmRunner.cpp
index 56868f1ce7..f89a0d70f5 100644
--- a/test/yulPhaser/AlgorithmRunner.cpp
+++ b/test/yulPhaser/AlgorithmRunner.cpp
@@ -434,6 +434,10 @@ BOOST_FIXTURE_TEST_CASE(run_should_overwrite_existing_file_if_autosave_file_spec
 	BOOST_TEST(readLinesFromFile(m_autosavePath) != originalContent);
 }
 
+// Disabled due to a fairly obscure bug in GCC 13+
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109561
+// The issue is on line 444, and more specifically the Options struct std::optional<std::string>
+/*
 BOOST_FIXTURE_TEST_CASE(run_should_not_save_population_to_file_if_autosave_file_not_specified, AlgorithmRunnerAutosaveFixture)
 {
 	m_options.maxRounds = 5;
@@ -445,6 +449,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_not_save_population_to_file_if_autosave_file_
 
 	BOOST_TEST(!fs::exists(m_autosavePath));
 }
+*/
 
 BOOST_FIXTURE_TEST_CASE(run_should_randomise_duplicate_chromosomes_if_requested, AlgorithmRunnerFixture)
 {

From c9e2c20932f5635faf5e7715b8a6999f2a8895dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Feb 2024 19:02:36 +0100
Subject: [PATCH 0842/1140] Fix a bug preventing repeated parts of optimizer
 sequence from ever stopping after the first cycle

---
 Changelog.md                                  |  1 +
 libyul/optimiser/Suite.cpp                    |  4 +-
 test/cmdlineTests/optimizer_user_yul/output   | 13 ++++++-
 .../copying/array_elements_to_mapping.sol     |  2 +-
 .../array/copying/array_to_mapping.sol        |  2 +-
 .../copying/calldata_array_to_mapping.sol     |  2 +-
 ...d_array_of_structs_calldata_to_storage.sol |  6 +--
 ...ted_array_of_structs_memory_to_storage.sol |  6 +--
 ...d_array_of_structs_calldata_to_storage.sol |  6 +--
 ...ted_array_of_structs_memory_to_storage.sol |  6 +--
 .../copying/storage_memory_packed_dyn.sol     |  2 +-
 .../externalContracts/deposit_contract.sol    | 12 +++---
 .../semanticTests/externalContracts/snark.sol |  4 +-
 .../functionCall/gas_and_value_basic.sol      |  4 +-
 .../gas_and_value_brace_syntax.sol            |  4 +-
 .../libraries/internal_types_in_library.sol   |  2 +-
 .../copy_substructures_from_mapping.sol       |  2 +-
 .../structs/copy_substructures_to_mapping.sol |  6 +--
 .../semanticTests/structs/copy_to_mapping.sol |  8 ++--
 .../mapping/copy_from_mapping_to_mapping.sol  |  2 +-
 .../userDefinedValueType/calldata.sol         |  4 +-
 .../skip_dynamic_types_for_structs.sol        |  2 +-
 .../unusedFunctionParameterPruner_loop.yul    | 38 ++++++++++++++++---
 23 files changed, 89 insertions(+), 49 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b924b1ccde..f34f803e68 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 Bugfixes:
  * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
+ * Optimizer: Fix optimizer executing each repeating part of the step sequence at least twice, even if the code size already became stable after the first iteration.
  * SMTChecker: Fix false positive when comparing hashes of same array or string literals.
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using an empty tuple in a conditional operator.
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index d35cdc256c..83bc037009 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -462,7 +462,9 @@ void OptimiserSuite::runSequence(std::string_view _stepAbbreviations, Block& _as
 			subsequences.push_back({subsequence, true});
 	}
 
-	size_t codeSize = 0;
+	// NOTE: If _repeatUntilStable is false, the value will not be used so do not calculate it.
+	size_t codeSize = (_repeatUntilStable ? CodeSize::codeSizeIncludingFunctions(_ast) : 0);
+
 	for (size_t round = 0; round < MaxRounds; ++round)
 	{
 		for (auto const& [subsequence, repeat]: subsequences)
diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output
index 689e82ddb4..602a7de95b 100644
--- a/test/cmdlineTests/optimizer_user_yul/output
+++ b/test/cmdlineTests/optimizer_user_yul/output
@@ -42,6 +42,7 @@ tag_5:
     /* "optimizer_user_yul/input.sol":263:269  a := 2 */
   swap1
   pop
+  0x00
     /* "optimizer_user_yul/input.sol":369:370  3 */
   0x03
     /* "optimizer_user_yul/input.sol":366:367  2 */
@@ -58,10 +59,18 @@ tag_6:
     /* "optimizer_user_yul/input.sol":384:392  sload(5) */
   dup1
     /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
-  iszero
-  tag_6
+  tag_8
   jumpi
+    /* "optimizer_user_yul/input.sol":495:504  exp(x, y) */
+  0x01
+    /* "optimizer_user_yul/input.sol":490:504  z := exp(x, y) */
+  swap2
+  pop
+    /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
+  jump(tag_6)
+tag_8:
     /* "optimizer_user_yul/input.sol":380:383  { } */
+  pop
   pop
     /* "optimizer_user_yul/input.sol":340:513  {... */
   pop
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 b1e8659be8..b138e7265f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
@@ -52,7 +52,7 @@ contract C {
 }
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 150004
+// gas irOptimized: 150022
 // gas legacy: 150745
 // gas legacyOptimized: 148678
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
index 50ea19a1ea..893610eb13 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: 147871
+// gas irOptimized: 147889
 // 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/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
index e6bf7671a1..b8bd588d56 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: 139683
+// gas irOptimized: 139637
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 ea5625f21d..6c5c0e8faa 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: 327874
+// gas irOptimized: 327883
 // 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: 140879
+// gas irOptimized: 140882
 // 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: 188535
+// gas irOptimized: 188541
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 96f24f77da..a593b1d1dd 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: 332660
+// 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: 145150
+// gas irOptimized: 145159
 // 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: 192598
+// gas irOptimized: 192616
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 844a86304e..3666443bbc 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: 304747
+// gas irOptimized: 304756
 // 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: 116464
+// gas irOptimized: 116467
 // 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: 188024
+// gas irOptimized: 188030
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 209a6ee696..821d33d4dd 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: 309074
+// gas irOptimized: 309101
 // 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: 118256
+// gas irOptimized: 118265
 // 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: 190993
+// gas irOptimized: 191011
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 3ba5604a79..48d06ab4ea 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: 109108
+// gas irOptimized: 109104
 // gas legacy: 122235
 // gas legacyOptimized: 118411
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index ce77683aab..5288d859b7 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,8 +176,8 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 809248
-// gas irOptimized code: 558000
+// gas irOptimized: 809628
+// gas irOptimized code: 563200
 // gas legacy: 919945
 // gas legacy code: 1437600
 // gas legacyOptimized: 848464
@@ -187,27 +187,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: 109009
+// gas irOptimized: 108921
 // gas legacy: 142735
 // gas legacyOptimized: 117558
 // 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: 109009
+// gas irOptimized: 108921
 // gas legacy: 142735
 // gas legacyOptimized: 117558
 // 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: 108994
+// gas irOptimized: 108914
 // gas legacy: 142744
 // gas legacyOptimized: 117570
 // 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: 108994
+// gas irOptimized: 108914
 // gas legacy: 142744
 // gas legacyOptimized: 117570
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index d3492a5c6b..58f5e58048 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: 269697
+// gas irOptimized: 269701
 // gas legacy: 275206
 // gas legacyOptimized: 266925
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 782210
+// gas irOptimized: 782238
 // gas legacy: 801868
 // gas legacyOptimized: 770942
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 806c8eb41b..2f8f62586b 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,8 +38,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 120226
-// gas irOptimized code: 132400
+// gas irOptimized: 120912
+// gas irOptimized code: 140000
 // gas legacy: 130568
 // gas legacy code: 261000
 // gas legacyOptimized: 121069
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 c186fc40b2..4821146e7e 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,8 +37,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 120226
-// gas irOptimized code: 132400
+// gas irOptimized: 120912
+// gas irOptimized code: 140000
 // gas legacy: 130568
 // gas legacy code: 261000
 // gas legacyOptimized: 121069
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 79d53273ba..bdf4e4c30a 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: 111560
+// gas irOptimized: 111629
 // gas legacy: 132935
 // gas legacyOptimized: 118023
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index 9b0fa9207a..8091f5a241 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: 121511
+// gas irOptimized: 121499
 // gas legacy: 123117
 // gas legacyOptimized: 121655
 // 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 a0834ca5bf..2083032ff3 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: 122952
+// gas irOptimized: 122923
 // gas legacy: 130136
 // gas legacyOptimized: 128650
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121622
+// gas irOptimized: 121616
 // gas legacy: 123191
 // gas legacyOptimized: 121760
 // 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: 115043
+// gas irOptimized: 115037
 // gas legacy: 122425
 // gas legacyOptimized: 120696
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index 033f0f518c..c44277e4f1 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: 121599
+// gas irOptimized: 121593
 // gas legacy: 123053
 // gas legacyOptimized: 121700
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121644
+// gas irOptimized: 121638
 // gas legacy: 123102
 // gas legacyOptimized: 121752
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122860
+// gas irOptimized: 122831
 // gas legacy: 129997
 // gas legacyOptimized: 128646
 // 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: 114958
+// gas irOptimized: 114952
 // gas legacy: 118210
 // gas legacyOptimized: 115324
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 b17ba6d916..e1e1e3b265 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
@@ -29,6 +29,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
-// gas irOptimized: 197082
+// gas irOptimized: 197116
 // gas legacy: 199891
 // gas legacyOptimized: 196817
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 9ed64be08b..ea1fc99b42 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: 122078
+// gas irOptimized: 122094
 // gas legacy: 125322
 // gas legacyOptimized: 122709
 // test_g() -> true
-// gas irOptimized: 106215
+// gas irOptimized: 106271
 // gas legacy: 111120
 // gas legacyOptimized: 106964
 // addresses(uint256): 0 -> 0x18
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 ef53a4e478..52287a8f32 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: 178263
+// gas irOptimized: 178277
 // gas legacy: 180657
 // gas legacyOptimized: 179156
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
index f0b7546d05..148f4a1e7e 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
@@ -20,18 +20,46 @@
 // {
 //     {
 //         f()
-//         f()
-//         f()
+//         f_72()
+//         f_73()
 //         sstore(0, 1)
 //     }
 //     function f()
 //     {
+//         let a := 1
+//         let b := 10
+//         let a_1 := calldataload(0)
+//         let _1 := iszero(a_1)
+//         for { } iszero(b) { b := add(b, not(0)) }
+//         {
+//             a := a_1
+//             mstore(a_1, 0)
+//             if _1 { leave }
+//         }
+//     }
+//     function f_72()
+//     {
+//         let a := 2
+//         let b := 10
+//         let a_1 := calldataload(0)
+//         let _1 := iszero(a_1)
+//         for { } iszero(b) { b := add(b, not(0)) }
+//         {
+//             a := a_1
+//             mstore(a_1, 0)
+//             if _1 { leave }
+//         }
+//     }
+//     function f_73()
+//     {
+//         let a := 3
 //         let b := 10
-//         let a := calldataload(0)
-//         let _1 := iszero(a)
+//         let a_1 := calldataload(0)
+//         let _1 := iszero(a_1)
 //         for { } iszero(b) { b := add(b, not(0)) }
 //         {
-//             mstore(a, 0)
+//             a := a_1
+//             mstore(a_1, 0)
 //             if _1 { leave }
 //         }
 //     }

From 10afe0dd544836239dcb1e870a4d2628eb9f0d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 11 May 2024 19:43:45 +0200
Subject: [PATCH 0843/1140] Make fullSuite medium test case less artificial

- The structural simplification here is pretty artificial while the main point of the test is resolution of memory loads.
- In exchange add a simpler case covering structural simplification for the whole sequence.
---
 test/libyul/yulOptimizerTests/fullSuite/medium.yul    |  4 +---
 .../fullSuite/structural_simplification.yul           | 11 +++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul

diff --git a/test/libyul/yulOptimizerTests/fullSuite/medium.yul b/test/libyul/yulOptimizerTests/fullSuite/medium.yul
index 9a6381d799..9115040716 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/medium.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/medium.yul
@@ -12,9 +12,7 @@
     if 0 {
         mstore(0x40, 0x20)
     }
-    if sub(2,1) {
-        for { switch mul(1,2) case 2 { mstore(0x40, 0x20) } } sub(1,1) {} { mstore(0x80, 0x40) }
-    }
+    mstore(0x40, 0x20)
     sstore(0, array_index_access(x, 3))
     sstore(1, mload(0x40))
 }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul b/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul
new file mode 100644
index 0000000000..85a975fde1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul
@@ -0,0 +1,11 @@
+{
+    if sub(2, 1) {
+        mstore(0x40, 0x20)
+        for {} sub(1, 1) {} {}
+    }
+    sstore(1, mload(0x40))
+}
+// ----
+// step: fullSuite
+//
+// { { sstore(1, 0x20) } }

From 54ab398a44143fce6f63502f533c651f4d080bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Mar 2024 12:00:27 +0100
Subject: [PATCH 0844/1140] Change the default optimizer sequence to the
 `the-good-parts-mk3` candidate

- `the-good-parts` variant found using seqbench.
- Third refinement:
    - adjusted to improve results for the erc20.sol contract.
    - adjustments to address regressions visible in test output of the previous version.
---
 libsolidity/interface/OptimiserSettings.h | 32 ++++++++++++-----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index 46683088a0..1ca46ccbc2 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -43,23 +43,25 @@ struct OptimiserSettings
 {
 	static char constexpr DefaultYulOptimiserSteps[] =
 		"dhfoDgvulfnTUtnIf"            // None of these can make stack problems worse
-		"["
-			"xa[r]EscLM"               // Turn into SSA and simplify
-			"cCTUtTOntnfDIul"          // Perform structural simplification
-			"Lcul"                     // Simplify again
-			"Vcul [j]"                 // Reverse SSA
-
-			// should have good "compilability" property here.
-
-			"Tpeul"                    // Run functional expression inliner
-			"xa[rul]"                  // Prune a bit more in SSA
-			"xa[r]cL"                  // Turn into SSA again and simplify
-			"gvif"                     // Run full inliner
-			"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify
-		"]"
+
+		"xa[r]EscLM"                   // Turn into SSA and simplify
+		"Vcul [j]"                     // Reverse SSA
+
+		// should have good "compilability" property here.
+
+		"Trpeul"                       // Run functional expression inliner
+		"xa[r]cL"                      // Turn into SSA again and simplify
+		"gvifM"                        // Run full inliner
+		"CTUca[r]LSsTFOtfDnca[r]Iulc"  // SSA plus simplify
+
+		"scCTUt"
+		"gvifM"                        // Run full inliner
+		"x[scCTUt] TOntnfDIul"         // Perform structural simplification
+		"gvifM"                        // Run full inliner
+
 		"jmul[jul] VcTOcul jmul";      // Make source short and pretty
 
-	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmu";
+	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmuO";
 
 	/// No optimisations at all - not recommended.
 	static OptimiserSettings none()

From c12fe8a1d00485f10a0d51d05be3ff209795421d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Mar 2024 20:27:38 +0100
Subject: [PATCH 0845/1140] Update gas expectations

---
 test/libsolidity/gasTests/abiv2_optimised.sol |  6 +++---
 .../abiEncoderV1/abi_decode_v2_storage.sol    |  4 ++--
 .../abi_encode_calldata_slice.sol             |  8 ++++----
 .../struct/struct_storage_ptr.sol             |  2 +-
 .../abi_encode_calldata_slice.sol             |  8 ++++----
 .../abiEncoderV2/abi_encode_v2.sol            |  4 ++--
 ...2_in_function_inherited_in_v1_contract.sol |  8 ++++----
 .../abiEncoderV2/calldata_array.sol           |  2 +-
 .../calldata_overlapped_dynamic_arrays.sol    |  4 ++--
 .../abiEncoderV2/storage_array_encoding.sol   |  8 ++++----
 .../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    |  4 ++--
 .../array/byte_array_transitional_2.sol       |  2 +-
 .../array/bytes_length_member.sol             |  2 +-
 .../array/constant_var_as_array_length.sol    |  4 ++--
 .../copying/array_copy_calldata_storage.sol   |  4 ++--
 .../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 |  4 ++--
 ...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    |  4 ++--
 .../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 |  4 ++--
 ...o_storage_dynamic_different_mutability.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 +-
 .../array/copying/array_to_mapping.sol        |  4 ++--
 .../copying/arrays_from_and_to_storage.sol    |  2 +-
 .../array/copying/bytes_inside_mappings.sol   |  4 ++--
 .../copying/bytes_storage_to_storage.sol      | 20 +++++++++----------
 .../calldata_array_dynamic_to_storage.sol     |  4 ++--
 .../copying/calldata_array_to_mapping.sol     |  2 +-
 ...nup_during_multi_element_per_slot_copy.sol |  4 ++--
 .../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 |  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        |  8 ++++----
 .../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     |  6 +++---
 .../array/fixed_arrays_in_constructors.sol    |  2 +-
 .../array/function_array_cross_calls.sol      |  8 ++++----
 ...nvalid_encoding_for_storage_byte_array.sol |  4 ++--
 .../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  |  4 ++--
 .../array/push/array_push_struct.sol          |  2 +-
 .../push/array_push_struct_from_calldata.sol  |  4 ++--
 .../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         |  8 ++++----
 .../copy_from_calldata_removes_bytes_data.sol |  2 +-
 .../constructor/arrays_in_constructors.sol    |  8 ++++----
 .../bytes_in_constructors_packer.sol          |  8 ++++----
 .../bytes_in_constructors_unpacker.sol        |  6 +++---
 .../constructor_static_array_argument.sol     |  4 ++--
 .../constructor/no_callvalue_check.sol        |  2 +-
 .../events/event_dynamic_array_storage.sol    |  4 ++--
 .../events/event_dynamic_array_storage_v2.sol |  4 ++--
 .../event_dynamic_nested_array_storage_v2.sol |  4 ++--
 .../events/event_indexed_string.sol           |  4 ++--
 .../externalContracts/FixedFeeRegistrar.sol   |  8 ++++----
 .../externalContracts/base64.sol              | 12 +++++------
 .../externalContracts/deposit_contract.sol    | 16 +++++++--------
 .../externalContracts/prbmath_signed.sol      |  4 ++--
 .../externalContracts/prbmath_unsigned.sol    |  4 ++--
 .../externalContracts/ramanujan_pi.sol        |  4 ++--
 .../semanticTests/externalContracts/snark.sol |  4 ++--
 .../externalContracts/strings.sol             | 12 +++++------
 .../creation_function_call_with_args.sol      |  2 +-
 .../creation_function_call_with_salt.sol      |  2 +-
 .../external_call_to_nonexisting.sol          |  8 ++++----
 ...ernal_call_to_nonexisting_debugstrings.sol |  8 ++++----
 .../functionCall/gas_and_value_basic.sol      |  4 ++--
 .../gas_and_value_brace_syntax.sol            |  4 ++--
 .../mapping_array_internal_argument.sol       |  2 +-
 .../immutable/multi_creation.sol              |  2 +-
 .../semanticTests/immutable/use_scratch.sol   |  2 +-
 ...ted_function_calldata_memory_interface.sol |  4 ++--
 .../transient_storage_selfdestruct.sol        |  4 ++--
 .../balance_other_contract.sol                |  4 ++--
 .../libraries/internal_types_in_library.sol   |  2 +-
 .../using_library_mappings_public.sol         |  2 +-
 .../using_library_mappings_return.sol         |  2 +-
 .../salted_create_with_value.sol              |  4 ++--
 .../storage/empty_nonempty_empty.sol          |  4 ++--
 .../storage/packed_storage_structs_bytes.sol  |  2 +-
 ...ta_struct_with_nested_array_to_storage.sol |  4 ++--
 .../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 | 16 +++++++--------
 .../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 +-
 .../mapping/copy_from_mapping_to_mapping.sol  |  4 ++--
 .../userDefinedValueType/calldata.sol         |  8 ++++----
 .../userDefinedValueType/erc20.sol            |  8 ++++----
 .../semanticTests/various/address_code.sol    |  6 +++---
 .../semanticTests/various/create_calldata.sol |  4 ++--
 .../various/destructuring_assignment.sol      |  4 ++--
 .../semanticTests/various/erc20.sol           |  8 ++++----
 .../various/many_subassemblies.sol            |  2 +-
 ...uct_post_cancun_multiple_beneficiaries.sol |  6 +++---
 .../selfdestruct_post_cancun_redeploy.sol     |  6 +++---
 ...ruct_pre_cancun_multiple_beneficiaries.sol |  6 +++---
 .../selfdestruct_pre_cancun_redeploy.sol      |  6 +++---
 .../skip_dynamic_types_for_structs.sol        |  4 ++--
 .../various/staticcall_for_view_and_pure.sol  |  2 +-
 .../semanticTests/various/value_complex.sol   |  4 ++--
 .../semanticTests/various/value_insane.sol    |  4 ++--
 .../viaYul/copy_struct_invalid_ir_bug.sol     |  2 +-
 168 files changed, 358 insertions(+), 358 deletions(-)

diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index 8f407e6ede..2989c1acd8 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: 634600
-//   executionCost: 668
-//   totalCost: 635268
+//   codeDepositCost: 618200
+//   executionCost: 649
+//   totalCost: 618849
 // 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 b4ef43c441..8d74a34f48 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: 203149
+// gas irOptimized: 203173
 // gas legacy: 206263
-// gas legacyOptimized: 203156
+// gas legacyOptimized: 203172
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 3dd5dd2693..a518a3750e 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: 306908
+// gas irOptimized: 314884
 // gas legacy: 305827
-// gas legacyOptimized: 255013
+// gas legacyOptimized: 253681
 // test_uint256() ->
-// gas irOptimized: 435054
+// gas irOptimized: 448346
 // gas legacy: 421315
-// gas legacyOptimized: 352838
+// gas legacyOptimized: 351650
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index efffab86c1..c8eb954189 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: 166475
+// gas irOptimized: 166759
 // 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 5457e7f674..b80d14d6b0 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: 306908
+// gas irOptimized: 314884
 // gas legacy: 305827
-// gas legacyOptimized: 255013
+// gas legacyOptimized: 253681
 // test_uint256() ->
-// gas irOptimized: 435054
+// gas irOptimized: 448346
 // gas legacy: 421315
-// gas legacyOptimized: 352838
+// gas legacyOptimized: 351650
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index c0d5f5d3fb..f07d4039d5 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: 111708
+// gas irOptimized: 111816
 // gas legacy: 113892
-// gas legacyOptimized: 111646
+// gas legacyOptimized: 111658
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 c41905e2a4..bb3ad1aad1 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,9 +30,9 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 55148
-// gas irOptimized code: 55200
+// gas irOptimized: 55117
+// gas irOptimized code: 56800
 // gas legacy: 57266
 // gas legacy code: 94600
-// gas legacyOptimized: 55173
-// gas legacyOptimized code: 55200
+// gas legacyOptimized: 55195
+// gas legacyOptimized code: 55000
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index f749e403b5..cdce1b95a5 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: 117157
+// gas irOptimized: 120978
 // gas legacy: 101568
 // 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 46df313331..81c9c46c6e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -33,8 +33,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: 111395
+// gas irOptimized: 111415
 // gas legacy: 112709
-// gas legacyOptimized: 111852
+// gas legacyOptimized: 111847
 // 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 14699df572..7eb93d4019 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: 180103
+// gas irOptimized: 180086
 // gas legacy: 184235
-// gas legacyOptimized: 180873
+// gas legacyOptimized: 180857
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112104
+// gas irOptimized: 112031
 // gas legacy: 115091
-// gas legacyOptimized: 112666
+// gas legacyOptimized: 112657
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 9f59c43155..93e20b475e 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: 135452
+// gas irOptimized: 135505
 // gas legacy: 137096
-// gas legacyOptimized: 135834
+// gas legacyOptimized: 135824
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index d313e7acb2..49fc58c45d 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: 108291
+// gas irOptimized: 108272
 // gas legacy: 181523
 // gas legacyOptimized: 117443
 // 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 2589e4709d..2957e6d98d 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: 3003025
+// gas irOptimized: 3017687
 // gas legacy: 3038654
 // gas legacyOptimized: 2995964
 // test_indices(uint256): 5 ->
-// gas irOptimized: 576296
+// gas irOptimized: 579670
 // gas legacy: 573810
 // gas legacyOptimized: 571847
 // test_indices(uint256): 10 ->
-// gas irOptimized: 157009
+// gas irOptimized: 157953
 // gas legacy: 160108
 // gas legacyOptimized: 156996
 // test_indices(uint256): 15 ->
-// gas irOptimized: 171409
+// gas irOptimized: 172733
 // gas legacy: 175973
 // gas legacyOptimized: 171596
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 5645329
+// gas irOptimized: 5673823
 // gas legacy: 5715748
 // gas legacyOptimized: 5632556
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18068701
+// gas irOptimized: 18173005
 // gas legacy: 18347810
 // gas legacyOptimized: 18037248
 // test_indices(uint256): 129 ->
-// gas irOptimized: 4136840
+// gas irOptimized: 4166279
 // gas legacy: 4140113
 // gas legacyOptimized: 4108272
 // test_indices(uint256): 128 ->
-// gas irOptimized: 395769
+// gas irOptimized: 405522
 // gas legacy: 433498
 // gas legacyOptimized: 400909
 // test_indices(uint256): 1 ->
-// gas irOptimized: 580232
+// gas irOptimized: 583437
 // gas legacy: 576715
 // gas legacyOptimized: 575542
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 c77aad0a45..494c99782f 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: 137913
+// gas irOptimized: 147246
 // gas legacy: 133633
 // gas legacyOptimized: 114354
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 140048
+// gas irOptimized: 149422
 // 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 5933586593..de260b3735 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: 131315
+// gas irOptimized: 133763
 // gas legacy: 131671
 // gas legacyOptimized: 129994
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 224578
+// gas irOptimized: 228556
 // gas legacy: 225237
 // gas legacyOptimized: 222359
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 321962
+// gas irOptimized: 327360
 // gas legacy: 322937
 // gas legacyOptimized: 318919
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5080806
+// gas irOptimized: 5180120
 // gas legacy: 5093941
 // gas legacyOptimized: 5020727
diff --git a/test/libsolidity/semanticTests/array/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
index 0669a32097..47fddc5547 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: 1209119
+// gas irOptimized: 1209116
 // 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 80376b423f..b84cdd90a3 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: 401024
+// gas irOptimized: 410745
 // gas legacy: 400640
 // gas legacyOptimized: 388804
 // pushEmpty(uint256): 256
-// gas irOptimized: 683700
+// gas irOptimized: 698285
 // gas legacy: 685108
 // gas legacyOptimized: 671480
 // 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 4b5b407eaf..607e1ecd35 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: 158881
+// gas irOptimized: 168565
 // gas legacy: 696850
 // gas legacyOptimized: 134488
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1762213
+// gas irOptimized: 1908127
 // 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 5befbe2282..78a74ab5d4 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: 815997
+// gas irOptimized: 833586
 // gas legacy: 808020
 // gas legacyOptimized: 784467
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12746889
+// gas irOptimized: 13029438
 // 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 95280054aa..918185e9af 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: 186557
+// gas irOptimized: 185219
 // gas legacy: 211054
-// gas legacyOptimized: 206042
+// gas legacyOptimized: 206077
 // 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_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 3e0f02225b..401f97a1c9 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: 123560
+// gas irOptimized: 122719
 // gas legacy: 147098
 // gas legacyOptimized: 144200
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 0a3c58b3ac..105bbfba8d 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: 110393
+// gas irOptimized: 110425
 // gas legacy: 110952
 // gas legacyOptimized: 110576
 // 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 19acb7cba1..342f3218fc 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -8,11 +8,11 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 124816
+// gas irOptimized: 124991
 // gas irOptimized code: 14800
 // gas legacy: 134317
 // gas legacy code: 46200
-// gas legacyOptimized: 127062
+// gas legacyOptimized: 127166
 // gas legacyOptimized code: 23400
 // a(uint256): 0 -> 1
 // a(uint256): 1 -> 2
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 80ecd3e1ce..96580c47db 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: 648315
+// gas irOptimized: 647725
 // gas legacy: 694356
-// gas legacyOptimized: 693864
+// gas legacyOptimized: 693850
 // 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 600f00a981..9609215a7d 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: 117264
+// gas irOptimized: 122592
 // 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 0bdcda1d9e..6c0ba7af69 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: 107453
+// gas irOptimized: 108246
 // 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 6e81269d8a..2176655fe3 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: 207889
+// gas irOptimized: 208459
 // 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 385f2ecfbf..20aee3a293 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: 4547793
+// gas irOptimized: 4549703
 // gas legacy: 4475396
 // gas legacyOptimized: 4447665
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4474777
+// gas irOptimized: 4478226
 // gas legacy: 4407188
 // gas legacyOptimized: 4381336
 // 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 737e4b32bc..0420f953bb 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: 689656
+// gas irOptimized: 689558
 // gas legacy: 686178
-// gas legacyOptimized: 685628
+// gas legacyOptimized: 685612
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 d477dc6cf9..e292809b80 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: 205044
+// gas irOptimized: 205667
 // 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 0571195861..44fede749c 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: 169565
+// gas irOptimized: 169669
 // 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 99dd1ca934..1f102ea14a 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: 111348
+// gas irOptimized: 111353
 // 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 30173409eb..03c1f4e875 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: 252929
+// gas irOptimized: 253591
 // 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 971469dec6..f4bf1b2d21 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: 123135
+// gas irOptimized: 123180
 // 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 0d613e5e94..145a8060ed 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: 196259
+// gas irOptimized: 196251
 // 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 cfb623393c..7fa5ee515f 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: 190694
+// gas irOptimized: 190628
 // 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 6bd31ca5af..d88ac06746 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: 161624
+// gas irOptimized: 161793
 // gas legacy: 162203
-// gas legacyOptimized: 159934
+// gas legacyOptimized: 159953
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 10a48a18c5..ebfbdeab97 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: 100980
+// gas irOptimized: 100495
 // gas legacy: 158142
-// gas legacyOptimized: 141096
+// gas legacyOptimized: 141020
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 a839e3bb44..3097530665 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: 273372
+// gas irOptimized: 273545
 // 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 f9e1cbd27e..b084874175 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: 233118
+// gas irOptimized: 232997
 // gas legacy: 235697
 // gas legacyOptimized: 235193
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 b138e7265f..085f72ed96 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: 150022
+// gas irOptimized: 149880
 // gas legacy: 150745
-// gas legacyOptimized: 148678
+// gas legacyOptimized: 148700
 // 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 919e832986..ac37f794e1 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: 180716
+// gas irOptimized: 181041
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157544
+// gas irOptimized: 157604
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134634
+// gas irOptimized: 134813
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111252
+// gas irOptimized: 111177
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 eb4b1bbb9a..e2228f993f 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: 226666
+// gas irOptimized: 226743
 // gas legacy: 227084
 // gas legacyOptimized: 226529
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 141225
+// gas irOptimized: 141325
 // 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 01329504d2..ab3c172d33 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: 104592
+// gas irOptimized: 104566
 // gas legacy: 108554
-// gas legacyOptimized: 102413
+// gas legacyOptimized: 102405
 // 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 50756d0b0c..2bb3bcf333 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: 104265
+// gas irOptimized: 104238
 // gas legacy: 108295
-// gas legacyOptimized: 102146
+// gas legacyOptimized: 102162
 // 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 546a6e49e4..3147401cfa 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: 119704
+// gas irOptimized: 120747
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 38e26e480a..5b3fe1f701 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: 118362
+// gas irOptimized: 118796
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 c6e6c58765..09037719a6 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: 326771
+// gas irOptimized: 327456
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 510e7c9a4a..8b6ad78ea7 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: 181890
+// gas irOptimized: 181932
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 5c44ef16a5..82e65edf1d 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: 131915
+// gas irOptimized: 131939
 // 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 893610eb13..75a68759b6 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: 147889
+// gas irOptimized: 147761
 // gas legacy: 148896
-// gas legacyOptimized: 146901
+// gas legacyOptimized: 146923
 // 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 0deb396d3d..af2983b066 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 {
 // 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: 103509
-// gas legacyOptimized: 101390
+// gas legacyOptimized: 101266
 // 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 19e5ddebd4..e61b7dff7a 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: 110558
+// gas irOptimized: 110550
 // gas legacy: 111312
 // gas legacyOptimized: 110741
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177509
+// gas irOptimized: 177501
 // gas legacy: 178314
 // gas legacyOptimized: 177716
 // 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 24565b4c62..ea364d4378 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: 103283
+// gas irOptimized: 103269
 // gas legacy: 112883
-// gas legacyOptimized: 112629
+// gas legacyOptimized: 112647
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 117740
+// gas irOptimized: 117928
 // gas legacy: 128943
-// gas legacyOptimized: 128864
+// gas legacyOptimized: 128854
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124080
+// gas irOptimized: 124200
 // gas legacy: 136071
-// gas legacyOptimized: 135479
+// gas legacyOptimized: 135469
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 127140
+// gas irOptimized: 127350
 // gas legacy: 148671
-// gas legacyOptimized: 148709
+// gas legacyOptimized: 148699
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 416966
+// gas irOptimized: 417312
 // gas legacy: 458976
-// gas legacyOptimized: 460674
+// gas legacyOptimized: 460664
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 706232d589..1da1d0a40c 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: 110968
+// gas irOptimized: 111096
 // gas legacy: 111551
-// gas legacyOptimized: 111339
+// gas legacyOptimized: 111323
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 b8bd588d56..48460586d2 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: 139637
+// gas irOptimized: 139587
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 36b94d7c39..e6284072d1 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,8 +16,8 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 89121
-// gas irOptimized code: 137200
+// gas irOptimized: 90065
+// gas irOptimized code: 149000
 // gas legacy: 89553
 // gas legacy code: 126200
 // gas legacyOptimized: 83556
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 33a4c7045a..7c0459ef13 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: 179420
+// gas irOptimized: 179408
 // gas legacy: 180675
-// gas legacyOptimized: 179700
+// gas legacyOptimized: 179686
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106349
+// gas irOptimized: 106344
 // gas legacy: 109394
-// gas legacyOptimized: 106614
+// gas legacyOptimized: 106600
 // 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 d4599cdb7e..1fd42ab346 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: 143412
+// gas irOptimized: 143867
 // gas legacy: 153395
-// gas legacyOptimized: 146720
+// gas legacyOptimized: 146689
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 fb21779012..a6a64942d2 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: 122455
+// gas irOptimized: 122461
 // 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 85c396fb4e..48d02bdc77 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -7,7 +7,7 @@ contract c {
 }
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177376
+// gas irOptimized: 177344
 // gas legacy: 177954
 // gas legacyOptimized: 177550
 // storageEmpty -> 0
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 6c5c0e8faa..672e7435f1 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: 327883
+// gas irOptimized: 327921
 // 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: 140882
+// gas irOptimized: 141162
 // 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: 188541
+// gas irOptimized: 188442
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 a593b1d1dd..f232d8aba9 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: 332567
 // 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: 145159
+// gas irOptimized: 145409
 // 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: 192616
+// gas irOptimized: 192248
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 56a4150790..097c7b4d10 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: 116546
+// gas irOptimized: 116530
 // gas legacy: 118845
-// gas legacyOptimized: 116887
+// gas legacyOptimized: 116844
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103147
+// gas irOptimized: 103150
 // gas legacy: 102654
-// gas legacyOptimized: 101581
+// gas legacyOptimized: 101556
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 79882a74b2..c549754790 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: 127422
+// gas irOptimized: 128296
 // gas legacy: 129050
-// gas legacyOptimized: 128222
+// gas legacyOptimized: 128210
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 f85b8eb9f3..ad00ee8c51 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: 150468
+// gas irOptimized: 150488
 // gas legacy: 150949
 // gas legacyOptimized: 150906
 // test2() -> FAILURE
-// gas irOptimized: 150378
+// gas irOptimized: 150389
 // gas legacy: 150673
 // gas legacyOptimized: 150576
 // test3() ->
-// gas irOptimized: 123762
+// gas irOptimized: 124300
 // 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 3666443bbc..3b774f56e4 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: 304756
+// gas irOptimized: 304794
 // 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: 116467
+// gas irOptimized: 116653
 // 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: 188030
+// gas irOptimized: 188000
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 821d33d4dd..35e7943b8b 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: 309101
+// gas irOptimized: 309078
 // 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: 118265
+// gas irOptimized: 118314
 // 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: 191011
+// gas irOptimized: 191051
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 c356e029f6..d0d1691597 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: 123202
+// gas irOptimized: 123195
 // test2()
-// gas irOptimized: 123027
+// gas irOptimized: 123018
 // 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 dfb7c27aca..a4222be0b4 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: 138040
+// gas irOptimized: 137897
 // test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164246
+// gas irOptimized: 164506
 // 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 9a2fbb4d9d..ac92189e48 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: 205783
+// gas irOptimized: 206440
 // gas legacy: 211765
 // gas legacyOptimized: 211181
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 0e8cff97fd..b743a5825a 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: 202162
+// gas irOptimized: 202083
 // gas legacy: 204328
-// gas legacyOptimized: 202887
+// gas legacyOptimized: 202900
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 3606d7d601..da7187a27e 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: 205783
+// gas irOptimized: 206440
 // gas legacy: 211770
 // gas legacyOptimized: 211186
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 cfbf5c8745..d4a348ea40 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: 291047
+// gas irOptimized: 291212
 // 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 48d06ab4ea..c5bd7d0b0c 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: 109104
+// gas irOptimized: 114338
 // gas legacy: 122235
 // gas legacyOptimized: 118411
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index d507f080f3..a95499fd8a 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: 125822
+// gas irOptimized: 136664
 // 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 fffea685a8..5deaa7d4e8 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: 204782
+// gas irOptimized: 218452
 // gas legacy: 242256
-// gas legacyOptimized: 241192
+// gas legacyOptimized: 241182
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index eb950d1834..380e302425 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: 519017
+// gas irOptimized: 519494
 // gas legacy: 518936
 // gas legacyOptimized: 515555
 // 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 2f6769a241..62b611a878 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: 110797
+// gas irOptimized: 112674
 // 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 7621d05bdc..2db14a939e 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: 122742
+// gas irOptimized: 122985
 // 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 b4d9a30ec0..cc009b7e9e 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: 464834
+// gas irOptimized: 465013
 // gas legacy: 468818
 // gas legacyOptimized: 466238
 // 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 0fb513543b..e4bf3a7197 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -18,9 +18,9 @@ contract B {
 }
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 59204
-// gas irOptimized code: 55200
+// gas irOptimized: 59212
+// gas irOptimized code: 56600
 // gas legacy: 68001
 // gas legacy code: 162000
-// gas legacyOptimized: 60037
+// gas legacyOptimized: 59997
 // gas legacyOptimized code: 70600
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 0eb0f1e90e..817d06c0f5 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: 103927
+// gas irOptimized: 104102
 // gas irOptimized code: 22400
 // gas legacy: 115186
 // gas legacy code: 59000
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index e35e24bbf1..e9517c0e38 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,9 +42,9 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 86128
-// gas irOptimized code: 169600
+// gas irOptimized: 86484
+// gas irOptimized code: 161200
 // gas legacy: 97576
 // gas legacy code: 342800
-// gas legacyOptimized: 87851
-// gas legacyOptimized code: 190800
+// gas legacyOptimized: 87811
+// gas legacyOptimized code: 193000
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 ddf67aa90f..5fd53c6d12 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: 121106
+// gas irOptimized: 121104
 // gas legacy: 121904
-// gas legacyOptimized: 121398
+// gas legacyOptimized: 121388
 // 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 a08d27ac0b..be1916ef13 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: 1827730
+// gas irOptimized: 1828226
 // 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 1b69ab336b..73870d4285 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: 148538
+// gas irOptimized: 148380
 // 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 d2e5995c00..e0fc165815 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: 126068
+// gas irOptimized: 125889
 // 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 a3ba9d4d21..c567c4509e 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: 140154
+// gas irOptimized: 138848
 // 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 a014e761ea..d9d2d9d2d9 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: 113782
+// gas irOptimized: 113679
 // 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 674b0841e6..490de759b5 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: 107183
+// gas irOptimized: 106778
 // gas legacy: 121245
 // gas legacyOptimized: 120370
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index 3e7ceb5a8b..6198ba1635 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: 111363
+// gas irOptimized: 111834
 // 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 a010a9938a..4bcac0f138 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: 112812
+// gas irOptimized: 112853
 // gas legacy: 113659
-// gas legacyOptimized: 113482
+// gas legacyOptimized: 113466
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 06c5db88b7..b6db507ea3 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: 135103
+// gas irOptimized: 135329
 // 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 4a33f816d7..37de90cb69 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: 137061
+// gas irOptimized: 137153
 // gas legacy: 142423
-// gas legacyOptimized: 137991
+// gas legacyOptimized: 137981
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 5f1fe0fac7..763cb9a040 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: 167700
+// gas irOptimized: 167569
 // gas legacy: 206219
 // gas legacyOptimized: 197297
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 30ed47920d..aeaeb9ee72 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: 179112
+// gas irOptimized: 179534
 // gas legacy: 181014
-// gas legacyOptimized: 180422
+// gas legacyOptimized: 180398
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 6901e32b8b..00e4545163 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: 112266
+// gas irOptimized: 112288
 // 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: 118686
+// gas irOptimized: 118708
 // 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 b19ebcc736..b013a7ebbc 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: 180849
+// gas irOptimized: 181778
 // gas legacy: 175185
 // gas legacyOptimized: 175005
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index a7608f6e0c..621860c075 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,7 +24,7 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 99524
+// gas irOptimized: 99552
 // gas irOptimized code: 12400
 // gas legacy: 101554
 // gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index 8d0cb0a012..dab01b5983 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,12 +28,12 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 81932
-// gas irOptimized code: 355200
+// gas irOptimized: 82100
+// gas irOptimized code: 357600
 // gas legacy: 101472
 // gas legacy code: 604200
-// gas legacyOptimized: 85004
-// gas legacyOptimized code: 392400
+// gas legacyOptimized: 84956
+// gas legacyOptimized code: 391800
 // 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 aedf5ada4f..09dcd03479 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,7 +9,7 @@ contract c {
 // EVMVersion: >=byzantium
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155130
+// gas irOptimized: 155125
 // gas legacy: 155473
 // gas legacyOptimized: 155295
 // checkIfDataIsEmpty() -> false
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 3e60ba451c..685b1a9389 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,9 +24,9 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 328126
-// gas irOptimized code: 96400
+// gas irOptimized: 327784
+// gas irOptimized code: 94000
 // gas legacy: 336626
 // gas legacy code: 244800
-// gas legacyOptimized: 329599
-// gas legacyOptimized code: 115000
+// gas legacyOptimized: 329518
+// gas legacyOptimized code: 117000
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index c0b9df16c3..0310d58d7a 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,9 +24,9 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 169361
-// gas irOptimized code: 99200
+// gas irOptimized: 169292
+// gas irOptimized code: 99600
 // gas legacy: 172944
 // gas legacy code: 239800
-// gas legacyOptimized: 169858
-// gas legacyOptimized code: 117000
+// gas legacyOptimized: 169818
+// gas legacyOptimized code: 118600
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 0918a970e2..4194e14a69 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,11 +8,11 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 180756
-// gas irOptimized code: 79200
+// gas irOptimized: 181465
+// gas irOptimized code: 78400
 // gas legacy: 195165
 // gas legacy code: 109400
-// gas legacyOptimized: 181600
+// gas legacyOptimized: 181609
 // gas legacyOptimized code: 71400
 // 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 e6ce445ada..327c41d9be 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,11 +9,11 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 147975
+// gas irOptimized: 148129
 // gas irOptimized code: 23000
 // gas legacy: 157978
 // gas legacy code: 60400
-// gas legacyOptimized: 150011
+// gas legacyOptimized: 149974
 // gas legacyOptimized code: 26200
 // a() -> 1
 // b(uint256): 0 -> 2
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index b1dc80a408..583f1ca37b 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,7 +17,7 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 117641
+// gas irOptimized: 117623
 // gas irOptimized code: 1800
 // gas legacy: 117821
 // gas legacy code: 4800
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index fec281c59a..76acd4a0b2 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: 113485
+// gas irOptimized: 114231
 // gas legacy: 116314
-// gas legacyOptimized: 114407
+// gas legacyOptimized: 114408
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 2b5a7114d9..bdcda3a093 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: 113485
+// gas irOptimized: 114231
 // gas legacy: 116314
-// gas legacyOptimized: 114407
+// gas legacyOptimized: 114408
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 d6cfb68bef..324f456f67 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: 185033
+// gas irOptimized: 185148
 // gas legacy: 187495
-// gas legacyOptimized: 184525
+// gas legacyOptimized: 184550
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 739619066a..0ad2affe37 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: 328856
+// gas irOptimized: 332789
 // gas legacy: 365828
-// gas legacyOptimized: 362251
+// gas legacyOptimized: 362250
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 925ed54e6d..47feaf5258 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,12 +74,12 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 77654
-// gas irOptimized code: 302200
+// gas irOptimized: 78076
+// gas irOptimized code: 307400
 // gas legacy: 115395
 // gas legacy code: 792400
-// gas legacyOptimized: 84566
-// gas legacyOptimized code: 387600
+// gas legacyOptimized: 84598
+// gas legacyOptimized code: 388000
 // 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 aed2a11df2..a986be149b 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,11 +33,11 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 78952
-// gas irOptimized code: 320600
+// gas irOptimized: 79076
+// gas irOptimized code: 322000
 // gas legacy: 102034
 // gas legacy code: 627400
-// gas legacyOptimized: 87950
+// gas legacyOptimized: 87926
 // gas legacyOptimized code: 429800
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
@@ -54,10 +54,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: 1322025
+// gas irOptimized: 1406025
 // gas legacy: 1554031
 // gas legacyOptimized: 1132031
 // encode_no_asm_large()
-// gas irOptimized: 3206081
+// gas irOptimized: 3512081
 // gas legacy: 4587075
-// gas legacyOptimized: 2823075
+// gas legacyOptimized: 2813075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 5288d859b7..9bfa3a340e 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,38 +176,38 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 809628
-// gas irOptimized code: 563200
+// gas irOptimized: 809602
+// gas irOptimized code: 558000
 // gas legacy: 919945
 // gas legacy code: 1437600
-// gas legacyOptimized: 848464
-// gas legacyOptimized code: 875200
+// gas legacyOptimized: 848699
+// gas legacyOptimized code: 878200
 // 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: 108921
+// gas irOptimized: 109178
 // gas legacy: 142735
 // gas legacyOptimized: 117558
 // 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: 108921
+// gas irOptimized: 109178
 // gas legacy: 142735
 // gas legacyOptimized: 117558
 // 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: 108914
+// gas irOptimized: 109174
 // gas legacy: 142744
 // gas legacyOptimized: 117570
 // 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: 108914
+// gas irOptimized: 109174
 // gas legacy: 142744
 // gas legacyOptimized: 117570
 // 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 ddd6397183..4990d24e9a 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,8 +48,8 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 177336
-// gas irOptimized code: 1664400
+// gas irOptimized: 177903
+// gas irOptimized code: 1674400
 // gas legacy: 209687
 // gas legacy code: 2204400
 // gas legacyOptimized: 178012
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index deacfd0564..5d95c7a75c 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,8 +48,8 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 168523
-// gas irOptimized code: 1547800
+// gas irOptimized: 170626
+// gas irOptimized code: 1577400
 // gas legacy: 195146
 // gas legacy code: 1998400
 // gas legacyOptimized: 168857
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index cdaec8797e..1aa72b897b 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,8 +33,8 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 79503
-// gas irOptimized code: 328000
+// gas irOptimized: 77816
+// gas irOptimized code: 307600
 // gas legacy: 92086
 // gas legacy code: 523000
 // gas legacyOptimized: 82667
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 58f5e58048..97d15183a1 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: 269701
+// gas irOptimized: 270424
 // gas legacy: 275206
 // gas legacyOptimized: 266925
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 782238
+// gas irOptimized: 785783
 // gas legacy: 801868
 // gas legacyOptimized: 770942
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 102c85ae0f..773d7156af 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,12 +49,12 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 95949
-// gas irOptimized code: 528000
+// gas irOptimized: 95303
+// gas irOptimized code: 520000
 // gas legacy: 126106
 // gas legacy code: 930200
-// gas legacyOptimized: 102559
-// gas legacyOptimized code: 611400
+// gas legacyOptimized: 102639
+// gas legacyOptimized code: 612400
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -72,6 +72,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1980944
+// gas irOptimized: 1976778
 // gas legacy: 4233999
-// gas legacyOptimized: 2318684
+// gas legacyOptimized: 2318670
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 1133dc2be3..f7c05c10c4 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: 138863
+// gas irOptimized: 138930
 // gas irOptimized code: 53800
 // gas legacy: 145570
 // gas legacy code: 95600
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 ba90a8ecd5..9742a1d2f3 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: 139026
+// gas irOptimized: 139112
 // gas irOptimized code: 53800
 // gas legacy: 145936
 // gas legacy code: 95600
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 5b254a9f6c..87f7cbebb0 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -22,12 +22,12 @@ contract C {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 89155
-// gas irOptimized code: 167800
+// gas irOptimized: 88853
+// gas irOptimized code: 164400
 // gas legacy: 102626
 // gas legacy code: 333200
-// gas legacyOptimized: 91471
-// gas legacyOptimized code: 196200
+// gas legacyOptimized: 91599
+// gas legacyOptimized code: 197800
 // 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 8bf182a89e..9da010e9bc 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -25,12 +25,12 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 98842
-// gas irOptimized code: 286000
+// gas irOptimized: 98698
+// gas irOptimized code: 284200
 // gas legacy: 123163
 // gas legacy code: 681200
-// gas legacyOptimized: 106957
-// gas legacyOptimized code: 386400
+// gas legacyOptimized: 107069
+// gas legacyOptimized code: 387800
 // 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/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 2f8f62586b..bf6f2c4baf 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,8 +38,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 120912
-// gas irOptimized code: 140000
+// gas irOptimized: 120218
+// gas irOptimized code: 132000
 // gas legacy: 130568
 // gas legacy code: 261000
 // gas legacyOptimized: 121069
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 4821146e7e..ebc78a437f 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,8 +37,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 120912
-// gas irOptimized code: 140000
+// gas irOptimized: 120218
+// gas irOptimized code: 132000
 // gas legacy: 130568
 // gas legacy code: 261000
 // gas legacyOptimized: 121069
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index 28c1822d77..7a9bf6014b 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: 111628
+// gas irOptimized: 111237
 // 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 c8806c50d0..e1eb0621a6 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: 86821
+// gas irOptimized: 86796
 // gas irOptimized code: 37200
 // gas legacy: 87728
 // gas legacy code: 60800
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index dc07086c29..2ee05af918 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: 81126
+// gas irOptimized: 81194
 // gas irOptimized code: 42400
 // gas legacy: 88245
 // gas legacy code: 109400
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 d5ff54b68a..5234c27adf 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,5 +25,5 @@ contract B {
 // gas irOptimized: 100282
 // gas legacy: 56840
 // gas legacy code: 123600
-// gas legacyOptimized: 54996
-// gas legacyOptimized code: 57600
+// gas legacyOptimized: 55002
+// gas legacyOptimized code: 60600
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
index f4975cd4c7..a375207252 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
@@ -40,8 +40,8 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor() ->
-// gas irOptimized: 127944
-// gas irOptimized code: 225200
+// gas irOptimized: 127596
+// gas irOptimized code: 221000
 // gas legacy: 149357
 // gas legacy code: 499800
 // gas legacyOptimized: 125830
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 0ad55b5ddf..8ec19fffa5 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,8 +16,8 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 114107
-// gas irOptimized code: 55800
+// gas irOptimized: 114353
+// gas irOptimized code: 58800
 // gas legacy: 118618
 // gas legacy code: 111400
 // gas legacyOptimized: 114067
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index bdf4e4c30a..8171184731 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: 111629
+// gas irOptimized: 111419
 // gas legacy: 132935
 // gas legacyOptimized: 118023
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index b3e06c5bcf..bbdc920471 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: 119635
+// gas irOptimized: 119837
 // 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 e9d855969a..98cdf4fd18 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: 120194
+// gas irOptimized: 119568
 // 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 735731c8ab..083c9a5e48 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,8 +21,8 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 187005
-// gas irOptimized code: 66000
+// gas irOptimized: 187022
+// gas irOptimized code: 67200
 // gas legacy: 190863
 // gas legacy code: 190200
 // gas legacyOptimized: 187258
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index 5f32421657..0c2f54b9e7 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: 111886
+// gas irOptimized: 111852
 // gas legacy: 112734
-// gas legacyOptimized: 112115
+// gas legacyOptimized: 112084
 // 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 2c29abc79b..75edb1c9e0 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: 132493
+// gas irOptimized: 132633
 // 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 add42a8f3b..ebf546fe28 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: 202843
+// gas irOptimized: 202902
 // gas legacy: 207384
-// gas legacyOptimized: 203584
+// gas legacyOptimized: 203588
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 699836179b..4465b1a3ee 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: 193677
+// gas irOptimized: 192828
 // 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 8ee19a278a..a072fb0576 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: 121394
+// gas irOptimized: 121282
 // gas legacy: 122978
-// gas legacyOptimized: 121648
+// gas legacyOptimized: 121652
 // 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 937eeeaf43..29e7afca36 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: 152882
+// gas irOptimized: 152965
 // 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 8091f5a241..61d2d68aad 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: 121499
+// gas irOptimized: 121454
 // gas legacy: 123117
-// gas legacyOptimized: 121655
+// gas legacyOptimized: 121659
 // 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 2083032ff3..7d458ca293 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: 122923
+// gas irOptimized: 122720
 // gas legacy: 130136
-// gas legacyOptimized: 128650
+// gas legacyOptimized: 128649
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121616
+// gas irOptimized: 121424
 // gas legacy: 123191
-// gas legacyOptimized: 121760
+// gas legacyOptimized: 121764
 // 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: 115037
+// gas irOptimized: 114852
 // gas legacy: 122425
-// gas legacyOptimized: 120696
+// gas legacyOptimized: 120700
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index c44277e4f1..068dc3d8c6 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: 121593
+// gas irOptimized: 121515
 // gas legacy: 123053
-// gas legacyOptimized: 121700
+// gas legacyOptimized: 121704
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121638
+// gas irOptimized: 121559
 // gas legacy: 123102
-// gas legacyOptimized: 121752
+// gas legacyOptimized: 121756
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122831
+// gas irOptimized: 122740
 // gas legacy: 129997
-// gas legacyOptimized: 128646
+// gas legacyOptimized: 128645
 // 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: 114952
+// gas irOptimized: 114824
 // gas legacy: 118210
-// gas legacyOptimized: 115324
+// gas legacyOptimized: 115329
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index e5b139d5c3..5ba9765415 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: 110317
+// gas irOptimized: 110772
 // 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 856edc27be..955e082b72 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: 133592
+// gas irOptimized: 133560
 // gas legacy: 134628
-// gas legacyOptimized: 133871
+// gas legacyOptimized: 133858
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133592
+// gas irOptimized: 133560
 // gas legacy: 134628
-// gas legacyOptimized: 133871
+// gas legacyOptimized: 133858
 // 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 a321f06868..1fb9ef2168 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: 109893
+// gas irOptimized: 109932
 // gas legacy: 110597
 // gas legacyOptimized: 110003
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118582
+// gas irOptimized: 118581
 // 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 71b40acc80..6b8788d2c0 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: 109706
+// gas irOptimized: 109921
 // 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 d76618bbc9..28998df448 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: 113210
+// gas irOptimized: 113477
 // gas legacy: 113591
 // gas legacyOptimized: 113103
 // g() ->
-// gas irOptimized: 118580
+// gas irOptimized: 118843
 // 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 9af3774692..bd9fcf3e23 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: 110382
+// gas irOptimized: 110682
 // gas legacy: 111993
 // gas legacyOptimized: 110546
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index b5e9d10bb8..1903870513 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: 134417
+// gas irOptimized: 134073
 // 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 e1e1e3b265..19c31f2880 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
@@ -29,6 +29,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
-// gas irOptimized: 197116
+// gas irOptimized: 197102
 // gas legacy: 199891
-// gas legacyOptimized: 196817
+// gas legacyOptimized: 196845
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index ea1fc99b42..1433386e5a 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: 122094
+// gas irOptimized: 122212
 // gas legacy: 125322
-// gas legacyOptimized: 122709
+// gas legacyOptimized: 122694
 // test_g() -> true
-// gas irOptimized: 106271
+// gas irOptimized: 106428
 // gas legacy: 111120
-// gas legacyOptimized: 106964
+// gas legacyOptimized: 106925
 // 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 8976cf3c52..30aa590d6f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,12 +113,12 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 121082
-// gas irOptimized code: 231600
+// gas irOptimized: 121322
+// gas irOptimized code: 234600
 // gas legacy: 163352
 // gas legacy code: 671400
-// gas legacyOptimized: 127448
-// gas legacyOptimized code: 285200
+// gas legacyOptimized: 127464
+// gas legacyOptimized code: 285400
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23653
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index f283aaeaa3..8b601ca8c1 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,11 +14,11 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 70351
-// gas irOptimized code: 95800
+// gas irOptimized: 70760
+// gas irOptimized code: 94600
 // gas legacy: 82380
 // gas legacy code: 153800
-// gas legacyOptimized: 69496
+// gas legacyOptimized: 69400
 // gas legacyOptimized code: 79200
 // initCode() -> 0x20, 0
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index b8ec252095..3ca50db136 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,8 +8,8 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 67834
-// gas irOptimized code: 70400
+// gas irOptimized: 68239
+// gas irOptimized code: 69000
 // gas legacy: 78029
 // gas legacy code: 90200
 // gas legacyOptimized: 68321
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index b8236e2cd5..82183a1121 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: 241837
+// gas irOptimized: 242027
 // gas legacy: 243284
-// gas legacyOptimized: 242420
+// gas legacyOptimized: 242395
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index f7956c4c50..1a7718f683 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,12 +96,12 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 121248
-// gas irOptimized code: 232000
+// gas irOptimized: 121632
+// gas irOptimized code: 236800
 // gas legacy: 159959
 // gas legacy code: 647600
-// gas legacyOptimized: 126918
-// gas legacyOptimized code: 281800
+// gas legacyOptimized: 126934
+// gas legacyOptimized code: 282000
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23524
diff --git a/test/libsolidity/semanticTests/various/many_subassemblies.sol b/test/libsolidity/semanticTests/various/many_subassemblies.sol
index 67a576da78..b270c70066 100644
--- a/test/libsolidity/semanticTests/various/many_subassemblies.sol
+++ b/test/libsolidity/semanticTests/various/many_subassemblies.sol
@@ -30,7 +30,7 @@ contract D {
 }
 // ----
 // run() ->
-// gas irOptimized: 375015
+// gas irOptimized: 374934
 // gas irOptimized code: 6600
 // gas legacy: 375119
 // gas legacy code: 17600
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
index 16797ee4c0..690bff8d55 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
@@ -35,8 +35,8 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor(), 2 ether ->
-// gas irOptimized: 107718
-// gas irOptimized code: 116200
+// gas irOptimized: 108104
+// gas irOptimized code: 119200
 // gas legacy: 120424
 // gas legacy code: 253600
 // gas legacyOptimized: 109015
@@ -46,7 +46,7 @@ contract D {
 // balance -> 2000000000000000000
 // exists() -> false
 // test_deploy_and_terminate_twice() ->
-// gas irOptimized: 121350
+// gas irOptimized: 121395
 // gas irOptimized code: 14000
 // gas legacy: 122384
 // gas legacy code: 43200
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
index 1b3022efed..1ae89a558e 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
@@ -82,8 +82,8 @@ contract D {
 // EVMVersion: >=cancun
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 132874
-// gas irOptimized code: 292400
+// gas irOptimized: 132974
+// gas irOptimized code: 293800
 // gas legacy: 151217
 // gas legacy code: 533400
 // gas legacyOptimized: 131436
@@ -91,7 +91,7 @@ contract D {
 // exists() -> false
 // test_deploy_and_terminate() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 96394
+// gas irOptimized: 96528
 // gas irOptimized code: 20800
 // gas legacy: 97788
 // gas legacy code: 20800
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
index a09a7cac68..dbe7109cbd 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
@@ -35,8 +35,8 @@ contract D {
 // EVMVersion: <=shanghai
 // ----
 // constructor(), 2 ether ->
-// gas irOptimized: 107718
-// gas irOptimized code: 116200
+// gas irOptimized: 108104
+// gas irOptimized code: 119200
 // gas legacy: 120424
 // gas legacy code: 253600
 // gas legacyOptimized: 109015
@@ -46,7 +46,7 @@ contract D {
 // balance -> 2000000000000000000
 // exists() -> false
 // test_deploy_and_terminate_twice() ->
-// gas irOptimized: 121350
+// gas irOptimized: 121395
 // gas irOptimized code: 14000
 // gas legacy: 122384
 // gas legacy code: 43200
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
index fc650ebba7..0d7f2334eb 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
@@ -79,8 +79,8 @@ contract D {
 // EVMVersion: =shanghai
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 133253
-// gas irOptimized code: 297000
+// gas irOptimized: 133342
+// gas irOptimized code: 298400
 // gas legacy: 151644
 // gas legacy code: 538600
 // gas legacyOptimized: 131799
@@ -88,7 +88,7 @@ contract D {
 // exists() -> false
 // test_deploy_and_terminate() ->
 // ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 96689
+// gas irOptimized: 96823
 // gas irOptimized code: 20800
 // gas legacy: 98095
 // gas legacy code: 20800
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 52287a8f32..9d078cfd69 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: 178277
+// gas irOptimized: 178195
 // gas legacy: 180657
-// gas legacyOptimized: 179156
+// gas legacyOptimized: 179146
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 77a330f3cd..2063fff7a5 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -45,7 +45,7 @@ contract D {
 // gas legacyOptimized: 98425380
 // gas legacyOptimized code: 13200
 // fpure() -> FAILURE
-// gas irOptimized: 98425389
+// gas irOptimized: 98425388
 // gas irOptimized code: 13200
 // gas legacy: 98413174
 // gas legacy code: 25600
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 427a006dc1..dc92e38df5 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -19,8 +19,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 114399
-// gas irOptimized code: 58000
+// gas irOptimized: 114463
+// gas irOptimized code: 58800
 // gas legacy: 120076
 // gas legacy code: 132200
 // gas legacyOptimized: 114536
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 97fbbab1e6..ad0e95701d 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -18,8 +18,8 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 114463
-// gas irOptimized code: 58800
+// gas irOptimized: 114527
+// gas irOptimized code: 59600
 // gas legacy: 120200
 // gas legacy code: 133600
 // gas legacyOptimized: 114568
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 5a85ba0759..fbaa7789ea 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: 112969
+// gas irOptimized: 113118
 // gas legacy: 112890
 // gas legacyOptimized: 112580

From e19abe4b622da3ae7ab386e160f631bc8108f6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Mar 2024 20:33:07 +0100
Subject: [PATCH 0846/1140] Update other test expectations

---
 .../debug_info_in_yul_snippet_escaping/output |   62 +-
 test/cmdlineTests/function_debug_info/output  |    4 +-
 .../output                                    |   21 +-
 .../output                                    |   21 +-
 test/cmdlineTests/name_simplifier/output      |  136 +--
 .../cmdlineTests/optimizer_array_sload/output |   15 +-
 test/cmdlineTests/optimizer_user_yul/output   |   13 +-
 .../output.json                               |  152 +--
 .../output.json                               |  140 +--
 .../output.json                               | 1021 +++++++++--------
 .../viair_subobject_optimization/output       |   51 +-
 .../sizeLimits/combined_too_large_paris.sol   |    6 +-
 .../combined_too_large_shanghai.sol           |    8 +-
 .../initcode_too_large_shanghai.sol           |    2 +-
 .../yulOptimizerTests/fullSuite/abi2.yul      |   31 +-
 .../fullSuite/abi_example1.yul                |   58 +-
 .../fullSuite/ackermann_function.yul          |    3 +-
 .../fullSuite/ackermann_function_if.yul       |    3 +-
 .../yulOptimizerTests/fullSuite/aztec.yul     |   79 +-
 .../call_arguments_without_side_effects.yul   |   29 +-
 .../fullSuite/create2_and_mask.yul            |    5 +-
 .../fullSuite/create_and_mask.yul             |    5 +-
 .../fullSuite/devcon_example.yul              |    5 +-
 .../fullSuite/extcodelength.yul               |    8 +-
 .../fullSuite/loopInvariantCodeMotion.yul     |    5 +-
 ..._dependent_cse_bug_part_1_pre_shanghai.yul |   11 +-
 ..._dependent_cse_bug_part_2_pre_shanghai.yul |   11 +-
 .../fullSuite/stack_compressor_msize.yul      |   28 +-
 .../fullSuite/structural_simplification.yul   |    9 +-
 .../unusedFunctionParameterPruner_loop.yul    |   38 +-
 30 files changed, 965 insertions(+), 1015 deletions(-)

diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 0bd6285b78..d5c02fc821 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -428,8 +428,7 @@ object "D_27" {
             {
                 /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
                 let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
                     if eq(0x26121ff0, shr(224, calldataload(0)))
@@ -437,10 +436,9 @@ object "D_27" {
                         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 _3 := datasize("C_2")
-                        let _4 := add(_1, _3)
-                        let _5 := 0xffffffffffffffff
-                        if or(gt(_4, _5), lt(_4, _1))
+                        let _2 := datasize("C_2")
+                        let _3 := add(_1, _2)
+                        if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
                             mstore(0, shl(224, 0x4e487b71))
@@ -448,45 +446,53 @@ object "D_27" {
                             revert(0, 0x24)
                         }
                         /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        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)))
+                        datacopy(_1, dataoffset("C_2"), _2)
+                        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(_3, _1)))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                            let pos := mload(_2)
+                            let pos := mload(64)
                             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()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
+                        let memPtr := 0
+                        let size := 0
+                        size := 0
+                        let memPtr_1 := mload(64)
+                        let newFreePtr := add(memPtr_1, 64)
+                        if or(gt(newFreePtr, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr_1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
                             revert(0, 0x24)
                         }
-                        mstore(_2, newFreePtr)
-                        mstore(memPtr, 2)
-                        mstore(add(memPtr, 32), "/*")
-                        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()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
+                        mstore(64, newFreePtr)
+                        memPtr := memPtr_1
+                        mstore(memPtr_1, 2)
+                        mstore(add(memPtr_1, 32), "/*")
+                        let memPtr_2 := 0
+                        let size_1 := 0
+                        size_1 := 0
+                        let memPtr_3 := mload(64)
+                        let newFreePtr_1 := add(memPtr_3, 96)
+                        if or(gt(newFreePtr_1, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_3))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
                             revert(0, 0x24)
                         }
-                        mstore(_2, newFreePtr_1)
-                        mstore(memPtr_1, 39)
-                        let _6 := add(memPtr_1, 32)
-                        mstore(_6, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
-                        mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
-                        let memPos := mload(_2)
+                        mstore(64, newFreePtr_1)
+                        memPtr_2 := memPtr_3
+                        mstore(memPtr_3, 39)
+                        let _4 := add(memPtr_3, 32)
+                        mstore(_4, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
+                        mstore(add(memPtr_3, 64), shl(200, 0x2e2e2e22202a2f))
+                        let memPos := mload(64)
                         mstore(memPos, 32)
-                        let length := mload(memPtr_1)
+                        let length := mload(memPtr_3)
                         mstore(add(memPos, 32), length)
-                        mcopy(add(memPos, _2), _6, length)
-                        mstore(add(add(memPos, length), _2), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
+                        mcopy(add(memPos, 64), _4, length)
+                        mstore(add(add(memPos, length), 64), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/function_debug_info/output b/test/cmdlineTests/function_debug_info/output
index bd7ba1197b..c1346e33ab 100644
--- a/test/cmdlineTests/function_debug_info/output
+++ b/test/cmdlineTests/function_debug_info/output
@@ -31,7 +31,7 @@
           "returnSlots": 2
         },
         "abi_decode_tuple_t_uint256": {
-          "entryPoint": 269,
+          "entryPoint": 271,
           "parameterSlots": 2,
           "returnSlots": 1
         },
@@ -40,7 +40,7 @@
           "returnSlots": 1
         },
         "panic_error_0x32": {
-          "entryPoint": 292,
+          "entryPoint": 294,
           "parameterSlots": 0,
           "returnSlots": 0
         }
diff --git a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
index 2441357d97..170cdf1a7a 100644
--- a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
+++ b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
@@ -22,25 +22,24 @@ object "C_14" {
                     {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _2 := 64
-                        let newFreePtr := add(_1, _2)
+                        let newFreePtr := add(_1, 64)
                         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
                             revert(0, 36)
                         }
-                        mstore(_2, newFreePtr)
+                        mstore(64, newFreePtr)
                         mstore(_1, 5)
-                        let _3 := add(_1, 0x20)
-                        mstore(_3, "aaaaa")
-                        let memPos := mload(_2)
-                        mstore(memPos, 0x20)
+                        let _2 := add(_1, 32)
+                        mstore(_2, "aaaaa")
+                        let memPos := mload(64)
+                        mstore(memPos, 32)
                         let length := mload(_1)
-                        mstore(add(memPos, 0x20), length)
-                        mcopy(add(memPos, _2), _3, length)
-                        mstore(add(add(memPos, length), _2), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
+                        mstore(add(memPos, 32), length)
+                        mcopy(add(memPos, 64), _2, length)
+                        mstore(add(add(memPos, length), 64), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/mcopy_string_literal_returned_from_function/output b/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
index 02740ec0d6..548c34de86 100644
--- a/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
+++ b/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
@@ -22,25 +22,24 @@ object "C_10" {
                     {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                        let _2 := 64
-                        let newFreePtr := add(_1, _2)
+                        let newFreePtr := add(_1, 64)
                         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
                             revert(0, 0x24)
                         }
-                        mstore(_2, newFreePtr)
+                        mstore(64, newFreePtr)
                         mstore(_1, 25)
-                        let _3 := add(_1, 0x20)
-                        mstore(_3, "MCOPY on Cancun vacation.")
-                        let memPos := mload(_2)
-                        mstore(memPos, 0x20)
+                        let _2 := add(_1, 32)
+                        mstore(_2, "MCOPY on Cancun vacation.")
+                        let memPos := mload(64)
+                        mstore(memPos, 32)
                         let length := mload(_1)
-                        mstore(add(memPos, 0x20), length)
-                        mcopy(add(memPos, _2), _3, length)
-                        mstore(add(add(memPos, length), _2), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
+                        mstore(add(memPos, 32), length)
+                        mcopy(add(memPos, 64), _2, length)
+                        mstore(add(add(memPos, length), 64), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 0a461e3e4a..04abaf6001 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -17,100 +17,104 @@ object "C_59" {
         code {
             {
                 /// @src 0:346:625  "contract C {..."
-                let _1 := memoryguard(0x80)
-                let _2 := 4
-                if iszero(lt(calldatasize(), _2))
+                mstore(64, memoryguard(0x80))
+                if iszero(lt(calldatasize(), 4))
                 {
                     if eq(0xf8eddcc6, shr(224, calldataload(0)))
                     {
                         if callvalue() { revert(0, 0) }
-                        let _3 := 32
-                        if slt(add(calldatasize(), not(3)), _3) { revert(0, 0) }
-                        let offset := calldataload(_2)
-                        let _4 := 0xffffffffffffffff
-                        if gt(offset, _4) { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 32) { revert(0, 0) }
+                        let offset := calldataload(4)
+                        if gt(offset, 0xffffffffffffffff) { 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)
+                        let length := calldataload(add(4, offset))
+                        if gt(length, 0xffffffffffffffff)
                         {
                             mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
+                            mstore(4, 0x41)
+                            revert(0, 36)
                         }
-                        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))
+                        let _1 := shl(5, length)
+                        let memPtr := 0
+                        memPtr := mload(64)
+                        let newFreePtr := add(memPtr, and(add(_1, 63), not(31)))
+                        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr))
                         {
                             mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
+                            mstore(4, 0x41)
+                            revert(0, 36)
                         }
-                        let _9 := 64
-                        mstore(_9, newFreePtr)
-                        let dst := _1
-                        mstore(_1, _5)
-                        dst := add(_1, _3)
+                        mstore(64, newFreePtr)
+                        let dst := memPtr
+                        mstore(memPtr, length)
+                        dst := add(memPtr, 32)
                         let dst_1 := dst
-                        let srcEnd := add(add(offset, _7), _6)
+                        let srcEnd := add(add(offset, _1), 36)
                         if gt(srcEnd, calldatasize()) { revert(0, 0) }
-                        let src := add(offset, _6)
-                        for { } lt(src, srcEnd) { src := add(src, _3) }
+                        let src := add(offset, 36)
+                        for { } lt(src, srcEnd) { src := add(src, 32) }
                         {
-                            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))
+                            if slt(sub(calldatasize(), src), 32) { revert(0, 0) }
+                            let memPtr_1 := 0
+                            memPtr_1 := mload(64)
+                            let newFreePtr_1 := add(memPtr_1, 32)
+                            if or(gt(newFreePtr_1, 0xffffffffffffffff), lt(newFreePtr_1, memPtr_1))
                             {
                                 mstore(0, shl(224, 0x4e487b71))
-                                mstore(_2, 0x41)
-                                revert(0, _6)
+                                mstore(4, 0x41)
+                                revert(0, 36)
                             }
-                            mstore(_9, newFreePtr_1)
-                            mstore(memPtr, calldataload(src))
-                            mstore(dst, memPtr)
-                            dst := add(dst, _3)
+                            mstore(64, newFreePtr_1)
+                            mstore(memPtr_1, calldataload(src))
+                            mstore(dst, memPtr_1)
+                            dst := add(dst, 32)
                         }
-                        if iszero(mload(_1))
+                        /// @src 0:469:474  "_s[0]"
+                        let addr := /** @src 0:346:625  "contract C {..." */ 0
+                        if iszero(mload(memPtr))
                         {
                             mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x32)
-                            revert(0, _6)
+                            mstore(4, 0x32)
+                            revert(0, 36)
                         }
+                        addr := 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)))
+                        /// @src 0:489:494  "_s[1]"
+                        let addr_1 := /** @src 0:346:625  "contract C {..." */ 0
+                        if iszero(lt(/** @src 0:492:493  "1" */ 0x01, /** @src 0:346:625  "contract C {..." */ mload(memPtr)))
                         {
                             mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x32)
-                            revert(0, _6)
+                            mstore(4, 0x32)
+                            revert(0, 36)
                         }
-                        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, _4), lt(newFreePtr_2, memPtr_1))
+                        addr_1 := add(memPtr, 64)
+                        let _2 := mload(/** @src 0:489:494  "_s[1]" */ mload(addr_1))
+                        /// @src 0:346:625  "contract C {..."
+                        sstore(0x02, _2)
+                        let memPtr_2 := 0
+                        memPtr_2 := mload(64)
+                        let newFreePtr_2 := add(memPtr_2, 160)
+                        if or(gt(newFreePtr_2, 0xffffffffffffffff), lt(newFreePtr_2, memPtr_2))
                         {
                             mstore(0, shl(224, 0x4e487b71))
-                            mstore(_2, 0x41)
-                            revert(0, _6)
+                            mstore(4, 0x41)
+                            revert(0, 36)
                         }
-                        mstore(_9, newFreePtr_2)
-                        mstore(memPtr_1, 100)
-                        let _11 := add(memPtr_1, _3)
-                        mstore(_11, "longstringlongstringlongstringlo")
-                        mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
-                        mstore(add(memPtr_1, 96), "stringlongstringlongstringlongst")
-                        mstore(add(memPtr_1, 128), "ring")
-                        let memPos := mload(_9)
-                        mstore(memPos, _10)
-                        mstore(add(memPos, _3), _9)
-                        let length := mload(memPtr_1)
-                        mstore(add(memPos, _9), length)
-                        mcopy(add(memPos, 96), _11, length)
-                        mstore(add(add(memPos, length), 96), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), 96))
+                        mstore(64, newFreePtr_2)
+                        mstore(memPtr_2, 100)
+                        let _3 := add(memPtr_2, 32)
+                        mstore(_3, "longstringlongstringlongstringlo")
+                        mstore(add(memPtr_2, 64), "ngstringlongstringlongstringlong")
+                        mstore(add(memPtr_2, 96), "stringlongstringlongstringlongst")
+                        mstore(add(memPtr_2, 128), "ring")
+                        let memPos := mload(64)
+                        mstore(memPos, _2)
+                        mstore(add(memPos, 32), 64)
+                        let length_1 := mload(memPtr_2)
+                        mstore(add(memPos, 64), length_1)
+                        mcopy(add(memPos, 96), _3, length_1)
+                        mstore(add(add(memPos, length_1), 96), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length_1, 0x1f), not(31))), memPos), 96))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index b32d421d07..c1e0796f56 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -18,7 +18,6 @@ object "Arraysum_34" {
             {
                 /// @src 0:80:429  "contract Arraysum {..."
                 mstore(64, memoryguard(0x80))
-                let _1 := 4
                 if iszero(lt(calldatasize(), 4))
                 {
                     if eq(0x81d73423, shr(224, calldataload(0)))
@@ -26,12 +25,14 @@ object "Arraysum_34" {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         let var_sum := 0
+                        /// @src 0:175:182  "sum = 0"
+                        var_sum := /** @src 0:80:429  "contract Arraysum {..." */ 0
                         /// @src 0:368:378  "uint i = 0"
                         let var_i := /** @src 0:80:429  "contract Arraysum {..." */ 0
-                        let _2 := sload(0)
+                        let _1 := 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)
+                        /** @src 0:80:429  "contract Arraysum {..." */ 1
                         /// @src 0:368:378  "uint i = 0"
                         {
                             /// @src 0:399:402  "i++"
@@ -39,13 +40,17 @@ object "Arraysum_34" {
                         }
                         /// @src 0:399:402  "i++"
                         {
+                            /// @src 0:380:397  "i < values.length"
+                            let _2 := iszero(lt(var_i, _1))
+                            if _2 { break }
                             /// @src 0:80:429  "contract Arraysum {..."
+                            _2 := 0
                             mstore(0, 0)
                             let sum := add(var_sum, sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)))
                             if gt(var_sum, sum)
                             {
                                 mstore(0, shl(224, 0x4e487b71))
-                                mstore(_1, 0x11)
+                                mstore(4, 0x11)
                                 revert(0, 0x24)
                             }
                             /// @src 0:407:423  "sum += values[i]"
@@ -54,7 +59,7 @@ object "Arraysum_34" {
                         /// @src 0:80:429  "contract Arraysum {..."
                         let memPos := mload(64)
                         mstore(memPos, var_sum)
-                        return(memPos, 32)
+                        return(memPos, 0x20)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output
index 602a7de95b..689e82ddb4 100644
--- a/test/cmdlineTests/optimizer_user_yul/output
+++ b/test/cmdlineTests/optimizer_user_yul/output
@@ -42,7 +42,6 @@ tag_5:
     /* "optimizer_user_yul/input.sol":263:269  a := 2 */
   swap1
   pop
-  0x00
     /* "optimizer_user_yul/input.sol":369:370  3 */
   0x03
     /* "optimizer_user_yul/input.sol":366:367  2 */
@@ -59,18 +58,10 @@ 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
-    /* "optimizer_user_yul/input.sol":495:504  exp(x, y) */
-  0x01
-    /* "optimizer_user_yul/input.sol":490:504  z := exp(x, y) */
-  swap2
-  pop
-    /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
-  jump(tag_6)
-tag_8:
     /* "optimizer_user_yul/input.sol":380:383  { } */
-  pop
   pop
     /* "optimizer_user_yul/input.sol":340:513  {... */
   pop
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 642d07f49a..4ef3c6df18 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
@@ -76,25 +76,18 @@ stop
 
 sub_0: assembly {
         /* \"C\":79:503  contract C... */
-      0x80
-      0x40
-      swap1
-      dup1
-      dup3
-      mstore
+      mstore(0x40, 0x80)
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
     tag_2:
       shr(0xe0, calldataload(0x00))
-      swap1
-      dup2
+      dup1
       0x26121ff0
       eq
       tag_4
       jumpi
-      pop
       dup1
       0x793816ec
       eq
@@ -122,19 +115,17 @@ sub_0: assembly {
       dup2
       swap1
       sstore
-      dup2
-      mload
+      mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":475:483  this.f() */
       dup2
       mstore
         /* \"C\":79:503  contract C... */
-      swap2
       swap1
         /* \"C\":475:483  this.f() */
       0x20
         /* \"C\":79:503  contract C... */
-      dup4
+      dup3
       0x04
       dup2
         /* \"C\":475:479  this */
@@ -142,50 +133,46 @@ sub_0: assembly {
         /* \"C\":475:483  this.f() */
       gas
       staticcall
-      swap3
-      dup4
+      swap2
+      dup3
       iszero
       tag_16
       jumpi
         /* \"C\":79:503  contract C... */
       0x00
         /* \"C\":475:483  this.f() */
-      swap4
+      swap3
       tag_18
       jumpi
         /* \"C\":79:503  contract C... */
     tag_19:
-        /* \"C\":464:483  stateVar + this.f() */
-      pop
-      tag_20
         /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":464:483  stateVar + this.f() */
-      swap4
         /* \"C\":464:494  stateVar + this.f() + immutVar */
-      tag_21
+      tag_20
         /* \"C\":464:483  stateVar + this.f() */
-      swap3
+      tag_21
+      dup6
+      dup6
       tag_1
       jump\t// in
-    tag_20:
+    tag_21:
         /* \"C\":486:494  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":464:494  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
-    tag_21:
+    tag_20:
         /* \"C\":79:503  contract C... */
-      swap1
-      mload
+      mload(0x40)
       swap1
       dup2
       mstore
       return
         /* \"C\":475:483  this.f() */
     tag_18:
-      swap3
+      swap2
       pop
       0x20
       jumpi(tag_22, gt(0x20, returndatasize))
@@ -196,12 +183,12 @@ sub_0: assembly {
       add
       not(0x1f)
       and
-      dup5
+      dup4
       add
       0xffffffffffffffff
       dup2
       gt
-      dup6
+      dup5
       dup3
       lt
       or
@@ -211,9 +198,9 @@ sub_0: assembly {
       0x20
         /* \"C\":79:503  contract C... */
       swap2
-      dup6
+      dup5
       swap2
-      dup6
+      0x40
       mstore
         /* \"C\":475:483  this.f() */
       dup2
@@ -223,11 +210,11 @@ sub_0: assembly {
       slt
       tag_26
       jumpi
-      swap2
+      swap1
       mload
-      swap2
+      swap1
         /* \"C\":464:483  stateVar + this.f() */
-      tag_20
+      tag_21
         /* \"C\":475:483  this.f() */
       jump(tag_19)
         /* \"C\":79:503  contract C... */
@@ -250,8 +237,7 @@ sub_0: assembly {
       jump(tag_23)
     tag_16:
         /* \"C\":79:503  contract C... */
-      dup3
-      mload
+      mload(0x40)
       returndatasize
       0x00
       dup3
@@ -278,14 +264,11 @@ sub_0: assembly {
       revert
         /* \"C\":79:503  contract C... */
     tag_6:
-      pop
       jumpi(tag_26, callvalue)
       jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       0x20
-      swap1
       sload(0x00)
-      swap1
-      mload
+      mload(0x40)
       swap1
       dup2
       mstore
@@ -296,12 +279,11 @@ sub_0: assembly {
         /* \"C\":326:334  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":120:122  41 */
-      swap1
-      dup2
+      dup1
       0x29
       add
-      swap2
-      dup3
+      swap1
+      dup2
       slt
       0x01
       and
@@ -309,7 +291,9 @@ sub_0: assembly {
       jumpi
         /* \"C\":79:503  contract C... */
       0x20
-      swap2
+      swap1
+      mload(0x40)
+      swap1
       dup2
       mstore
       return
@@ -438,25 +422,18 @@ stop
 
 sub_0: assembly {
         /* \"D\":91:181  contract D is C(3)... */
-      0x80
-      0x40
-      swap1
-      dup1
-      dup3
-      mstore
+      mstore(0x40, 0x80)
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
     tag_2:
       shr(0xe0, calldataload(0x00))
-      swap1
-      dup2
+      dup1
       0x26121ff0
       eq
       tag_4
       jumpi
-      pop
       dup1
       0x793816ec
       eq
@@ -484,19 +461,17 @@ sub_0: assembly {
       dup2
       swap1
       sstore
-      dup2
-      mload
+      mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":475:483  this.f() */
       dup2
       mstore
         /* \"D\":91:181  contract D is C(3)... */
-      swap2
       swap1
         /* \"C\":475:483  this.f() */
       0x20
         /* \"D\":91:181  contract D is C(3)... */
-      dup4
+      dup3
       0x04
       dup2
         /* \"C\":475:479  this */
@@ -504,50 +479,46 @@ sub_0: assembly {
         /* \"C\":475:483  this.f() */
       gas
       staticcall
-      swap3
-      dup4
+      swap2
+      dup3
       iszero
       tag_16
       jumpi
         /* \"D\":91:181  contract D is C(3)... */
       0x00
         /* \"C\":475:483  this.f() */
-      swap4
+      swap3
       tag_18
       jumpi
         /* \"D\":91:181  contract D is C(3)... */
     tag_19:
-        /* \"C\":464:483  stateVar + this.f() */
-      pop
-      tag_20
         /* \"C\":475:483  this.f() */
       0x20
-        /* \"C\":464:483  stateVar + this.f() */
-      swap4
         /* \"C\":464:494  stateVar + this.f() + immutVar */
-      tag_21
+      tag_20
         /* \"C\":464:483  stateVar + this.f() */
-      swap3
+      tag_21
+      dup6
+      dup6
       tag_1
       jump\t// in
-    tag_20:
+    tag_21:
         /* \"C\":486:494  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":464:494  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
-    tag_21:
+    tag_20:
         /* \"D\":91:181  contract D is C(3)... */
-      swap1
-      mload
+      mload(0x40)
       swap1
       dup2
       mstore
       return
         /* \"C\":475:483  this.f() */
     tag_18:
-      swap3
+      swap2
       pop
       0x20
       jumpi(tag_22, gt(0x20, returndatasize))
@@ -558,12 +529,12 @@ sub_0: assembly {
       add
       not(0x1f)
       and
-      dup5
+      dup4
       add
       0xffffffffffffffff
       dup2
       gt
-      dup6
+      dup5
       dup3
       lt
       or
@@ -573,9 +544,9 @@ sub_0: assembly {
       0x20
         /* \"D\":91:181  contract D is C(3)... */
       swap2
-      dup6
+      dup5
       swap2
-      dup6
+      0x40
       mstore
         /* \"C\":475:483  this.f() */
       dup2
@@ -585,11 +556,11 @@ sub_0: assembly {
       slt
       tag_26
       jumpi
-      swap2
+      swap1
       mload
-      swap2
+      swap1
         /* \"C\":464:483  stateVar + this.f() */
-      tag_20
+      tag_21
         /* \"C\":475:483  this.f() */
       jump(tag_19)
         /* \"D\":91:181  contract D is C(3)... */
@@ -612,8 +583,7 @@ sub_0: assembly {
       jump(tag_23)
     tag_16:
         /* \"D\":91:181  contract D is C(3)... */
-      dup3
-      mload
+      mload(0x40)
       returndatasize
       0x00
       dup3
@@ -640,14 +610,11 @@ sub_0: assembly {
       revert
         /* \"D\":91:181  contract D is C(3)... */
     tag_6:
-      pop
       jumpi(tag_26, callvalue)
       jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       0x20
-      swap1
       sload(0x00)
-      swap1
-      mload
+      mload(0x40)
       swap1
       dup2
       mstore
@@ -658,12 +625,11 @@ sub_0: assembly {
         /* \"C\":326:334  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":120:122  41 */
-      swap1
-      dup2
+      dup1
       0x29
       add
-      swap2
-      dup3
+      swap1
+      dup2
       slt
       0x01
       and
@@ -671,7 +637,9 @@ sub_0: assembly {
       jumpi
         /* \"D\":91:181  contract D is C(3)... */
       0x20
-      swap2
+      swap1
+      mload(0x40)
+      swap1
       dup2
       mstore
       return
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 3e687cc1a0..8f0d5b5b5d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -650,9 +650,7 @@ object \"C_54\" {
         code {
             {
                 /// @src 0:79:510  \"contract C...\"
-                let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     switch shr(224, calldataload(0))
@@ -660,89 +658,91 @@ object \"C_54\" {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:333:341  \"immutVar\"
-                        let _3 := loadimmutable(\"8\")
-                        /// @src 0:79:510  \"contract C...\"
-                        let sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 0:79:510  \"contract C...\" */ _3)
-                        if and(1, slt(sum, _3))
+                        let _1 := loadimmutable(\"8\")
+                        /// @src 0:322:341  \"constVar + immutVar\"
+                        let sum := /** @src 0:79:510  \"contract C...\" */ 0
+                        sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 0:79:510  \"contract C...\" */ _1)
+                        if and(1, slt(sum, _1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(0, 0x24)
                         }
-                        mstore(_1, sum)
-                        return(_1, 32)
+                        let memPos := mload(64)
+                        mstore(memPos, sum)
+                        return(memPos, 32)
                     }
                     case 0x793816ec {
                         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, _4)
-                        return(memPos, 32)
+                        let _2 := sload(0)
+                        let memPos_1 := mload(64)
+                        mstore(memPos_1, _2)
+                        return(memPos_1, 32)
                     }
                     case 0x9942ec6f {
                         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))
+                        let _3 := sload(0)
+                        if eq(_3, sub(shl(255, 1), 1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(0, 0x24)
                         }
-                        let ret := add(_5, 1)
+                        let ret := add(_3, 1)
                         sstore(0, ret)
                         /// @src 0:482:490  \"this.f()\"
-                        let _6 := /** @src 0:79:510  \"contract C...\" */ mload(_2)
+                        let _4 := /** @src 0:79:510  \"contract C...\" */ mload(64)
                         /// @src 0:482:490  \"this.f()\"
-                        mstore(_6, /** @src 0:79:510  \"contract C...\" */ shl(228, 0x026121ff))
+                        mstore(_4, /** @src 0:79:510  \"contract C...\" */ shl(228, 0x026121ff))
                         /// @src 0:482:490  \"this.f()\"
-                        let _7 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _6, /** @src 0:79:510  \"contract C...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _6, 32)
-                        if iszero(_7)
+                        let _5 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _4, /** @src 0:79:510  \"contract C...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _4, 32)
+                        if iszero(_5)
                         {
                             /// @src 0:79:510  \"contract C...\"
-                            let pos := mload(_2)
+                            let pos := mload(64)
                             returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
                         /// @src 0:482:490  \"this.f()\"
                         let expr := /** @src 0:79:510  \"contract C...\" */ 0
                         /// @src 0:482:490  \"this.f()\"
-                        if _7
+                        if _5
                         {
-                            let _8 := 32
-                            if gt(32, returndatasize()) { _8 := returndatasize() }
+                            let _6 := 32
+                            if gt(32, returndatasize()) { _6 := returndatasize() }
                             /// @src 0:79:510  \"contract C...\"
-                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
+                            let newFreePtr := add(_4, and(add(_6, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _4))
                             {
                                 mstore(0, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
                                 revert(0, 0x24)
                             }
-                            mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_6, _8), /** @src 0:79:510  \"contract C...\" */ _6), /** @src 0:482:490  \"this.f()\" */ 32)
+                            mstore(64, newFreePtr)
+                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_4, _6), /** @src 0:79:510  \"contract C...\" */ _4), /** @src 0:482:490  \"this.f()\" */ 32)
                             /// @src 0:79:510  \"contract C...\"
                             { revert(0, 0) }
                             /// @src 0:482:490  \"this.f()\"
-                            expr := /** @src 0:79:510  \"contract C...\" */ mload(_6)
+                            expr := /** @src 0:79:510  \"contract C...\" */ mload(_4)
                         }
                         /// @src 0:471:490  \"stateVar + this.f()\"
                         let expr_1 := checked_add_int256(ret, expr)
                         /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
                         let var := /** @src 0:471:501  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:493:501  \"immutVar\" */ loadimmutable(\"8\"))
                         /// @src 0:79:510  \"contract C...\"
-                        let memPos_1 := mload(_2)
-                        mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:482:490  \"this.f()\" */ 32)
+                        let memPos_2 := mload(64)
+                        mstore(memPos_2, var)
+                        return(memPos_2, /** @src 0:482:490  \"this.f()\" */ 32)
                     }
                     case /** @src 0:79:510  \"contract C...\" */ 0xa00b982b {
                         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:127:129  \"41\" */ 0x29)
+                        let memPos_3 := mload(64)
+                        mstore(memPos_3, /** @src 0:127:129  \"41\" */ 0x29)
                         /// @src 0:79:510  \"contract C...\"
-                        return(memPos_2, 32)
+                        return(memPos_3, 32)
                     }
                 }
                 revert(0, 0)
@@ -1493,9 +1493,7 @@ object \"D_72\" {
         code {
             {
                 /// @src 1:91:181  \"contract D is C(3)...\"
-                let _1 := memoryguard(0x80)
-                let _2 := 64
-                mstore(_2, _1)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     switch shr(224, calldataload(0))
@@ -1503,89 +1501,91 @@ object \"D_72\" {
                         if callvalue() { revert(0, 0) }
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:333:341  \"immutVar\"
-                        let _3 := loadimmutable(\"8\")
-                        /// @src 1:91:181  \"contract D is C(3)...\"
-                        let sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 1:91:181  \"contract D is C(3)...\" */ _3)
-                        if and(1, slt(sum, _3))
+                        let _1 := loadimmutable(\"8\")
+                        /// @src 0:322:341  \"constVar + immutVar\"
+                        let sum := /** @src 1:91:181  \"contract D is C(3)...\" */ 0
+                        sum := add(/** @src 0:127:129  \"41\" */ 0x29, /** @src 1:91:181  \"contract D is C(3)...\" */ _1)
+                        if and(1, slt(sum, _1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(0, 0x24)
                         }
-                        mstore(_1, sum)
-                        return(_1, 32)
+                        let memPos := mload(64)
+                        mstore(memPos, sum)
+                        return(memPos, 32)
                     }
                     case 0x793816ec {
                         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, _4)
-                        return(memPos, 32)
+                        let _2 := sload(0)
+                        let memPos_1 := mload(64)
+                        mstore(memPos_1, _2)
+                        return(memPos_1, 32)
                     }
                     case 0x9942ec6f {
                         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))
+                        let _3 := sload(0)
+                        if eq(_3, sub(shl(255, 1), 1))
                         {
                             mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(0, 0x24)
                         }
-                        let ret := add(_5, 1)
+                        let ret := add(_3, 1)
                         sstore(0, ret)
                         /// @src 0:482:490  \"this.f()\"
-                        let _6 := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(_2)
+                        let _4 := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(64)
                         /// @src 0:482:490  \"this.f()\"
-                        mstore(_6, /** @src 1:91:181  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
+                        mstore(_4, /** @src 1:91:181  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
                         /// @src 0:482:490  \"this.f()\"
-                        let _7 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _6, /** @src 1:91:181  \"contract D is C(3)...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _6, 32)
-                        if iszero(_7)
+                        let _5 := staticcall(gas(), /** @src 0:482:486  \"this\" */ address(), /** @src 0:482:490  \"this.f()\" */ _4, /** @src 1:91:181  \"contract D is C(3)...\" */ 4, /** @src 0:482:490  \"this.f()\" */ _4, 32)
+                        if iszero(_5)
                         {
                             /// @src 1:91:181  \"contract D is C(3)...\"
-                            let pos := mload(_2)
+                            let pos := mload(64)
                             returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
                         /// @src 0:482:490  \"this.f()\"
                         let expr := /** @src 1:91:181  \"contract D is C(3)...\" */ 0
                         /// @src 0:482:490  \"this.f()\"
-                        if _7
+                        if _5
                         {
-                            let _8 := 32
-                            if gt(32, returndatasize()) { _8 := returndatasize() }
+                            let _6 := 32
+                            if gt(32, returndatasize()) { _6 := returndatasize() }
                             /// @src 1:91:181  \"contract D is C(3)...\"
-                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
+                            let newFreePtr := add(_4, and(add(_6, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _4))
                             {
                                 mstore(0, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
                                 revert(0, 0x24)
                             }
-                            mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_6, _8), /** @src 1:91:181  \"contract D is C(3)...\" */ _6), /** @src 0:482:490  \"this.f()\" */ 32)
+                            mstore(64, newFreePtr)
+                            if slt(sub(/** @src 0:482:490  \"this.f()\" */ add(_4, _6), /** @src 1:91:181  \"contract D is C(3)...\" */ _4), /** @src 0:482:490  \"this.f()\" */ 32)
                             /// @src 1:91:181  \"contract D is C(3)...\"
                             { revert(0, 0) }
                             /// @src 0:482:490  \"this.f()\"
-                            expr := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(_6)
+                            expr := /** @src 1:91:181  \"contract D is C(3)...\" */ mload(_4)
                         }
                         /// @src 0:471:490  \"stateVar + this.f()\"
                         let expr_1 := checked_add_int256(ret, expr)
                         /// @src 0:464:501  \"return stateVar + this.f() + immutVar\"
                         let var := /** @src 0:471:501  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:493:501  \"immutVar\" */ loadimmutable(\"8\"))
                         /// @src 1:91:181  \"contract D is C(3)...\"
-                        let memPos_1 := mload(_2)
-                        mstore(memPos_1, var)
-                        return(memPos_1, /** @src 0:482:490  \"this.f()\" */ 32)
+                        let memPos_2 := mload(64)
+                        mstore(memPos_2, var)
+                        return(memPos_2, /** @src 0:482:490  \"this.f()\" */ 32)
                     }
                     case /** @src 1:91:181  \"contract D is C(3)...\" */ 0xa00b982b {
                         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:127:129  \"41\" */ 0x29)
+                        let memPos_3 := mload(64)
+                        mstore(memPos_3, /** @src 0:127:129  \"41\" */ 0x29)
                         /// @src 1:91:181  \"contract D is C(3)...\"
-                        return(memPos_2, 32)
+                        return(memPos_3, 32)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/output.json b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
index 0f8c3d4eae..e5b276b1b9 100644
--- a/test/cmdlineTests/standard_optimizer_generatedSources/output.json
+++ b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
@@ -11,9 +11,9 @@
                         "generatedSources": [
                             {
                                 "ast": {
-                                    "nativeSrc": "0:1445:1",
+                                    "nativeSrc": "0:1505:1",
                                     "nodeType": "YulBlock",
-                                    "src": "0:1445:1",
+                                    "src": "0:1505:1",
                                     "statements": [
                                         {
                                             "nativeSrc": "6:3:1",
@@ -159,71 +159,49 @@
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "241:1020:1",
+                                                "nativeSrc": "241:1080:1",
                                                 "nodeType": "YulBlock",
-                                                "src": "241:1020:1",
+                                                "src": "241:1080: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": "",
-                                                            "value": "32"
-                                                        },
-                                                        "variables": [
-                                                            {
-                                                                "name": "_1",
-                                                                "nativeSrc": "255:2:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "255:2:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "308:16:1",
+                                                            "nativeSrc": "287:16:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "308:16:1",
+                                                            "src": "287:16:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "317:1:1",
+                                                                                "nativeSrc": "296:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "317:1:1",
+                                                                                "src": "296:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "320:1:1",
+                                                                                "nativeSrc": "299:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "320:1:1",
+                                                                                "src": "299:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "revert",
-                                                                            "nativeSrc": "310:6:1",
+                                                                            "nativeSrc": "289:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "310:6:1"
+                                                                            "src": "289:6:1"
                                                                         },
-                                                                        "nativeSrc": "310:12:1",
+                                                                        "nativeSrc": "289:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "310:12:1"
+                                                                        "src": "289:12:1"
                                                                     },
-                                                                    "nativeSrc": "310:12:1",
+                                                                    "nativeSrc": "289:12:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "310:12:1"
+                                                                    "src": "289:12:1"
                                                                 }
                                                             ]
                                                         },
@@ -233,142 +211,122 @@
                                                                     "arguments": [
                                                                         {
                                                                             "name": "dataEnd",
-                                                                            "nativeSrc": "283:7:1",
+                                                                            "nativeSrc": "262:7:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "283:7:1"
+                                                                            "src": "262:7:1"
                                                                         },
                                                                         {
                                                                             "name": "headStart",
-                                                                            "nativeSrc": "292:9:1",
+                                                                            "nativeSrc": "271:9:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "292:9:1"
+                                                                            "src": "271:9:1"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "sub",
-                                                                        "nativeSrc": "279:3:1",
+                                                                        "nativeSrc": "258:3:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "279:3:1"
+                                                                        "src": "258:3:1"
                                                                     },
-                                                                    "nativeSrc": "279:23:1",
+                                                                    "nativeSrc": "258:23:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "279:23:1"
+                                                                    "src": "258:23:1"
                                                                 },
                                                                 {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "304:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "304:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "283:2:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "283:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "slt",
-                                                                "nativeSrc": "275:3:1",
+                                                                "nativeSrc": "254:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "275:3:1"
+                                                                "src": "254:3:1"
                                                             },
-                                                            "nativeSrc": "275:32:1",
+                                                            "nativeSrc": "254:32:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "275:32:1"
+                                                            "src": "254:32:1"
                                                         },
-                                                        "nativeSrc": "272:52:1",
+                                                        "nativeSrc": "251:52:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "272:52:1"
+                                                        "src": "251:52:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "333:37:1",
+                                                        "nativeSrc": "312:37:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "333:37:1",
+                                                        "src": "312:37:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "name": "headStart",
-                                                                    "nativeSrc": "360:9:1",
+                                                                    "nativeSrc": "339:9:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "360:9:1"
+                                                                    "src": "339:9:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "calldataload",
-                                                                "nativeSrc": "347:12:1",
+                                                                "nativeSrc": "326:12:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "347:12:1"
+                                                                "src": "326:12:1"
                                                             },
-                                                            "nativeSrc": "347:23:1",
+                                                            "nativeSrc": "326:23:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "347:23:1"
+                                                            "src": "326:23:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "offset",
-                                                                "nativeSrc": "337:6:1",
-                                                                "nodeType": "YulTypedName",
-                                                                "src": "337:6:1",
-                                                                "type": ""
-                                                            }
-                                                        ]
-                                                    },
-                                                    {
-                                                        "nativeSrc": "379:28:1",
-                                                        "nodeType": "YulVariableDeclaration",
-                                                        "src": "379:28:1",
-                                                        "value": {
-                                                            "kind": "number",
-                                                            "nativeSrc": "389:18:1",
-                                                            "nodeType": "YulLiteral",
-                                                            "src": "389:18:1",
-                                                            "type": "",
-                                                            "value": "0xffffffffffffffff"
-                                                        },
-                                                        "variables": [
-                                                            {
-                                                                "name": "_2",
-                                                                "nativeSrc": "383:2:1",
+                                                                "nativeSrc": "316:6:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "383:2:1",
+                                                                "src": "316:6:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "434:16:1",
+                                                            "nativeSrc": "392:16:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "434:16:1",
+                                                            "src": "392:16:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "443:1:1",
+                                                                                "nativeSrc": "401:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "443:1:1",
+                                                                                "src": "401:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "446:1:1",
+                                                                                "nativeSrc": "404:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "446:1:1",
+                                                                                "src": "404:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "revert",
-                                                                            "nativeSrc": "436:6:1",
+                                                                            "nativeSrc": "394:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "436:6:1"
+                                                                            "src": "394:6:1"
                                                                         },
-                                                                        "nativeSrc": "436:12:1",
+                                                                        "nativeSrc": "394:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "436:12:1"
+                                                                        "src": "394:12:1"
                                                                     },
-                                                                    "nativeSrc": "436:12:1",
+                                                                    "nativeSrc": "394:12:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "436:12:1"
+                                                                    "src": "394:12:1"
                                                                 }
                                                             ]
                                                         },
@@ -376,109 +334,111 @@
                                                             "arguments": [
                                                                 {
                                                                     "name": "offset",
-                                                                    "nativeSrc": "422:6:1",
+                                                                    "nativeSrc": "364:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "422:6:1"
+                                                                    "src": "364:6:1"
                                                                 },
                                                                 {
-                                                                    "name": "_2",
-                                                                    "nativeSrc": "430:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "430:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "372:18:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "372:18:1",
+                                                                    "type": "",
+                                                                    "value": "0xffffffffffffffff"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "gt",
-                                                                "nativeSrc": "419:2:1",
+                                                                "nativeSrc": "361:2:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "419:2:1"
+                                                                "src": "361:2:1"
                                                             },
-                                                            "nativeSrc": "419:14:1",
+                                                            "nativeSrc": "361:30:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "419:14:1"
+                                                            "src": "361:30:1"
                                                         },
-                                                        "nativeSrc": "416:34:1",
+                                                        "nativeSrc": "358:50:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "416:34:1"
+                                                        "src": "358:50:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "459:32:1",
+                                                        "nativeSrc": "417:32:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "459:32:1",
+                                                        "src": "417:32:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "name": "headStart",
-                                                                    "nativeSrc": "473:9:1",
+                                                                    "nativeSrc": "431:9:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "473:9:1"
+                                                                    "src": "431:9:1"
                                                                 },
                                                                 {
                                                                     "name": "offset",
-                                                                    "nativeSrc": "484:6:1",
+                                                                    "nativeSrc": "442:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "484:6:1"
+                                                                    "src": "442:6:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "469:3:1",
+                                                                "nativeSrc": "427:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "469:3:1"
+                                                                "src": "427:3:1"
                                                             },
-                                                            "nativeSrc": "469:22:1",
+                                                            "nativeSrc": "427:22:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "469:22:1"
+                                                            "src": "427:22:1"
                                                         },
                                                         "variables": [
                                                             {
-                                                                "name": "_3",
-                                                                "nativeSrc": "463:2:1",
+                                                                "name": "_1",
+                                                                "nativeSrc": "421:2:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "463:2:1",
+                                                                "src": "421:2:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "539:16:1",
+                                                            "nativeSrc": "497:16:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "539:16:1",
+                                                            "src": "497:16:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "548:1:1",
+                                                                                "nativeSrc": "506:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "548:1:1",
+                                                                                "src": "506:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "551:1:1",
+                                                                                "nativeSrc": "509:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "551:1:1",
+                                                                                "src": "509:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "revert",
-                                                                            "nativeSrc": "541:6:1",
+                                                                            "nativeSrc": "499:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "541:6:1"
+                                                                            "src": "499:6:1"
                                                                         },
-                                                                        "nativeSrc": "541:12:1",
+                                                                        "nativeSrc": "499:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "541:12:1"
+                                                                        "src": "499:12:1"
                                                                     },
-                                                                    "nativeSrc": "541:12:1",
+                                                                    "nativeSrc": "499:12:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "541:12:1"
+                                                                    "src": "499:12:1"
                                                                 }
                                                             ]
                                                         },
@@ -489,341 +449,343 @@
                                                                         {
                                                                             "arguments": [
                                                                                 {
-                                                                                    "name": "_3",
-                                                                                    "nativeSrc": "518:2:1",
+                                                                                    "name": "_1",
+                                                                                    "nativeSrc": "476:2:1",
                                                                                     "nodeType": "YulIdentifier",
-                                                                                    "src": "518:2:1"
+                                                                                    "src": "476:2:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
-                                                                                    "nativeSrc": "522:4:1",
+                                                                                    "nativeSrc": "480:4:1",
                                                                                     "nodeType": "YulLiteral",
-                                                                                    "src": "522:4:1",
+                                                                                    "src": "480:4:1",
                                                                                     "type": "",
                                                                                     "value": "0x1f"
                                                                                 }
                                                                             ],
                                                                             "functionName": {
                                                                                 "name": "add",
-                                                                                "nativeSrc": "514:3:1",
+                                                                                "nativeSrc": "472:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "514:3:1"
+                                                                                "src": "472:3:1"
                                                                             },
-                                                                            "nativeSrc": "514:13:1",
+                                                                            "nativeSrc": "472:13:1",
                                                                             "nodeType": "YulFunctionCall",
-                                                                            "src": "514:13:1"
+                                                                            "src": "472:13:1"
                                                                         },
                                                                         {
                                                                             "name": "dataEnd",
-                                                                            "nativeSrc": "529:7:1",
+                                                                            "nativeSrc": "487:7:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "529:7:1"
+                                                                            "src": "487:7:1"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "slt",
-                                                                        "nativeSrc": "510:3:1",
+                                                                        "nativeSrc": "468:3:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "510:3:1"
+                                                                        "src": "468:3:1"
                                                                     },
-                                                                    "nativeSrc": "510:27:1",
+                                                                    "nativeSrc": "468:27:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "510:27:1"
+                                                                    "src": "468:27:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "iszero",
-                                                                "nativeSrc": "503:6:1",
+                                                                "nativeSrc": "461:6:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "503:6:1"
+                                                                "src": "461:6:1"
                                                             },
-                                                            "nativeSrc": "503:35:1",
+                                                            "nativeSrc": "461:35:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "503:35:1"
+                                                            "src": "461:35:1"
                                                         },
-                                                        "nativeSrc": "500:55:1",
+                                                        "nativeSrc": "458:55:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "500:55:1"
+                                                        "src": "458:55:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "564:26:1",
+                                                        "nativeSrc": "522:30:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "564:26:1",
+                                                        "src": "522:30:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
-                                                                    "name": "_3",
-                                                                    "nativeSrc": "587:2:1",
+                                                                    "name": "_1",
+                                                                    "nativeSrc": "549:2:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "587:2:1"
+                                                                    "src": "549:2:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "calldataload",
-                                                                "nativeSrc": "574:12:1",
+                                                                "nativeSrc": "536:12:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "574:12:1"
+                                                                "src": "536:12:1"
                                                             },
-                                                            "nativeSrc": "574:16:1",
+                                                            "nativeSrc": "536:16:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "574:16:1"
+                                                            "src": "536:16:1"
                                                         },
                                                         "variables": [
                                                             {
-                                                                "name": "_4",
-                                                                "nativeSrc": "568:2:1",
+                                                                "name": "length",
+                                                                "nativeSrc": "526:6:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "568:2:1",
+                                                                "src": "526:6:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "613:22:1",
+                                                            "nativeSrc": "595:22:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "613:22:1",
+                                                            "src": "595:22:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [],
                                                                         "functionName": {
                                                                             "name": "panic_error_0x41",
-                                                                            "nativeSrc": "615:16:1",
+                                                                            "nativeSrc": "597:16:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "615:16:1"
+                                                                            "src": "597:16:1"
                                                                         },
-                                                                        "nativeSrc": "615:18:1",
+                                                                        "nativeSrc": "597:18:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "615:18:1"
+                                                                        "src": "597:18:1"
                                                                     },
-                                                                    "nativeSrc": "615:18:1",
+                                                                    "nativeSrc": "597:18:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "615:18:1"
+                                                                    "src": "597:18:1"
                                                                 }
                                                             ]
                                                         },
                                                         "condition": {
                                                             "arguments": [
                                                                 {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "605:2:1",
+                                                                    "name": "length",
+                                                                    "nativeSrc": "567:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "605:2:1"
+                                                                    "src": "567:6:1"
                                                                 },
                                                                 {
-                                                                    "name": "_2",
-                                                                    "nativeSrc": "609:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "609:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "575:18:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "575:18:1",
+                                                                    "type": "",
+                                                                    "value": "0xffffffffffffffff"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "gt",
-                                                                "nativeSrc": "602:2:1",
+                                                                "nativeSrc": "564:2:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "602:2:1"
+                                                                "src": "564:2:1"
                                                             },
-                                                            "nativeSrc": "602:10:1",
+                                                            "nativeSrc": "564:30:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "602:10:1"
+                                                            "src": "564:30:1"
                                                         },
-                                                        "nativeSrc": "599:36:1",
+                                                        "nativeSrc": "561:56:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "599:36:1"
+                                                        "src": "561:56:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "644:20:1",
+                                                        "nativeSrc": "626:24:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "644:20:1",
+                                                        "src": "626:24:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "658:1:1",
+                                                                    "nativeSrc": "640:1:1",
                                                                     "nodeType": "YulLiteral",
-                                                                    "src": "658:1:1",
+                                                                    "src": "640:1:1",
                                                                     "type": "",
                                                                     "value": "5"
                                                                 },
                                                                 {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "661:2:1",
+                                                                    "name": "length",
+                                                                    "nativeSrc": "643:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "661:2:1"
+                                                                    "src": "643:6:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "shl",
-                                                                "nativeSrc": "654:3:1",
+                                                                "nativeSrc": "636:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "654:3:1"
+                                                                "src": "636:3:1"
                                                             },
-                                                            "nativeSrc": "654:10:1",
+                                                            "nativeSrc": "636:14:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "654:10:1"
+                                                            "src": "636:14:1"
                                                         },
                                                         "variables": [
                                                             {
-                                                                "name": "_5",
-                                                                "nativeSrc": "648:2:1",
+                                                                "name": "_2",
+                                                                "nativeSrc": "630:2:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "648:2:1",
+                                                                "src": "630:2:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
-                                                        "nativeSrc": "673:23:1",
+                                                        "nativeSrc": "659:23:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "673:23:1",
+                                                        "src": "659:23:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "693:2:1",
+                                                                    "nativeSrc": "679:2:1",
                                                                     "nodeType": "YulLiteral",
-                                                                    "src": "693:2:1",
+                                                                    "src": "679:2:1",
                                                                     "type": "",
                                                                     "value": "64"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "mload",
-                                                                "nativeSrc": "687:5:1",
+                                                                "nativeSrc": "673:5:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "687:5:1"
+                                                                "src": "673:5:1"
                                                             },
-                                                            "nativeSrc": "687:9:1",
+                                                            "nativeSrc": "673:9:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "687:9:1"
+                                                            "src": "673:9:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "memPtr",
-                                                                "nativeSrc": "677:6:1",
+                                                                "nativeSrc": "663:6:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "677:6:1",
+                                                                "src": "663:6:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
-                                                        "nativeSrc": "705:56:1",
+                                                        "nativeSrc": "691:56:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "705:56:1",
+                                                        "src": "691:56:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "name": "memPtr",
-                                                                    "nativeSrc": "727:6:1",
+                                                                    "nativeSrc": "713:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "727:6:1"
+                                                                    "src": "713:6:1"
                                                                 },
                                                                 {
                                                                     "arguments": [
                                                                         {
                                                                             "arguments": [
                                                                                 {
-                                                                                    "name": "_5",
-                                                                                    "nativeSrc": "743:2:1",
+                                                                                    "name": "_2",
+                                                                                    "nativeSrc": "729:2:1",
                                                                                     "nodeType": "YulIdentifier",
-                                                                                    "src": "743:2:1"
+                                                                                    "src": "729:2:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
-                                                                                    "nativeSrc": "747:2:1",
+                                                                                    "nativeSrc": "733:2:1",
                                                                                     "nodeType": "YulLiteral",
-                                                                                    "src": "747:2:1",
+                                                                                    "src": "733:2:1",
                                                                                     "type": "",
                                                                                     "value": "63"
                                                                                 }
                                                                             ],
                                                                             "functionName": {
                                                                                 "name": "add",
-                                                                                "nativeSrc": "739:3:1",
+                                                                                "nativeSrc": "725:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "739:3:1"
+                                                                                "src": "725:3:1"
                                                                             },
-                                                                            "nativeSrc": "739:11:1",
+                                                                            "nativeSrc": "725:11:1",
                                                                             "nodeType": "YulFunctionCall",
-                                                                            "src": "739:11:1"
+                                                                            "src": "725:11:1"
                                                                         },
                                                                         {
                                                                             "arguments": [
                                                                                 {
                                                                                     "kind": "number",
-                                                                                    "nativeSrc": "756:2:1",
+                                                                                    "nativeSrc": "742:2:1",
                                                                                     "nodeType": "YulLiteral",
-                                                                                    "src": "756:2:1",
+                                                                                    "src": "742:2:1",
                                                                                     "type": "",
                                                                                     "value": "31"
                                                                                 }
                                                                             ],
                                                                             "functionName": {
                                                                                 "name": "not",
-                                                                                "nativeSrc": "752:3:1",
+                                                                                "nativeSrc": "738:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "752:3:1"
+                                                                                "src": "738:3:1"
                                                                             },
-                                                                            "nativeSrc": "752:7:1",
+                                                                            "nativeSrc": "738:7:1",
                                                                             "nodeType": "YulFunctionCall",
-                                                                            "src": "752:7:1"
+                                                                            "src": "738:7:1"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "and",
-                                                                        "nativeSrc": "735:3:1",
+                                                                        "nativeSrc": "721:3:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "735:3:1"
+                                                                        "src": "721:3:1"
                                                                     },
-                                                                    "nativeSrc": "735:25:1",
+                                                                    "nativeSrc": "721:25:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "735:25:1"
+                                                                    "src": "721:25:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "723:3:1",
+                                                                "nativeSrc": "709:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "723:3:1"
+                                                                "src": "709:3:1"
                                                             },
-                                                            "nativeSrc": "723:38:1",
+                                                            "nativeSrc": "709:38:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "723:38:1"
+                                                            "src": "709:38:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "newFreePtr",
-                                                                "nativeSrc": "709:10:1",
+                                                                "nativeSrc": "695:10:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "709:10:1",
+                                                                "src": "695:10:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "820:22:1",
+                                                            "nativeSrc": "822:22:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "820:22:1",
+                                                            "src": "822:22:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [],
                                                                         "functionName": {
                                                                             "name": "panic_error_0x41",
-                                                                            "nativeSrc": "822:16:1",
+                                                                            "nativeSrc": "824:16:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "822:16:1"
+                                                                            "src": "824:16:1"
                                                                         },
-                                                                        "nativeSrc": "822:18:1",
+                                                                        "nativeSrc": "824:18:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "822:18:1"
+                                                                        "src": "824:18:1"
                                                                     },
-                                                                    "nativeSrc": "822:18:1",
+                                                                    "nativeSrc": "824:18:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "822:18:1"
+                                                                    "src": "824:18:1"
                                                                 }
                                                             ]
                                                         },
@@ -833,115 +795,117 @@
                                                                     "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
-                                                                            "nativeSrc": "779:10:1",
+                                                                            "nativeSrc": "765:10:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "779:10:1"
+                                                                            "src": "765:10:1"
                                                                         },
                                                                         {
-                                                                            "name": "_2",
-                                                                            "nativeSrc": "791:2:1",
-                                                                            "nodeType": "YulIdentifier",
-                                                                            "src": "791:2:1"
+                                                                            "kind": "number",
+                                                                            "nativeSrc": "777:18:1",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "777:18:1",
+                                                                            "type": "",
+                                                                            "value": "0xffffffffffffffff"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "gt",
-                                                                        "nativeSrc": "776:2:1",
+                                                                        "nativeSrc": "762:2:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "776:2:1"
+                                                                        "src": "762:2:1"
                                                                     },
-                                                                    "nativeSrc": "776:18:1",
+                                                                    "nativeSrc": "762:34:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "776:18:1"
+                                                                    "src": "762:34:1"
                                                                 },
                                                                 {
                                                                     "arguments": [
                                                                         {
                                                                             "name": "newFreePtr",
-                                                                            "nativeSrc": "799:10:1",
+                                                                            "nativeSrc": "801:10:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "799:10:1"
+                                                                            "src": "801:10:1"
                                                                         },
                                                                         {
                                                                             "name": "memPtr",
-                                                                            "nativeSrc": "811:6:1",
+                                                                            "nativeSrc": "813:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "811:6:1"
+                                                                            "src": "813:6:1"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "lt",
-                                                                        "nativeSrc": "796:2:1",
+                                                                        "nativeSrc": "798:2:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "796:2:1"
+                                                                        "src": "798:2:1"
                                                                     },
-                                                                    "nativeSrc": "796:22:1",
+                                                                    "nativeSrc": "798:22:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "796:22:1"
+                                                                    "src": "798:22:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "or",
-                                                                "nativeSrc": "773:2:1",
+                                                                "nativeSrc": "759:2:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "773:2:1"
+                                                                "src": "759:2:1"
                                                             },
-                                                            "nativeSrc": "773:46:1",
+                                                            "nativeSrc": "759:62:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "773:46:1"
+                                                            "src": "759:62:1"
                                                         },
-                                                        "nativeSrc": "770:72:1",
+                                                        "nativeSrc": "756:88:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "770:72:1"
+                                                        "src": "756:88:1"
                                                     },
                                                     {
                                                         "expression": {
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "858:2:1",
+                                                                    "nativeSrc": "860:2:1",
                                                                     "nodeType": "YulLiteral",
-                                                                    "src": "858:2:1",
+                                                                    "src": "860:2:1",
                                                                     "type": "",
                                                                     "value": "64"
                                                                 },
                                                                 {
                                                                     "name": "newFreePtr",
-                                                                    "nativeSrc": "862:10:1",
+                                                                    "nativeSrc": "864:10:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "862:10:1"
+                                                                    "src": "864:10:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "mstore",
-                                                                "nativeSrc": "851:6:1",
+                                                                "nativeSrc": "853:6:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "851:6:1"
+                                                                "src": "853:6:1"
                                                             },
-                                                            "nativeSrc": "851:22:1",
+                                                            "nativeSrc": "853:22:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "851:22:1"
+                                                            "src": "853:22:1"
                                                         },
-                                                        "nativeSrc": "851:22:1",
+                                                        "nativeSrc": "853:22:1",
                                                         "nodeType": "YulExpressionStatement",
-                                                        "src": "851:22:1"
+                                                        "src": "853:22:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "882:17:1",
+                                                        "nativeSrc": "884:17:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "882:17:1",
+                                                        "src": "884:17:1",
                                                         "value": {
                                                             "name": "memPtr",
-                                                            "nativeSrc": "893:6:1",
+                                                            "nativeSrc": "895:6:1",
                                                             "nodeType": "YulIdentifier",
-                                                            "src": "893:6:1"
+                                                            "src": "895:6:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "dst",
-                                                                "nativeSrc": "886:3:1",
+                                                                "nativeSrc": "888:3:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "886:3:1",
+                                                                "src": "888:3:1",
                                                                 "type": ""
                                                             }
                                                         ]
@@ -951,166 +915,170 @@
                                                             "arguments": [
                                                                 {
                                                                     "name": "memPtr",
-                                                                    "nativeSrc": "915:6:1",
+                                                                    "nativeSrc": "917:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "915:6:1"
+                                                                    "src": "917:6:1"
                                                                 },
                                                                 {
-                                                                    "name": "_4",
-                                                                    "nativeSrc": "923:2:1",
+                                                                    "name": "length",
+                                                                    "nativeSrc": "925:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "923:2:1"
+                                                                    "src": "925:6:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "mstore",
-                                                                "nativeSrc": "908:6:1",
+                                                                "nativeSrc": "910:6:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "908:6:1"
+                                                                "src": "910:6:1"
                                                             },
-                                                            "nativeSrc": "908:18:1",
+                                                            "nativeSrc": "910:22:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "908:18:1"
+                                                            "src": "910:22:1"
                                                         },
-                                                        "nativeSrc": "908:18:1",
+                                                        "nativeSrc": "910:22:1",
                                                         "nodeType": "YulExpressionStatement",
-                                                        "src": "908:18:1"
+                                                        "src": "910:22:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "935:22:1",
+                                                        "nativeSrc": "941:22:1",
                                                         "nodeType": "YulAssignment",
-                                                        "src": "935:22:1",
+                                                        "src": "941:22:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "name": "memPtr",
-                                                                    "nativeSrc": "946:6:1",
+                                                                    "nativeSrc": "952:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "946:6:1"
+                                                                    "src": "952:6:1"
                                                                 },
                                                                 {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "954:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "954:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "960:2:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "960:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "942:3:1",
+                                                                "nativeSrc": "948:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "942:3:1"
+                                                                "src": "948:3:1"
                                                             },
-                                                            "nativeSrc": "942:15:1",
+                                                            "nativeSrc": "948:15:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "942:15:1"
+                                                            "src": "948:15:1"
                                                         },
                                                         "variableNames": [
                                                             {
                                                                 "name": "dst",
-                                                                "nativeSrc": "935:3:1",
+                                                                "nativeSrc": "941:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "935:3:1"
+                                                                "src": "941:3:1"
                                                             }
                                                         ]
                                                     },
                                                     {
-                                                        "nativeSrc": "966:34:1",
+                                                        "nativeSrc": "972:34:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "966:34:1",
+                                                        "src": "972:34:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "arguments": [
                                                                         {
-                                                                            "name": "_3",
-                                                                            "nativeSrc": "988:2:1",
+                                                                            "name": "_1",
+                                                                            "nativeSrc": "994:2:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "988:2:1"
+                                                                            "src": "994:2:1"
                                                                         },
                                                                         {
-                                                                            "name": "_5",
-                                                                            "nativeSrc": "992:2:1",
+                                                                            "name": "_2",
+                                                                            "nativeSrc": "998:2:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "992:2:1"
+                                                                            "src": "998:2:1"
                                                                         }
                                                                     ],
                                                                     "functionName": {
                                                                         "name": "add",
-                                                                        "nativeSrc": "984:3:1",
+                                                                        "nativeSrc": "990:3:1",
                                                                         "nodeType": "YulIdentifier",
-                                                                        "src": "984:3:1"
+                                                                        "src": "990:3:1"
                                                                     },
-                                                                    "nativeSrc": "984:11:1",
+                                                                    "nativeSrc": "990:11:1",
                                                                     "nodeType": "YulFunctionCall",
-                                                                    "src": "984:11:1"
+                                                                    "src": "990:11:1"
                                                                 },
                                                                 {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "997:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "997:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1003:2:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1003:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "980:3:1",
+                                                                "nativeSrc": "986:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "980:3:1"
+                                                                "src": "986:3:1"
                                                             },
-                                                            "nativeSrc": "980:20:1",
+                                                            "nativeSrc": "986:20:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "980:20:1"
+                                                            "src": "986:20:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "srcEnd",
-                                                                "nativeSrc": "970:6:1",
+                                                                "nativeSrc": "976:6:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "970:6:1",
+                                                                "src": "976:6:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "1032:16:1",
+                                                            "nativeSrc": "1038:16:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "1032:16:1",
+                                                            "src": "1038:16:1",
                                                             "statements": [
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "1041:1:1",
+                                                                                "nativeSrc": "1047:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "1041:1:1",
+                                                                                "src": "1047:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
-                                                                                "nativeSrc": "1044:1:1",
+                                                                                "nativeSrc": "1050:1:1",
                                                                                 "nodeType": "YulLiteral",
-                                                                                "src": "1044:1:1",
+                                                                                "src": "1050:1:1",
                                                                                 "type": "",
                                                                                 "value": "0"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "revert",
-                                                                            "nativeSrc": "1034:6:1",
+                                                                            "nativeSrc": "1040:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1034:6:1"
+                                                                            "src": "1040:6:1"
                                                                         },
-                                                                        "nativeSrc": "1034:12:1",
+                                                                        "nativeSrc": "1040:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "1034:12:1"
+                                                                        "src": "1040:12:1"
                                                                     },
-                                                                    "nativeSrc": "1034:12:1",
+                                                                    "nativeSrc": "1040:12:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "1034:12:1"
+                                                                    "src": "1040:12:1"
                                                                 }
                                                             ]
                                                         },
@@ -1118,154 +1086,199 @@
                                                             "arguments": [
                                                                 {
                                                                     "name": "srcEnd",
-                                                                    "nativeSrc": "1015:6:1",
+                                                                    "nativeSrc": "1021:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1015:6:1"
+                                                                    "src": "1021:6:1"
                                                                 },
                                                                 {
                                                                     "name": "dataEnd",
-                                                                    "nativeSrc": "1023:7:1",
+                                                                    "nativeSrc": "1029:7:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1023:7:1"
+                                                                    "src": "1029:7:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "gt",
-                                                                "nativeSrc": "1012:2:1",
+                                                                "nativeSrc": "1018:2:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1012:2:1"
+                                                                "src": "1018:2:1"
                                                             },
-                                                            "nativeSrc": "1012:19:1",
+                                                            "nativeSrc": "1018:19:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "1012:19:1"
+                                                            "src": "1018:19:1"
                                                         },
-                                                        "nativeSrc": "1009:39:1",
+                                                        "nativeSrc": "1015:39:1",
                                                         "nodeType": "YulIf",
-                                                        "src": "1009:39:1"
+                                                        "src": "1015:39:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "1057:22:1",
+                                                        "nativeSrc": "1063:22:1",
                                                         "nodeType": "YulVariableDeclaration",
-                                                        "src": "1057:22:1",
+                                                        "src": "1063:22:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
-                                                                    "name": "_3",
-                                                                    "nativeSrc": "1072:2:1",
+                                                                    "name": "_1",
+                                                                    "nativeSrc": "1078:2:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1072:2:1"
+                                                                    "src": "1078:2:1"
                                                                 },
                                                                 {
-                                                                    "name": "_1",
-                                                                    "nativeSrc": "1076:2:1",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "1076:2:1"
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1082:2:1",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1082:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "1068:3:1",
+                                                                "nativeSrc": "1074:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1068:3:1"
+                                                                "src": "1074:3:1"
                                                             },
-                                                            "nativeSrc": "1068:11:1",
+                                                            "nativeSrc": "1074:11:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "1068:11:1"
+                                                            "src": "1074:11:1"
                                                         },
                                                         "variables": [
                                                             {
                                                                 "name": "src",
-                                                                "nativeSrc": "1061:3:1",
+                                                                "nativeSrc": "1067:3:1",
                                                                 "nodeType": "YulTypedName",
-                                                                "src": "1061:3:1",
+                                                                "src": "1067:3:1",
                                                                 "type": ""
                                                             }
                                                         ]
                                                     },
                                                     {
                                                         "body": {
-                                                            "nativeSrc": "1144:86:1",
+                                                            "nativeSrc": "1150:140:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "1144:86:1",
+                                                            "src": "1150:140:1",
                                                             "statements": [
+                                                                {
+                                                                    "nativeSrc": "1164:14:1",
+                                                                    "nodeType": "YulVariableDeclaration",
+                                                                    "src": "1164:14:1",
+                                                                    "value": {
+                                                                        "kind": "number",
+                                                                        "nativeSrc": "1177:1:1",
+                                                                        "nodeType": "YulLiteral",
+                                                                        "src": "1177:1:1",
+                                                                        "type": "",
+                                                                        "value": "0"
+                                                                    },
+                                                                    "variables": [
+                                                                        {
+                                                                            "name": "value",
+                                                                            "nativeSrc": "1168:5:1",
+                                                                            "nodeType": "YulTypedName",
+                                                                            "src": "1168:5:1",
+                                                                            "type": ""
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                {
+                                                                    "nativeSrc": "1191:26:1",
+                                                                    "nodeType": "YulAssignment",
+                                                                    "src": "1191:26:1",
+                                                                    "value": {
+                                                                        "arguments": [
+                                                                            {
+                                                                                "name": "src",
+                                                                                "nativeSrc": "1213:3:1",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1213:3:1"
+                                                                            }
+                                                                        ],
+                                                                        "functionName": {
+                                                                            "name": "calldataload",
+                                                                            "nativeSrc": "1200:12:1",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1200:12:1"
+                                                                        },
+                                                                        "nativeSrc": "1200:17:1",
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1200:17:1"
+                                                                    },
+                                                                    "variableNames": [
+                                                                        {
+                                                                            "name": "value",
+                                                                            "nativeSrc": "1191:5:1",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1191:5:1"
+                                                                        }
+                                                                    ]
+                                                                },
                                                                 {
                                                                     "expression": {
                                                                         "arguments": [
                                                                             {
                                                                                 "name": "dst",
-                                                                                "nativeSrc": "1165:3:1",
+                                                                                "nativeSrc": "1237:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "1165:3:1"
+                                                                                "src": "1237:3:1"
                                                                             },
                                                                             {
-                                                                                "arguments": [
-                                                                                    {
-                                                                                        "name": "src",
-                                                                                        "nativeSrc": "1183:3:1",
-                                                                                        "nodeType": "YulIdentifier",
-                                                                                        "src": "1183:3:1"
-                                                                                    }
-                                                                                ],
-                                                                                "functionName": {
-                                                                                    "name": "calldataload",
-                                                                                    "nativeSrc": "1170:12:1",
-                                                                                    "nodeType": "YulIdentifier",
-                                                                                    "src": "1170:12:1"
-                                                                                },
-                                                                                "nativeSrc": "1170:17:1",
-                                                                                "nodeType": "YulFunctionCall",
-                                                                                "src": "1170:17:1"
+                                                                                "name": "value",
+                                                                                "nativeSrc": "1242:5:1",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1242:5:1"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "mstore",
-                                                                            "nativeSrc": "1158:6:1",
+                                                                            "nativeSrc": "1230:6:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1158:6:1"
+                                                                            "src": "1230:6:1"
                                                                         },
-                                                                        "nativeSrc": "1158:30:1",
+                                                                        "nativeSrc": "1230:18:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "1158:30:1"
+                                                                        "src": "1230:18:1"
                                                                     },
-                                                                    "nativeSrc": "1158:30:1",
+                                                                    "nativeSrc": "1230:18:1",
                                                                     "nodeType": "YulExpressionStatement",
-                                                                    "src": "1158:30:1"
+                                                                    "src": "1230:18:1"
                                                                 },
                                                                 {
-                                                                    "nativeSrc": "1201:19:1",
+                                                                    "nativeSrc": "1261:19:1",
                                                                     "nodeType": "YulAssignment",
-                                                                    "src": "1201:19:1",
+                                                                    "src": "1261:19:1",
                                                                     "value": {
                                                                         "arguments": [
                                                                             {
                                                                                 "name": "dst",
-                                                                                "nativeSrc": "1212:3:1",
+                                                                                "nativeSrc": "1272:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "1212:3:1"
+                                                                                "src": "1272:3:1"
                                                                             },
                                                                             {
-                                                                                "name": "_1",
-                                                                                "nativeSrc": "1217:2:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1217:2:1"
+                                                                                "kind": "number",
+                                                                                "nativeSrc": "1277:2:1",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1277:2:1",
+                                                                                "type": "",
+                                                                                "value": "32"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "add",
-                                                                            "nativeSrc": "1208:3:1",
+                                                                            "nativeSrc": "1268:3:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1208:3:1"
+                                                                            "src": "1268:3:1"
                                                                         },
-                                                                        "nativeSrc": "1208:12:1",
+                                                                        "nativeSrc": "1268:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "1208:12:1"
+                                                                        "src": "1268:12:1"
                                                                     },
                                                                     "variableNames": [
                                                                         {
                                                                             "name": "dst",
-                                                                            "nativeSrc": "1201:3:1",
+                                                                            "nativeSrc": "1261:3:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1201:3:1"
+                                                                            "src": "1261:3:1"
                                                                         }
                                                                     ]
                                                                 }
@@ -1275,105 +1288,107 @@
                                                             "arguments": [
                                                                 {
                                                                     "name": "src",
-                                                                    "nativeSrc": "1099:3:1",
+                                                                    "nativeSrc": "1105:3:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1099:3:1"
+                                                                    "src": "1105:3:1"
                                                                 },
                                                                 {
                                                                     "name": "srcEnd",
-                                                                    "nativeSrc": "1104:6:1",
+                                                                    "nativeSrc": "1110:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1104:6:1"
+                                                                    "src": "1110:6:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "lt",
-                                                                "nativeSrc": "1096:2:1",
+                                                                "nativeSrc": "1102:2:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1096:2:1"
+                                                                "src": "1102:2:1"
                                                             },
-                                                            "nativeSrc": "1096:15:1",
+                                                            "nativeSrc": "1102:15:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "1096:15:1"
+                                                            "src": "1102:15:1"
                                                         },
-                                                        "nativeSrc": "1088:142:1",
+                                                        "nativeSrc": "1094:196:1",
                                                         "nodeType": "YulForLoop",
                                                         "post": {
-                                                            "nativeSrc": "1112:23:1",
+                                                            "nativeSrc": "1118:23:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "1112:23:1",
+                                                            "src": "1118:23:1",
                                                             "statements": [
                                                                 {
-                                                                    "nativeSrc": "1114:19:1",
+                                                                    "nativeSrc": "1120:19:1",
                                                                     "nodeType": "YulAssignment",
-                                                                    "src": "1114:19:1",
+                                                                    "src": "1120:19:1",
                                                                     "value": {
                                                                         "arguments": [
                                                                             {
                                                                                 "name": "src",
-                                                                                "nativeSrc": "1125:3:1",
+                                                                                "nativeSrc": "1131:3:1",
                                                                                 "nodeType": "YulIdentifier",
-                                                                                "src": "1125:3:1"
+                                                                                "src": "1131:3:1"
                                                                             },
                                                                             {
-                                                                                "name": "_1",
-                                                                                "nativeSrc": "1130:2:1",
-                                                                                "nodeType": "YulIdentifier",
-                                                                                "src": "1130:2:1"
+                                                                                "kind": "number",
+                                                                                "nativeSrc": "1136:2:1",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1136:2:1",
+                                                                                "type": "",
+                                                                                "value": "32"
                                                                             }
                                                                         ],
                                                                         "functionName": {
                                                                             "name": "add",
-                                                                            "nativeSrc": "1121:3:1",
+                                                                            "nativeSrc": "1127:3:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1121:3:1"
+                                                                            "src": "1127:3:1"
                                                                         },
-                                                                        "nativeSrc": "1121:12:1",
+                                                                        "nativeSrc": "1127:12:1",
                                                                         "nodeType": "YulFunctionCall",
-                                                                        "src": "1121:12:1"
+                                                                        "src": "1127:12:1"
                                                                     },
                                                                     "variableNames": [
                                                                         {
                                                                             "name": "src",
-                                                                            "nativeSrc": "1114:3:1",
+                                                                            "nativeSrc": "1120:3:1",
                                                                             "nodeType": "YulIdentifier",
-                                                                            "src": "1114:3:1"
+                                                                            "src": "1120:3:1"
                                                                         }
                                                                     ]
                                                                 }
                                                             ]
                                                         },
                                                         "pre": {
-                                                            "nativeSrc": "1092:3:1",
+                                                            "nativeSrc": "1098:3:1",
                                                             "nodeType": "YulBlock",
-                                                            "src": "1092:3:1",
+                                                            "src": "1098:3:1",
                                                             "statements": []
                                                         },
-                                                        "src": "1088:142:1"
+                                                        "src": "1094:196:1"
                                                     },
                                                     {
-                                                        "nativeSrc": "1239:16:1",
+                                                        "nativeSrc": "1299:16:1",
                                                         "nodeType": "YulAssignment",
-                                                        "src": "1239:16:1",
+                                                        "src": "1299:16:1",
                                                         "value": {
                                                             "name": "memPtr",
-                                                            "nativeSrc": "1249:6:1",
+                                                            "nativeSrc": "1309:6:1",
                                                             "nodeType": "YulIdentifier",
-                                                            "src": "1249:6:1"
+                                                            "src": "1309:6:1"
                                                         },
                                                         "variableNames": [
                                                             {
                                                                 "name": "value0",
-                                                                "nativeSrc": "1239:6:1",
+                                                                "nativeSrc": "1299:6:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1239:6:1"
+                                                                "src": "1299:6:1"
                                                             }
                                                         ]
                                                     }
                                                 ]
                                             },
                                             "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
-                                            "nativeSrc": "146:1115:1",
+                                            "nativeSrc": "146:1175:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters": [
                                                 {
@@ -1400,51 +1415,51 @@
                                                     "type": ""
                                                 }
                                             ],
-                                            "src": "146:1115:1"
+                                            "src": "146:1175:1"
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "1367:76:1",
+                                                "nativeSrc": "1427:76:1",
                                                 "nodeType": "YulBlock",
-                                                "src": "1367:76:1",
+                                                "src": "1427:76:1",
                                                 "statements": [
                                                     {
-                                                        "nativeSrc": "1377:26:1",
+                                                        "nativeSrc": "1437:26:1",
                                                         "nodeType": "YulAssignment",
-                                                        "src": "1377:26:1",
+                                                        "src": "1437:26:1",
                                                         "value": {
                                                             "arguments": [
                                                                 {
                                                                     "name": "headStart",
-                                                                    "nativeSrc": "1389:9:1",
+                                                                    "nativeSrc": "1449:9:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1389:9:1"
+                                                                    "src": "1449:9:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1400:2:1",
+                                                                    "nativeSrc": "1460:2:1",
                                                                     "nodeType": "YulLiteral",
-                                                                    "src": "1400:2:1",
+                                                                    "src": "1460:2:1",
                                                                     "type": "",
                                                                     "value": "32"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "add",
-                                                                "nativeSrc": "1385:3:1",
+                                                                "nativeSrc": "1445:3:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1385:3:1"
+                                                                "src": "1445:3:1"
                                                             },
-                                                            "nativeSrc": "1385:18:1",
+                                                            "nativeSrc": "1445:18:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "1385:18:1"
+                                                            "src": "1445:18:1"
                                                         },
                                                         "variableNames": [
                                                             {
                                                                 "name": "tail",
-                                                                "nativeSrc": "1377:4:1",
+                                                                "nativeSrc": "1437:4:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1377:4:1"
+                                                                "src": "1437:4:1"
                                                             }
                                                         ]
                                                     },
@@ -1453,62 +1468,62 @@
                                                             "arguments": [
                                                                 {
                                                                     "name": "headStart",
-                                                                    "nativeSrc": "1419:9:1",
+                                                                    "nativeSrc": "1479:9:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1419:9:1"
+                                                                    "src": "1479:9:1"
                                                                 },
                                                                 {
                                                                     "name": "value0",
-                                                                    "nativeSrc": "1430:6:1",
+                                                                    "nativeSrc": "1490:6:1",
                                                                     "nodeType": "YulIdentifier",
-                                                                    "src": "1430:6:1"
+                                                                    "src": "1490:6:1"
                                                                 }
                                                             ],
                                                             "functionName": {
                                                                 "name": "mstore",
-                                                                "nativeSrc": "1412:6:1",
+                                                                "nativeSrc": "1472:6:1",
                                                                 "nodeType": "YulIdentifier",
-                                                                "src": "1412:6:1"
+                                                                "src": "1472:6:1"
                                                             },
-                                                            "nativeSrc": "1412:25:1",
+                                                            "nativeSrc": "1472:25:1",
                                                             "nodeType": "YulFunctionCall",
-                                                            "src": "1412:25:1"
+                                                            "src": "1472:25:1"
                                                         },
-                                                        "nativeSrc": "1412:25:1",
+                                                        "nativeSrc": "1472:25:1",
                                                         "nodeType": "YulExpressionStatement",
-                                                        "src": "1412:25:1"
+                                                        "src": "1472:25:1"
                                                     }
                                                 ]
                                             },
                                             "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
-                                            "nativeSrc": "1266:177:1",
+                                            "nativeSrc": "1326:177:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters": [
                                                 {
                                                     "name": "headStart",
-                                                    "nativeSrc": "1336:9:1",
+                                                    "nativeSrc": "1396:9:1",
                                                     "nodeType": "YulTypedName",
-                                                    "src": "1336:9:1",
+                                                    "src": "1396:9:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "value0",
-                                                    "nativeSrc": "1347:6:1",
+                                                    "nativeSrc": "1407:6:1",
                                                     "nodeType": "YulTypedName",
-                                                    "src": "1347:6:1",
+                                                    "src": "1407:6:1",
                                                     "type": ""
                                                 }
                                             ],
                                             "returnVariables": [
                                                 {
                                                     "name": "tail",
-                                                    "nativeSrc": "1358:4:1",
+                                                    "nativeSrc": "1418:4:1",
                                                     "nodeType": "YulTypedName",
-                                                    "src": "1358:4:1",
+                                                    "src": "1418:4:1",
                                                     "type": ""
                                                 }
                                             ],
-                                            "src": "1266:177:1"
+                                            "src": "1326:177:1"
                                         }
                                     ]
                                 },
@@ -1522,30 +1537,30 @@
     }
     function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr(headStart, dataEnd) -> value0
     {
-        let _1 := 32
-        if slt(sub(dataEnd, headStart), _1) { revert(0, 0) }
+        if slt(sub(dataEnd, headStart), 32) { revert(0, 0) }
         let offset := calldataload(headStart)
-        let _2 := 0xffffffffffffffff
-        if gt(offset, _2) { revert(0, 0) }
-        let _3 := add(headStart, offset)
-        if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }
-        let _4 := calldataload(_3)
-        if gt(_4, _2) { panic_error_0x41() }
-        let _5 := shl(5, _4)
+        if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
+        let _1 := add(headStart, offset)
+        if iszero(slt(add(_1, 0x1f), dataEnd)) { revert(0, 0) }
+        let length := calldataload(_1)
+        if gt(length, 0xffffffffffffffff) { panic_error_0x41() }
+        let _2 := shl(5, length)
         let memPtr := mload(64)
-        let newFreePtr := add(memPtr, and(add(_5, 63), not(31)))
-        if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { panic_error_0x41() }
+        let newFreePtr := add(memPtr, and(add(_2, 63), not(31)))
+        if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
         mstore(64, newFreePtr)
         let dst := memPtr
-        mstore(memPtr, _4)
-        dst := add(memPtr, _1)
-        let srcEnd := add(add(_3, _5), _1)
+        mstore(memPtr, length)
+        dst := add(memPtr, 32)
+        let srcEnd := add(add(_1, _2), 32)
         if gt(srcEnd, dataEnd) { revert(0, 0) }
-        let src := add(_3, _1)
-        for { } lt(src, srcEnd) { src := add(src, _1) }
+        let src := add(_1, 32)
+        for { } lt(src, srcEnd) { src := add(src, 32) }
         {
-            mstore(dst, calldataload(src))
-            dst := add(dst, _1)
+            let value := 0
+            value := calldataload(src)
+            mstore(dst, value)
+            dst := add(dst, 32)
         }
         value0 := memPtr
     }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 5090c282bb..dafba2771c 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -119,53 +119,50 @@ sub_0: assembly {
       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 {... */
-      swap1
-      not(0x1f)
       swap1
-      dup2
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       0x3f
-      dup5
+      dup3
       add
+      not(0x1f)
       and
       dup2
       add
-      swap2
+      swap1
+      0xffffffffffffffff
+      dup3
+      gt
       dup2
       dup4
       lt
-      0xffffffffffffffff
-      dup5
-      gt
       or
       tag_9
       jumpi
       0x40
-      swap3
-      dup4
+      swap2
+      dup3
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dup4
       dup3
+      dup2
       mstore
       0x20
-      dup3
+      dup2
       add
-      swap4
+      swap3
       dataOffset(sub_0)
-      dup6
+      dup5
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      0x1f
-      dup4
+      dup2
       mload
-      swap5
-      dup6
-      swap4
+      swap3
+      dup4
+      swap2
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       0x20
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup6
+      dup4
       mstore
       mload
       dup1
@@ -174,21 +171,23 @@ sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       0x20
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup8
+      dup6
       add
       mstore
-      dup7
-      dup7
+      dup5
+      dup5
       add
       mcopy
       0x00
-      dup6
       dup3
-      dup7
+      dup3
       add
+      dup5
       add
       mstore
+      0x1f
       add
+      not(0x1f)
       and
       dup2
       add
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
index 0a97c87dfa..82a3415d0c 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 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.
+// 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
index 32e8d9133b..dd0122971d 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 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 54618 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 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 54616 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 d48693db05..15273c66a7 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 60882 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 60879 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/abi2.yul b/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
index d8c8e90558..2f2e060be0 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
@@ -1093,25 +1093,21 @@
 //         value0 := and(calldataload(headStart), sub(shl(160, 1), 1))
 //         value1 := calldataload(add(headStart, 32))
 //         let offset := calldataload(add(headStart, 64))
-//         let _1 := 0xffffffffffffffff
-//         if gt(offset, _1) { revert(0, 0) }
-//         let _2 := add(headStart, offset)
-//         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(0, 0) }
-//         let length := calldataload(_2)
-//         if gt(length, _1) { revert(0, 0) }
-//         if gt(add(add(_2, length), 32), dataEnd) { revert(0, 0) }
-//         value2 := add(_2, 32)
+//         if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
+//         let _1 := add(headStart, offset)
+//         if iszero(slt(add(_1, 0x1f), dataEnd)) { revert(0, 0) }
+//         let length := calldataload(_1)
+//         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
+//         if gt(add(add(_1, length), 32), dataEnd) { revert(0, 0) }
+//         value2 := add(_1, 32)
 //         value3 := length
-//         let _3 := calldataload(add(headStart, 96))
-//         if iszero(lt(_3, 3)) { revert(0, 0) }
-//         value4 := _3
+//         value4 := cleanup_revert_enum_Operation(calldataload(add(headStart, 96)))
 //     }
 //     function abi_encode_bytes32_address_uint256_bytes32_enum_Operation_uint256_uint256_uint256_address_address_uint256(headStart, value10, value9, value8, value7, value6, value5, value4, value3, value2, value1, value0) -> tail
 //     {
 //         tail := add(headStart, 352)
 //         mstore(headStart, value0)
-//         let _1 := sub(shl(160, 1), 1)
-//         mstore(add(headStart, 32), and(value1, _1))
+//         mstore(add(headStart, 32), and(value1, sub(shl(160, 1), 1)))
 //         mstore(add(headStart, 64), value2)
 //         mstore(add(headStart, 96), value3)
 //         if iszero(lt(value4, 3)) { invalid() }
@@ -1119,8 +1115,13 @@
 //         mstore(add(headStart, 160), value5)
 //         mstore(add(headStart, 192), value6)
 //         mstore(add(headStart, 224), value7)
-//         mstore(add(headStart, 256), and(value8, _1))
-//         mstore(add(headStart, 288), and(value9, _1))
+//         mstore(add(headStart, 256), and(value8, sub(shl(160, 1), 1)))
+//         mstore(add(headStart, 288), and(value9, sub(shl(160, 1), 1)))
 //         mstore(add(headStart, 320), value10)
 //     }
+//     function cleanup_revert_enum_Operation(value) -> cleaned
+//     {
+//         if iszero(lt(value, 3)) { revert(0, 0) }
+//         cleaned := value
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
index 2abdf6d9c2..dbb87439f6 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
@@ -492,68 +492,64 @@
 //     }
 //     function abi_decode_array_array_uint256_memory_dyn(offset, end) -> array
 //     {
-//         let _1 := 0x1f
 //         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
 //         mstore(array, length)
-//         let _2 := 0x20
-//         dst := add(array, _2)
-//         let src := add(offset, _2)
-//         if gt(add(add(offset, shl(6, length)), _2), end) { revert(0, 0) }
+//         dst := add(array, 0x20)
+//         let src := add(offset, 0x20)
+//         if gt(add(add(offset, shl(6, length)), 0x20), end) { revert(0, 0) }
 //         let i := 0
 //         for { } lt(i, length) { i := add(i, 1) }
 //         {
-//             if iszero(slt(add(src, _1), end)) { revert(0, 0) }
-//             let dst_1 := allocateMemory_967()
-//             let dst_2 := dst_1
+//             if iszero(slt(add(src, 0x1f), end)) { revert(0, 0) }
+//             let dst_1 := allocateMemory_823()
+//             let array_1 := dst_1
 //             let src_1 := src
-//             let _3 := add(src, 64)
-//             if gt(_3, end) { revert(0, 0) }
+//             let _1 := add(src, 64)
+//             if gt(_1, end) { revert(0, 0) }
 //             let i_1 := 0
 //             for { } lt(i_1, 0x2) { i_1 := add(i_1, 1) }
 //             {
 //                 mstore(dst_1, calldataload(src_1))
-//                 dst_1 := add(dst_1, _2)
-//                 src_1 := add(src_1, _2)
+//                 dst_1 := add(dst_1, 0x20)
+//                 src_1 := add(src_1, 0x20)
 //             }
-//             mstore(dst, dst_2)
-//             dst := add(dst, _2)
-//             src := _3
+//             mstore(dst, array_1)
+//             dst := add(dst, 0x20)
+//             src := _1
 //         }
 //     }
 //     function abi_decode_uint256t_uint256t_array_uint256_dynt_array_array_uint256_memory_dyn(headStart, dataEnd) -> value0, value1, value2, value3
 //     {
 //         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
 //         value0 := calldataload(headStart)
-//         let _1 := 32
-//         value1 := calldataload(add(headStart, _1))
+//         value1 := calldataload(add(headStart, 32))
 //         let offset := calldataload(add(headStart, 64))
-//         let _2 := 0xffffffffffffffff
-//         if gt(offset, _2) { revert(0, 0) }
-//         let _3 := add(headStart, offset)
-//         if iszero(slt(add(_3, 0x1f), dataEnd)) { revert(0, 0) }
-//         let length := calldataload(_3)
+//         if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
+//         let _1 := add(headStart, offset)
+//         if iszero(slt(add(_1, 0x1f), dataEnd)) { revert(0, 0) }
+//         let length := calldataload(_1)
 //         let dst := allocateMemory(array_allocation_size_array_address_dyn_memory(length))
-//         let dst_1 := dst
+//         let array := dst
 //         mstore(dst, length)
-//         dst := add(dst, _1)
-//         let src := add(_3, _1)
-//         if gt(add(add(_3, shl(5, length)), _1), dataEnd) { revert(0, 0) }
+//         dst := add(dst, 32)
+//         let src := add(_1, 32)
+//         if gt(add(add(_1, shl(5, length)), 32), dataEnd) { revert(0, 0) }
 //         let i := 0
 //         for { } lt(i, length) { i := add(i, 1) }
 //         {
 //             mstore(dst, calldataload(src))
-//             dst := add(dst, _1)
-//             src := add(src, _1)
+//             dst := add(dst, 32)
+//             src := add(src, 32)
 //         }
-//         value2 := dst_1
+//         value2 := array
 //         let offset_1 := calldataload(add(headStart, 96))
-//         if gt(offset_1, _2) { revert(0, 0) }
+//         if gt(offset_1, 0xffffffffffffffff) { revert(0, 0) }
 //         value3 := abi_decode_array_array_uint256_memory_dyn(add(headStart, offset_1), dataEnd)
 //     }
-//     function allocateMemory_967() -> memPtr
+//     function allocateMemory_823() -> memPtr
 //     {
 //         memPtr := mload(64)
 //         let newFreePtr := add(memPtr, 64)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul
index dd5facaf03..bf419017bf 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function.yul
@@ -36,8 +36,7 @@
 //             switch n
 //             case 0 { ret := A(add(m, not(0)), 1) }
 //             default {
-//                 let _1 := not(0)
-//                 ret := A(add(m, _1), A(m, add(n, _1)))
+//                 ret := A(add(m, not(0)), A(m, add(n, not(0))))
 //             }
 //         }
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul
index 005c58778b..edf1a086fa 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/ackermann_function_if.yul
@@ -45,7 +45,6 @@
 //             ret := A(add(m, not(0)), 1)
 //             leave
 //         }
-//         let _1 := not(0)
-//         ret := A(add(m, _1), A(m, add(n, _1)))
+//         ret := A(add(m, not(0)), A(m, add(n, not(0))))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul b/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
index 2b22055794..8b26a7ba37 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
@@ -237,53 +237,56 @@
 //     {
 //         mstore(0x80, 7673901602397024137095011250362199966051872585513276903826533215767972925880)
 //         mstore(0xa0, 8489654445897228341090914135473290831551238522473825886865492707826370766375)
-//         let notes := add(0x04, calldataload(0x04))
+//         let _1 := calldataload(0x04)
+//         let notes := add(0x04, _1)
+//         let m := calldataload(0x24)
 //         let n := calldataload(notes)
-//         if gt(calldataload(0x24), n)
+//         let challenge := mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//         if gt(m, n)
 //         {
 //             mstore(0x00, 404)
 //             revert(0x00, 0x20)
 //         }
 //         let kn := calldataload(add(calldatasize(), not(191)))
-//         let _1 := 0x2a0
-//         mstore(_1, caller())
+//         mstore(0x2a0, caller())
 //         mstore(0x2c0, kn)
-//         mstore(0x2e0, calldataload(0x24))
-//         kn := mulmod(sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//         mstore(0x2e0, m)
+//         kn := mulmod(sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn), challenge, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
 //         hashCommitments(notes, n)
 //         let b := add(0x300, shl(7, n))
 //         let i := 0
 //         for { } lt(i, n) { i := add(i, 0x01) }
 //         {
-//             let noteIndex := add(add(calldataload(0x04), mul(i, 0xc0)), 0x24)
+//             let _2 := add(_1, mul(i, 0xc0))
+//             let noteIndex := add(_2, 0x24)
 //             let k := 0
-//             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)
+//             let a := calldataload(add(_2, 0x44))
+//             let c := challenge
+//             let _3 := add(i, 0x01)
+//             switch eq(_3, n)
 //             case 1 {
 //                 k := kn
-//                 if eq(calldataload(0x24), n)
+//                 if eq(m, n)
 //                 {
 //                     k := sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn)
 //                 }
 //             }
 //             case 0 { k := calldataload(noteIndex) }
 //             validateCommitment(noteIndex, k, a)
-//             switch gt(_2, calldataload(0x24))
+//             switch gt(_3, m)
 //             case 1 {
 //                 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)
+//                 c := mulmod(challenge, x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
 //                 mstore(0, keccak256(0, 0x20))
 //             }
 //             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)
+//             calldatacopy(0xe0, add(_2, 164), 0x40)
+//             calldatacopy(0x20, add(_2, 100), 0x40)
 //             mstore(0x120, sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, c))
 //             mstore(0x60, k)
 //             mstore(0xc0, a)
@@ -292,19 +295,18 @@
 //             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))
+//             if eq(i, m)
 //             {
 //                 mstore(0x260, mload(0x20))
 //                 mstore(0x280, mload(0x40))
 //                 mstore(0x1e0, mload(0xe0))
 //                 mstore(0x200, sub(0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47, mload(0x100)))
 //             }
-//             if gt(i, calldataload(0x24))
+//             if gt(i, m)
 //             {
 //                 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))
+//                 let result_4 := and(result, call(gas(), 7, 0, 0x20, 0x60, 0x220, 0x40))
+//                 let result_5 := and(result_4, call(gas(), 6, 0, 0x220, 0x80, 0x260, 0x40))
 //                 result := and(result_5, call(gas(), 6, 0, 0x1a0, 0x80, 0x1e0, 0x40))
 //             }
 //             if iszero(result)
@@ -314,8 +316,8 @@
 //             }
 //             b := add(b, 0x40)
 //         }
-//         if lt(calldataload(0x24), n) { validatePairing() }
-//         if iszero(eq(mod(keccak256(_1, add(b, not(671))), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)))
+//         if lt(m, n) { validatePairing() }
+//         if iszero(eq(mod(keccak256(0x2a0, add(b, not(671))), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), challenge))
 //         {
 //             mstore(0, 404)
 //             revert(0, 0x20)
@@ -329,35 +331,28 @@
 //         let t2_x_1 := calldataload(132)
 //         let t2_y := calldataload(164)
 //         let t2_y_1 := calldataload(196)
-//         let _1 := 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b
-//         let _2 := 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa
-//         let _3 := 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2
-//         let _4 := 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed
-//         if or(or(or(or(or(or(or(iszero(t2_x), iszero(t2_x_1)), iszero(t2_y)), iszero(t2_y_1)), eq(t2_x, _4)), eq(t2_x_1, _3)), eq(t2_y, _2)), eq(t2_y_1, _1))
+//         if or(or(or(or(or(or(or(iszero(t2_x), iszero(t2_x_1)), iszero(t2_y)), iszero(t2_y_1)), eq(t2_x, 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed)), eq(t2_x_1, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2)), eq(t2_y, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)), eq(t2_y_1, 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b))
 //         {
 //             mstore(0x00, 400)
 //             revert(0x00, 0x20)
 //         }
-//         let _5 := mload(0x1e0)
-//         let _6 := 0x20
-//         mstore(_6, _5)
+//         mstore(0x20, mload(0x1e0))
 //         mstore(0x40, mload(0x200))
-//         mstore(0x80, _4)
-//         mstore(0x60, _3)
-//         mstore(0xc0, _2)
-//         mstore(0xa0, _1)
+//         mstore(0x80, 0x1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed)
+//         mstore(0x60, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2)
+//         mstore(0xc0, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)
+//         mstore(0xa0, 0x90689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b)
 //         mstore(0xe0, mload(0x260))
 //         mstore(0x100, mload(0x280))
 //         mstore(0x140, t2_x)
 //         mstore(0x120, t2_x_1)
-//         let _7 := 0x180
-//         mstore(_7, t2_y)
+//         mstore(0x180, t2_y)
 //         mstore(0x160, t2_y_1)
-//         let success := call(gas(), 8, 0, _6, _7, _6, _6)
-//         if or(iszero(success), iszero(mload(_6)))
+//         let success := call(gas(), 8, 0, 0x20, 0x180, 0x20, 0x20)
+//         if or(iszero(success), iszero(mload(0x20)))
 //         {
 //             mstore(0, 400)
-//             revert(0, _6)
+//             revert(0, 0x20)
 //         }
 //     }
 //     function validateCommitment(note, k, a)
@@ -366,9 +361,7 @@
 //         let gammaY := calldataload(add(note, 0x60))
 //         let sigmaX := calldataload(add(note, 0x80))
 //         let sigmaY := calldataload(add(note, 0xa0))
-//         let _1 := 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-//         let _2 := 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-//         if iszero(and(and(and(eq(mod(a, _2), a), gt(a, 1)), and(eq(mod(k, _2), k), gt(k, 1))), and(eq(addmod(mulmod(mulmod(sigmaX, sigmaX, _1), sigmaX, _1), 3, _1), mulmod(sigmaY, sigmaY, _1)), eq(addmod(mulmod(mulmod(gammaX, gammaX, _1), gammaX, _1), 3, _1), mulmod(gammaY, gammaY, _1)))))
+//         if iszero(and(and(and(eq(mod(a, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), a), gt(a, 1)), and(eq(mod(k, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), k), gt(k, 1))), and(eq(addmod(mulmod(mulmod(sigmaX, sigmaX, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), sigmaX, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), 3, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), mulmod(sigmaY, sigmaY, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47)), eq(addmod(mulmod(mulmod(gammaX, gammaX, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), gammaX, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), 3, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47), mulmod(gammaY, gammaY, 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47)))))
 //         {
 //             mstore(0x00, 400)
 //             revert(0x00, 0x20)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
index fc36bdfa37..5f42470f65 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
@@ -28,21 +28,20 @@
 //
 // {
 //     {
-//         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)
+//         mstore(1, 1)
+//         mstore(2, 1)
+//         mstore(3, 1)
+//         mstore(4, 1)
+//         mstore(5, 1)
+//         mstore(6, 1)
+//         let _1 := sload(8)
+//         mstore(mload(7), 1)
+//         mstore(_1, 1)
+//         mstore(calldataload(9), 1)
+//         let _2 := mload(13)
+//         mstore(11, 1)
+//         mstore(12, 1)
+//         mstore(_2, 1)
 //         return(0, 32)
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul b/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
index f9d248e2fe..6ebca20f5b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
@@ -13,8 +13,7 @@
 //
 // {
 //     {
-//         let _1 := sub(shl(160, 1), 1)
-//         let a := and(create2(0, 0, 0x20, 0), _1)
-//         sstore(a, and(_1, create2(0, 0, 0x20, 0)))
+//         let a := and(create2(0, 0, 0x20, 0), sub(shl(160, 1), 1))
+//         sstore(a, and(sub(shl(160, 1), 1), create2(0, 0, 0x20, 0)))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul b/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul
index c89c620bb5..078616bb3b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/create_and_mask.yul
@@ -13,8 +13,7 @@
 //
 // {
 //     {
-//         let _1 := sub(shl(160, 1), 1)
-//         let a := and(create(0, 0, 0x20), _1)
-//         sstore(a, and(_1, create(0, 0, 0x20)))
+//         let a := and(create(0, 0, 0x20), sub(shl(160, 1), 1))
+//         sstore(a, and(sub(shl(160, 1), 1), create(0, 0, 0x20)))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
index fe06f1629b..fca4a6366b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
@@ -25,8 +25,11 @@
 //         let sum := 0
 //         let length := calldataload(_1)
 //         let i := 0
-//         for { } lt(i, length) { i := add(i, 1) }
+//         for { } true { i := add(i, 1) }
 //         {
+//             let _2 := iszero(lt(i, length))
+//             if _2 { break }
+//             _2 := 0
 //             sum := add(sum, calldataload(add(add(_1, shl(5, i)), 0x20)))
 //         }
 //         sstore(0, sum)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
index 436f5d5faf..dd6cdc0e44 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
@@ -26,12 +26,10 @@
 //         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) }
+//         if gt(length, 0xffffffffffffffff) { 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) }
+//         let newFreePtr := add(memPtr, and(add(and(add(length, 31), not(31)), 63), not(31)))
+//         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
 //         mstore(64, newFreePtr)
 //         mstore(memPtr, length)
 //         extcodecopy(value, add(memPtr, 32), 0, length)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
index 86329c3275..76d671bfc3 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
@@ -29,8 +29,11 @@
 //         let length := calldataload(_1)
 //         let i := 0
 //         let _2 := calldataload(7)
-//         for { } lt(i, length) { i := add(i, 1) }
+//         for { } true { i := add(i, 1) }
 //         {
+//             let _3 := iszero(lt(i, length))
+//             if _3 { break }
+//             _3 := 0
 //             sum := add(sum, add(calldataload(add(add(_1, shl(5, i)), 0x20)), _2))
 //         }
 //         sstore(0, sum)
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 d041cff104..4d3ed471b4 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
@@ -33,14 +33,13 @@
 // {
 //     {
 //         let a := 0
-//         let a_1 := 0
-//         for { } a_1 { }
+//         for { } a { }
 //         {
-//             let _1 := add(a_1, a_1)
+//             let _1 := add(a, a)
 //             let var := add(_1, _1)
-//             switch a_1
-//             case 0 { a_1 := var }
-//             default { sstore(a, var) }
+//             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
index 06965e3ca6..3161dc2efa 100644
--- 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
@@ -33,14 +33,13 @@
 // {
 //     {
 //         let a := 0
-//         let a_1 := 0
-//         for { } a_1 { }
+//         for { } a { }
 //         {
-//             let _1 := add(a_1, a_1)
+//             let _1 := add(a, a)
 //             let var := add(_1, _1)
-//             switch a_1
-//             case 0 { a_1 := var }
-//             default { sstore(a, var) }
+//             switch a
+//             case 0 { a := var }
+//             default { sstore(0, var) }
 //         }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
index 75e2ff4c20..5fbe8d22e6 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
@@ -40,22 +40,18 @@
 //
 // {
 //     {
-//         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(2, _1)
-//         extcodecopy(_1, msize(), _1, _1)
+//         let _1 := gt(not(gcd(10, 15)), 1)
+//         let _2 := gcd(10, 15)
+//         let _3 := lt(or(1, add(gcd(10, 15), not(0))), 1)
+//         let _4 := gcd(10, 15)
+//         let _5 := 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(not(0), _5), 1), _4), _3), _2), 1), 1), _1), 1)), 1), 1), 1)
+//         sstore(not(gcd(10, 15)), 1)
+//         sstore(2, 1)
+//         foo_singlereturn()
 //         sstore(0, 0)
-//         sstore(3, _1)
+//         sstore(3, 1)
 //     }
 //     function gcd(_a, _b) -> out
 //     {
@@ -63,4 +59,6 @@
 //         case 0 { out := _a }
 //         default { out := gcd(_b, mod(_a, _b)) }
 //     }
+//     function foo_singlereturn()
+//     { extcodecopy(1, msize(), 1, 1) }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul b/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul
index 85a975fde1..aabc14f151 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/structural_simplification.yul
@@ -8,4 +8,11 @@
 // ----
 // step: fullSuite
 //
-// { { sstore(1, 0x20) } }
+// {
+//     {
+//         mstore(0x40, 0x20)
+//         for { } iszero(1) { }
+//         { }
+//         sstore(1, mload(0x40))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
index 148f4a1e7e..f0b7546d05 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
@@ -20,46 +20,18 @@
 // {
 //     {
 //         f()
-//         f_72()
-//         f_73()
+//         f()
+//         f()
 //         sstore(0, 1)
 //     }
 //     function f()
 //     {
-//         let a := 1
-//         let b := 10
-//         let a_1 := calldataload(0)
-//         let _1 := iszero(a_1)
-//         for { } iszero(b) { b := add(b, not(0)) }
-//         {
-//             a := a_1
-//             mstore(a_1, 0)
-//             if _1 { leave }
-//         }
-//     }
-//     function f_72()
-//     {
-//         let a := 2
-//         let b := 10
-//         let a_1 := calldataload(0)
-//         let _1 := iszero(a_1)
-//         for { } iszero(b) { b := add(b, not(0)) }
-//         {
-//             a := a_1
-//             mstore(a_1, 0)
-//             if _1 { leave }
-//         }
-//     }
-//     function f_73()
-//     {
-//         let a := 3
 //         let b := 10
-//         let a_1 := calldataload(0)
-//         let _1 := iszero(a_1)
+//         let a := calldataload(0)
+//         let _1 := iszero(a)
 //         for { } iszero(b) { b := add(b, not(0)) }
 //         {
-//             a := a_1
-//             mstore(a_1, 0)
+//             mstore(a, 0)
 //             if _1 { leave }
 //         }
 //     }

From d5f5742bfc5fff81e5958a5ff230c75d01d222f4 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 8 May 2024 17:25:50 +0200
Subject: [PATCH 0847/1140] CI: Stop installing cvc4 on archlinux

This change is in preparation for upgrading to cvc5. Since archlinux is
not running SMT tests anyway, we can drop cvc4 from the build
immediately.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38bcaea7b3..6feb033dea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1146,7 +1146,7 @@ jobs:
       - run:
           name: Install build dependencies
           command: |
-            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake cvc4 git openssh tar
+            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake git openssh tar
       - checkout
       - run_build
       - store_artifacts_solc
@@ -1273,7 +1273,7 @@ jobs:
       - run:
           name: Install runtime dependencies
           command: |
-            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
+            pacman --noconfirm -Syu --noprogressbar --needed z3
       - soltest
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest

From 5ffd39a79245be31ffa766e1ed8bba943aac6524 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 8 May 2024 15:02:07 +0200
Subject: [PATCH 0848/1140] Fix segmentation fault when assigning to a
 parenthesized non-tuple expression of a tuple type
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/TypeChecker.cpp          |  3 +-
 ...d_non_tuple_expressions_of_tuple_types.sol | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/tupleAssignments/assignments_to_tuple_and_non_tuple_expressions_of_tuple_types.sol

diff --git a/Changelog.md b/Changelog.md
index f34f803e68..252f228c53 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,7 @@ Bugfixes:
  * SMTChecker: Fix internal error when using bitwise operators with an array element as argument.
  * Standard JSON Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``optimizerSteps`` sequence.
  * StaticAnalyzer: Only raise a compile time error for division and modulo by zero when it's between literals.
+ * TypeChecker: Fix compiler crash when the left-hand side of an assignment was a parenthesized non-tuple expression of a tuple type.
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index a7402ba40f..42c98a8f05 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -116,7 +116,8 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 		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() || lhsResolved->components().size() != _rhs.components().size())
+		solAssert(!lhsResolved || lhsResolved->components().size() == lhsType.components().size());
+		if (lhsType.components().size() != _rhs.components().size())
 		{
 			solAssert(m_errorReporter.hasErrors(), "");
 			return;
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/assignments_to_tuple_and_non_tuple_expressions_of_tuple_types.sol b/test/libsolidity/syntaxTests/tupleAssignments/assignments_to_tuple_and_non_tuple_expressions_of_tuple_types.sol
new file mode 100644
index 0000000000..e88d82b85c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tupleAssignments/assignments_to_tuple_and_non_tuple_expressions_of_tuple_types.sol
@@ -0,0 +1,40 @@
+contract C {
+	uint[] public array;
+
+	function f() public {
+		// (f()) is not a tuple expression, but its value is a tuple.
+		(f()) = ();
+	}
+
+	function g() public {
+		// (revert()) is not a tuple expression, but its value is a tuple.
+		(revert()) = ();
+	}
+
+	function h() internal returns (uint, uint) {}
+
+	function i() public {
+		// (h()) is not a tuple expression, but its value is a tuple (uint, uint).
+		(h()) = (1, 1);
+	}
+
+	function j() public returns (uint, uint) {
+		// (j()) is not a tuple expression, but its value is a tuple (uint, uint).
+		(j()) = (1, 1);
+	}
+
+	function m() public {
+		// (uint x, uint y) is a tuple expression, and its value is a tuple (uint, uint).
+		(uint x, uint y) = (1, 1);
+	}
+
+	function n() public {
+		// ((array.push(), array.push())) is not a tuple expression, but contains a tuple expression, and the value of both is a tuple (pointer uint, pointer uint).
+		((array.push(), array.push())) = (1, 1);
+	}
+}
+// ----
+// TypeError 4247: (126-129): Expression has to be an lvalue.
+// TypeError 4247: (236-244): Expression has to be an lvalue.
+// TypeError 4247: (407-410): Expression has to be an lvalue.
+// TypeError 4247: (550-553): Expression has to be an lvalue.

From 9a60c27c3c88a07f7fa69102a5a60f921b1e94b5 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 May 2024 12:28:08 +0200
Subject: [PATCH 0849/1140] Update bytecode size test for byzantium.

---
 .../syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
index 67dee4cad6..4f3239c227 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 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.
+// 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 febe38a27a9aaa0b31a6094d89f97a9c13628f39 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Wed, 8 May 2024 18:10:58 +0200
Subject: [PATCH 0850/1140] SMTChecker: add insufficient funds verification
 target for CHC engine

---
 Changelog.md                                  |  2 +-
 libsolidity/formal/BMC.cpp                    |  6 +++
 libsolidity/formal/CHC.cpp                    | 18 +++++++
 .../model_checker_targets_all_all_engines/err | 14 +-----
 .../model_checker_targets_all_chc/err         |  2 +
 .../model_checker_targets_balance_chc/err     |  1 +
 .../err                                       | 14 +-----
 .../model_checker_targets_default_chc/err     |  2 +
 .../output.json                               | 12 +++++
 .../output.json                               | 49 ++++---------------
 .../output.json                               | 10 ++++
 .../blockchain_state/balance_spend.sol        |  3 +-
 .../blockchain_state/balance_spend_2.sol      |  6 +--
 .../blockchain_state/decreasing_balance.sol   |  2 +-
 .../blockchain_state/free_function_2.sol      |  3 +-
 .../blockchain_state/library_internal_2.sol   |  3 +-
 .../blockchain_state/library_public_2.sol     |  2 +-
 .../{transfer.sol => transfer_1.sol}          |  3 +-
 .../blockchain_state/transfer_2.sol           | 14 ++++++
 .../blockchain_state/transfer_3.sol           | 11 +++++
 .../blockchain_state/transfer_4.sol           | 12 +++++
 .../smtCheckerTests/functions/this_state.sol  | 14 +++---
 .../types/address_transfer.sol                |  2 +-
 .../types/address_transfer_2.sol              |  4 +-
 .../types/address_transfer_3.sol              |  3 +-
 .../types/address_transfer_insufficient.sol   |  4 +-
 26 files changed, 125 insertions(+), 91 deletions(-)
 create mode 100644 test/cmdlineTests/model_checker_targets_balance_chc/err
 rename test/libsolidity/smtCheckerTests/blockchain_state/{transfer.sol => transfer_1.sol} (66%)
 create mode 100644 test/libsolidity/smtCheckerTests/blockchain_state/transfer_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/blockchain_state/transfer_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/blockchain_state/transfer_4.sol

diff --git a/Changelog.md b/Changelog.md
index 252f228c53..4ed7bd2a36 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,7 +5,7 @@ Language Features:
 
 
 Compiler Features:
-
+* SMTChecker: Create balance check verification target for CHC engine.
 
 Bugfixes:
  * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 932a315a70..97dd7050fe 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -1050,6 +1050,12 @@ void BMC::checkDivByZero(BMCVerificationTarget& _target)
 void BMC::checkBalance(BMCVerificationTarget& _target)
 {
 	solAssert(_target.type == VerificationTargetType::Balance, "");
+
+	if (
+		m_solvedTargets.count(_target.expression) &&
+		m_solvedTargets.at(_target.expression).count(VerificationTargetType::Balance)
+	)
+		return;
 	checkCondition(
 		_target,
 		_target.constraints && _target.value,
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 2c9075abcc..b6ffd5954f 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -607,6 +607,22 @@ void CHC::endVisit(FunctionCall const& _funCall)
 		SMTEncoder::endVisit(_funCall);
 		unknownFunctionCall(_funCall);
 		break;
+	case FunctionType::Kind::Send:
+	case FunctionType::Kind::Transfer:
+	{
+		auto value = _funCall.arguments().front();
+		solAssert(value, "");
+		smtutil::Expression thisBalance = state().balance();
+
+		verificationTargetEncountered(
+			&_funCall,
+			VerificationTargetType::Balance,
+			thisBalance < expr(*value)
+		);
+
+		SMTEncoder::endVisit(_funCall);
+		break;
+	}
 	case FunctionType::Kind::KECCAK256:
 	case FunctionType::Kind::ECRecover:
 	case FunctionType::Kind::SHA256:
@@ -2013,6 +2029,8 @@ std::pair<std::string, ErrorId> CHC::targetDescription(CHCVerificationTarget con
 		return {"Division by zero", 4281_error};
 	else if (_target.type == VerificationTargetType::Assert)
 		return {"Assertion violation", 6328_error};
+	else if (_target.type == VerificationTargetType::Balance)
+		return {"Insufficient funds", 8656_error};
 	else
 		solAssert(false);
 }
diff --git a/test/cmdlineTests/model_checker_targets_all_all_engines/err b/test/cmdlineTests/model_checker_targets_all_all_engines/err
index cc8a8ea33d..c67d97b612 100644
--- a/test/cmdlineTests/model_checker_targets_all_all_engines/err
+++ b/test/cmdlineTests/model_checker_targets_all_all_engines/err
@@ -88,21 +88,11 @@ test.f(0x0, 1)
 13 | 		arr[x];
    | 		^^^^^^
 
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Warning: BMC: Condition is always true.
  --> model_checker_targets_all_all_engines/input.sol:6:11:
   |
 6 | 		require(x >= 0);
   | 		        ^^^^^^
 Note: Callstack:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_all_all_engines/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_all_chc/err b/test/cmdlineTests/model_checker_targets_all_chc/err
index d0404ecfb6..9c257cefe9 100644
--- a/test/cmdlineTests/model_checker_targets_all_chc/err
+++ b/test/cmdlineTests/model_checker_targets_all_chc/err
@@ -87,3 +87,5 @@ test.f(0x0, 1)
    |
 13 | 		arr[x];
    | 		^^^^^^
+
+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_targets_balance_chc/err b/test/cmdlineTests/model_checker_targets_balance_chc/err
new file mode 100644
index 0000000000..57bfe42678
--- /dev/null
+++ b/test/cmdlineTests/model_checker_targets_balance_chc/err
@@ -0,0 +1 @@
+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_targets_default_all_engines/err b/test/cmdlineTests/model_checker_targets_default_all_engines/err
index c1fe2f5b3e..62d3b203cb 100644
--- a/test/cmdlineTests/model_checker_targets_default_all_engines/err
+++ b/test/cmdlineTests/model_checker_targets_default_all_engines/err
@@ -58,21 +58,11 @@ test.f(0x0, 1)
 13 | 		arr[x];
    | 		^^^^^^
 
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Warning: BMC: Condition is always true.
  --> model_checker_targets_default_all_engines/input.sol:6:11:
   |
 6 | 		require(x >= 0);
   | 		        ^^^^^^
 Note: Callstack:
-
-Warning: BMC: Insufficient funds happens here.
-  --> model_checker_targets_default_all_engines/input.sol:10:3:
-   |
-10 | 		a.transfer(x);
-   | 		^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
diff --git a/test/cmdlineTests/model_checker_targets_default_chc/err b/test/cmdlineTests/model_checker_targets_default_chc/err
index bd2aa0b4de..70f3c5bc60 100644
--- a/test/cmdlineTests/model_checker_targets_default_chc/err
+++ b/test/cmdlineTests/model_checker_targets_default_chc/err
@@ -57,3 +57,5 @@ test.f(0x0, 1)
    |
 13 | 		arr[x];
    | 		^^^^^^
+
+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/standard_model_checker_targets_balance_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
index f047ff70a9..9d3e40b708 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
@@ -1,4 +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"
+        }
+    ],
     "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 2318e5adfa..8f20d854bf 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
@@ -148,6 +148,16 @@ test.f(0x0, 1)",
             },
             "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": "6838",
@@ -172,45 +182,6 @@ Note: Callstack:
                 "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);
-   | \t\t\t\t\t\t^^^^^^^^^^^^^
-Note: Counterexample:
-  a = 0
-  x = 0
-
-Note: Callstack:
-Note:
-
-",
-            "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": {
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 eb39e02712..e045a8bff4 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
@@ -147,6 +147,16 @@ test.f(0x0, 1)",
                 "start": 283
             },
             "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/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
index 387e45bb9f..720ab56950 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
@@ -19,5 +19,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (280-314): 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 1236: (175-190): BMC: Insufficient funds 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_spend_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
index 5df0b99956..3ceac964f1 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
@@ -15,9 +15,9 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (193-226): CHC: Assertion violation might happen here.
+// Warning 8656: (141-156): CHC: Insufficient funds happens here.
+// Warning 6328: (193-226): CHC: Assertion violation happens here.
 // Warning 6328: (245-279): CHC: Assertion violation happens here.
 // Warning 6328: (298-332): CHC: Assertion violation happens here.
-// Warning 1236: (141-156): BMC: Insufficient funds happens here.
-// Warning 4661: (193-226): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol b/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
index 76455060d8..df35a27858 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
@@ -18,4 +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.
+// Info 1391: CHC: 1 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 e2e187038c..3b7c0f9dce 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
@@ -20,5 +20,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (258-274): 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 1236: (33-46): BMC: Insufficient funds 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/blockchain_state/library_internal_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
index f16a57acf6..826af0bf86 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
@@ -23,5 +23,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (315-331): 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 1236: (87-100): BMC: Insufficient funds 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/blockchain_state/library_public_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
index 4b500581d3..02e29be8de 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
@@ -21,6 +21,6 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 4588: (238-243): Assertion checker does not yet implement this type of function call.
+// Warning 8656: (54-67): CHC: Insufficient funds happens here.
 // Warning 6328: (282-298): CHC: Assertion violation happens here.
 // Warning 6328: (317-331): CHC: Assertion violation happens here.
-// Warning 1236: (54-67): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
similarity index 66%
rename from test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
rename to test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
index c099ffb2e5..3118086b92 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
@@ -12,5 +12,4 @@ 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.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
\ No newline at end of file
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_2.sol
new file mode 100644
index 0000000000..ed5b4c90f2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_2.sol
@@ -0,0 +1,14 @@
+contract C {
+	address payable recipient;
+	uint amount;
+
+	function shouldHold() public {
+		uint tempAmount = address(this).balance;
+		recipient.transfer(tempAmount);
+		recipient.transfer(amount);
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// 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_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_3.sol
new file mode 100644
index 0000000000..4b3318b6be
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_3.sol
@@ -0,0 +1,11 @@
+contract C {
+	address payable recipient;
+
+	function shouldFail() public {
+		recipient.transfer(1);
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 8656: (76-97): CHC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_4.sol
new file mode 100644
index 0000000000..ab0c4a81ef
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_4.sol
@@ -0,0 +1,12 @@
+contract C {
+	address payable recipient;
+
+	function f() public payable {
+		require(msg.value > 1);
+		recipient.transfer(1);
+	}
+}
+// ====
+// 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 dec101060d..d069bd90f8 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_state.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_state.sol
@@ -1,14 +1,14 @@
 contract C
 {
-    uint public x;
-    function g() public {
+	uint public x;
+	function g() public {
 		x = 0;
-        this.h();
+		this.h();
 		assert(x == 2);
-    }
-    function h() public {
-        x = 2;
-    }
+	}
+	function h() public {
+		x = 2;
+	}
 }
 // ====
 // SMTEngine: all
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer.sol b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
index 89e8ae1027..1430e15cb8 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 8656: (98-113): CHC: Insufficient funds happens here.
 // 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/address_transfer_2.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
index 0a2c08d0ca..ce6492d9e5 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
@@ -15,6 +15,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 8656: (184-199): CHC: Insufficient funds happens here.
+// Warning 8656: (203-218): CHC: Insufficient funds happens here.
 // Warning 6328: (262-291): CHC: Assertion violation happens here.
-// Warning 1236: (184-199): BMC: Insufficient funds happens here.
-// Warning 1236: (203-218): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
index 02d20c4f5b..3f9cc22c7b 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
@@ -13,5 +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.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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_insufficient.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
index 59568cb5be..55a96026ee 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
@@ -12,6 +12,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 8656: (101-116): CHC: Insufficient funds happens here.
+// Warning 8656: (120-136): CHC: Insufficient funds happens here.
 // 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.

From c84863f90773523beec4ce871d527655e5d7be9f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 May 2023 17:27:30 +0200
Subject: [PATCH 0851/1140] Do not allocate memory on reverts with small
 errors.

Do not allocate memory on reverts with small errors.

Workaround for StringLiteralType

Addition require error test coverage
---
 Changelog.md                                  |  4 +-
 libsolidity/codegen/YulUtilFunctions.cpp      | 42 ++++++++++++++++-
 .../cmdlineTests/require_with_error_ir/output |  4 ++
 .../require_with_string_ir/output             |  4 ++
 .../errors/errors_by_parameter_type.sol       | 45 +++++++++++++++++++
 .../errors/small_error_optimization.sol       | 22 +++++++++
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/errors/errors_by_parameter_type.sol
 create mode 100644 test/libsolidity/semanticTests/errors/small_error_optimization.sol

diff --git a/Changelog.md b/Changelog.md
index 4ed7bd2a36..6f129732c7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,7 +5,9 @@ Language Features:
 
 
 Compiler Features:
-* SMTChecker: Create balance check verification target for CHC engine.
+ * SMTChecker: Create balance check verification target for CHC engine.
+ * Yul IR Code Generation: Cheaper code for reverting with errors of a small static encoding size.
+
 
 Bugfixes:
  * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index b71dfd566a..9d1929fe1e 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -32,11 +32,30 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolidity/ast/TypeProvider.h>
 
+#include <range/v3/algorithm/all_of.hpp>
+
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace std::string_literals;
 
+namespace
+{
+
+std::optional<size_t> staticEncodingSize(std::vector<Type const*> const& _parameterTypes)
+{
+	size_t encodedSize = 0;
+	for (auto* type: _parameterTypes)
+	{
+		if (type->isDynamicallyEncoded())
+			return std::nullopt;
+		encodedSize += type->calldataHeadSize();
+	}
+	return encodedSize;
+}
+
+}
+
 std::string YulUtilFunctions::identityFunction()
 {
 	std::string functionName = "identity";
@@ -226,9 +245,26 @@ std::string YulUtilFunctions::revertWithError(
 {
 	solAssert((!_posVar.empty() && !_endVar.empty()) || (_posVar.empty() && _endVar.empty()));
 	bool const needsNewVariable = !_posVar.empty() && !_endVar.empty();
+	bool needsAllocation = true;
+
+	if (std::optional<size_t> size = staticEncodingSize(_parameterTypes))
+		if (
+			ranges::all_of(_parameterTypes, [](auto const* type) {
+				solAssert(!dynamic_cast<InaccessibleDynamicType const*>(type));
+				return type && type->isValueType();
+			})
+		)
+		{
+			constexpr size_t errorSelectorSize = 4;
+			needsAllocation = *size + errorSelectorSize > CompilerUtils::generalPurposeMemoryStart;
+		}
 
 	Whiskers templ(R"({
+		<?needsAllocation>
 		let <pos> := <allocateUnbounded>()
+		<!needsAllocation>
+		let <pos> := 0
+		</needsAllocation>
 		mstore(<pos>, <hash>)
 		let <end> := <encode>(add(<pos>, 4) <argumentVars>)
 		revert(<pos>, sub(<end>, <pos>))
@@ -236,7 +272,9 @@ std::string YulUtilFunctions::revertWithError(
 	templ("pos", needsNewVariable ? _posVar : "memPtr");
 	templ("end", needsNewVariable ? _endVar : "end");
 	templ("hash", formatNumber(util::selectorFromSignatureU256(_signature)));
-	templ("allocateUnbounded", allocateUnboundedFunction());
+	templ("needsAllocation", needsAllocation);
+	if (needsAllocation)
+		templ("allocateUnbounded", allocateUnboundedFunction());
 
 	std::vector<std::string> errorArgumentVars;
 	std::vector<Type const*> errorArgumentTypes;
@@ -282,7 +320,7 @@ std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const*
 			}
 		)")
 		("functionName", functionName)
-		("revertWithError", revertWithError("Error(string)", {_messageType}, {_stringArgumentExpression}))
+		("revertWithError", revertWithError("Error(string)", {TypeProvider::stringMemory()}, {_stringArgumentExpression}))
 		("functionParameterNames", joinHumanReadablePrefixed(functionParameterNames))
 		.render();
 	});
diff --git a/test/cmdlineTests/require_with_error_ir/output b/test/cmdlineTests/require_with_error_ir/output
index 232f0d76fc..09515f3cd8 100644
--- a/test/cmdlineTests/require_with_error_ir/output
+++ b/test/cmdlineTests/require_with_error_ir/output
@@ -186,7 +186,9 @@ object "C_36" {
             function require_helper_t_error_7_CustomError_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720(condition , expr_15) {
                 if iszero(condition)
                 {
+
                     let memPtr := allocate_unbounded()
+
                     mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_rational_1_by_1_t_stringliteral_332c39dcd398ea34a48b871898d589f55fc4c7bce00562fb670c972e7e1b0720__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_15)
                     revert(memPtr, sub(end, memPtr))
@@ -241,7 +243,9 @@ object "C_36" {
             function require_helper_t_error_7_CustomError_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5(condition , expr_29) {
                 if iszero(condition)
                 {
+
                     let memPtr := allocate_unbounded()
+
                     mstore(memPtr, 0x97ea5a2f00000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_rational_2_by_1_t_stringliteral_89027a4db8d1d3a0787296eb1553fba0dc506f981f9697f1a66994c458d392b5__to_t_uint256_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_29)
                     revert(memPtr, sub(end, memPtr))
diff --git a/test/cmdlineTests/require_with_string_ir/output b/test/cmdlineTests/require_with_string_ir/output
index 21828ac2a5..3a19db3727 100644
--- a/test/cmdlineTests/require_with_string_ir/output
+++ b/test/cmdlineTests/require_with_string_ir/output
@@ -228,7 +228,9 @@ object "C_28" {
             function require_helper_t_string_memory_ptr(condition , expr_12_mpos) {
                 if iszero(condition)
                 {
+
                     let memPtr := allocate_unbounded()
+
                     mstore(memPtr, 0x08c379a000000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(add(memPtr, 4) , expr_12_mpos)
                     revert(memPtr, sub(end, memPtr))
@@ -266,7 +268,9 @@ object "C_28" {
             function require_helper_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46(condition ) {
                 if iszero(condition)
                 {
+
                     let memPtr := allocate_unbounded()
+
                     mstore(memPtr, 0x08c379a000000000000000000000000000000000000000000000000000000000)
                     let end := abi_encode_tuple_t_stringliteral_b25d43cff48de8365ad132c5f45b74f4593f9e69e5b749d86685f77282c88e46__to_t_string_memory_ptr__fromStack(add(memPtr, 4) )
                     revert(memPtr, sub(end, memPtr))
diff --git a/test/libsolidity/semanticTests/errors/errors_by_parameter_type.sol b/test/libsolidity/semanticTests/errors/errors_by_parameter_type.sol
new file mode 100644
index 0000000000..bc70b5bef7
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/errors_by_parameter_type.sol
@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+struct S {
+    uint256 a;
+    bool b;
+    string s;
+}
+
+error E();
+error E1(uint256);
+error E2(string);
+error E3(S);
+error E4(address);
+error E5(function() external pure);
+
+contract C {
+    function a() external pure {
+        require(false, E());
+    }
+    function b() external pure {
+        require(false, E1(1));
+    }
+    function c() external pure {
+        require(false, E2("string literal"));
+    }
+    function d() external pure {
+        require(false, E3(S(1, true, "string literal")));
+    }
+    function e() external view {
+        require(false, E4(address(this)));
+    }
+    function f() external view {
+        require(false, E5(this.a));
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// a() -> FAILURE, hex"92bbf6e8"
+// b() -> FAILURE, hex"47e26897", hex"0000000000000000000000000000000000000000000000000000000000000001"
+// c() -> FAILURE, hex"8f372c34", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
+// d() -> FAILURE, hex"5717173e", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
+// e() -> FAILURE, hex"7efef9ea", hex"000000000000000000000000c06afe3a8444fc0004668591e8306bfb9968e79e"
+// f() -> FAILURE, hex"0c3f12eb", hex"c06afe3a8444fc0004668591e8306bfb9968e79e0dbe671f0000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/small_error_optimization.sol b/test/libsolidity/semanticTests/errors/small_error_optimization.sol
new file mode 100644
index 0000000000..0c9cd750aa
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/small_error_optimization.sol
@@ -0,0 +1,22 @@
+error E();
+contract A {
+	uint8[] x;
+	function f() public {
+		for (uint i = 0; i < 100; ++i)
+			x.push(uint8(i));
+		revert E();
+	}
+}
+contract B {
+	function f() public {
+		(new A()).f();
+	}
+}
+// ----
+// f() -> FAILURE, hex"92bbf6e8"
+// gas irOptimized: 221918
+// gas irOptimized code: 42800
+// gas legacy: 233746
+// gas legacy code: 37400
+// gas legacyOptimized: 224864
+// gas legacyOptimized code: 34200

From e3e4f665232fbd77d81260a7f8f65f529cef68b3 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 13 May 2024 16:40:17 +0200
Subject: [PATCH 0852/1140] Remove bzzr entries from static binary section in
 the docs

---
 docs/installing-solidity.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 8d5b421d3a..f079fb0245 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -249,7 +249,6 @@ Each one includes a ``list.json`` file listing the available binaries. For examp
       "keccak256": "0x300330ecd127756b824aa13e843cb1f43c473cb22eaf3750d5fb9c99279af8c3",
       "sha256": "0x2b55ed5fec4d9625b6c7b3ab1abd2b7fb7dd2a9c68543bf0323db2c7e2d55af2",
       "urls": [
-        "bzzr://16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1",
         "dweb:/ipfs/QmTLs5MuLEWXQkths41HiACoXDiH8zxyqBHGFDRSzVE5CS"
       ]
     }
@@ -264,7 +263,7 @@ This means that:
   In this case git is not necessary and symlinks are resolved transparently, either by serving a copy
   of the file or returning a HTTP redirect.
 - The file is also available on IPFS at `QmTLs5MuLEWXQkths41HiACoXDiH8zxyqBHGFDRSzVE5CS`_.
-- The file might in future be available on Swarm at `16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1`_.
+  Please, be aware that the order of items in the ``urls`` array is not predetermined or guaranteed and users should not rely on it.
 - 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
@@ -305,14 +304,12 @@ This means that:
     in the long-term.
 
 .. _IPFS: https://ipfs.io
-.. _Swarm: https://swarm-gateways.net/bzz:/swarm.eth
 .. _solc-bin: https://github.com/ethereum/solc-bin/
 .. _Solidity release page on GitHub: https://github.com/ethereum/solidity/releases
 .. _sha3sum: https://github.com/maandree/sha3sum
 .. _keccak256() function from ethereumjs-util: https://github.com/ethereumjs/ethereumjs-util/blob/master/docs/modules/_hash_.md#const-keccak256
 .. _WebAssembly builds: https://emscripten.org/docs/compiling/WebAssembly.html
 .. _QmTLs5MuLEWXQkths41HiACoXDiH8zxyqBHGFDRSzVE5CS: https://gateway.ipfs.io/ipfs/QmTLs5MuLEWXQkths41HiACoXDiH8zxyqBHGFDRSzVE5CS
-.. _16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1: https://swarm-gateways.net/bzz:/16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1/
 
 .. _building-from-source:
 

From 8216a70e5b308da5c0302395f62d89ec281ec99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 May 2024 14:58:05 +0200
Subject: [PATCH 0853/1140] Add the missing changelog entry for the new default
 optimizer sequence

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

diff --git a/Changelog.md b/Changelog.md
index 6f129732c7..c6ec0a5533 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
  * SMTChecker: Create balance check verification target for CHC engine.
  * Yul IR Code Generation: Cheaper code for reverting with errors of a small static encoding size.
+ * Yul Optimizer: New, faster default optimizer step sequence.
 
 
 Bugfixes:

From 108d398a7cb9200087b1b0f5baf036414ea8c14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 May 2024 16:14:33 +0200
Subject: [PATCH 0854/1140] Changelog: Optimizer -> Yul Optimizer in the entry
 for the superfluous sequence repetition bugfix

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

diff --git a/Changelog.md b/Changelog.md
index c6ec0a5533..443259806f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,7 +12,6 @@ Compiler Features:
 
 Bugfixes:
  * Commandline Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``--yul-optimizations`` sequence.
- * Optimizer: Fix optimizer executing each repeating part of the step sequence at least twice, even if the code size already became stable after the first iteration.
  * SMTChecker: Fix false positive when comparing hashes of same array or string literals.
  * SMTChecker: Fix internal error on mapping access caused by too strong requirements on sort compatibility of the index and mapping domain.
  * SMTChecker: Fix internal error when using an empty tuple in a conditional operator.
@@ -20,6 +19,7 @@ Bugfixes:
  * Standard JSON Interface: Fix ICE when the optimizer is disabled and an empty/blank string is used for ``optimizerSteps`` sequence.
  * StaticAnalyzer: Only raise a compile time error for division and modulo by zero when it's between literals.
  * TypeChecker: Fix compiler crash when the left-hand side of an assignment was a parenthesized non-tuple expression of a tuple type.
+ * Yul Optimizer: Fix optimizer executing each repeating part of the step sequence at least twice, even if the code size already became stable after the first iteration.
  * Yul Optimizer: Fix the order of assignments generated by ``SSATransform`` being dependent on AST IDs, sometimes resulting in different (but equivalent) bytecode when unrelated files were added to the compilation pipeline.
 
 

From bbf5aa2f5b662b1d522e4eb280325ba2a30d5979 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 May 2024 18:42:19 +0200
Subject: [PATCH 0855/1140] Remove json-cpp from create source tarball script.

---
 scripts/create_source_tarball.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh
index 1ea8c0b570..4af1cf586a 100755
--- a/scripts/create_source_tarball.sh
+++ b/scripts/create_source_tarball.sh
@@ -29,17 +29,6 @@ REPO_ROOT="$(dirname "$0")"/..
     then
         cp prerelease.txt "$SOLDIR/"
     fi
-    # Add dependencies
-    mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true
-    jsoncpp_version="1.9.3"
-    jsoncpp_package_path="$SOLDIR/deps/downloads/jsoncpp-${jsoncpp_version}.tar.gz"
-    jsoncpp_sha256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d
-    wget -O "$jsoncpp_package_path" "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz"
-    if ! [ "$(sha256sum "$jsoncpp_package_path")" = "${jsoncpp_sha256}  ${jsoncpp_package_path}" ]
-    then
-        >&2 echo "ERROR: Downloaded jsoncpp source package has wrong checksum."
-        exit 1
-    fi
     mkdir -p "$REPO_ROOT/upload"
     tar --owner 0 --group 0 -czf "$REPO_ROOT/upload/solidity_$versionstring.tar.gz" -C "$TEMPDIR" "solidity_$versionstring"
     rm -r "$TEMPDIR"

From 70e1edcebe3c0e5621ca590afae2744e9a284e92 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 May 2024 18:39:25 +0200
Subject: [PATCH 0856/1140] Update PPA release script.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 scripts/release_ppa.sh        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index be45f44526..016cd5d21e 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 mantic"
+DISTRIBUTIONS="focal jammy mantic noble"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 9a94fbcf2c..0e4eb7ed4d 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 mantic"
+DISTRIBUTIONS="focal jammy mantic noble"
 
 if is_release
 then
@@ -125,7 +125,8 @@ 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
+mkdir -p ./solc/deps/nlohmann/nlohmann/ 2>/dev/null || true
+wget -O ./solc/deps/nlohmann/nlohmann/json.hpp https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp
 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-9.1.0.tar.gz https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
 

From 659d13fcbe97cd89ace325c3493e38253bb9f889 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 May 2024 18:00:36 +0200
Subject: [PATCH 0857/1140] Add header include for docker builds.

---
 liblangutil/Token.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index d1073a872b..d9438271ca 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -42,6 +42,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iosfwd>
 #include <string>
 #include <tuple>

From acec7170bad18b3dce83badec128e3cb75caec53 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 May 2024 18:53:04 +0200
Subject: [PATCH 0858/1140] Update license template.

---
 cmake/templates/license.h.in | 221 ++++++++++++++++++++++++++++-------
 1 file changed, 176 insertions(+), 45 deletions(-)

diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in
index 2d7f2691a8..7ade6be059 100644
--- a/cmake/templates/license.h.in
+++ b/cmake/templates/license.h.in
@@ -3,7 +3,7 @@
 #include <string>
 
 static std::string const otherLicenses{R"(Most of the code is licensed under GPLv3 (see below), the license for individual
-parts are as follows:
+parts and dependencies are as follows:
 
 libkeccak-tiny:
   The file libsolutil/Keccak256.cpp incorporates libkeccak-tiny.
@@ -11,6 +11,26 @@ 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.
 
+nlohmann-json:
+  The source code of nlohmann-json is licensed under the following
+  conditions:
+
+  The class is licensed under the MIT License:
+
+  Copyright © 2013-2022 Niels Lohmann
+
+  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.
+
+  The class contains the UTF-8 Decoder from Bjoern Hoehrmann which is licensed under the MIT License (see above). Copyright © 2008-2009 Björn Hoehrmann bjoern@hoehrmann.de
+
+  The class contains a slightly modified version of the Grisu2 algorithm from Florian Loitsch which is licensed under the MIT License (see above). Copyright © 2009 Florian Loitsch
+
+  The class contains a copy of Hedley from Evan Nemerson which is licensed as CC0-1.0.
+
 picosha2:
   The file libsolutil/picosha2.h is imported.
 
@@ -34,62 +54,160 @@ picosha2:
   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
-  conditions...
+range-v3:
+  The range-v3 library is licensed under the following conditions:
+
+  ========================================================
+  Boost Software License - Version 1.0 - August 17th, 2003
+  ========================================================
 
-  The JsonCpp Authors explicitly disclaim copyright in all
-  jurisdictions which recognize such a disclaimer. In such jurisdictions,
-  this software is released into the Public Domain.
+  Permission is hereby granted, free of charge, to any person or organization
+  obtaining a copy of the software and accompanying documentation covered by
+  this license (the "Software") to use, reproduce, display, distribute,
+  execute, and transmit the Software, and to prepare derivative works of the
+  Software, and to permit third-parties to whom the Software is furnished to
+  do so, all subject to the following:
 
-  In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-  2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
-  released under the terms of the MIT License (see below).
+  The copyright notices in the Software and this entire statement, including
+  the above license grant, this restriction and the following disclaimer,
+  must be included in all copies of the Software, in whole or in part, and
+  all derivative works of the Software, unless such copies or derivative
+  works are solely in the form of machine-executable object code generated by
+  a source language processor.
 
-  In jurisdictions which recognize Public Domain property, the user of this
-  software may choose to accept it either as 1) Public Domain, 2) under the
-  conditions of the MIT License (see below), or 3) under the terms of dual
-  Public Domain/MIT License conditions described here, as they choose.
+  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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
 
-  The MIT License is about as close to Public Domain as a license can get, and is
-  described in clear, concise terms at:
+  ==============================================================================
+  libc++ License
+  ==============================================================================
 
-	 http://en.wikipedia.org/wiki/MIT_License
+  The libc++ library is dual licensed under both the University of Illinois
+  "BSD-Like" license and the MIT license.  As a user of this code you may choose
+  to use it under either license.  As a contributor, you agree to allow your code
+  to be used under both.
 
-  The full text of the MIT License follows:
+  Full text of the relevant licenses is included below.
 
-  ========================================================================
-  Copyright (c) 2007-2010 The JsonCpp Authors
+  ==============================================================================
 
-  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:
+  University of Illinois/NCSA
+  Open Source License
 
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
+  Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
+  http://llvm.org/svn/llvm-project/libcxx/trunk/CREDITS.TXT
 
-  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
+  All rights reserved.
+
+  Developed by:
+
+      LLVM Team
+
+      University of Illinois at Urbana-Champaign
+
+      http://llvm.org
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy of
+  this software and associated documentation files (the "Software"), to deal with
+  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:
+
+      * Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimers.
+
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimers in the
+        documentation and/or other materials provided with the distribution.
+
+      * Neither the names of the LLVM Team, University of Illinois at
+        Urbana-Champaign, nor the names of its contributors may be used to
+        endorse or promote products derived from this Software without specific
+        prior written permission.
+
+  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
+  CONTRIBUTORS 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 WITH THE
   SOFTWARE.
-  ========================================================================
-  (END LICENSE TEXT)
 
-  The MIT license is compatible with both the GPL and commercial
-  software, affording one all of the rights of Public Domain with the
-  minor nuisance of being required to keep the above copyright notice
-  and license text in the source code. Note also that by accepting the
-  Public Domain "license" you can re-license your copy using whatever
-  license you like.
+  ==============================================================================
+
+  Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
+    http://llvm.org/svn/llvm-project/libcxx/trunk/CREDITS.TXT
+
+  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.
+
+  ==============================================================================
+  Stepanov and McJones, "Elements of Programming" license
+  ==============================================================================
+
+  // Copyright (c) 2009 Alexander Stepanov and Paul McJones
+  //
+  // Permission to use, copy, modify, distribute and sell this software
+  // and its documentation for any purpose is hereby granted without
+  // fee, provided that the above copyright notice appear in all copies
+  // and that both that copyright notice and this permission notice
+  // appear in supporting documentation. The authors make no
+  // representations about the suitability of this software for any
+  // purpose. It is provided "as is" without express or implied
+  // warranty.
+  //
+  // Algorithms from
+  // Elements of Programming
+  // by Alexander Stepanov and Paul McJones
+  // Addison-Wesley Professional, 2009
+
+  ==============================================================================
+  SGI C++ Standard Template Library license
+  ==============================================================================
+
+  // Copyright (c) 1994
+  // Hewlett-Packard Company
+  //
+  // Permission to use, copy, modify, distribute and sell this software
+  // and its documentation for any purpose is hereby granted without fee,
+  // provided that the above copyright notice appear in all copies and
+  // that both that copyright notice and this permission notice appear
+  // in supporting documentation.  Hewlett-Packard Company makes no
+  // representations about the suitability of this software for any
+  // purpose.  It is provided "as is" without express or implied warranty.
+  //
+  // Copyright (c) 1996
+  // Silicon Graphics Computer Systems, Inc.
+  //
+  // Permission to use, copy, modify, distribute and sell this software
+  // and its documentation for any purpose is hereby granted without fee,
+  // provided that the above copyright notice appear in all copies and
+  // that both that copyright notice and this permission notice appear
+  // in supporting documentation.  Silicon Graphics makes no
+  // representations about the suitability of this software for any
+  // purpose.  It is provided "as is" without express or implied warranty.
+  //
 
 scanner/token:
   The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are derived from
@@ -167,6 +285,19 @@ base64:
 
   Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/
 
+Z3:
+  The Z3 library is licensed under the following terms:
+
+  Copyright (c) Microsoft Corporation
+  All rights reserved.
+  MIT License
+
+  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.
+
 
 All other code is licensed under GPL version 3:
 

From 24f18e83a6c81935daa150c129b4007d5a41a014 Mon Sep 17 00:00:00 2001
From: hydai <z54981220@gmail.com>
Date: Wed, 15 May 2024 23:39:26 +0800
Subject: [PATCH 0859/1140] Remove using namespace std from testing tools,
 ossfuzz and yulPhaser

Signed-off-by: hydai <z54981220@gmail.com>
---
 scripts/check_style.sh                        |   4 +
 test/tools/afl_fuzzer.cpp                     |  23 +-
 test/tools/fuzzer_common.cpp                  |  43 ++-
 test/tools/isoltest.cpp                       | 121 ++++---
 test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp    |  11 +-
 .../SolidityCustomMutatorInterface.cpp        |   7 +-
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |  19 +-
 test/tools/ossfuzz/SolidityGenerator.cpp      |  53 ++-
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |  23 +-
 test/tools/ossfuzz/abiV2ProtoFuzzer.cpp       |  13 +-
 test/tools/ossfuzz/const_opt_ossfuzz.cpp      |   4 +-
 test/tools/ossfuzz/protoToAbiV2.cpp           | 321 +++++++++---------
 test/tools/ossfuzz/protoToSol.cpp             |  59 ++--
 test/tools/ossfuzz/protoToYul.cpp             | 151 ++++----
 .../ossfuzz/protomutators/YulProtoMutator.cpp |   9 +-
 test/tools/ossfuzz/solProtoFuzzer.cpp         |  15 +-
 test/tools/ossfuzz/solc_ossfuzz.cpp           |   9 +-
 .../ossfuzz/strictasm_assembly_ossfuzz.cpp    |   5 +-
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |   9 +-
 test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp  |   5 +-
 test/tools/ossfuzz/yulFuzzerCommon.cpp        |   5 +-
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |  11 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |  19 +-
 test/tools/yulopti.cpp                        |  93 +++--
 test/tools/yulrun.cpp                         |  31 +-
 tools/yulPhaser/AlgorithmRunner.cpp           |  41 ++-
 tools/yulPhaser/Chromosome.cpp                |  25 +-
 tools/yulPhaser/Common.cpp                    |  15 +-
 tools/yulPhaser/FitnessMetrics.cpp            |   9 +-
 tools/yulPhaser/GeneticAlgorithms.cpp         |  13 +-
 tools/yulPhaser/Mutations.cpp                 |  65 ++--
 tools/yulPhaser/PairSelections.cpp            |  23 +-
 tools/yulPhaser/Phaser.cpp                    | 195 ++++++-----
 tools/yulPhaser/Population.cpp                |  53 ++-
 tools/yulPhaser/Program.cpp                   |  63 ++--
 tools/yulPhaser/ProgramCache.cpp              |  29 +-
 tools/yulPhaser/Selections.cpp                |  27 +-
 tools/yulPhaser/SimulationRNG.cpp             |   5 +-
 38 files changed, 796 insertions(+), 830 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 3c9acf86ca..e9d470b761 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -50,8 +50,12 @@ NAMESPACE_STD_FREE_FILES=(
     test/libsolidity/util/*
     test/libyul/*
     test/solc/*
+    test/tools/*
+    test/tools/ossfuzz/*
+    test/tools/ossfuzz/protomutators/*
     test/tools/yulInterpreter/*
     test/yulPhaser/*
+    tools/yulPhaser/*
 )
 
 (
diff --git a/test/tools/afl_fuzzer.cpp b/test/tools/afl_fuzzer.cpp
index af0939c2bd..bac98d76bf 100644
--- a/test/tools/afl_fuzzer.cpp
+++ b/test/tools/afl_fuzzer.cpp
@@ -28,7 +28,6 @@
 #include <string>
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -60,11 +59,11 @@ Allowed options)",
 		)
 		(
 			"input-file",
-			po::value<string>(),
+			po::value<std::string>(),
 			"input file"
 		)(
 			"input-files",
-			po::value<std::vector<string>>()->multitoken(),
+			po::value<std::vector<std::string>>()->multitoken(),
 			"input files"
 		)
 		(
@@ -86,7 +85,7 @@ Allowed options)",
 	}
 	catch (po::error const& _exception)
 	{
-		cerr << _exception.what() << endl;
+		std::cerr << _exception.what() << std::endl;
 		return 1;
 	}
 
@@ -95,26 +94,26 @@ Allowed options)",
 
 	if (arguments.count("help"))
 	{
-		cout << options;
+		std::cout << options;
 		return 0;
 	}
 
-	vector<string> inputs;
+	std::vector<std::string> inputs;
 	if (arguments.count("input-file"))
-		inputs.push_back(arguments["input-file"].as<string>());
+		inputs.push_back(arguments["input-file"].as<std::string>());
 	else if (arguments.count("input-files"))
-		inputs = arguments["input-files"].as<vector<string>>();
+		inputs = arguments["input-files"].as<std::vector<std::string>>();
 	else
 		inputs.emplace_back("");
 
 	bool optimize = !arguments.count("without-optimizer");
 	int retResult = 0;
 
-	for (string const& inputFile: inputs)
+	for (std::string const& inputFile: inputs)
 	{
-		string input;
+		std::string input;
 		if (inputFile.size() == 0)
-			input = readUntilEnd(cin);
+			input = readUntilEnd(std::cin);
 		else
 			input = readFileAsString(inputFile);
 
@@ -134,7 +133,7 @@ Allowed options)",
 			if (inputFile.size() == 0)
 				throw;
 
-			cerr << "Fuzzer "
+			std::cerr << "Fuzzer "
 				<< (optimize ? "" : "(without optimizer) ")
 				<< "failed on "
 				<< inputFile;
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index c7e94f40b7..b054883820 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -33,14 +33,13 @@
 
 #include <sstream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
-static vector<EVMVersion> s_evmVersions = {
+static std::vector<EVMVersion> s_evmVersions = {
 	EVMVersion::homestead(),
 	EVMVersion::tangerineWhistle(),
 	EVMVersion::spuriousDragon(),
@@ -53,10 +52,10 @@ static vector<EVMVersion> s_evmVersions = {
 	EVMVersion::paris()
 };
 
-void FuzzerUtil::testCompilerJsonInterface(string const& _input, bool _optimize, bool _quiet)
+void FuzzerUtil::testCompilerJsonInterface(std::string const& _input, bool _optimize, bool _quiet)
 {
 	if (!_quiet)
-		cout << "Testing compiler " << (_optimize ? "with" : "without") << " optimizer." << endl;
+		std::cout << "Testing compiler " << (_optimize ? "with" : "without") << " optimizer." << std::endl;
 
 	Json config;
 	config["language"] = "Solidity";
@@ -82,7 +81,7 @@ void FuzzerUtil::forceSMT(StringMap& _input)
 	// Add SMT checker pragma if not already present in source
 	static auto constexpr smtPragma = "pragma experimental SMTChecker;";
 	for (auto &sourceUnit: _input)
-		if (sourceUnit.second.find(smtPragma) == string::npos)
+		if (sourceUnit.second.find(smtPragma) == std::string::npos)
 			sourceUnit.second += smtPragma;
 }
 
@@ -144,13 +143,13 @@ void FuzzerUtil::testCompiler(
 	}
 }
 
-void FuzzerUtil::runCompiler(string const& _input, bool _quiet)
+void FuzzerUtil::runCompiler(std::string const& _input, bool _quiet)
 {
 	if (!_quiet)
-		cout << "Input JSON: " << _input << endl;
-	string outputString(solidity_compile(_input.c_str(), nullptr, nullptr));
+		std::cout << "Input JSON: " << _input << std::endl;
+	std::string outputString(solidity_compile(_input.c_str(), nullptr, nullptr));
 	if (!_quiet)
-		cout << "Output JSON: " << outputString << endl;
+		std::cout << "Output JSON: " << outputString << std::endl;
 
 	// This should be safe given the above copies the output.
 	solidity_reset();
@@ -158,32 +157,32 @@ void FuzzerUtil::runCompiler(string const& _input, bool _quiet)
 	Json output;
 	if (!jsonParseStrict(outputString, output))
 	{
-		string msg{"Compiler produced invalid JSON output."};
-		cout << msg << endl;
+		std::string msg{"Compiler produced invalid JSON output."};
+		std::cout << msg << std::endl;
 		BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
 	}
 	if (output.contains("errors"))
 		for (auto const& error: output["errors"])
 		{
-			string invalid = findAnyOf(error["type"].get<std::string>(), vector<string>{
+			std::string invalid = findAnyOf(error["type"].get<std::string>(), std::vector<std::string>{
 					"Exception",
 					"InternalCompilerError"
 			});
 			if (!invalid.empty())
 			{
-				string msg = "Invalid error: \"" + error["type"].get<std::string>() + "\"";
-				cout << msg << endl;
+				std::string msg = "Invalid error: \"" + error["type"].get<std::string>() + "\"";
+				std::cout << msg << std::endl;
 				BOOST_THROW_EXCEPTION(std::runtime_error(std::move(msg)));
 			}
 		}
 }
 
-void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
+void FuzzerUtil::testConstantOptimizer(std::string const& _input, bool _quiet)
 {
 	if (!_quiet)
-		cout << "Testing constant optimizer" << endl;
-	vector<u256> numbers;
-	stringstream sin(_input);
+		std::cout << "Testing constant optimizer" << std::endl;
+	std::vector<u256> numbers;
+	std::stringstream sin(_input);
 
 	while (!sin.eof())
 	{
@@ -192,7 +191,7 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
 		numbers.push_back(u256(data));
 	}
 	if (!_quiet)
-		cout << "Got " << numbers.size() << " inputs:" << endl;
+		std::cout << "Got " << numbers.size() << " inputs:" << std::endl;
 
 	for (bool isCreation: {false, true})
 	{
@@ -200,7 +199,7 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
 		for (u256 const& n: numbers)
 		{
 			if (!_quiet)
-				cout << n << endl;
+				std::cout << n << std::endl;
 			assembly.append(n);
 		}
 		for (unsigned runs: {1u, 2u, 3u, 20u, 40u, 100u, 200u, 400u, 1000u})
@@ -217,10 +216,10 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
 	}
 }
 
-void FuzzerUtil::testStandardCompiler(string const& _input, bool _quiet)
+void FuzzerUtil::testStandardCompiler(std::string const& _input, bool _quiet)
 {
 	if (!_quiet)
-		cout << "Testing compiler via JSON interface." << endl;
+		std::cout << "Testing compiler via JSON interface." << std::endl;
 
 	runCompiler(_input, _quiet);
 }
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 9d20f1059f..fa56b35d7d 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -38,7 +38,6 @@
 #include <windows.h>
 #endif
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
@@ -69,24 +68,24 @@ struct TestStats
 class TestFilter
 {
 public:
-	explicit TestFilter(string _filter): m_filter(std::move(_filter))
+	explicit TestFilter(std::string _filter): m_filter(std::move(_filter))
 	{
-		string filter{m_filter};
+		std::string filter{m_filter};
 
 		boost::replace_all(filter, "/", "\\/");
 		boost::replace_all(filter, "*", ".*");
 
-		m_filterExpression = regex{"(" + filter + "(\\.sol|\\.yul|\\.stack))"};
+		m_filterExpression = std::regex{"(" + filter + "(\\.sol|\\.yul|\\.stack))"};
 	}
 
-	bool matches(fs::path const& _path, string const& _name) const
+	bool matches(fs::path const& _path, std::string const& _name) const
 	{
-		return regex_match(_name, m_filterExpression) && solidity::test::isValidSemanticTestPath(_path);
+		return std::regex_match(_name, m_filterExpression) && solidity::test::isValidSemanticTestPath(_path);
 	}
 
 private:
-	string m_filter;
-	regex m_filterExpression;
+	std::string m_filter;
+	std::regex m_filterExpression;
 };
 
 class TestTool
@@ -96,7 +95,7 @@ class TestTool
 		TestCreator _testCaseCreator,
 		TestOptions const& _options,
 		fs::path _path,
-		string _name
+		std::string _name
 	):
 		m_testCaseCreator(_testCaseCreator),
 		m_options(_options),
@@ -137,9 +136,9 @@ class TestTool
 	TestOptions const& m_options;
 	TestFilter m_filter;
 	fs::path const m_path;
-	string const m_name;
+	std::string const m_name;
 
-	unique_ptr<TestCase> m_test;
+	std::unique_ptr<TestCase> m_test;
 
 	static bool m_exitRequested;
 };
@@ -154,7 +153,7 @@ TestTool::Result TestTool::process()
 	{
 		if (m_filter.matches(m_path, m_name))
 		{
-			(AnsiColorized(cout, formatted, {BOLD}) << m_name << ": ").flush();
+			(AnsiColorized(std::cout, formatted, {BOLD}) << m_name << ": ").flush();
 
 			m_test = m_testCaseCreator(TestCase::Config{
 				m_path.string(),
@@ -170,22 +169,22 @@ TestTool::Result TestTool::process()
 				switch (TestCase::TestResult result = m_test->run(outputMessages, "  ", formatted))
 				{
 					case TestCase::TestResult::Success:
-						AnsiColorized(cout, formatted, {BOLD, GREEN}) << "OK" << endl;
+						AnsiColorized(std::cout, formatted, {BOLD, GREEN}) << "OK" << std::endl;
 						return Result::Success;
 					default:
-						AnsiColorized(cout, formatted, {BOLD, RED}) << "FAIL" << endl;
+						AnsiColorized(std::cout, formatted, {BOLD, RED}) << "FAIL" << std::endl;
 
-						AnsiColorized(cout, formatted, {BOLD, CYAN}) << "  Contract:" << endl;
-						m_test->printSource(cout, "    ", formatted);
-						m_test->printSettings(cout, "    ", formatted);
+						AnsiColorized(std::cout, formatted, {BOLD, CYAN}) << "  Contract:" << std::endl;
+						m_test->printSource(std::cout, "    ", formatted);
+						m_test->printSettings(std::cout, "    ", formatted);
 
-						cout << endl << outputMessages.str() << endl;
+						std::cout << std::endl << outputMessages.str() << std::endl;
 						return result == TestCase::TestResult::FatalError ? Result::Exception : Result::Failure;
 				}
 			}
 			else
 			{
-				AnsiColorized(cout, formatted, {BOLD, YELLOW}) << "NOT RUN" << endl;
+				AnsiColorized(std::cout, formatted, {BOLD, YELLOW}) << "NOT RUN" << std::endl;
 				return Result::Skipped;
 			}
 		}
@@ -194,30 +193,30 @@ TestTool::Result TestTool::process()
 	}
 	catch (boost::exception const& _e)
 	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << endl;
+		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
+			"Exception during test: " << boost::diagnostic_information(_e) << std::endl;
 		return Result::Exception;
 	}
 	catch (std::exception const& _e)
 	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << endl;
+		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
+			"Exception during test: " << boost::diagnostic_information(_e) << std::endl;
 		return Result::Exception;
 	}
 	catch (...)
 	{
-		AnsiColorized(cout, formatted, {BOLD, RED}) <<
-			"Unknown exception during test: " << boost::current_exception_diagnostic_information() << endl;
+		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
+			"Unknown exception during test: " << boost::current_exception_diagnostic_information() << std::endl;
 		return Result::Exception;
 	}
 }
 
 void TestTool::updateTestCase()
 {
-	ofstream file(m_path.string(), ios::trunc);
+	std::ofstream file(m_path.string(), std::ios::trunc);
 	m_test->printSource(file);
 	m_test->printUpdatedSettings(file);
-	file << "// ----" << endl;
+	file << "// ----" << std::endl;
 	m_test->printUpdatedExpectations(file, "// ");
 }
 
@@ -230,34 +229,34 @@ TestTool::Request TestTool::handleResponse(bool _exception)
 	}
 
 	if (_exception)
-		cout << "(e)dit/(s)kip/(q)uit? ";
+		std::cout << "(e)dit/(s)kip/(q)uit? ";
 	else
-		cout << "(e)dit/(u)pdate expectations/(s)kip/(q)uit? ";
-	cout.flush();
+		std::cout << "(e)dit/(u)pdate expectations/(s)kip/(q)uit? ";
+	std::cout.flush();
 
 	while (true)
 	{
 		switch(readStandardInputChar())
 		{
 		case 's':
-			cout << endl;
+			std::cout << std::endl;
 			return Request::Skip;
 		case 'u':
 			if (_exception)
 				break;
 			else
 			{
-				cout << endl;
+				std::cout << std::endl;
 				updateTestCase();
 				return Request::Rerun;
 			}
 		case 'e':
-			cout << endl << endl;
+			std::cout << std::endl << std::endl;
 			if (system((m_options.editor + " \"" + m_path.string() + "\"").c_str()))
-				cerr << "Error running editor command." << endl << endl;
+				std::cerr << "Error running editor command." << std::endl << std::endl;
 			return Request::Rerun;
 		case 'q':
-			cout << endl;
+			std::cout << std::endl;
 			return Request::Quit;
 		default:
 			break;
@@ -326,7 +325,7 @@ TestStats TestTool::processPath(
 					m_exitRequested = true;
 					break;
 				case Request::Rerun:
-					cout << "Re-running test case..." << endl;
+					std::cout << "Re-running test case..." << std::endl;
 					--testCount;
 					break;
 				case Request::Skip:
@@ -379,7 +378,7 @@ std::optional<TestStats> runTestSuite(
 	TestOptions const& _options,
 	fs::path const& _basePath,
 	fs::path const& _subdirectory,
-	string const& _name,
+	std::string const& _name,
 	solidity::test::Batcher& _batcher
 )
 {
@@ -388,7 +387,7 @@ std::optional<TestStats> runTestSuite(
 
 	if (!fs::exists(testPath) || !fs::is_directory(testPath))
 	{
-		cerr << _name << " tests not found. Use the --testpath argument." << endl;
+		std::cerr << _name << " tests not found. Use the --testpath argument." << std::endl;
 		return std::nullopt;
 	}
 
@@ -402,19 +401,19 @@ std::optional<TestStats> runTestSuite(
 
 	if (stats.skippedCount != stats.testCount)
 	{
-		cout << endl << _name << " Test Summary: ";
-		AnsiColorized(cout, formatted, {BOLD, stats ? GREEN : RED}) <<
+		std::cout << std::endl << _name << " Test Summary: ";
+		AnsiColorized(std::cout, formatted, {BOLD, stats ? GREEN : RED}) <<
 			stats.successCount <<
 			"/" <<
 			stats.testCount;
-		cout << " tests successful";
+		std::cout << " tests successful";
 		if (stats.skippedCount > 0)
 		{
-			cout << " (";
-			AnsiColorized(cout, formatted, {BOLD, YELLOW}) << stats.skippedCount;
-			cout<< " tests skipped)";
+			std::cout << " (";
+			AnsiColorized(std::cout, formatted, {BOLD, YELLOW}) << stats.skippedCount;
+			std::cout<< " tests skipped)";
 		}
-		cout << "." << endl << endl;
+		std::cout << "." << std::endl << std::endl;
 	}
 	return stats;
 }
@@ -446,14 +445,14 @@ int main(int argc, char const *argv[])
 			return EXIT_FAILURE;
 
 		if (options.disableSemanticTests)
-			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
+			std::cout << std::endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << std::endl << std::endl;
 
 		TestStats global_stats{0, 0};
-		cout << "Running tests..." << endl << endl;
+		std::cout << "Running tests..." << std::endl << std::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;
+			std::cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << std::endl;
 
 		// Actually run the tests.
 		// Interactive tests are added in InteractiveTests.h
@@ -479,42 +478,42 @@ int main(int argc, char const *argv[])
 				return EXIT_FAILURE;
 		}
 
-		cout << endl << "Summary: ";
-		AnsiColorized(cout, !options.noColor, {BOLD, global_stats ? GREEN : RED}) <<
+		std::cout << std::endl << "Summary: ";
+		AnsiColorized(std::cout, !options.noColor, {BOLD, global_stats ? GREEN : RED}) <<
 			 global_stats.successCount << "/" << global_stats.testCount;
-		cout << " tests successful";
+		std::cout << " tests successful";
 		if (global_stats.skippedCount > 0)
 		{
-			cout << " (";
-			AnsiColorized(cout, !options.noColor, {BOLD, YELLOW}) << global_stats.skippedCount;
-			cout << " tests skipped)";
+			std::cout << " (";
+			AnsiColorized(std::cout, !options.noColor, {BOLD, YELLOW}) << global_stats.skippedCount;
+			std::cout << " tests skipped)";
 		}
-		cout << "." << endl;
+		std::cout << "." << std::endl;
 
 		if (options.disableSemanticTests)
-			cout << "\nNOTE: Skipped semantics tests.\n" << endl;
+			std::cout << "\nNOTE: Skipped semantics tests.\n" << std::endl;
 
 		return global_stats ? EXIT_SUCCESS : EXIT_FAILURE;
 	}
 	catch (boost::program_options::error const& exception)
 	{
-		cerr << exception.what() << endl;
+		std::cerr << exception.what() << std::endl;
 		return 2;
 	}
 	catch (std::runtime_error const& exception)
 	{
-		cerr << exception.what() << endl;
+		std::cerr << exception.what() << std::endl;
 		return 2;
 	}
 	catch (solidity::test::ConfigException const& exception)
 	{
-		cerr << exception.what() << endl;
+		std::cerr << exception.what() << std::endl;
 		return 2;
 	}
 	catch (...)
 	{
-		cerr << "Unhandled exception caught." << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
+		std::cerr << "Unhandled exception caught." << std::endl;
+		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
 		return 2;
 	}
 }
diff --git a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
index 78697a9ddd..e10979ee13 100644
--- a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
+++ b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
@@ -29,7 +29,6 @@ using namespace solidity::test::abiv2fuzzer;
 using namespace solidity::test;
 using namespace solidity::util;
 using namespace solidity;
-using namespace std;
 
 static constexpr size_t abiCoderHeapSize = 1024 * 512;
 static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
@@ -37,18 +36,18 @@ static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 DEFINE_PROTO_FUZZER(Contract const& _contract)
 {
 	ProtoConverter converter(_contract.seed());
-	string contractSource = converter.contractToString(_contract);
+	std::string contractSource = converter.contractToString(_contract);
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
 		// With libFuzzer binary run this to generate the solidity source file x.sol from a proto input:
 		// PROTO_FUZZER_DUMP_PATH=x.sol ./a.out proto-input
-		ofstream of(dump_path);
+		std::ofstream of(dump_path);
 		of << contractSource;
 	}
 
-	string typeString = converter.isabelleTypeString();
-	string valueString = converter.isabelleValueString();
+	std::string typeString = converter.isabelleTypeString();
+	std::string valueString = converter.isabelleValueString();
 	abicoder::ABICoder coder(abiCoderHeapSize);
 	if (!typeString.empty() && converter.coderFunction())
 	{
@@ -58,7 +57,7 @@ DEFINE_PROTO_FUZZER(Contract const& _contract)
 		// We target the default EVM which is the latest
 		langutil::EVMVersion version;
 		EVMHost hostContext(version, evmone);
-		string contractName = "C";
+		std::string contractName = "C";
 		StringMap source({{"test.sol", contractSource}});
 		CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
 		EvmoneUtility evmoneUtil(
diff --git a/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp b/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp
index ea5fa20ce4..738d69b8c0 100644
--- a/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp
+++ b/test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp
@@ -21,7 +21,6 @@
 
 #include <liblangutil/Exceptions.h>
 
-using namespace std;
 using namespace solidity::test::fuzzer::mutator;
 
 // Prototype as we can't use the FuzzerInterface.h header.
@@ -54,17 +53,17 @@ SolidityCustomMutatorInterface::SolidityCustomMutatorInterface(
 	data(_data),
 	size(_size),
 	maxMutantSize(_maxSize),
-	generator(make_shared<SolidityGenerator>(_seed))
+	generator(std::make_shared<SolidityGenerator>(_seed))
 {}
 
 size_t SolidityCustomMutatorInterface::generate()
 {
-	string testCase = generator->generateTestProgram();
+	std::string testCase = generator->generateTestProgram();
 	solAssert(
 		!testCase.empty() && data,
 		"Solc custom mutator: Invalid mutant or memory pointer"
 	);
-	size_t mutantSize = min(testCase.size(), maxMutantSize - 1);
+	size_t mutantSize = std::min(testCase.size(), maxMutantSize - 1);
 	mempcpy(data, testCase.data(), mutantSize);
 	return mutantSize;
 }
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index 9d98190dda..425239808b 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -28,9 +28,8 @@ using namespace solidity::test::fuzzer;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::util;
-using namespace std;
 
-optional<CompilerOutput> SolidityCompilationFramework::compileContract()
+std::optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 {
 	m_compiler.setSources(m_compilerInput.sourceCode);
 	m_compiler.setLibraries(m_compilerInput.libraryAddresses);
@@ -41,8 +40,8 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 	{
 		if (m_compilerInput.debugFailure)
 		{
-			cerr << "Compiling contract failed" << endl;
-			cerr << SourceReferenceFormatter::formatErrorInformation(
+			std::cerr << "Compiling contract failed" << std::endl;
+			std::cerr << SourceReferenceFormatter::formatErrorInformation(
 				m_compiler.errors(),
 				m_compiler
 			);
@@ -51,7 +50,7 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 	}
 	else
 	{
-		string contractName;
+		std::string contractName;
 		if (m_compilerInput.contractName.empty())
 			contractName = m_compiler.lastContractName();
 		else
@@ -103,7 +102,7 @@ evmc::Result EvmoneUtility::deployContract(bytes const& _code)
 
 evmc::Result EvmoneUtility::deployAndExecute(
 	bytes const& _byteCode,
-	string const& _hexEncodedInput
+	std::string const& _hexEncodedInput
 )
 {
 	// Deploy contract and signal failure if deploy failed
@@ -128,9 +127,9 @@ evmc::Result EvmoneUtility::deployAndExecute(
 	return callResult;
 }
 
-evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
+evmc::Result EvmoneUtility::compileDeployAndExecute(std::string _fuzzIsabelle)
 {
-	map<string, h160> libraryAddressMap;
+	std::map<std::string, h160> libraryAddressMap;
 	// Stage 1: Compile and deploy library if present.
 	if (!m_libraryName.empty())
 	{
@@ -158,7 +157,7 @@ evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 		"SolidityEvmoneInterface: Invalid compilation output."
 	);
 
-	string methodName;
+	std::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
@@ -175,7 +174,7 @@ evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 	);
 }
 
-optional<CompilerOutput> EvmoneUtility::compileContract()
+std::optional<CompilerOutput> EvmoneUtility::compileContract()
 {
 	try
 	{
diff --git a/test/tools/ossfuzz/SolidityGenerator.cpp b/test/tools/ossfuzz/SolidityGenerator.cpp
index 1d836a4aee..1897de6f12 100644
--- a/test/tools/ossfuzz/SolidityGenerator.cpp
+++ b/test/tools/ossfuzz/SolidityGenerator.cpp
@@ -23,7 +23,6 @@
 
 using namespace solidity::test::fuzzer::mutator;
 using namespace solidity::util;
-using namespace std;
 
 GeneratorBase::GeneratorBase(std::shared_ptr<SolidityGenerator> _mutator)
 {
@@ -32,11 +31,11 @@ GeneratorBase::GeneratorBase(std::shared_ptr<SolidityGenerator> _mutator)
 	uRandDist = mutator->uniformRandomDist();
 }
 
-string GeneratorBase::visitChildren()
+std::string GeneratorBase::visitChildren()
 {
-	ostringstream os;
+	std::ostringstream os;
 	// Randomise visit order
-	vector<GeneratorPtr> randomisedChildren;
+	std::vector<GeneratorPtr> randomisedChildren;
 	for (auto const& child: generators)
 		randomisedChildren.push_back(child);
 	shuffle(randomisedChildren.begin(), randomisedChildren.end(), *uRandDist->randomEngine);
@@ -47,7 +46,7 @@ string GeneratorBase::visitChildren()
 	return os.str();
 }
 
-string TestState::randomPath(set<string> const& _sourceUnitPaths) const
+std::string TestState::randomPath(std::set<std::string> const& _sourceUnitPaths) const
 {
 	auto it = _sourceUnitPaths.begin();
 	/// Advance iterator by n where 0 <= n <= sourceUnitPaths.size() - 1
@@ -60,7 +59,7 @@ string TestState::randomPath(set<string> const& _sourceUnitPaths) const
 	return *it;
 }
 
-string TestState::randomPath() const
+std::string TestState::randomPath() const
 {
 	solAssert(!empty(), "Solc custom mutator: Null test state");
 	return randomPath(sourceUnitPaths);
@@ -73,20 +72,20 @@ void TestState::print(std::ostream& _os) const
 		_os << "Source path: " << item << std::endl;
 }
 
-string TestState::randomNonCurrentPath() const
+std::string TestState::randomNonCurrentPath() const
 {
 	/// To obtain a source path that is not the currently visited
 	/// source unit itself, we require at least one other source
 	/// unit to be previously visited.
 	solAssert(size() >= 2, "Solc custom mutator: Invalid test state");
 
-	set<string> filteredSourcePaths;
-	string currentPath = currentSourceUnitPath;
-	copy_if(
+	std::set<std::string> filteredSourcePaths;
+	std::string currentPath = currentSourceUnitPath;
+	std::copy_if(
 		sourceUnitPaths.begin(),
 		sourceUnitPaths.end(),
 		inserter(filteredSourcePaths, filteredSourcePaths.begin()),
-		[currentPath](string const& _item) {
+		[currentPath](std::string const& _item) {
 			return _item != currentPath;
 		}
 	);
@@ -100,12 +99,12 @@ void TestCaseGenerator::setup()
 	});
 }
 
-string TestCaseGenerator::visit()
+std::string TestCaseGenerator::visit()
 {
-	ostringstream os;
+	std::ostringstream os;
 	for (unsigned i = 0; i < uRandDist->distributionOneToN(s_maxSourceUnits); i++)
 	{
-		string sourcePath = path();
+		std::string sourcePath = path();
 		os << "\n"
 			<< "==== Source: "
 			<< sourcePath
@@ -126,32 +125,32 @@ void SourceUnitGenerator::setup()
 	});
 }
 
-string SourceUnitGenerator::visit()
+std::string SourceUnitGenerator::visit()
 {
 	return visitChildren();
 }
 
-string PragmaGenerator::visit()
+std::string PragmaGenerator::visit()
 {
 	static constexpr const char* preamble = R"(
 		pragma solidity >= 0.0.0;
 		pragma experimental SMTChecker;
 	)";
 	// Choose equally at random from coder v1 and v2
-	string abiPragma = "pragma abicoder v" +
-		to_string(uRandDist->distributionOneToN(2)) +
+	std::string abiPragma = "pragma abicoder v" +
+		std::to_string(uRandDist->distributionOneToN(2)) +
 		";\n";
 	return preamble + abiPragma;
 }
 
-string ImportGenerator::visit()
+std::string ImportGenerator::visit()
 {
 	/*
 	 * Case 1: No source units defined
 	 * Case 2: One source unit defined
 	 * Case 3: At least two source units defined
 	 */
-	ostringstream os;
+	std::ostringstream os;
 	// Self import with a small probability only if
 	// there is one source unit present in test.
 	if (state->size() == 1)
@@ -175,19 +174,19 @@ string ImportGenerator::visit()
 }
 
 template <typename T>
-shared_ptr<T> SolidityGenerator::generator()
+std::shared_ptr<T> SolidityGenerator::generator()
 {
 	for (auto& g: m_generators)
-		if (holds_alternative<shared_ptr<T>>(g))
-			return get<shared_ptr<T>>(g);
+		if (std::holds_alternative<std::shared_ptr<T>>(g))
+			return std::get<std::shared_ptr<T>>(g);
 	solAssert(false, "");
 }
 
 SolidityGenerator::SolidityGenerator(unsigned _seed)
 {
 	m_generators = {};
-	m_urd = make_shared<UniformRandomDistribution>(make_unique<RandomEngine>(_seed));
-	m_state = make_shared<TestState>(m_urd);
+	m_urd = std::make_shared<UniformRandomDistribution>(std::make_unique<RandomEngine>(_seed));
+	m_state = std::make_shared<TestState>(m_urd);
 }
 
 template <size_t I>
@@ -200,14 +199,14 @@ void SolidityGenerator::createGenerators()
 	}
 }
 
-string SolidityGenerator::generateTestProgram()
+std::string SolidityGenerator::generateTestProgram()
 {
 	createGenerators();
 	for (auto& g: m_generators)
 		std::visit(GenericVisitor{
 			[&](auto const& _item) { return _item->setup(); }
 		}, g);
-	string program = generator<TestCaseGenerator>()->generate();
+	std::string program = generator<TestCaseGenerator>()->generate();
 	destroyGenerators();
 	return program;
 }
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index fb502af527..25559bc66f 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -46,7 +46,6 @@ using namespace solidity::test::fuzzer;
 using namespace solidity::yul;
 using namespace solidity::yul::test::yul_fuzzer;
 using namespace solidity::langutil;
-using namespace std;
 
 static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 
@@ -80,7 +79,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		filterStatefulInstructions,
 		filterUnboundedLoops
 	);
-	string yul_source = converter.programToString(_input);
+	std::string yul_source = converter.programToString(_input);
 	// Do not fuzz the EVM Version field.
 	// See https://github.com/ethereum/solidity/issues/12590
 	langutil::EVMVersion version;
@@ -89,8 +88,8 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
+		std::ofstream of(dump_path);
+		of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));
 	}
 
 	YulStringRepository::reset();
@@ -103,7 +102,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	bool unoptimizedStackTooDeep = false;
 	try
 	{
-		YulAssembler assembler{version, nullopt, settings, yul_source};
+		YulAssembler assembler{version, std::nullopt, settings, yul_source};
 		unoptimisedByteCode = assembler.assemble();
 		auto yulObject = assembler.object();
 		recursiveFunction = recursiveFunctionExists(
@@ -116,7 +115,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		unoptimizedStackTooDeep = true;
 	}
 
-	ostringstream unoptimizedState;
+	std::ostringstream unoptimizedState;
 	bool noRevertInSource = true;
 	bool noInvalidInSource = true;
 	if (!unoptimizedStackTooDeep)
@@ -128,8 +127,8 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		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;
+		noRevertInSource = yul_source.find("revert") == std::string::npos;
+		noInvalidInSource = yul_source.find("invalid") == std::string::npos;
 		if (noInvalidInSource)
 			solAssert(
 				callResult.status_code != EVMC_INVALID_INSTRUCTION,
@@ -157,7 +156,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	bytes optimisedByteCode;
 	try
 	{
-		optimisedByteCode = YulAssembler{version, nullopt, settings, yul_source}.assemble();
+		optimisedByteCode = YulAssembler{version, std::nullopt, settings, yul_source}.assemble();
 	}
 	catch (solidity::yul::StackTooDeepError const&)
 	{
@@ -194,13 +193,13 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		 (!noInvalidInSource && callResultOpt.status_code == EVMC_INVALID_INSTRUCTION)),
 		"Optimised call failed."
 	);
-	ostringstream optimizedState;
+	std::ostringstream optimizedState;
 	optimizedState << EVMHostPrinter{hostContext, deployResultOpt.create_address}.state();
 
 	if (unoptimizedState.str() != optimizedState.str())
 	{
-		cout << unoptimizedState.str() << endl;
-		cout << optimizedState.str() << endl;
+		std::cout << unoptimizedState.str() << std::endl;
+		std::cout << optimizedState.str() << std::endl;
 		solAssert(
 			false,
 			"State of unoptimised and optimised stack reused code do not match."
diff --git a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
index 6d792a70c5..bdfe4e48c6 100644
--- a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
@@ -29,27 +29,26 @@ using namespace solidity::test::abiv2fuzzer;
 using namespace solidity::test;
 using namespace solidity::util;
 using namespace solidity;
-using namespace std;
 
 static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 
 DEFINE_PROTO_FUZZER(Contract const& _input)
 {
-	string contract_source = ProtoConverter{_input.seed()}.contractToString(_input);
+	std::string contract_source = ProtoConverter{_input.seed()}.contractToString(_input);
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
 		// With libFuzzer binary run this to generate the solidity source file x.sol from a proto input:
 		// PROTO_FUZZER_DUMP_PATH=x.sol ./a.out proto-input
-		ofstream of(dump_path);
+		std::ofstream of(dump_path);
 		of << contract_source;
 	}
 
 	// We target the default EVM which is the latest
 	langutil::EVMVersion version;
 	EVMHost hostContext(version, evmone);
-	string contractName = "C";
-	string methodName = "test()";
+	std::string contractName = "C";
+	std::string methodName = "test()";
 	StringMap source({{"test.sol", contract_source}});
 	CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
 	EvmoneUtility evmoneUtil(
@@ -67,9 +66,9 @@ DEFINE_PROTO_FUZZER(Contract const& _input)
 		if (!EvmoneUtility::zeroWord(result.output_data, result.output_size))
 		{
 			solidity::bytes res;
-			for (size_t i = 0; i < result.output_size; i++)
+			for (std::size_t i = 0; i < result.output_size; i++)
 				res.push_back(result.output_data[i]);
-			cout << solidity::util::toHex(res) << endl;
+			std::cout << solidity::util::toHex(res) << std::endl;
 			solAssert(
 				false,
 				"Proto ABIv2 fuzzer: ABIv2 coding failure found"
diff --git a/test/tools/ossfuzz/const_opt_ossfuzz.cpp b/test/tools/ossfuzz/const_opt_ossfuzz.cpp
index 0b799c956e..84ad87e7f8 100644
--- a/test/tools/ossfuzz/const_opt_ossfuzz.cpp
+++ b/test/tools/ossfuzz/const_opt_ossfuzz.cpp
@@ -18,8 +18,6 @@
 
 #include <test/tools/fuzzer_common.h>
 
-using namespace std;
-
 // Prototype as we can't use the FuzzerInterface.h header.
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
 
@@ -27,7 +25,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 {
 	if (_size <= 250)
 	{
-		string input(reinterpret_cast<char const*>(_data), _size);
+		std::string input(reinterpret_cast<char const*>(_data), _size);
 		FuzzerUtil::testConstantOptimizer(input, /*quiet=*/true);
 	}
 	return 0;
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
index af2e5ede1b..1511390ebb 100644
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ b/test/tools/ossfuzz/protoToAbiV2.cpp
@@ -50,14 +50,13 @@ BOOST_PP_REPEAT(32, USINGDECL, 0)
 /// Switch implementation that instantiates case statements for (un)signed
 /// Solidity integer types.
 #define SWITCHIMPL(sign)                                                       \
-	ostringstream stream;                                                      \
+	std::ostringstream stream;                                                      \
 	switch (_intWidth)                                                         \
 	{                                                                          \
 	BOOST_PP_REPEAT(32, CASEIMPL, sign)                                        \
 	}                                                                          \
 	return stream.str();
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::test::abiv2fuzzer;
 
@@ -75,17 +74,17 @@ static V integerValue(unsigned _counter)
 		return value;
 }
 
-static string signedIntegerValue(unsigned _counter, unsigned _intWidth)
+static std::string signedIntegerValue(unsigned _counter, unsigned _intWidth)
 {
 	SWITCHIMPL(1)
 }
 
-static string unsignedIntegerValue(unsigned _counter, unsigned _intWidth)
+static std::string unsignedIntegerValue(unsigned _counter, unsigned _intWidth)
 {
 	SWITCHIMPL(0)
 }
 
-static string integerValue(unsigned _counter, unsigned _intWidth, bool _signed)
+static std::string integerValue(unsigned _counter, unsigned _intWidth, bool _signed)
 {
 	if (_signed)
 		return signedIntegerValue(_counter, _intWidth);
@@ -94,10 +93,10 @@ static string integerValue(unsigned _counter, unsigned _intWidth, bool _signed)
 }
 }
 
-string ProtoConverter::getVarDecl(
-	string const& _type,
-	string const& _varName,
-	string const& _qualifier
+std::string ProtoConverter::getVarDecl(
+	std::string const& _type,
+	std::string const& _varName,
+	std::string const& _qualifier
 )
 {
 	// One level of indentation for state variable declarations
@@ -114,7 +113,7 @@ string ProtoConverter::getVarDecl(
 		"\n";
 }
 
-pair<string, string> ProtoConverter::visit(Type const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(Type const& _type)
 {
 	switch (_type.type_oneof_case())
 	{
@@ -123,11 +122,11 @@ pair<string, string> ProtoConverter::visit(Type const& _type)
 	case Type::kNvtype:
 		return visit(_type.nvtype());
 	case Type::TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
+		return std::make_pair("", "");
 	}
 }
 
-pair<string, string> ProtoConverter::visit(ValueType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(ValueType const& _type)
 {
 	switch (_type.value_type_oneof_case())
 	{
@@ -140,11 +139,11 @@ pair<string, string> ProtoConverter::visit(ValueType const& _type)
 	case ValueType::kAdty:
 		return visit(_type.adty());
 	case ValueType::VALUE_TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
+		return std::make_pair("", "");
 	}
 }
 
-pair<string, string> ProtoConverter::visit(NonValueType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(NonValueType const& _type)
 {
 	switch (_type.nonvalue_type_oneof_case())
 	{
@@ -154,56 +153,56 @@ pair<string, string> ProtoConverter::visit(NonValueType const& _type)
 		if (ValidityVisitor().visit(_type.arrtype()))
 			return visit(_type.arrtype());
 		else
-			return make_pair("", "");
+			return std::make_pair("", "");
 	case NonValueType::kStype:
 		if (ValidityVisitor().visit(_type.stype()))
 			return visit(_type.stype());
 		else
-			return make_pair("", "");
+			return std::make_pair("", "");
 	case NonValueType::NONVALUE_TYPE_ONEOF_NOT_SET:
-		return make_pair("", "");
+		return std::make_pair("", "");
 	}
 }
 
-pair<string, string> ProtoConverter::visit(BoolType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(BoolType const& _type)
 {
 	return processType(_type, true);
 }
 
-pair<string, string> ProtoConverter::visit(IntegerType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(IntegerType const& _type)
 {
 	return processType(_type, true);
 }
 
-pair<string, string> ProtoConverter::visit(FixedByteType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(FixedByteType const& _type)
 {
 	return processType(_type, true);
 }
 
-pair<string, string> ProtoConverter::visit(AddressType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(AddressType const& _type)
 {
 	return processType(_type, true);
 }
 
-pair<string, string> ProtoConverter::visit(DynamicByteArrayType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(DynamicByteArrayType const& _type)
 {
 	return processType(_type, false);
 }
 
-pair<string, string> ProtoConverter::visit(ArrayType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(ArrayType const& _type)
 {
 	return processType(_type, false);
 }
 
-pair<string, string> ProtoConverter::visit(StructType const& _type)
+std::pair<std::string, std::string> ProtoConverter::visit(StructType const& _type)
 {
 	return processType(_type, false);
 }
 
 template <typename T>
-pair<string, string> ProtoConverter::processType(T const& _type, bool _isValueType)
+std::pair<std::string, std::string> ProtoConverter::processType(T const& _type, bool _isValueType)
 {
-	ostringstream local, global;
+	std::ostringstream local, global;
 	auto [varName, paramName] = newVarNames(getNextVarCounter(), m_isStateVar);
 
 	// Add variable name to the argument list of coder function call
@@ -212,7 +211,7 @@ pair<string, string> ProtoConverter::processType(T const& _type, bool _isValueTy
 	else
 		m_argsCoder << ", " << varName;
 
-	string location{};
+	std::string location{};
 	if (!m_isStateVar && !_isValueType)
 		location = "memory";
 
@@ -230,24 +229,24 @@ pair<string, string> ProtoConverter::processType(T const& _type, bool _isValueTy
 	local << assignCheckBuffers.second;
 
 	m_structCounter += m_numStructsAdded;
-	return make_pair(global.str(), local.str());
+	return std::make_pair(global.str(), local.str());
 }
 
 template <typename T>
-pair<string, string> ProtoConverter::varDecl(
-	string const& _varName,
-	string const& _paramName,
+std::pair<std::string, std::string> ProtoConverter::varDecl(
+	std::string const& _varName,
+	std::string const& _paramName,
 	T _type,
 	bool _isValueType,
-	string const& _location
+	std::string const& _location
 )
 {
-	ostringstream local, global;
+	std::ostringstream local, global;
 
 	TypeVisitor tVisitor(m_structCounter);
-	string typeStr = tVisitor.visit(_type);
+	std::string typeStr = tVisitor.visit(_type);
 	if (typeStr.empty())
-		return make_pair("", "");
+		return std::make_pair("", "");
 
 	// Append struct defs
 	global << tVisitor.structDef();
@@ -292,17 +291,17 @@ pair<string, string> ProtoConverter::varDecl(
 	if (tVisitor.isLastDynParamRightPadded())
 		m_isLastDynParamRightPadded = true;
 
-	return make_pair(global.str(), local.str());
+	return std::make_pair(global.str(), local.str());
 }
 
 template <typename T>
-pair<string, string> ProtoConverter::assignChecker(
-	string const& _varName,
-	string const& _paramName,
+std::pair<std::string, std::string> ProtoConverter::assignChecker(
+	std::string const& _varName,
+	std::string const& _paramName,
 	T _type
 )
 {
-	ostringstream local;
+	std::ostringstream local;
 	AssignCheckVisitor acVisitor(
 		_varName,
 		_paramName,
@@ -311,7 +310,7 @@ pair<string, string> ProtoConverter::assignChecker(
 		m_counter,
 		m_structCounter
 	);
-	pair<string, string> assignCheckStrPair = acVisitor.visit(_type);
+	std::pair<std::string, std::string> assignCheckStrPair = acVisitor.visit(_type);
 	m_returnValue += acVisitor.errorStmts();
 	m_counter += acVisitor.counted();
 
@@ -325,10 +324,10 @@ pair<string, string> ProtoConverter::assignChecker(
 	// Therefore, we buffer their assignments and
 	// render them in function scope later.
 	local << assignCheckStrPair.first;
-	return make_pair("", local.str());
+	return std::make_pair("", local.str());
 }
 
-pair<string, string> ProtoConverter::visit(VarDecl const& _x)
+std::pair<std::string, std::string> ProtoConverter::visit(VarDecl const& _x)
 {
 	return visit(_x.type());
 }
@@ -375,11 +374,11 @@ void ProtoConverter::appendTypedParams(
 
 void ProtoConverter::appendTypes(
 	bool _isValueType,
-	string const& _typeString,
+	std::string const& _typeString,
 	Delimiter _delimiter
 )
 {
-	string qualifiedTypeString = (
+	std::string qualifiedTypeString = (
 		_isValueType ?
 		_typeString :
 		_typeString + " memory"
@@ -392,11 +391,11 @@ void ProtoConverter::appendTypes(
 
 void ProtoConverter::appendTypedReturn(
 	bool _isValueType,
-	string const& _typeString,
+	std::string const& _typeString,
 	Delimiter _delimiter
 )
 {
-	string qualifiedTypeString = (
+	std::string qualifiedTypeString = (
 		_isValueType ?
 		_typeString :
 		_typeString + " memory"
@@ -404,7 +403,7 @@ void ProtoConverter::appendTypedReturn(
 	m_typedReturn << Whiskers(R"(<delimiter><type> <varName>)")
 		("delimiter", delimiterToString(_delimiter))
 		("type", qualifiedTypeString)
-		("varName", "lv_" + to_string(m_varCounter - 1))
+		("varName", "lv_" + std::to_string(m_varCounter - 1))
 		.render();
 }
 
@@ -467,16 +466,16 @@ std::string ProtoConverter::typedParametersAsString(CalleeType _calleeType)
 		return m_typedParamsPublic.str();
 	case CalleeType::EXTERNAL:
 	{
-		ostringstream typedParamsExternal;
+		std::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);
+			Delimiter del = std::get<0>(i);
+			bool valueType = std::get<1>(i);
+			std::string typeString = std::get<2>(i);
+			std::string varName = std::get<3>(i);
 			bool isCalldata = randomBool(/*probability=*/0.5);
-			string location = (isCalldata ? "calldata" : "memory");
-			string qualifiedTypeString = (valueType ? typeString : typeString + " " + location);
+			std::string location = (isCalldata ? "calldata" : "memory");
+			std::string qualifiedTypeString = (valueType ? typeString : typeString + " " + location);
 			typedParamsExternal << Whiskers(R"(<delimiter><type> <varName>)")
 				("delimiter", delimiterToString(del))
 				("type", qualifiedTypeString)
@@ -488,17 +487,17 @@ std::string ProtoConverter::typedParametersAsString(CalleeType _calleeType)
 	}
 }
 
-string ProtoConverter::visit(TestFunction const& _x, string const& _storageVarDefs)
+std::string ProtoConverter::visit(TestFunction const& _x, std::string const& _storageVarDefs)
 {
 	// TODO: Support more than one but less than N local variables
 	auto localVarBuffers = visit(_x.local_vars());
 
-	string structTypeDecl = localVarBuffers.first;
-	string localVarDefs = localVarBuffers.second;
+	std::string structTypeDecl = localVarBuffers.first;
+	std::string localVarDefs = localVarBuffers.second;
 
-	ostringstream testBuffer;
+	std::ostringstream testBuffer;
 
-	string testFunction = Whiskers(R"(
+	std::string testFunction = Whiskers(R"(
 	function test() public returns (uint) {
 		<?calldata>return test_calldata_coding();</calldata>
 		<?returndata>return test_returndata_coding();</returndata>
@@ -507,8 +506,8 @@ string ProtoConverter::visit(TestFunction const& _x, string const& _storageVarDe
 	("returndata", m_test == Contract_Test::Contract_Test_RETURNDATA_CODER)
 	.render();
 
-	string functionDeclCalldata = "function test_calldata_coding() internal returns (uint)";
-	string functionDeclReturndata = "function test_returndata_coding() internal returns (uint)";
+	std::string functionDeclCalldata = "function test_calldata_coding() internal returns (uint)";
+	std::string functionDeclReturndata = "function test_returndata_coding() internal returns (uint)";
 
 	testBuffer << Whiskers(R"(<structTypeDecl>
 <testFunction>
@@ -551,7 +550,7 @@ string ProtoConverter::visit(TestFunction const& _x, string const& _storageVarDe
 	return testBuffer.str();
 }
 
-string ProtoConverter::testCallDataFunction(unsigned _invalidLength)
+std::string ProtoConverter::testCallDataFunction(unsigned _invalidLength)
 {
 	return Whiskers(R"(
 		uint returnVal = this.coder_calldata_public(<argumentNames>);
@@ -592,7 +591,7 @@ string ProtoConverter::testCallDataFunction(unsigned _invalidLength)
 		.render();
 }
 
-string ProtoConverter::testReturnDataFunction()
+std::string ProtoConverter::testReturnDataFunction()
 {
 	return Whiskers(R"(
 <?varsPresent>
@@ -607,9 +606,9 @@ string ProtoConverter::testReturnDataFunction()
 		.render();
 }
 
-string ProtoConverter::calldataHelperFunctions()
+std::string ProtoConverter::calldataHelperFunctions()
 {
-	stringstream calldataHelperFuncs;
+	std::stringstream calldataHelperFuncs;
 	calldataHelperFuncs << R"(
 	/// Accepts function selector, correct argument encoding, and length of
 	/// invalid encoding and returns the correct and incorrect abi encoding
@@ -676,12 +675,12 @@ string ProtoConverter::calldataHelperFunctions()
 	})";
 
 	/// These are indirections to test memory-calldata codings more robustly.
-	stringstream indirections;
+	std::stringstream indirections;
 	unsigned numIndirections = randomNumberOneToN(s_maxIndirections);
 	for (unsigned i = 1; i <= numIndirections; i++)
 	{
 		bool finalIndirection = i == numIndirections;
-		string mutability = (finalIndirection ? "pure" : "view");
+		std::string mutability = (finalIndirection ? "pure" : "view");
 		indirections << Whiskers(R"(
 	function coder_calldata_external_i<N>(<parameters>) external <mutability> returns (uint) {
 <?finalIndirection>
@@ -692,12 +691,12 @@ string ProtoConverter::calldataHelperFunctions()
 </finalIndirection>
 	}
 		)")
-		("N", to_string(i))
+		("N", std::to_string(i))
 		("parameters", typedParametersAsString(CalleeType::EXTERNAL))
 		("mutability", mutability)
 		("finalIndirection", finalIndirection)
 		("equality_checks", equalityChecksAsString())
-		("NPlusOne", to_string(i + 1))
+		("NPlusOne", std::to_string(i + 1))
 		("untyped_parameters", m_untypedParamsExternal.str())
 		.render();
 	}
@@ -726,9 +725,9 @@ string ProtoConverter::calldataHelperFunctions()
 	return calldataHelperFuncs.str();
 }
 
-string ProtoConverter::commonHelperFunctions()
+std::string ProtoConverter::commonHelperFunctions()
 {
-	stringstream helperFuncs;
+	std::stringstream helperFuncs;
 	helperFuncs << R"(
 	/// Compares bytes, returning true if they are equal and false otherwise.
 	function bytesCompare(bytes memory a, bytes memory b) internal pure returns (bool) {
@@ -746,7 +745,7 @@ string ProtoConverter::commonHelperFunctions()
 
 void ProtoConverter::visit(Contract const& _x)
 {
-	string pragmas = R"(pragma solidity >=0.0;
+	std::string pragmas = R"(pragma solidity >=0.0;
 pragma experimental ABIEncoderV2;)";
 
 	// Record test spec
@@ -754,10 +753,10 @@ pragma experimental ABIEncoderV2;)";
 
 	// TODO: Support more than one but less than N state variables
 	auto storageBuffers = visit(_x.state_vars());
-	string storageVarDecls = storageBuffers.first;
-	string storageVarDefs = storageBuffers.second;
+	std::string storageVarDecls = storageBuffers.first;
+	std::string storageVarDefs = storageBuffers.second;
 	m_isStateVar = false;
-	string testFunction = visit(_x.testfunction(), storageVarDefs);
+	std::string testFunction = visit(_x.testfunction(), storageVarDefs);
 	/* Structure of contract body
 	 * - Storage variable declarations
 	 * - Struct definitions
@@ -767,7 +766,7 @@ pragma experimental ABIEncoderV2;)";
 	 *     - Test code proper (calls public and external functions)
 	 * - Helper functions
 	 */
-	ostringstream contractBody;
+	std::ostringstream contractBody;
 	contractBody << storageVarDecls
 	             << testFunction
 	             << commonHelperFunctions();
@@ -782,32 +781,32 @@ pragma experimental ABIEncoderV2;)";
 		.render();
 }
 
-string ProtoConverter::isabelleTypeString() const
+std::string ProtoConverter::isabelleTypeString() const
 {
-	string typeString = m_isabelleTypeString.str();
+	std::string typeString = m_isabelleTypeString.str();
 	if (!typeString.empty())
 		return "(" + typeString + ")";
 	else
 		return typeString;
 }
 
-string ProtoConverter::isabelleValueString() const
+std::string ProtoConverter::isabelleValueString() const
 {
-	string valueString = m_isabelleValueString.str();
+	std::string valueString = m_isabelleValueString.str();
 	if (!valueString.empty())
 		return "(" + valueString + ")";
 	else
 		return valueString;
 }
 
-string ProtoConverter::contractToString(Contract const& _input)
+std::string ProtoConverter::contractToString(Contract const& _input)
 {
 	visit(_input);
 	return m_output.str();
 }
 
 /// Type visitor
-void TypeVisitor::StructTupleString::addTypeStringToTuple(string& _typeString)
+void TypeVisitor::StructTupleString::addTypeStringToTuple(std::string& _typeString)
 {
 	index++;
 	if (index > 1)
@@ -815,51 +814,51 @@ void TypeVisitor::StructTupleString::addTypeStringToTuple(string& _typeString)
 	stream << _typeString;
 }
 
-void TypeVisitor::StructTupleString::addArrayBracketToType(string& _arrayBracket)
+void TypeVisitor::StructTupleString::addArrayBracketToType(std::string& _arrayBracket)
 {
 	stream << _arrayBracket;
 }
 
-string TypeVisitor::visit(BoolType const&)
+std::string TypeVisitor::visit(BoolType const&)
 {
 	m_baseType = "bool";
 	m_structTupleString.addTypeStringToTuple(m_baseType);
 	return m_baseType;
 }
 
-string TypeVisitor::visit(IntegerType const& _type)
+std::string TypeVisitor::visit(IntegerType const& _type)
 {
 	m_baseType = getIntTypeAsString(_type);
 	m_structTupleString.addTypeStringToTuple(m_baseType);
 	return m_baseType;
 }
 
-string TypeVisitor::visit(FixedByteType const& _type)
+std::string TypeVisitor::visit(FixedByteType const& _type)
 {
 	m_baseType = getFixedByteTypeAsString(_type);
 	m_structTupleString.addTypeStringToTuple(m_baseType);
 	return m_baseType;
 }
 
-string TypeVisitor::visit(AddressType const&)
+std::string TypeVisitor::visit(AddressType const&)
 {
 	m_baseType = "address";
 	m_structTupleString.addTypeStringToTuple(m_baseType);
 	return m_baseType;
 }
 
-string TypeVisitor::visit(ArrayType const& _type)
+std::string TypeVisitor::visit(ArrayType const& _type)
 {
 	if (!ValidityVisitor().visit(_type))
 		return "";
 
-	string baseType = visit(_type.t());
+	std::string baseType = visit(_type.t());
 	solAssert(!baseType.empty(), "");
-	string arrayBracket = _type.is_static() ?
-	                     string("[") +
-	                     to_string(getStaticArrayLengthFromFuzz(_type.length())) +
-	                     string("]") :
-	                     string("[]");
+	std::string arrayBracket = _type.is_static() ?
+	                     std::string("[") +
+	                     std::to_string(getStaticArrayLengthFromFuzz(_type.length())) +
+	                     std::string("]") :
+	                     std::string("[]");
 	m_baseType += arrayBracket;
 	m_structTupleString.addArrayBracketToType(arrayBracket);
 
@@ -872,7 +871,7 @@ string TypeVisitor::visit(ArrayType const& _type)
 	return baseType + arrayBracket;
 }
 
-string TypeVisitor::visit(DynamicByteArrayType const&)
+std::string TypeVisitor::visit(DynamicByteArrayType const&)
 {
 	m_isLastDynParamRightPadded = true;
 	m_baseType = "bytes";
@@ -893,10 +892,10 @@ void TypeVisitor::structDefinition(StructType const& _type)
 	m_structFieldCounter = 0;
 
 	// Commence struct declaration
-	string structDef = lineString(
+	std::string structDef = lineString(
 		"struct " +
-		string(s_structNamePrefix) +
-		to_string(m_structCounter) +
+		std::string(s_structNamePrefix) +
+		std::to_string(m_structCounter) +
 		" {"
 	);
 	// Start tuple of types with parenthesis
@@ -905,7 +904,7 @@ void TypeVisitor::structDefinition(StructType const& _type)
 	m_indentation++;
 	for (auto const& t: _type.t())
 	{
-		string type{};
+		std::string type{};
 
 		if (!ValidityVisitor().visit(t))
 			continue;
@@ -920,10 +919,10 @@ void TypeVisitor::structDefinition(StructType const& _type)
 		structDef += lineString(
 			Whiskers(R"(<type> <member>;)")
 				("type", type)
-				("member", "m" + to_string(m_structFieldCounter++))
+				("member", "m" + std::to_string(m_structFieldCounter++))
 				.render()
 		);
-		string isabelleTypeStr = tVisitor.isabelleTypeString();
+		std::string isabelleTypeStr = tVisitor.isabelleTypeString();
 		m_structTupleString.addTypeStringToTuple(isabelleTypeStr);
 	}
 	m_indentation--;
@@ -936,7 +935,7 @@ void TypeVisitor::structDefinition(StructType const& _type)
 	m_structFieldCounter = wasFieldCounter;
 }
 
-string TypeVisitor::visit(StructType const& _type)
+std::string TypeVisitor::visit(StructType const& _type)
 {
 	if (ValidityVisitor().visit(_type))
 	{
@@ -945,7 +944,7 @@ string TypeVisitor::visit(StructType const& _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-empty struct, assign the name S<suffix>
-		m_baseType = s_structTypeName + to_string(m_structStartCounter);
+		m_baseType = s_structTypeName + std::to_string(m_structStartCounter);
 	}
 	else
 		m_baseType = {};
@@ -954,7 +953,7 @@ string TypeVisitor::visit(StructType const& _type)
 }
 
 /// AssignCheckVisitor implementation
-void AssignCheckVisitor::ValueStream::appendValue(string& _value)
+void AssignCheckVisitor::ValueStream::appendValue(std::string& _value)
 {
 	solAssert(!_value.empty(), "Abiv2 fuzzer: Empty value");
 	index++;
@@ -963,77 +962,77 @@ void AssignCheckVisitor::ValueStream::appendValue(string& _value)
 	stream << _value;
 }
 
-pair<string, string> AssignCheckVisitor::visit(BoolType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(BoolType const& _type)
 {
-	string value = ValueGetterVisitor(counter()).visit(_type);
+	std::string value = ValueGetterVisitor(counter()).visit(_type);
 	if (!m_forcedVisit)
 		m_valueStream.appendValue(value);
 	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
 }
 
-pair<string, string> AssignCheckVisitor::visit(IntegerType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(IntegerType const& _type)
 {
-	string value = ValueGetterVisitor(counter()).visit(_type);
+	std::string value = ValueGetterVisitor(counter()).visit(_type);
 	if (!m_forcedVisit)
 		m_valueStream.appendValue(value);
 	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
 }
 
-pair<string, string> AssignCheckVisitor::visit(FixedByteType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(FixedByteType const& _type)
 {
-	string value = ValueGetterVisitor(counter()).visit(_type);
+	std::string value = ValueGetterVisitor(counter()).visit(_type);
 	if (!m_forcedVisit)
 	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
+		std::string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
 		m_valueStream.appendValue(isabelleValue);
 	}
 	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
 }
 
-pair<string, string> AssignCheckVisitor::visit(AddressType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(AddressType const& _type)
 {
-	string value = ValueGetterVisitor(counter()).visit(_type);
+	std::string value = ValueGetterVisitor(counter()).visit(_type);
 	if (!m_forcedVisit)
 	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleAddressValueAsString(value);
+		std::string isabelleValue = ValueGetterVisitor{}.isabelleAddressValueAsString(value);
 		m_valueStream.appendValue(isabelleValue);
 	}
 	return assignAndCheckStringPair(m_varName, m_paramName, value, value, DataType::VALUE);
 }
 
-pair<string, string> AssignCheckVisitor::visit(DynamicByteArrayType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(DynamicByteArrayType const& _type)
 {
-	string value = ValueGetterVisitor(counter()).visit(_type);
+	std::string value = ValueGetterVisitor(counter()).visit(_type);
 	if (!m_forcedVisit)
 	{
-		string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
+		std::string isabelleValue = ValueGetterVisitor{}.isabelleBytesValueAsString(value);
 		m_valueStream.appendValue(isabelleValue);
 	}
 	DataType dataType = DataType::BYTES;
 	return assignAndCheckStringPair(m_varName, m_paramName, value, value, dataType);
 }
 
-pair<string, string> AssignCheckVisitor::visit(ArrayType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(ArrayType const& _type)
 {
 	if (!ValidityVisitor().visit(_type))
-		return make_pair("", "");
+		return std::make_pair("", "");
 
 	// Obtain type of array to be resized and initialized
-	string typeStr{};
+	std::string typeStr{};
 
 	unsigned wasStructCounter = m_structCounter;
 	TypeVisitor tVisitor(m_structCounter);
 	typeStr = tVisitor.visit(_type);
 
-	pair<string, string> resizeBuffer;
-	string lengthStr;
+	std::pair<std::string, std::string> resizeBuffer;
+	std::string lengthStr;
 	unsigned length;
 
 	// Resize dynamic arrays
 	if (!_type.is_static())
 	{
 		length = getDynArrayLengthFromFuzz(_type.length(), counter());
-		lengthStr = to_string(length);
+		lengthStr = std::to_string(length);
 		if (m_stateVar)
 		{
 			// Dynamic storage arrays are resized via the empty push() operation
@@ -1048,7 +1047,7 @@ pair<string, string> AssignCheckVisitor::visit(ArrayType const& _type)
 		else
 		{
 			// Resizing memory arrays via the new operator
-			string resizeOp = Whiskers(R"(new <fullTypeStr>(<length>))")
+			std::string resizeOp = Whiskers(R"(new <fullTypeStr>(<length>))")
 				("fullTypeStr", typeStr)
 				("length", lengthStr)
 				.render();
@@ -1064,22 +1063,22 @@ pair<string, string> AssignCheckVisitor::visit(ArrayType const& _type)
 	else
 	{
 		length = getStaticArrayLengthFromFuzz(_type.length());
-		lengthStr = to_string(length);
+		lengthStr = std::to_string(length);
 		// Add check on length
 		resizeBuffer.second = checkString(m_paramName + ".length", lengthStr, DataType::VALUE);
 	}
 
 	// Add assignCheckBuffer and check statements
-	pair<string, string> assignCheckBuffer;
-	string wasVarName = m_varName;
-	string wasParamName = m_paramName;
+	std::pair<std::string, std::string> assignCheckBuffer;
+	std::string wasVarName = m_varName;
+	std::string wasParamName = m_paramName;
 	if (!m_forcedVisit)
 		m_valueStream.startArray();
 	for (unsigned i = 0; i < length; i++)
 	{
-		m_varName = wasVarName + "[" + to_string(i) + "]";
-		m_paramName = wasParamName + "[" + to_string(i) + "]";
-		pair<string, string> assign = visit(_type.t());
+		m_varName = wasVarName + "[" + std::to_string(i) + "]";
+		m_paramName = wasParamName + "[" + std::to_string(i) + "]";
+		std::pair<std::string, std::string> assign = visit(_type.t());
 		assignCheckBuffer.first += assign.first;
 		assignCheckBuffer.second += assign.second;
 		if (i < length - 1)
@@ -1102,33 +1101,33 @@ pair<string, string> AssignCheckVisitor::visit(ArrayType const& _type)
 	m_paramName = wasParamName;
 
 	// Compose resize and initialization assignment and check
-	return make_pair(
+	return std::make_pair(
 		resizeBuffer.first + assignCheckBuffer.first,
 		resizeBuffer.second + assignCheckBuffer.second
 	);
 }
 
-pair<string, string> AssignCheckVisitor::visit(StructType const& _type)
+std::pair<std::string, std::string> AssignCheckVisitor::visit(StructType const& _type)
 {
 	if (!ValidityVisitor().visit(_type))
-		return make_pair("", "");
+		return std::make_pair("", "");
 
-	pair<string, string> assignCheckBuffer;
+	std::pair<std::string, std::string> assignCheckBuffer;
 	unsigned i = 0;
 
 	// Increment struct counter
 	m_structCounter++;
 
-	string wasVarName = m_varName;
-	string wasParamName = m_paramName;
+	std::string wasVarName = m_varName;
+	std::string wasParamName = m_paramName;
 
 	if (!m_forcedVisit)
 		m_valueStream.startStruct();
 	for (auto const& t: _type.t())
 	{
-		m_varName = wasVarName + ".m" + to_string(i);
-		m_paramName = wasParamName + ".m" + to_string(i);
-		pair<string, string> assign = visit(t);
+		m_varName = wasVarName + ".m" + std::to_string(i);
+		m_paramName = wasParamName + ".m" + std::to_string(i);
+		std::pair<std::string, std::string> assign = visit(t);
 		// If type is not well formed continue without
 		// updating state.
 		if (assign.first.empty() && assign.second.empty())
@@ -1144,29 +1143,29 @@ pair<string, string> AssignCheckVisitor::visit(StructType const& _type)
 	return assignCheckBuffer;
 }
 
-pair<string, string> AssignCheckVisitor::assignAndCheckStringPair(
-	string const& _varRef,
-	string const& _checkRef,
-	string const& _assignValue,
-	string const& _checkValue,
+std::pair<std::string, std::string> AssignCheckVisitor::assignAndCheckStringPair(
+	std::string const& _varRef,
+	std::string const& _checkRef,
+	std::string const& _assignValue,
+	std::string const& _checkValue,
 	DataType _type
 )
 {
-	return make_pair(assignString(_varRef, _assignValue), checkString(_checkRef, _checkValue, _type));
+	return std::make_pair(assignString(_varRef, _assignValue), checkString(_checkRef, _checkValue, _type));
 }
 
-string AssignCheckVisitor::assignString(string const& _ref, string const& _value)
+std::string AssignCheckVisitor::assignString(std::string const& _ref, std::string const& _value)
 {
-	string assignStmt = Whiskers(R"(<ref> = <value>;)")
+	std::string assignStmt = Whiskers(R"(<ref> = <value>;)")
 		("ref", _ref)
 		("value", _value)
 		.render();
 	return indentation() + assignStmt + "\n";
 }
 
-string AssignCheckVisitor::checkString(string const& _ref, string const& _value, DataType _type)
+std::string AssignCheckVisitor::checkString(std::string const& _ref, std::string const& _value, DataType _type)
 {
-	string checkPred;
+	std::string checkPred;
 	switch (_type)
 	{
 	case DataType::BYTES:
@@ -1184,25 +1183,25 @@ string AssignCheckVisitor::checkString(string const& _ref, string const& _value,
 	case DataType::ARRAY:
 		solUnimplemented("Proto ABIv2 fuzzer: Invalid data type.");
 	}
-	string checkStmt = Whiskers(R"(if (<checkPred>) return <errCode>;)")
+	std::string checkStmt = Whiskers(R"(if (<checkPred>) return <errCode>;)")
 		("checkPred", checkPred)
-		("errCode", to_string(m_errorCode++))
+		("errCode", std::to_string(m_errorCode++))
 		.render();
 	return indentation() + checkStmt + "\n";
 }
 
 /// ValueGetterVisitor
-string ValueGetterVisitor::visit(BoolType const&)
+std::string ValueGetterVisitor::visit(BoolType const&)
 {
 	return counter() % 2 ? "true" : "false";
 }
 
-string ValueGetterVisitor::visit(IntegerType const& _type)
+std::string ValueGetterVisitor::visit(IntegerType const& _type)
 {
 	return integerValue(counter(), getIntWidth(_type), _type.is_signed());
 }
 
-string ValueGetterVisitor::visit(FixedByteType const& _type)
+std::string ValueGetterVisitor::visit(FixedByteType const& _type)
 {
 	return fixedByteValueAsString(
 		getFixedByteWidth(_type),
@@ -1210,12 +1209,12 @@ string ValueGetterVisitor::visit(FixedByteType const& _type)
 	);
 }
 
-string ValueGetterVisitor::visit(AddressType const&)
+std::string ValueGetterVisitor::visit(AddressType const&)
 {
 	return addressValueAsString(counter());
 }
 
-string ValueGetterVisitor::visit(DynamicByteArrayType const&)
+std::string ValueGetterVisitor::visit(DynamicByteArrayType const&)
 {
 	return bytesArrayValueAsString(
 		counter(),
@@ -1331,7 +1330,7 @@ std::string ValueGetterVisitor::variableLengthValueAsString(
 
 	unsigned numBytesRemaining = _numBytes;
 	// Stores the literal
-	string output{};
+	std::string output{};
 	// If requested value is shorter than or exactly 32 bytes,
 	// the literal is the return value of hexValueAsString.
 	if (numBytesRemaining <= 32)
@@ -1350,7 +1349,7 @@ std::string ValueGetterVisitor::variableLengthValueAsString(
 		// update number of bytes to be appended.
 		// Stores the cached literal that saves us
 		// (expensive) calls to keccak256.
-		string cachedString = hexValueAsString(
+		std::string cachedString = hexValueAsString(
 			/*numBytes=*/32,
 			             _counter,
 			             _isHexLiteral,
@@ -1398,7 +1397,7 @@ std::string ValueGetterVisitor::variableLengthValueAsString(
 		.render();
 }
 
-string ValueGetterVisitor::bytesArrayValueAsString(unsigned _counter, bool _isHexLiteral)
+std::string ValueGetterVisitor::bytesArrayValueAsString(unsigned _counter, bool _isHexLiteral)
 {
 	return variableLengthValueAsString(
 		getVarLength(_counter),
diff --git a/test/tools/ossfuzz/protoToSol.cpp b/test/tools/ossfuzz/protoToSol.cpp
index 73ed34b0d3..f8a60c4a00 100644
--- a/test/tools/ossfuzz/protoToSol.cpp
+++ b/test/tools/ossfuzz/protoToSol.cpp
@@ -26,30 +26,29 @@
 
 using namespace solidity::test::solprotofuzzer;
 using namespace solidity::util;
-using namespace std;
 
-string ProtoConverter::protoToSolidity(Program const& _p)
+std::string ProtoConverter::protoToSolidity(Program const& _p)
 {
 	// Create random number generator with fuzzer supplied
 	// seed.
-	m_randomGen = make_shared<SolRandomNumGenerator>(_p.seed());
+	m_randomGen = std::make_shared<SolRandomNumGenerator>(_p.seed());
 	return visit(_p);
 }
 
-pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testContract)
+std::pair<std::string, std::string> ProtoConverter::generateTestCase(TestContract const& _testContract)
 {
-	ostringstream testCode;
-	string usingLibDecl;
+	std::ostringstream testCode;
+	std::string usingLibDecl;
 	switch (_testContract.type())
 	{
 	case TestContract::LIBRARY:
 	{
 		m_libraryTest = true;
 		auto testTuple = pseudoRandomLibraryTest();
-		m_libraryName = get<0>(testTuple);
+		m_libraryName = std::get<0>(testTuple);
 		Whiskers u(R"(<ind>using <libraryName> for uint;)");
 		u("ind", "\t");
-		u("libraryName", get<0>(testTuple));
+		u("libraryName", std::get<0>(testTuple));
 		usingLibDecl = u.render();
 		Whiskers test(R"(<endl><ind><varDecl><endl><ind><ifStmt>)");
 		test("endl", "\n");
@@ -57,8 +56,8 @@ pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testC
 		test("varDecl", "uint x;");
 		Whiskers ifStmt(R"(if (<cond>)<endl><ind>return 1;)");
 		Whiskers ifCond(R"(x.<testFunction>() != <expectedOutput>)");
-		ifCond("testFunction", get<1>(testTuple));
-		ifCond("expectedOutput", get<2>(testTuple));
+		ifCond("testFunction", std::get<1>(testTuple));
+		ifCond("expectedOutput", std::get<2>(testTuple));
 		ifStmt("cond", ifCond.render());
 		ifStmt("endl", "\n");
 		ifStmt("ind", "\t\t\t");
@@ -77,8 +76,8 @@ pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testC
 			// running into stack too deep errors
 			if (contractVarIndex >= s_maxVars)
 				break;
-			string contractName = testTuple.first;
-			string contractVarName = "tc" + to_string(contractVarIndex);
+			std::string contractName = testTuple.first;
+			std::string contractVarName = "tc" + std::to_string(contractVarIndex);
 			Whiskers init(R"(<endl><ind><contractName> <contractVarName> = new <contractName>();)");
 			init("endl", "\n");
 			init("ind", "\t\t");
@@ -98,7 +97,7 @@ pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testC
 				ifStmt("endl", "\n");
 				ifStmt("cond", ifCond.render());
 				ifStmt("ind", "\t\t\t");
-				ifStmt("errorCode", to_string(errorCode));
+				ifStmt("errorCode", std::to_string(errorCode));
 				tc("ifStmt", ifStmt.render());
 				testCode << tc.render();
 				errorCode++;
@@ -113,10 +112,10 @@ pair<string, string> ProtoConverter::generateTestCase(TestContract const& _testC
 	return {usingLibDecl, testCode.str()};
 }
 
-string ProtoConverter::visit(TestContract const& _testContract)
+std::string ProtoConverter::visit(TestContract const& _testContract)
 {
-	string testCode;
-	string usingLibDecl;
+	std::string testCode;
+	std::string usingLibDecl;
 	m_libraryTest = false;
 
 	// Simply return valid uint (zero) if there are
@@ -143,15 +142,15 @@ bool ProtoConverter::libraryTest() const
 	return m_libraryTest;
 }
 
-string ProtoConverter::libraryName() const
+std::string ProtoConverter::libraryName() const
 {
 	return m_libraryName;
 }
 
-string ProtoConverter::visit(Program const& _p)
+std::string ProtoConverter::visit(Program const& _p)
 {
-	ostringstream program;
-	ostringstream contracts;
+	std::ostringstream program;
+	std::ostringstream contracts;
 
 	for (auto &contract: _p.contracts())
 		contracts << visit(contract);
@@ -163,7 +162,7 @@ string ProtoConverter::visit(Program const& _p)
 	return p.render();
 }
 
-string ProtoConverter::visit(ContractType const& _contractType)
+std::string ProtoConverter::visit(ContractType const& _contractType)
 {
 	switch (_contractType.contract_type_oneof_case())
 	{
@@ -178,25 +177,25 @@ string ProtoConverter::visit(ContractType const& _contractType)
 	}
 }
 
-string ProtoConverter::visit(Contract const& _contract)
+std::string ProtoConverter::visit(Contract const& _contract)
 {
 	openProgramScope(&_contract);
 	return "";
 }
 
-string ProtoConverter::visit(Interface const& _interface)
+std::string ProtoConverter::visit(Interface const& _interface)
 {
 	openProgramScope(&_interface);
 	return "";
 }
 
-string ProtoConverter::visit(Library const& _library)
+std::string ProtoConverter::visit(Library const& _library)
 {
 	openProgramScope(&_library);
 	return "";
 }
 
-tuple<string, string, string> ProtoConverter::pseudoRandomLibraryTest()
+std::tuple<std::string, std::string, std::string> ProtoConverter::pseudoRandomLibraryTest()
 {
 	solAssert(m_libraryTests.size() > 0, "Sol proto fuzzer: No library tests found");
 	unsigned index = randomNumber() % m_libraryTests.size();
@@ -205,18 +204,18 @@ tuple<string, string, string> ProtoConverter::pseudoRandomLibraryTest()
 
 void ProtoConverter::openProgramScope(CIL _program)
 {
-	string programNamePrefix;
-	if (holds_alternative<Contract const*>(_program))
+	std::string programNamePrefix;
+	if (std::holds_alternative<Contract const*>(_program))
 		programNamePrefix = "C";
-	else if (holds_alternative<Interface const*>(_program))
+	else if (std::holds_alternative<Interface const*>(_program))
 		programNamePrefix = "I";
 	else
 		programNamePrefix = "L";
-	string programName = programNamePrefix + to_string(m_programNumericSuffix++);
+	std::string programName = programNamePrefix + std::to_string(m_programNumericSuffix++);
 	m_programNameMap.emplace(_program, programName);
 }
 
-string ProtoConverter::programName(CIL _program)
+std::string ProtoConverter::programName(CIL _program)
 {
 	solAssert(m_programNameMap.count(_program), "Sol proto fuzzer: Unregistered program");
 	return m_programNameMap[_program];
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 1ba0d599d4..8822666c8b 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -32,14 +32,13 @@
 
 #include <algorithm>
 
-using namespace std;
 using namespace solidity::yul::test::yul_fuzzer;
 using namespace solidity::yul::test;
 using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity;
 
-string ProtoConverter::dictionaryToken(HexPrefix _p)
+std::string ProtoConverter::dictionaryToken(HexPrefix _p)
 {
 	std::string token;
 	// If dictionary constant is requested while converting
@@ -57,9 +56,9 @@ string ProtoConverter::dictionaryToken(HexPrefix _p)
 	return _p == HexPrefix::Add ? "0x" + token : token;
 }
 
-string ProtoConverter::createHex(string const& _hexBytes)
+std::string ProtoConverter::createHex(std::string const& _hexBytes)
 {
-	string tmp{_hexBytes};
+	std::string tmp{_hexBytes};
 	if (!tmp.empty())
 	{
 		ranges::actions::remove_if(tmp, [=](char c) -> bool {
@@ -79,9 +78,9 @@ string ProtoConverter::createHex(string const& _hexBytes)
 	return tmp;
 }
 
-string ProtoConverter::createAlphaNum(string const& _strBytes)
+std::string ProtoConverter::createAlphaNum(std::string const& _strBytes)
 {
-	string tmp{_strBytes};
+	std::string tmp{_strBytes};
 	if (!tmp.empty())
 	{
 		ranges::actions::remove_if(tmp, [=](char c) -> bool {
@@ -123,12 +122,12 @@ EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
 	}
 }
 
-string ProtoConverter::visit(Literal const& _x)
+std::string ProtoConverter::visit(Literal const& _x)
 {
 	switch (_x.literal_oneof_case())
 	{
 	case Literal::kIntval:
-		return to_string(_x.intval());
+		return std::to_string(_x.intval());
 	case Literal::kHexval:
 		return "0x" + createHex(_x.hexval());
 	case Literal::kStrval:
@@ -238,7 +237,7 @@ void ProtoConverter::visit(Expression const& _x)
 	case Expression::kFuncExpr:
 		if (auto v = functionExists(NumFunctionReturns::Single); v.has_value())
 		{
-			string functionName = v.value();
+			std::string functionName = v.value();
 			visit(_x.func_expr(), functionName, true);
 		}
 		else
@@ -359,11 +358,11 @@ void ProtoConverter::visit(BinaryOp const& _x)
 	{
 		m_output << "mod(";
 		visit(_x.left());
-		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+		m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 		m_output << ",";
 		m_output << "mod(";
 		visit(_x.right());
-		m_output << ", " << to_string(s_maxSize) << ")";
+		m_output << ", " << std::to_string(s_maxSize) << ")";
 	}
 	else
 	{
@@ -374,7 +373,7 @@ void ProtoConverter::visit(BinaryOp const& _x)
 	m_output << ")";
 }
 
-void ProtoConverter::scopeVariables(vector<string> const& _varNames)
+void ProtoConverter::scopeVariables(std::vector<std::string> const& _varNames)
 {
 	// If we are inside a for-init block, there are two places
 	// where the visited vardecl may have been defined:
@@ -443,7 +442,7 @@ void ProtoConverter::scopeVariables(vector<string> const& _varNames)
 
 void ProtoConverter::visit(VarDecl const& _x)
 {
-	string varName = newVarName();
+	std::string varName = newVarName();
 	m_output << "let " << varName << " := ";
 	visit(_x.expr());
 	m_output << "\n";
@@ -453,14 +452,14 @@ void ProtoConverter::visit(VarDecl const& _x)
 void ProtoConverter::visit(MultiVarDecl const& _x)
 {
 	m_output << "let ";
-	vector<string> varNames;
+	std::vector<std::string> varNames;
 	// We support up to 4 variables in a single
 	// declaration statement.
 	unsigned numVars = _x.num_vars() % 3 + 2;
-	string delimiter;
+	std::string delimiter;
 	for (unsigned i = 0; i < numVars; i++)
 	{
-		string varName = newVarName();
+		std::string varName = newVarName();
 		varNames.push_back(varName);
 		m_output << delimiter << varName;
 		if (i == 0)
@@ -472,7 +471,7 @@ void ProtoConverter::visit(MultiVarDecl const& _x)
 
 void ProtoConverter::visit(TypedVarDecl const& _x)
 {
-	string varName = newVarName();
+	std::string varName = newVarName();
 	m_output << "let " << varName;
 	switch (_x.type())
 	{
@@ -662,7 +661,7 @@ void ProtoConverter::visit(UnaryOp const& _x)
 	{
 		m_output << "mod(";
 		visit(_x.operand());
-		m_output << ", " << to_string(s_maxMemory - 32) << ")";
+		m_output << ", " << std::to_string(s_maxMemory - 32) << ")";
 	}
 	else
 		visit(_x.operand());
@@ -844,20 +843,20 @@ void ProtoConverter::visit(CopyFunc const& _x)
 	m_output << "(";
 	m_output << "mod(";
 	visit(_x.target());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	if (type == CopyFunc::MEMORY)
 	{
 		m_output << "mod(";
 		visit(_x.source());
-		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+		m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	}
 	else
 		visit(_x.source());
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
@@ -869,13 +868,13 @@ void ProtoConverter::visit(ExtCodeCopy const& _x)
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.target());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::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 << ", " << std::to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
@@ -884,11 +883,11 @@ 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 << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 		m_output << ", ";
 		m_output << "mod(";
 		visit(_y.size());
-		m_output << ", " << to_string(s_maxSize) << ")";
+		m_output << ", " << std::to_string(s_maxSize) << ")";
 	};
 
 	switch (_x.num_topics())
@@ -984,7 +983,7 @@ void ProtoConverter::visitFunctionInputParams(FunctionCall const& _x, unsigned _
 
 void ProtoConverter::convertFunctionCall(
 	FunctionCall const& _x,
-	string const& _name,
+	std::string const& _name,
 	unsigned _numInParams,
 	bool _newLine
 )
@@ -996,10 +995,10 @@ void ProtoConverter::convertFunctionCall(
 		m_output << "\n";
 }
 
-vector<string> ProtoConverter::createVarDecls(unsigned _start, unsigned _end, bool _isAssignment)
+std::vector<std::string> ProtoConverter::createVarDecls(unsigned _start, unsigned _end, bool _isAssignment)
 {
 	m_output << "let ";
-	vector<string> varsVec = createVars(_start, _end);
+	std::vector<std::string> varsVec = createVars(_start, _end);
 	if (_isAssignment)
 		m_output << " := ";
 	else
@@ -1007,7 +1006,7 @@ vector<string> ProtoConverter::createVarDecls(unsigned _start, unsigned _end, bo
 	return varsVec;
 }
 
-optional<string> ProtoConverter::functionExists(NumFunctionReturns _numReturns)
+std::optional<std::string> ProtoConverter::functionExists(NumFunctionReturns _numReturns)
 {
 	for (auto const& item: m_functionSigMap)
 		if (_numReturns == NumFunctionReturns::None || _numReturns == NumFunctionReturns::Single)
@@ -1020,10 +1019,10 @@ optional<string> ProtoConverter::functionExists(NumFunctionReturns _numReturns)
 			if (item.second.second >= static_cast<unsigned>(_numReturns))
 				return item.first;
 		}
-	return nullopt;
+	return std::nullopt;
 }
 
-void ProtoConverter::visit(FunctionCall const& _x, string const& _functionName, bool _expression)
+void ProtoConverter::visit(FunctionCall const& _x, std::string const& _functionName, bool _expression)
 {
 	yulAssert(m_functionSigMap.count(_functionName), "Proto fuzzer: Invalid function.");
 	auto ret = m_functionSigMap.at(_functionName);
@@ -1038,7 +1037,7 @@ void ProtoConverter::visit(FunctionCall const& _x, string const& _functionName,
 	else
 	{
 		yulAssert(numOutParams > 0, "");
-		vector<string> varsVec;
+		std::vector<std::string> varsVec;
 		if (!_expression)
 		{
 			// Obtain variable name suffix
@@ -1096,19 +1095,19 @@ void ProtoConverter::visit(LowLevelCall const& _x)
 	}
 	m_output << "mod(";
 	visit(_x.in());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.insize());
-	m_output << ", " << to_string(s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxSize) << ")";
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.out());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.outsize());
-	m_output << ", " << to_string(s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxSize) << ")";
 	m_output << ")";
 }
 
@@ -1137,11 +1136,11 @@ void ProtoConverter::visit(Create const& _x)
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.position());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxSize) << ")";
 	if (type == Create::CREATE2)
 	{
 		m_output << ", ";
@@ -1183,7 +1182,7 @@ void ProtoConverter::visit(StoreFunc const& _x)
 	{
 		m_output << "mod(";
 		visit(_x.loc());
-		m_output << ", " << to_string(s_maxMemory) << ")";
+		m_output << ", " << std::to_string(s_maxMemory) << ")";
 	}
 	else if (storeType == StoreFunc::MSTORE)
 	{
@@ -1191,7 +1190,7 @@ void ProtoConverter::visit(StoreFunc const& _x)
 		// upper bound on memory.
 		m_output << "mod(";
 		visit(_x.loc());
-		m_output << ", " << to_string(s_maxMemory - 32) << ")";
+		m_output << ", " << std::to_string(s_maxMemory - 32) << ")";
 
 	}
 	m_output << ", ";
@@ -1261,7 +1260,7 @@ void ProtoConverter::visit(BoundedForStmt const& _x)
 
 void ProtoConverter::visit(CaseStmt const& _x)
 {
-	string literal = visit(_x.case_lit());
+	std::string literal = visit(_x.case_lit());
 	// u256 value of literal
 	u256 literalVal;
 
@@ -1278,7 +1277,7 @@ void ProtoConverter::visit(CaseStmt const& _x)
 		// a case statement containing a case literal that has already been used in a
 		// previous case statement. If the hash (u256 value) matches a previous hash,
 		// then we simply don't create a new case statement.
-		string noDoubleQuoteStr;
+		std::string noDoubleQuoteStr;
 		if (literal.size() > 2)
 		{
 			// Ensure that all characters in the string literal except the first
@@ -1376,11 +1375,11 @@ void ProtoConverter::visit(RetRevStmt const& _x)
 	m_output << "(";
 	m_output << "mod(";
 	visit(_x.pos());
-	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.size());
-	m_output << ", " << to_string(s_maxSize) << ")";
+	m_output << ", " << std::to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
@@ -1527,14 +1526,14 @@ void ProtoConverter::openBlockScope()
 			!m_funcVars.empty(),
 			"Proto fuzzer: Invalid data structure"
 		);
-		m_funcVars.back().push_back(vector<string>{});
+		m_funcVars.back().push_back(std::vector<std::string>{});
 		if (m_inForInitScope && m_forInitScopeExtEnabled)
 		{
 			yulAssert(
 				!m_funcForLoopInitVars.empty(),
 				"Proto fuzzer: Invalid data structure"
 			);
-			m_funcForLoopInitVars.back().push_back(vector<string>{});
+			m_funcForLoopInitVars.back().push_back(std::vector<std::string>{});
 		}
 	}
 	else
@@ -1545,13 +1544,13 @@ void ProtoConverter::openBlockScope()
 	}
 }
 
-void ProtoConverter::openFunctionScope(vector<string> const& _funcParams)
+void ProtoConverter::openFunctionScope(std::vector<std::string> const& _funcParams)
 {
-	m_funcVars.push_back(vector<vector<string>>({_funcParams}));
-	m_funcForLoopInitVars.push_back(vector<vector<string>>({}));
+	m_funcVars.push_back(std::vector<std::vector<std::string>>({_funcParams}));
+	m_funcForLoopInitVars.push_back(std::vector<std::vector<std::string>>({}));
 }
 
-void ProtoConverter::updateFunctionMaps(string const& _var)
+void ProtoConverter::updateFunctionMaps(std::string const& _var)
 {
 	size_t erased = m_functionSigMap.erase(_var);
 
@@ -1609,7 +1608,7 @@ void ProtoConverter::closeFunctionScope()
 	m_funcForLoopInitVars.pop_back();
 }
 
-void ProtoConverter::addVarsToScope(vector<string> const& _vars)
+void ProtoConverter::addVarsToScope(std::vector<std::string> const& _vars)
 {
 	// If we are in function definition, add the new vars to current function scope
 	if (m_inFunctionDef)
@@ -1706,12 +1705,12 @@ void ProtoConverter::visit(Block const& _x)
 	closeBlockScope();
 }
 
-vector<string> ProtoConverter::createVars(unsigned _startIdx, unsigned _endIdx)
+std::vector<std::string> ProtoConverter::createVars(unsigned _startIdx, unsigned _endIdx)
 {
 	yulAssert(_endIdx > _startIdx, "Proto fuzzer: Variable indices not in range");
-	string varsStr = suffixedVariableNameList("x_", _startIdx, _endIdx);
+	std::string varsStr = suffixedVariableNameList("x_", _startIdx, _endIdx);
 	m_output << varsStr;
-	vector<string> varsVec;
+	std::vector<std::string> varsVec;
 	boost::split(
 		varsVec,
 		varsStr,
@@ -1740,14 +1739,14 @@ void ProtoConverter::registerFunction(FunctionDef const* _x)
 		numReturns = NumFunctionReturns::Multiple;
 
 	// Generate function name
-	string funcName = functionName(numReturns);
+	std::string funcName = functionName(numReturns);
 
 	// Register function
-	auto ret = m_functionSigMap.emplace(make_pair(funcName, make_pair(numInParams, numOutParams)));
+	auto ret = m_functionSigMap.emplace(std::make_pair(funcName, std::make_pair(numInParams, numOutParams)));
 	yulAssert(ret.second, "Proto fuzzer: Function already exists.");
 	m_functions.push_back(funcName);
 	m_scopeFuncs.back().push_back(funcName);
-	m_functionDefMap.emplace(make_pair(_x, funcName));
+	m_functionDefMap.emplace(std::make_pair(_x, funcName));
 }
 
 void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
@@ -1760,7 +1759,7 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 		unsigned diceValue = counter() % 4;
 		// Pseudo-randomly choose one of the first ten 32-byte
 		// aligned slots.
-		string slot = to_string((counter() % 10) * 32);
+		std::string slot = std::to_string((counter() % 10) * 32);
 		switch (diceValue)
 		{
 		case 0:
@@ -1769,7 +1768,7 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 		case 1:
 		{
 			// Access memory within stipulated bounds
-			slot = "mod(" + dictionaryToken() + ", " + to_string(s_maxMemory - 32) + ")";
+			slot = "mod(" + dictionaryToken() + ", " + std::to_string(s_maxMemory - 32) + ")";
 			m_output << "mload(" << slot << ")";
 			break;
 		}
@@ -1787,19 +1786,19 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 	}
 }
 
-void ProtoConverter::saveFunctionCallOutput(vector<string> const& _varsVec)
+void ProtoConverter::saveFunctionCallOutput(std::vector<std::string> const& _varsVec)
 {
 	constexpr auto numSlots = 10;
 	constexpr auto slotSize = 32;
 
-	for (string const& var: _varsVec)
+	for (std::string const& var: _varsVec)
 	{
 		// Flip a dice to choose whether to save output values
 		// in storage or memory.
 		unsigned diceThrow = counter() % (m_evmVersion.supportsTransientStorage() ? 3 : 2);
 		// Pseudo-randomly choose one of the first ten 32-byte
 		// aligned slots.
-		string slot = std::to_string((counter() % numSlots) * slotSize);
+		std::string slot = std::to_string((counter() % numSlots) * slotSize);
 		if (diceThrow == 0)
 			m_output << "sstore(" << slot << ", " << var << ")\n";
 		else if (diceThrow == 1)
@@ -1816,12 +1815,12 @@ void ProtoConverter::saveFunctionCallOutput(vector<string> const& _varsVec)
 }
 
 void ProtoConverter::createFunctionCall(
-	string const& _funcName,
+	std::string const& _funcName,
 	unsigned _numInParams,
 	unsigned _numOutParams
 )
 {
-	vector<string> varsVec{};
+	std::vector<std::string> varsVec{};
 	if (_numOutParams > 0)
 	{
 		unsigned startIdx = counter();
@@ -1864,16 +1863,16 @@ void ProtoConverter::createFunctionDefAndCall(
 
 	// Obtain function name
 	yulAssert(m_functionDefMap.count(&_x), "Proto fuzzer: Unregistered function");
-	string funcName = m_functionDefMap.at(&_x);
+	std::string funcName = m_functionDefMap.at(&_x);
 
-	vector<string> varsVec = {};
+	std::vector<std::string> varsVec = {};
 	m_output << "function " << funcName << "(";
 	unsigned startIdx = counter();
 	if (_numInParams > 0)
 		varsVec = createVars(startIdx, startIdx + _numInParams);
 	m_output << ")";
 
-	vector<string> outVarsVec = {};
+	std::vector<std::string> outVarsVec = {};
 	// This creates -> x_n+1,...,x_r
 	if (_numOutParams > 0)
 	{
@@ -1937,15 +1936,15 @@ void ProtoConverter::visit(LeaveStmt const&)
 	m_output << "leave\n";
 }
 
-string ProtoConverter::getObjectIdentifier(unsigned _x)
+std::string ProtoConverter::getObjectIdentifier(unsigned _x)
 {
 	unsigned currentId = currentObjectId();
-	string currentObjName = "object" + to_string(currentId);
+	std::string currentObjName = "object" + std::to_string(currentId);
 	yulAssert(
 		m_objectScope.count(currentObjName) && !m_objectScope.at(currentObjName).empty(),
 		"Yul proto fuzzer: Error referencing object"
 	);
-	vector<string> objectIdsInScope = m_objectScope.at(currentObjName);
+	std::vector<std::string> objectIdsInScope = m_objectScope.at(currentObjName);
 	return objectIdsInScope[_x % objectIdsInScope.size()];
 }
 
@@ -1979,8 +1978,8 @@ void ProtoConverter::visit(Object const& _x)
 void ProtoConverter::buildObjectScopeTree(Object const& _x)
 {
 	// Identifies object being visited
-	string objectName = newObjectId(false);
-	vector<string> node{objectName};
+	std::string objectName = newObjectId(false);
+	std::vector<std::string> node{objectName};
 	if (_x.has_data())
 		node.emplace_back(s_dataIdentifier);
 	for (auto const& subObj: _x.sub_obj())
@@ -1988,12 +1987,12 @@ void ProtoConverter::buildObjectScopeTree(Object const& _x)
 		// Identifies sub object whose numeric suffix is
 		// m_objectId
 		unsigned subObjectId = m_objectId;
-		string subObjectName = "object" + to_string(subObjectId);
+		std::string subObjectName = "object" + std::to_string(subObjectId);
 		node.push_back(subObjectName);
 		buildObjectScopeTree(subObj);
 		// Add sub-object to object's ancestors
 		yulAssert(m_objectScope.count(subObjectName), "Yul proto fuzzer: Invalid object hierarchy");
-		for (string const& item: m_objectScope.at(subObjectName))
+		for (std::string const& item: m_objectScope.at(subObjectName))
 			if (item != subObjectName)
 				node.emplace_back(subObjectName + "." + item);
 	}
@@ -2033,13 +2032,13 @@ void ProtoConverter::visit(Program const& _x)
 	}
 }
 
-string ProtoConverter::programToString(Program const& _input)
+std::string ProtoConverter::programToString(Program const& _input)
 {
 	visit(_input);
 	return m_output.str();
 }
 
-string ProtoConverter::functionTypeToString(NumFunctionReturns _type)
+std::string ProtoConverter::functionTypeToString(NumFunctionReturns _type)
 {
 	switch (_type)
 	{
diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
index 9b0c97a22d..bf370dd378 100644
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
+++ b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
@@ -6,11 +6,10 @@
 
 using namespace solidity::yul::test::yul_fuzzer;
 using namespace protobuf_mutator;
-using namespace std;
 
 using YPM = YulProtoMutator;
 
-MutationInfo::MutationInfo(ProtobufMessage const* _message, string const& _info):
+MutationInfo::MutationInfo(ProtobufMessage const* _message, std::string const& _info):
 	ScopeGuard([&]{ exitInfo(); }),
 	m_protobufMsg(_message)
 {
@@ -60,7 +59,7 @@ struct addControlFlow
 		/// Unused variable registers callback.
 		LPMPostProcessor<T> callback(function);
 	}
-	function<void(T*, unsigned)> function;
+	std::function<void(T*, unsigned)> function;
 };
 }
 
@@ -182,7 +181,7 @@ void YPM::addControlFlow(T* _msg, unsigned _seed)
 		Leave,
 		Termination
 	};
-	uniform_int_distribution<unsigned> d(
+	std::uniform_int_distribution<unsigned> d(
 		static_cast<unsigned>(ControlFlowStmt::For),
 		static_cast<unsigned>(ControlFlowStmt::Termination)
 	);
@@ -229,7 +228,7 @@ Block* YPM::randomBlock(ForStmt* _stmt, unsigned _seed)
 		Post = 1,
 		Body = 2
 	};
-	uniform_int_distribution<unsigned> d(
+	std::uniform_int_distribution<unsigned> d(
 		static_cast<unsigned>(ForBlocks::Init),
 		static_cast<unsigned>(ForBlocks::Body)
 	);
diff --git a/test/tools/ossfuzz/solProtoFuzzer.cpp b/test/tools/ossfuzz/solProtoFuzzer.cpp
index f7acc6c10d..06edd3e99a 100644
--- a/test/tools/ossfuzz/solProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/solProtoFuzzer.cpp
@@ -35,19 +35,18 @@ using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::test;
 using namespace solidity::util;
-using namespace std;
 
 DEFINE_PROTO_FUZZER(Program const& _input)
 {
 	ProtoConverter converter;
-	string sol_source = converter.protoToSolidity(_input);
+	std::string sol_source = converter.protoToSolidity(_input);
 
 	if (char const* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
 		// With libFuzzer binary run this to generate a YUL source file x.yul:
 		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(sol_source.data(), static_cast<streamsize>(sol_source.size()));
+		std::ofstream of(dump_path);
+		of.write(sol_source.data(), static_cast<std::streamsize>(sol_source.size()));
 	}
 
 	if (char const* dump_path = getenv("SOL_DEBUG_FILE"))
@@ -55,7 +54,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		sol_source.clear();
 		// With libFuzzer binary run this to generate a YUL source file x.yul:
 		// PROTO_FUZZER_LOAD_PATH=x.yul ./a.out proto-input
-		ifstream ifstr(dump_path);
+		std::ifstream ifstr(dump_path);
 		sol_source = {
 			std::istreambuf_iterator<char>(ifstr),
 			std::istreambuf_iterator<char>()
@@ -66,9 +65,9 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// We target the default EVM which is the latest
 	langutil::EVMVersion version;
 	EVMHost hostContext(version, evmone);
-	string contractName = "C";
-	string libraryName = converter.libraryTest() ? converter.libraryName() : "";
-	string methodName = "test()";
+	std::string contractName = "C";
+	std::string libraryName = converter.libraryTest() ? converter.libraryName() : "";
+	std::string methodName = "test()";
 	StringMap source({{"test.sol", sol_source}});
 	CompilerInput cInput(version, source, contractName, OptimiserSettings::minimal(), {});
 	EvmoneUtility evmoneUtil(
diff --git a/test/tools/ossfuzz/solc_ossfuzz.cpp b/test/tools/ossfuzz/solc_ossfuzz.cpp
index 620ef332b9..dc7e26a2ae 100644
--- a/test/tools/ossfuzz/solc_ossfuzz.cpp
+++ b/test/tools/ossfuzz/solc_ossfuzz.cpp
@@ -23,7 +23,6 @@
 #include <sstream>
 
 using namespace solidity::frontend::test;
-using namespace std;
 
 // Prototype as we can't use the FuzzerInterface.h header.
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
@@ -32,13 +31,13 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 {
 	if (_size <= 600)
 	{
-		string input(reinterpret_cast<char const*>(_data), _size);
-		map<string, string> sourceCode;
+		std::string input(reinterpret_cast<char const*>(_data), _size);
+		std::map<std::string, std::string> sourceCode;
 		try
 		{
 			TestCaseReader t = TestCaseReader(std::istringstream(input));
 			sourceCode = t.sources().sources;
-			map<string, string> settings = t.settings();
+			std::map<std::string, std::string> settings = t.settings();
 			bool compileViaYul =
 				settings.count("compileViaYul") &&
 				(settings.at("compileViaYul") == "also" || settings.at("compileViaYul") == "true");
@@ -51,7 +50,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 				compileViaYul
 			);
 		}
-		catch (runtime_error const&)
+		catch (std::runtime_error const&)
 		{
 			return 0;
 		}
diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
index c7ffd3d417..595aecdca3 100644
--- a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
@@ -24,7 +24,6 @@
 
 using namespace solidity;
 using namespace solidity::yul;
-using namespace std;
 
 // Prototype as we can't use the FuzzerInterface.h header.
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
@@ -36,10 +35,10 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	YulStringRepository::reset();
 
-	string input(reinterpret_cast<char const*>(_data), _size);
+	std::string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::minimal(),
 		langutil::DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index 5c923a3ea7..e31391b0e1 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -36,7 +36,6 @@
 #include <memory>
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -51,7 +50,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	if (_size > 600)
 		return 0;
 
-	string input(reinterpret_cast<char const*>(_data), _size);
+	std::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) || !(isPrint(c) || (c == '\n') || (c == '\t')));
@@ -62,7 +61,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	YulStack stack(
 		langutil::EVMVersion(),
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
@@ -81,8 +80,8 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 		return 0;
 	}
 
-	ostringstream os1;
-	ostringstream os2;
+	std::ostringstream os1;
+	std::ostringstream os2;
 	// Disable memory tracing to avoid false positive reports
 	// such as unused write to memory e.g.,
 	// { mstore(0, 1) }
diff --git a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
index db35cc8652..7553c81c0f 100644
--- a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
@@ -25,7 +25,6 @@ using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
-using namespace std;
 
 // Prototype as we can't use the FuzzerInterface.h header.
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size);
@@ -37,10 +36,10 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	YulStringRepository::reset();
 
-	string input(reinterpret_cast<char const*>(_data), _size);
+	std::string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.cpp b/test/tools/ossfuzz/yulFuzzerCommon.cpp
index 57f930cfe1..4f7a871ac8 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.cpp
+++ b/test/tools/ossfuzz/yulFuzzerCommon.cpp
@@ -17,14 +17,13 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <test/tools/ossfuzz/yulFuzzerCommon.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::yul::test::yul_fuzzer;
 
 yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
-	ostream& _os,
-	shared_ptr<yul::Block> _ast,
+	std::ostream& _os,
+	std::shared_ptr<yul::Block> _ast,
 	Dialect const& _dialect,
 	bool _disableMemoryTracing,
 	bool _outputStorageOnly,
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index c2ac680934..b27d879d56 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -40,20 +40,19 @@ using namespace solidity::langutil;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::yul::test::yul_fuzzer;
-using namespace std;
 
 DEFINE_PROTO_FUZZER(Program const& _input)
 {
 	ProtoConverter converter;
-	string yul_source = converter.programToString(_input);
+	std::string yul_source = converter.programToString(_input);
 	EVMVersion version = converter.version();
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
 		// With libFuzzer binary run this to generate a YUL source file x.yul:
 		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
+		std::ofstream of(dump_path);
+		of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));
 	}
 
 	if (yul_source.size() > 1200)
@@ -64,7 +63,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// YulStack entry point
 	YulStack stack(
 		version,
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
@@ -85,6 +84,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		EVMDialect::strictAssemblyForEVMObjects(version)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
+	std::shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
 	yulAssert(astBlock != nullptr, "Optimiser error.");
 }
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index d1717a159a..49470f7198 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -36,7 +36,6 @@
 
 #include <test/tools/ossfuzz/yulFuzzerCommon.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -47,15 +46,15 @@ using namespace solidity::yul::test::yul_fuzzer;
 DEFINE_PROTO_FUZZER(Program const& _input)
 {
 	ProtoConverter converter;
-	string yul_source = converter.programToString(_input);
+	std::string yul_source = converter.programToString(_input);
 	EVMVersion version = converter.version();
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
 		// With libFuzzer binary run this to generate a YUL source file x.yul:
 		// PROTO_FUZZER_DUMP_PATH=x.yul ./a.out proto-input
-		ofstream of(dump_path);
-		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
+		std::ofstream of(dump_path);
+		of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));
 	}
 
 	YulStringRepository::reset();
@@ -63,7 +62,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// YulStack entry point
 	YulStack stack(
 		version,
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
@@ -81,8 +80,8 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		yulAssert(false, "Proto fuzzer generated malformed program");
 	}
 
-	ostringstream os1;
-	ostringstream os2;
+	std::ostringstream os1;
+	std::ostringstream os2;
 	// Disable memory tracing to avoid false positive reports
 	// such as unused write to memory e.g.,
 	// { mstore(0, 1) }
@@ -102,7 +101,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		EVMDialect::strictAssemblyForEVMObjects(version)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
+	std::shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
 	yulAssert(astBlock != nullptr, "Optimiser error.");
 	termReason = yulFuzzerUtil::interpret(
 		os2,
@@ -116,8 +115,8 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	bool isTraceEq = (os1.str() == os2.str());
 	if (!isTraceEq)
 	{
-		cout << os1.str() << endl;
-		cout << os2.str() << endl;
+		std::cout << os1.str() << std::endl;
+		std::cout << os2.str() << std::endl;
 		yulAssert(false, "Interpreted traces for optimized and unoptimized code differ.");
 	}
 	return;
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 20491afe16..d16b1da196 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -64,7 +64,6 @@
 #include <iostream>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -79,14 +78,14 @@ class YulOpti
 	static void printErrors(CharStream const& _charStream, ErrorList const& _errors)
 	{
 		SourceReferenceFormatter{
-			cerr,
+			std::cerr,
 			SingletonCharStreamProvider(_charStream),
 			true,
 			false
 		}.printErrorInformation(_errors);
 	}
 
-	void parse(string const& _input)
+	void parse(std::string const& _input)
 	{
 		ErrorList errors;
 		ErrorReporter errorReporter(errors);
@@ -96,11 +95,11 @@ class YulOpti
 			m_ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
 			if (!m_ast || !errorReporter.errors().empty())
 			{
-				cerr << "Error parsing source." << endl;
+				std::cerr << "Error parsing source." << std::endl;
 				printErrors(_charStream, errors);
 				throw std::runtime_error("Could not parse source.");
 			}
-			m_analysisInfo = make_unique<yul::AsmAnalysisInfo>();
+			m_analysisInfo = std::make_unique<yul::AsmAnalysisInfo>();
 			AsmAnalyzer analyzer(
 				*m_analysisInfo,
 				errorReporter,
@@ -108,21 +107,21 @@ class YulOpti
 			);
 			if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())
 			{
-				cerr << "Error analyzing source." << endl;
+				std::cerr << "Error analyzing source." << std::endl;
 				printErrors(_charStream, errors);
 				throw std::runtime_error("Could not analyze source.");
 			}
 		}
 		catch(...)
 		{
-			cerr << "Fatal error during parsing: " << endl;
+			std::cerr << "Fatal error during parsing: " << std::endl;
 			printErrors(_charStream, errors);
 			throw;
 		}
 	}
 
 	void printUsageBanner(
-		map<char, string> const& _extraOptions,
+		std::map<char, std::string> const& _extraOptions,
 		size_t _columns
 	)
 	{
@@ -134,10 +133,10 @@ class YulOpti
 			max_element(_extraOptions.begin(), _extraOptions.end(), hasShorterString)->second.size()
 		);
 
-		vector<string> overlappingAbbreviations =
+		std::vector<std::string> overlappingAbbreviations =
 			ranges::views::set_intersection(_extraOptions | ranges::views::keys, optimiserSteps | ranges::views::keys) |
-			ranges::views::transform([](char _abbreviation){ return string(1, _abbreviation); }) |
-			ranges::to<vector>();
+			ranges::views::transform([](char _abbreviation){ return std::string(1, _abbreviation); }) |
+			ranges::to<std::vector>();
 
 		yulAssert(
 			overlappingAbbreviations.empty(),
@@ -148,10 +147,10 @@ class YulOpti
 			"Please update the code to use a different character and recompile yulopti."
 		);
 
-		vector<tuple<char, string>> sortedOptions =
+		std::vector<std::tuple<char, std::string>> sortedOptions =
 			ranges::views::concat(optimiserSteps, _extraOptions) |
-			ranges::to<vector<tuple<char, string>>>() |
-			ranges::actions::sort([](tuple<char, string> const& _a, tuple<char, string> const& _b) {
+			ranges::to<std::vector<std::tuple<char, std::string>>>() |
+			ranges::actions::sort([](std::tuple<char, std::string> const& _a, std::tuple<char, std::string> const& _b) {
 				return (
 					!boost::algorithm::iequals(get<1>(_a), get<1>(_b)) ?
 					boost::algorithm::lexicographical_compare(get<1>(_a), get<1>(_b), boost::algorithm::is_iless()) :
@@ -164,9 +163,9 @@ class YulOpti
 		for (size_t row = 0; row < rows; ++row)
 		{
 			for (auto const& [key, name]: sortedOptions | ranges::views::drop(row) | ranges::views::stride(rows))
-				cout << key << ": " << setw(static_cast<int>(longestDescriptionLength)) << setiosflags(ios::left) << name << " ";
+				std::cout << key << ": " << std::setw(static_cast<int>(longestDescriptionLength)) << std::setiosflags(std::ios::left) << name << " ";
 
-			cout << endl;
+			std::cout << std::endl;
 		}
 	}
 
@@ -177,22 +176,22 @@ class YulOpti
 		m_nameDispenser.reset(*m_ast);
 	}
 
-	void runSteps(string _source, string _steps)
+	void runSteps(std::string _source, std::string _steps)
 	{
 		parse(_source);
 		disambiguate();
 		OptimiserSuite{m_context}.runSequence(_steps, *m_ast);
-		cout << AsmPrinter{m_dialect}(*m_ast) << endl;
+		std::cout << AsmPrinter{m_dialect}(*m_ast) << std::endl;
 	}
 
-	void runInteractive(string _source, bool _disambiguated = false)
+	void runInteractive(std::string _source, bool _disambiguated = false)
 	{
 		bool disambiguated = _disambiguated;
 		while (true)
 		{
 			parse(_source);
 			disambiguated = disambiguated || (disambiguate(), true);
-			map<char, string> const& extraOptions = {
+			std::map<char, std::string> const& extraOptions = {
 				// QUIT starts with a non-letter character on purpose to get it to show up on top of the list
 				{'#', ">>> QUIT <<<"},
 				{',', "VarNameCleaner"},
@@ -200,10 +199,10 @@ class YulOpti
 			};
 
 			printUsageBanner(extraOptions, 4);
-			cout << "? ";
-			cout.flush();
+			std::cout << "? ";
+			std::cout.flush();
 			char option = static_cast<char>(readStandardInputChar());
-			cout << ' ' << option << endl;
+			std::cout << ' ' << option << std::endl;
 
 			try
 			{
@@ -234,19 +233,19 @@ class YulOpti
 			}
 			catch (...)
 			{
-				cerr << endl << "Exception during optimiser step:" << endl;
-				cerr << boost::current_exception_diagnostic_information() << endl;
+				std::cerr << std::endl << "Exception during optimiser step:" << std::endl;
+				std::cerr << boost::current_exception_diagnostic_information() << std::endl;
 			}
-			cout << "----------------------" << endl;
-			cout << _source << endl;
+			std::cout << "----------------------" << std::endl;
+			std::cout << _source << std::endl;
 		}
 	}
 
 private:
-	shared_ptr<yul::Block> m_ast;
+	std::shared_ptr<yul::Block> m_ast;
 	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
-	unique_ptr<AsmAnalysisInfo> m_analysisInfo;
-	set<YulString> const m_reservedIdentifiers = {};
+	std::unique_ptr<AsmAnalysisInfo> m_analysisInfo;
+	std::set<YulString> const m_reservedIdentifiers = {};
 	NameDispenser m_nameDispenser{m_dialect, m_reservedIdentifiers};
 	OptimiserStepContext m_context{
 		m_dialect,
@@ -275,12 +274,12 @@ int main(int argc, char** argv)
 		options.add_options()
 			(
 				"input-file",
-				po::value<string>(),
+				po::value<std::string>(),
 				"input file"
 			)
 			(
 				"steps",
-				po::value<string>(),
+				po::value<std::string>(),
 				"steps to execute non-interactively"
 			)
 			(
@@ -302,43 +301,43 @@ int main(int argc, char** argv)
 
 		if (arguments.count("help"))
 		{
-			cout << options;
+			std::cout << options;
 			return 0;
 		}
 
-		string input;
+		std::string input;
 		if (arguments.count("input-file"))
 		{
-			string filename = arguments["input-file"].as<string>();
+			std::string filename = arguments["input-file"].as<std::string>();
 			if (filename == "-")
 			{
 				nonInteractive = true;
-				input = readUntilEnd(cin);
+				input = readUntilEnd(std::cin);
 			}
 			else
-				input = readFileAsString(arguments["input-file"].as<string>());
+				input = readFileAsString(arguments["input-file"].as<std::string>());
 		}
 		else
 		{
-			cout << options;
+			std::cout << options;
 			return 1;
 		}
 
 		if (nonInteractive && !arguments.count("steps"))
 		{
-			cout << options;
+			std::cout << options;
 			return 1;
 		}
 
 		YulOpti yulOpti;
 		bool disambiguated = false;
 		if (!nonInteractive)
-			cout << input << endl;
+			std::cout << input << std::endl;
 		if (arguments.count("steps"))
 		{
-			string sequence = arguments["steps"].as<string>();
+			std::string sequence = arguments["steps"].as<std::string>();
 			if (!nonInteractive)
-				cout << "----------------------" << endl;
+				std::cout << "----------------------" << std::endl;
 			yulOpti.runSteps(input, sequence);
 			disambiguated = true;
 		}
@@ -349,23 +348,23 @@ int main(int argc, char** argv)
 	}
 	catch (po::error const& _exception)
 	{
-		cerr << _exception.what() << endl;
+		std::cerr << _exception.what() << std::endl;
 		return 1;
 	}
 	catch (FileNotFound const& _exception)
 	{
-		cerr << "File not found:" << _exception.comment() << endl;
+		std::cerr << "File not found:" << _exception.comment() << std::endl;
 		return 1;
 	}
 	catch (NotAFile const& _exception)
 	{
-		cerr << "Not a regular file:" << _exception.comment() << endl;
+		std::cerr << "Not a regular file:" << _exception.comment() << std::endl;
 		return 1;
 	}
 	catch(...)
 	{
-		cerr << endl << "Exception:" << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
+		std::cerr << std::endl << "Exception:" << std::endl;
+		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
 		return 1;
 	}
 }
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index 2e1bcc013e..fb18b4e598 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -43,7 +43,6 @@
 #include <memory>
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -55,11 +54,11 @@ namespace po = boost::program_options;
 namespace
 {
 
-pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source)
+std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>> parse(std::string const& _source)
 {
 	YulStack stack(
 		langutil::EVMVersion(),
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::Default()
@@ -71,15 +70,15 @@ pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source
 	}
 	else
 	{
-		SourceReferenceFormatter(cout, stack, true, false).printErrorInformation(stack.errors());
+		SourceReferenceFormatter(std::cout, stack, true, false).printErrorInformation(stack.errors());
 		return {};
 	}
 }
 
-void interpret(string const& _source, bool _inspect, bool _disableExternalCalls)
+void interpret(std::string const& _source, bool _inspect, bool _disableExternalCalls)
 {
-	shared_ptr<Block> ast;
-	shared_ptr<AsmAnalysisInfo> analysisInfo;
+	std::shared_ptr<Block> ast;
+	std::shared_ptr<AsmAnalysisInfo> analysisInfo;
 	tie(ast, analysisInfo) = parse(_source);
 	if (!ast || !analysisInfo)
 		return;
@@ -100,7 +99,7 @@ void interpret(string const& _source, bool _inspect, bool _disableExternalCalls)
 	{
 	}
 
-	state.dumpTraceAndState(cout, /*disableMemoryTracing=*/false);
+	state.dumpTraceAndState(std::cout, /*disableMemoryTracing=*/false);
 }
 
 }
@@ -119,7 +118,7 @@ Allowed options)",
 		("help", "Show this help screen.")
 		("enable-external-calls", "Enable external calls")
 		("interactive", "Run interactive")
-		("input-file", po::value<vector<string>>(), "input file");
+		("input-file", po::value<std::vector<std::string>>(), "input file");
 	po::positional_options_description filesPositions;
 	filesPositions.add("input-file", -1);
 
@@ -132,17 +131,17 @@ Allowed options)",
 	}
 	catch (po::error const& _exception)
 	{
-		cerr << _exception.what() << endl;
+		std::cerr << _exception.what() << std::endl;
 		return 1;
 	}
 
 	if (arguments.count("help"))
-		cout << options;
+		std::cout << options;
 	else
 	{
-		string input;
+		std::string input;
 		if (arguments.count("input-file"))
-			for (string path: arguments["input-file"].as<vector<string>>())
+			for (std::string path: arguments["input-file"].as<std::vector<std::string>>())
 			{
 				try
 				{
@@ -150,17 +149,17 @@ Allowed options)",
 				}
 				catch (FileNotFound const&)
 				{
-					cerr << "File not found: " << path << endl;
+					std::cerr << "File not found: " << path << std::endl;
 					return 1;
 				}
 				catch (NotAFile const&)
 				{
-					cerr << "Not a regular file: " << path << endl;
+					std::cerr << "Not a regular file: " << path << std::endl;
 					return 1;
 				}
 			}
 		else
-			input = readUntilEnd(cin);
+			input = readUntilEnd(std::cin);
 
 		interpret(input, arguments.count("interactive"), !arguments.count("enable-external-calls"));
 	}
diff --git a/tools/yulPhaser/AlgorithmRunner.cpp b/tools/yulPhaser/AlgorithmRunner.cpp
index d5ad75575c..827261dc08 100644
--- a/tools/yulPhaser/AlgorithmRunner.cpp
+++ b/tools/yulPhaser/AlgorithmRunner.cpp
@@ -26,7 +26,6 @@
 #include <cstring>
 #include <fstream>
 
-using namespace std;
 using namespace solidity::phaser;
 
 void AlgorithmRunner::run(GeneticAlgorithm& _algorithm)
@@ -65,12 +64,12 @@ void AlgorithmRunner::printRoundSummary(
 		if (m_options.showRoundInfo)
 		{
 			m_outputStream << "---------- ROUND " << _round + 1;
-			m_outputStream << " [round: " << fixed << setprecision(1) << roundTime << " s,";
-			m_outputStream << " total: " << fixed << setprecision(1) << totalTime << " s]";
-			m_outputStream << " ----------" << endl;
+			m_outputStream << " [round: " << std::fixed << std::setprecision(1) << roundTime << " s,";
+			m_outputStream << " total: " << std::fixed << std::setprecision(1) << totalTime << " s]";
+			m_outputStream << " ----------" << std::endl;
 		}
 		else if (m_population.individuals().size() > 0)
-			m_outputStream << endl;
+			m_outputStream << std::endl;
 
 		m_outputStream << m_population;
 	}
@@ -78,11 +77,11 @@ void AlgorithmRunner::printRoundSummary(
 	{
 		if (m_options.showRoundInfo)
 		{
-			m_outputStream << setw(5) << _round + 1 << " | ";
-			m_outputStream << setw(5) << fixed << setprecision(1) << totalTime << " | ";
+			m_outputStream << std::setw(5) << _round + 1 << " | ";
+			m_outputStream << std::setw(5) << std::fixed << std::setprecision(1) << totalTime << " | ";
 		}
 
-		m_outputStream << m_population.individuals()[0] << endl;
+		m_outputStream << m_population.individuals()[0] << std::endl;
 	}
 }
 
@@ -91,7 +90,7 @@ void AlgorithmRunner::printInitialPopulation() const
 	if (!m_options.showInitialPopulation)
 		return;
 
-	m_outputStream << "---------- INITIAL POPULATION ----------" << endl;
+	m_outputStream << "---------- INITIAL POPULATION ----------" << std::endl;
 	m_outputStream << m_population;
 }
 
@@ -108,23 +107,23 @@ void AlgorithmRunner::printCacheStats() const
 		else
 			++disabledCacheCount;
 
-	m_outputStream << "---------- CACHE STATS ----------" << endl;
+	m_outputStream << "---------- CACHE STATS ----------" << std::endl;
 
 	if (disabledCacheCount < m_programCaches.size())
 	{
 		for (auto& [round, count]: totalStats.roundEntryCounts)
-			m_outputStream << "Round " << round << ": " << count << " entries" << endl;
-		m_outputStream << "Total hits: " << totalStats.hits << endl;
-		m_outputStream << "Total misses: " << totalStats.misses << endl;
-		m_outputStream << "Size of cached code: " << totalStats.totalCodeSize << endl;
+			m_outputStream << "Round " << round << ": " << count << " entries" << std::endl;
+		m_outputStream << "Total hits: " << totalStats.hits << std::endl;
+		m_outputStream << "Total misses: " << totalStats.misses << std::endl;
+		m_outputStream << "Size of cached code: " << totalStats.totalCodeSize << std::endl;
 	}
 
 	if (disabledCacheCount == m_programCaches.size())
-		m_outputStream << "Program cache disabled" << endl;
+		m_outputStream << "Program cache disabled" << std::endl;
 	else if (disabledCacheCount > 0)
 	{
 		m_outputStream << "Program cache disabled for " << disabledCacheCount << " out of ";
-		m_outputStream << m_programCaches.size() << " programs" << endl;
+		m_outputStream << m_programCaches.size() << " programs" << std::endl;
 	}
 }
 
@@ -133,20 +132,20 @@ void AlgorithmRunner::populationAutosave() const
 	if (!m_options.populationAutosaveFile.has_value())
 		return;
 
-	ofstream outputStream(m_options.populationAutosaveFile.value(), ios::out | ios::trunc);
+	std::ofstream outputStream(m_options.populationAutosaveFile.value(), std::ios::out | std::ios::trunc);
 	assertThrow(
 		outputStream.is_open(),
 		FileOpenError,
-		"Could not open file '" + m_options.populationAutosaveFile.value() + "': " + strerror(errno)
+		"Could not open file '" + m_options.populationAutosaveFile.value() + "': " + std::strerror(errno)
 	);
 
 	for (auto& individual: m_population.individuals())
-		outputStream << individual.chromosome << endl;
+		outputStream << individual.chromosome << std::endl;
 
 	assertThrow(
 		!outputStream.bad(),
 		FileWriteError,
-		"Error while writing to file '" + m_options.populationAutosaveFile.value() + "': " + strerror(errno)
+		"Error while writing to file '" + m_options.populationAutosaveFile.value() + "': " + std::strerror(errno)
 	);
 }
 
@@ -188,7 +187,7 @@ Population AlgorithmRunner::randomiseDuplicates(
 	if (_population.individuals().size() == 0)
 		return _population;
 
-	vector<Individual> individuals{_population.individuals()[0]};
+	std::vector<Individual> individuals{_population.individuals()[0]};
 	size_t duplicateCount = 0;
 	for (size_t i = 1; i < _population.individuals().size(); ++i)
 		if (_population.individuals()[i].chromosome == _population.individuals()[i - 1].chromosome)
diff --git a/tools/yulPhaser/Chromosome.cpp b/tools/yulPhaser/Chromosome.cpp
index 6e8d3544e1..85a97a781c 100644
--- a/tools/yulPhaser/Chromosome.cpp
+++ b/tools/yulPhaser/Chromosome.cpp
@@ -25,7 +25,6 @@
 
 #include <sstream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::phaser;
@@ -33,36 +32,36 @@ using namespace solidity::phaser;
 namespace solidity::phaser
 {
 
-ostream& operator<<(ostream& _stream, Chromosome const& _chromosome);
+std::ostream& operator<<(std::ostream& _stream, Chromosome const& _chromosome);
 
 }
 
 Chromosome Chromosome::makeRandom(size_t _length)
 {
-	vector<string> steps;
+	std::vector<std::string> steps;
 	for (size_t i = 0; i < _length; ++i)
 		steps.push_back(randomOptimisationStep());
 
 	return Chromosome(std::move(steps));
 }
 
-ostream& phaser::operator<<(ostream& _stream, Chromosome const& _chromosome)
+std::ostream& phaser::operator<<(std::ostream& _stream, Chromosome const& _chromosome)
 {
 	return _stream << _chromosome.m_genes;
 }
 
-vector<string> Chromosome::allStepNames()
+std::vector<std::string> Chromosome::allStepNames()
 {
-	vector<string> stepNames;
+	std::vector<std::string> stepNames;
 	for (auto const& step: OptimiserSuite::allSteps())
 		stepNames.push_back(step.first);
 
 	return stepNames;
 }
 
-string const& Chromosome::randomOptimisationStep()
+std::string const& Chromosome::randomOptimisationStep()
 {
-	static vector<string> stepNames = allStepNames();
+	static std::vector<std::string> stepNames = allStepNames();
 
 	return stepNames[SimulationRNG::uniformInt(0, stepNames.size() - 1)];
 }
@@ -72,18 +71,18 @@ char Chromosome::randomGene()
 	return OptimiserSuite::stepNameToAbbreviationMap().at(randomOptimisationStep());
 }
 
-string Chromosome::stepsToGenes(vector<string> const& _optimisationSteps)
+std::string Chromosome::stepsToGenes(std::vector<std::string> const& _optimisationSteps)
 {
-	string genes;
-	for (string const& stepName: _optimisationSteps)
+	std::string genes;
+	for (std::string const& stepName: _optimisationSteps)
 		genes.push_back(OptimiserSuite::stepNameToAbbreviationMap().at(stepName));
 
 	return genes;
 }
 
-vector<string> Chromosome::genesToSteps(string const& _genes)
+std::vector<std::string> Chromosome::genesToSteps(std::string const& _genes)
 {
-	vector<string> steps;
+	std::vector<std::string> steps;
 	for (char abbreviation: _genes)
 		steps.push_back(OptimiserSuite::stepAbbreviationToNameMap().at(abbreviation));
 
diff --git a/tools/yulPhaser/Common.cpp b/tools/yulPhaser/Common.cpp
index a23210172d..ca5197b7d1 100644
--- a/tools/yulPhaser/Common.cpp
+++ b/tools/yulPhaser/Common.cpp
@@ -26,21 +26,20 @@
 #include <cstring>
 #include <fstream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::phaser;
 
-vector<string> phaser::readLinesFromFile(string const& _path)
+std::vector<std::string> phaser::readLinesFromFile(std::string const& _path)
 {
-	ifstream inputStream(_path);
-	assertThrow(inputStream.is_open(), FileOpenError, "Could not open file '" + _path + "': " + strerror(errno));
+	std::ifstream inputStream(_path);
+	assertThrow(inputStream.is_open(), FileOpenError, "Could not open file '" + _path + "': " + std::strerror(errno));
 
-	string line;
-	vector<string> lines;
-	while (!getline(inputStream, line).fail())
+	std::string line;
+	std::vector<std::string> lines;
+	while (!std::getline(inputStream, line).fail())
 		lines.push_back(line);
 
-	assertThrow(!inputStream.bad(), FileReadError, "Error while reading from file '" + _path + "': " + strerror(errno));
+	assertThrow(!inputStream.bad(), FileReadError, "Error while reading from file '" + _path + "': " + std::strerror(errno));
 
 	return lines;
 }
diff --git a/tools/yulPhaser/FitnessMetrics.cpp b/tools/yulPhaser/FitnessMetrics.cpp
index e0b719e255..43ad3aa641 100644
--- a/tools/yulPhaser/FitnessMetrics.cpp
+++ b/tools/yulPhaser/FitnessMetrics.cpp
@@ -22,7 +22,6 @@
 
 #include <cmath>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::yul;
 using namespace solidity::phaser;
@@ -62,7 +61,7 @@ size_t ProgramSize::evaluate(Chromosome const& _chromosome)
 
 size_t RelativeProgramSize::evaluate(Chromosome const& _chromosome)
 {
-	double const scalingFactor = pow(10, m_fixedPointPrecision);
+	double const scalingFactor = std::pow(10, m_fixedPointPrecision);
 
 	size_t unoptimisedSize = optimisedProgram(Chromosome("")).codeSize(codeWeights());
 	if (unoptimisedSize == 0)
@@ -70,7 +69,7 @@ size_t RelativeProgramSize::evaluate(Chromosome const& _chromosome)
 
 	size_t optimisedSize = optimisedProgram(_chromosome).codeSize(codeWeights());
 
-	return static_cast<size_t>(round(
+	return static_cast<size_t>(std::round(
 		double(optimisedSize) / double(unoptimisedSize) * scalingFactor
 	));
 }
@@ -103,7 +102,7 @@ size_t FitnessMetricMaximum::evaluate(Chromosome const& _chromosome)
 
 	size_t maximum = m_metrics[0]->evaluate(_chromosome);
 	for (size_t i = 1; i < m_metrics.size(); ++i)
-		maximum = max(maximum, m_metrics[i]->evaluate(_chromosome));
+		maximum = std::max(maximum, m_metrics[i]->evaluate(_chromosome));
 
 	return maximum;
 }
@@ -114,7 +113,7 @@ size_t FitnessMetricMinimum::evaluate(Chromosome const& _chromosome)
 
 	size_t minimum = m_metrics[0]->evaluate(_chromosome);
 	for (size_t i = 1; i < m_metrics.size(); ++i)
-		minimum = min(minimum, m_metrics[i]->evaluate(_chromosome));
+		minimum = std::min(minimum, m_metrics[i]->evaluate(_chromosome));
 
 	return minimum;
 }
diff --git a/tools/yulPhaser/GeneticAlgorithms.cpp b/tools/yulPhaser/GeneticAlgorithms.cpp
index ff40d222a7..9345fda4f9 100644
--- a/tools/yulPhaser/GeneticAlgorithms.cpp
+++ b/tools/yulPhaser/GeneticAlgorithms.cpp
@@ -21,13 +21,12 @@
 #include <tools/yulPhaser/Selections.h>
 #include <tools/yulPhaser/PairSelections.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::phaser;
 
-function<Crossover> phaser::buildCrossoverOperator(
+std::function<Crossover> phaser::buildCrossoverOperator(
 	CrossoverChoice _choice,
-	optional<double> _uniformCrossoverSwapChance
+	std::optional<double> _uniformCrossoverSwapChance
 )
 {
 	switch (_choice)
@@ -44,9 +43,9 @@ function<Crossover> phaser::buildCrossoverOperator(
 	};
 }
 
-function<SymmetricCrossover> phaser::buildSymmetricCrossoverOperator(
+std::function<SymmetricCrossover> phaser::buildSymmetricCrossoverOperator(
 	CrossoverChoice _choice,
-	optional<double> _uniformCrossoverSwapChance
+	std::optional<double> _uniformCrossoverSwapChance
 )
 {
 	switch (_choice)
@@ -146,14 +145,14 @@ Population ClassicGeneticAlgorithm::select(Population _population, size_t _selec
 
 	size_t maxFitness = 0;
 	for (auto const& individual: _population.individuals())
-		maxFitness = max(maxFitness, individual.fitness);
+		maxFitness = std::max(maxFitness, individual.fitness);
 
 	size_t rouletteRange = 0;
 	for (auto const& individual: _population.individuals())
 		// Add 1 to make sure that every chromosome has non-zero probability of being chosen
 		rouletteRange += maxFitness + 1 - individual.fitness;
 
-	vector<Individual> selectedIndividuals;
+	std::vector<Individual> selectedIndividuals;
 	for (size_t i = 0; i < _selectionSize; ++i)
 	{
 		size_t ball = SimulationRNG::uniformInt(0, rouletteRange - 1);
diff --git a/tools/yulPhaser/Mutations.cpp b/tools/yulPhaser/Mutations.cpp
index 873fbbb9ba..ac55ae9d4e 100644
--- a/tools/yulPhaser/Mutations.cpp
+++ b/tools/yulPhaser/Mutations.cpp
@@ -28,15 +28,14 @@
 #include <string>
 #include <vector>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::phaser;
 
-function<Mutation> phaser::geneRandomisation(double _chance)
+std::function<Mutation> phaser::geneRandomisation(double _chance)
 {
 	return [=](Chromosome const& _chromosome)
 	{
-		string genes;
+		std::string genes;
 		for (char gene: _chromosome.genes())
 			genes.push_back(
 				SimulationRNG::bernoulliTrial(_chance) ?
@@ -48,11 +47,11 @@ function<Mutation> phaser::geneRandomisation(double _chance)
 	};
 }
 
-function<Mutation> phaser::geneDeletion(double _chance)
+std::function<Mutation> phaser::geneDeletion(double _chance)
 {
 	return [=](Chromosome const& _chromosome)
 	{
-		string genes;
+		std::string genes;
 		for (char gene: _chromosome.genes())
 			if (!SimulationRNG::bernoulliTrial(_chance))
 				genes.push_back(gene);
@@ -61,11 +60,11 @@ function<Mutation> phaser::geneDeletion(double _chance)
 	};
 }
 
-function<Mutation> phaser::geneAddition(double _chance)
+std::function<Mutation> phaser::geneAddition(double _chance)
 {
 	return [=](Chromosome const& _chromosome)
 	{
-		string genes;
+		std::string genes;
 
 		if (SimulationRNG::bernoulliTrial(_chance))
 			genes.push_back(Chromosome::randomGene());
@@ -81,10 +80,10 @@ function<Mutation> phaser::geneAddition(double _chance)
 	};
 }
 
-function<Mutation> phaser::alternativeMutations(
+std::function<Mutation> phaser::alternativeMutations(
 	double _firstMutationChance,
-	function<Mutation> _mutation1,
-	function<Mutation> _mutation2
+	std::function<Mutation> _mutation1,
+	std::function<Mutation> _mutation2
 )
 {
 	return [=](Chromosome const& _chromosome)
@@ -96,7 +95,7 @@ function<Mutation> phaser::alternativeMutations(
 	};
 }
 
-function<Mutation> phaser::mutationSequence(vector<function<Mutation>> _mutations)
+std::function<Mutation> phaser::mutationSequence(std::vector<std::function<Mutation>> _mutations)
 {
 	return [=](Chromosome const& _chromosome)
 	{
@@ -134,26 +133,26 @@ ChromosomePair fixedPointSwap(
 
 }
 
-function<Crossover> phaser::randomPointCrossover()
+std::function<Crossover> phaser::randomPointCrossover()
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
+		size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
 
 		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
 		size_t minPoint = (minLength > 0 ? 1 : 0);
 		assert(minPoint <= minLength);
 
 		size_t randomPoint = SimulationRNG::uniformInt(minPoint, minLength);
-		return get<0>(fixedPointSwap(_chromosome1, _chromosome2, randomPoint));
+		return std::get<0>(fixedPointSwap(_chromosome1, _chromosome2, randomPoint));
 	};
 }
 
-function<SymmetricCrossover> phaser::symmetricRandomPointCrossover()
+std::function<SymmetricCrossover> phaser::symmetricRandomPointCrossover()
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
+		size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
 
 		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
 		size_t minPoint = (minLength > 0 ? 1 : 0);
@@ -164,16 +163,16 @@ function<SymmetricCrossover> phaser::symmetricRandomPointCrossover()
 	};
 }
 
-function<Crossover> phaser::fixedPointCrossover(double _crossoverPoint)
+std::function<Crossover> phaser::fixedPointCrossover(double _crossoverPoint)
 {
 	assert(0.0 <= _crossoverPoint && _crossoverPoint <= 1.0);
 
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
-		size_t concretePoint = static_cast<size_t>(round(double(minLength) * _crossoverPoint));
+		size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
+		size_t concretePoint = static_cast<size_t>(std::round(double(minLength) * _crossoverPoint));
 
-		return get<0>(fixedPointSwap(_chromosome1, _chromosome2, concretePoint));
+		return std::get<0>(fixedPointSwap(_chromosome1, _chromosome2, concretePoint));
 	};
 }
 
@@ -192,8 +191,8 @@ ChromosomePair fixedTwoPointSwap(
 	assert(_crossoverPoint2 <= _chromosome1.length());
 	assert(_crossoverPoint2 <= _chromosome2.length());
 
-	size_t lowPoint = min(_crossoverPoint1, _crossoverPoint2);
-	size_t highPoint = max(_crossoverPoint1, _crossoverPoint2);
+	size_t lowPoint = std::min(_crossoverPoint1, _crossoverPoint2);
+	size_t highPoint = std::max(_crossoverPoint1, _crossoverPoint2);
 
 	return {
 		Chromosome(
@@ -211,11 +210,11 @@ ChromosomePair fixedTwoPointSwap(
 
 }
 
-function<Crossover> phaser::randomTwoPointCrossover()
+std::function<Crossover> phaser::randomTwoPointCrossover()
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
+		size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
 
 		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
 		size_t minPoint = (minLength > 0 ? 1 : 0);
@@ -223,15 +222,15 @@ function<Crossover> phaser::randomTwoPointCrossover()
 
 		size_t randomPoint1 = SimulationRNG::uniformInt(minPoint, minLength);
 		size_t randomPoint2 = SimulationRNG::uniformInt(randomPoint1, minLength);
-		return get<0>(fixedTwoPointSwap(_chromosome1, _chromosome2, randomPoint1, randomPoint2));
+		return std::get<0>(fixedTwoPointSwap(_chromosome1, _chromosome2, randomPoint1, randomPoint2));
 	};
 }
 
-function<SymmetricCrossover> phaser::symmetricRandomTwoPointCrossover()
+std::function<SymmetricCrossover> phaser::symmetricRandomTwoPointCrossover()
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		size_t minLength = min(_chromosome1.length(), _chromosome2.length());
+		size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
 
 		// Don't use position 0 (because this just swaps the values) unless it's the only choice.
 		size_t minPoint = (minLength > 0 ? 1 : 0);
@@ -248,10 +247,10 @@ namespace
 
 ChromosomePair uniformSwap(Chromosome const& _chromosome1, Chromosome const& _chromosome2, double _swapChance)
 {
-	string steps1;
-	string steps2;
+	std::string steps1;
+	std::string steps2;
 
-	size_t minLength = min(_chromosome1.length(), _chromosome2.length());
+	size_t minLength = std::min(_chromosome1.length(), _chromosome2.length());
 	for (size_t i = 0; i < minLength; ++i)
 		if (SimulationRNG::bernoulliTrial(_swapChance))
 		{
@@ -286,15 +285,15 @@ ChromosomePair uniformSwap(Chromosome const& _chromosome1, Chromosome const& _ch
 
 }
 
-function<Crossover> phaser::uniformCrossover(double _swapChance)
+std::function<Crossover> phaser::uniformCrossover(double _swapChance)
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
-		return get<0>(uniformSwap(_chromosome1, _chromosome2, _swapChance));
+		return std::get<0>(uniformSwap(_chromosome1, _chromosome2, _swapChance));
 	};
 }
 
-function<SymmetricCrossover> phaser::symmetricUniformCrossover(double _swapChance)
+std::function<SymmetricCrossover> phaser::symmetricUniformCrossover(double _swapChance)
 {
 	return [=](Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
diff --git a/tools/yulPhaser/PairSelections.cpp b/tools/yulPhaser/PairSelections.cpp
index 4c9d4ee5f9..deff948630 100644
--- a/tools/yulPhaser/PairSelections.cpp
+++ b/tools/yulPhaser/PairSelections.cpp
@@ -23,17 +23,16 @@
 
 #include <cmath>
 
-using namespace std;
 using namespace solidity::phaser;
 
-vector<tuple<size_t, size_t>> RandomPairSelection::materialise(size_t _poolSize) const
+std::vector<std::tuple<size_t, size_t>> RandomPairSelection::materialise(size_t _poolSize) const
 {
 	if (_poolSize < 2)
 		return {};
 
-	auto count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
+	auto count = static_cast<size_t>(std::round(double(_poolSize) * m_selectionSize));
 
-	vector<tuple<size_t, size_t>> selection;
+	std::vector<std::tuple<size_t, size_t>> selection;
 	for (size_t i = 0; i < count; ++i)
 	{
 		size_t index1 = SimulationRNG::uniformInt(0, _poolSize - 1);
@@ -49,9 +48,9 @@ vector<tuple<size_t, size_t>> RandomPairSelection::materialise(size_t _poolSize)
 	return selection;
 }
 
-vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSize) const
+std::vector<std::tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSize) const
 {
-	vector<size_t> selectedIndices = RandomSubset(m_selectionChance).materialise(_poolSize);
+	std::vector<size_t> selectedIndices = RandomSubset(m_selectionChance).materialise(_poolSize);
 
 	if (selectedIndices.size() % 2 != 0)
 	{
@@ -72,7 +71,7 @@ vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSiz
 	}
 	assert(selectedIndices.size() % 2 == 0);
 
-	vector<tuple<size_t, size_t>> selectedPairs;
+	std::vector<std::tuple<size_t, size_t>> selectedPairs;
 	for (size_t i = selectedIndices.size() / 2; i > 0; --i)
 	{
 		size_t position1 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
@@ -89,18 +88,18 @@ vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSiz
 	return selectedPairs;
 }
 
-vector<tuple<size_t, size_t>> PairMosaicSelection::materialise(size_t _poolSize) const
+std::vector<std::tuple<size_t, size_t>> PairMosaicSelection::materialise(size_t _poolSize) const
 {
 	if (_poolSize < 2)
 		return {};
 
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
+	size_t count = static_cast<size_t>(std::round(double(_poolSize) * m_selectionSize));
 
-	vector<tuple<size_t, size_t>> selection;
+	std::vector<std::tuple<size_t, size_t>> selection;
 	for (size_t i = 0; i < count; ++i)
 	{
-		tuple<size_t, size_t> pair = m_pattern[i % m_pattern.size()];
-		selection.emplace_back(min(get<0>(pair), _poolSize - 1), min(get<1>(pair), _poolSize - 1));
+		std::tuple<size_t, size_t> pair = m_pattern[i % m_pattern.size()];
+		selection.emplace_back(std::min(std::get<0>(pair), _poolSize - 1), std::min(std::get<1>(pair), _poolSize - 1));
 	}
 
 	return selection;
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index db5ec35ced..6bddf39fc0 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -37,7 +37,6 @@
 
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -49,58 +48,58 @@ namespace po = boost::program_options;
 namespace
 {
 
-map<PhaserMode, string> const PhaserModeToStringMap =
+std::map<PhaserMode, std::string> const PhaserModeToStringMap =
 {
 	{PhaserMode::RunAlgorithm, "run-algorithm"},
 	{PhaserMode::PrintOptimisedPrograms, "print-optimised-programs"},
 	{PhaserMode::PrintOptimisedASTs, "print-optimised-asts"},
 };
-map<string, PhaserMode> const StringToPhaserModeMap = invertMap(PhaserModeToStringMap);
+std::map<std::string, PhaserMode> const StringToPhaserModeMap = invertMap(PhaserModeToStringMap);
 
-map<Algorithm, string> const AlgorithmToStringMap =
+std::map<Algorithm, std::string> const AlgorithmToStringMap =
 {
 	{Algorithm::Random, "random"},
 	{Algorithm::GEWEP, "GEWEP"},
 	{Algorithm::Classic, "classic"},
 };
-map<string, Algorithm> const StringToAlgorithmMap = invertMap(AlgorithmToStringMap);
+std::map<std::string, Algorithm> const StringToAlgorithmMap = invertMap(AlgorithmToStringMap);
 
-map<MetricChoice, string> MetricChoiceToStringMap =
+std::map<MetricChoice, std::string> MetricChoiceToStringMap =
 {
 	{MetricChoice::CodeSize, "code-size"},
 	{MetricChoice::RelativeCodeSize, "relative-code-size"},
 };
-map<string, MetricChoice> const StringToMetricChoiceMap = invertMap(MetricChoiceToStringMap);
+std::map<std::string, MetricChoice> const StringToMetricChoiceMap = invertMap(MetricChoiceToStringMap);
 
-map<MetricAggregatorChoice, string> const MetricAggregatorChoiceToStringMap =
+std::map<MetricAggregatorChoice, std::string> const MetricAggregatorChoiceToStringMap =
 {
 	{MetricAggregatorChoice::Average, "average"},
 	{MetricAggregatorChoice::Sum, "sum"},
 	{MetricAggregatorChoice::Maximum, "maximum"},
 	{MetricAggregatorChoice::Minimum, "minimum"},
 };
-map<string, MetricAggregatorChoice> const StringToMetricAggregatorChoiceMap = invertMap(MetricAggregatorChoiceToStringMap);
+std::map<std::string, MetricAggregatorChoice> const StringToMetricAggregatorChoiceMap = invertMap(MetricAggregatorChoiceToStringMap);
 
-map<CrossoverChoice, string> const CrossoverChoiceToStringMap =
+std::map<CrossoverChoice, std::string> const CrossoverChoiceToStringMap =
 {
 	{CrossoverChoice::SinglePoint, "single-point"},
 	{CrossoverChoice::TwoPoint, "two-point"},
 	{CrossoverChoice::Uniform, "uniform"},
 };
-map<string, CrossoverChoice> const StringToCrossoverChoiceMap = invertMap(CrossoverChoiceToStringMap);
+std::map<std::string, CrossoverChoice> const StringToCrossoverChoiceMap = invertMap(CrossoverChoiceToStringMap);
 
 }
 
-istream& phaser::operator>>(istream& _inputStream, PhaserMode& _phaserMode) { return deserializeChoice(_inputStream, _phaserMode, StringToPhaserModeMap); }
-ostream& phaser::operator<<(ostream& _outputStream, PhaserMode _phaserMode) { return serializeChoice(_outputStream, _phaserMode, PhaserModeToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, Algorithm& _algorithm) { return deserializeChoice(_inputStream, _algorithm, StringToAlgorithmMap); }
-ostream& phaser::operator<<(ostream& _outputStream, Algorithm _algorithm) { return serializeChoice(_outputStream, _algorithm, AlgorithmToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, MetricChoice& _metric) { return deserializeChoice(_inputStream, _metric, StringToMetricChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, MetricChoice _metric) { return serializeChoice(_outputStream, _metric, MetricChoiceToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, MetricAggregatorChoice& _aggregator) { return deserializeChoice(_inputStream, _aggregator, StringToMetricAggregatorChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, MetricAggregatorChoice _aggregator) { return serializeChoice(_outputStream, _aggregator, MetricAggregatorChoiceToStringMap); }
-istream& phaser::operator>>(istream& _inputStream, CrossoverChoice& _crossover) { return deserializeChoice(_inputStream, _crossover, StringToCrossoverChoiceMap); }
-ostream& phaser::operator<<(ostream& _outputStream, CrossoverChoice _crossover) { return serializeChoice(_outputStream, _crossover, CrossoverChoiceToStringMap); }
+std::istream& phaser::operator>>(std::istream& _inputStream, PhaserMode& _phaserMode) { return deserializeChoice(_inputStream, _phaserMode, StringToPhaserModeMap); }
+std::ostream& phaser::operator<<(std::ostream& _outputStream, PhaserMode _phaserMode) { return serializeChoice(_outputStream, _phaserMode, PhaserModeToStringMap); }
+std::istream& phaser::operator>>(std::istream& _inputStream, Algorithm& _algorithm) { return deserializeChoice(_inputStream, _algorithm, StringToAlgorithmMap); }
+std::ostream& phaser::operator<<(std::ostream& _outputStream, Algorithm _algorithm) { return serializeChoice(_outputStream, _algorithm, AlgorithmToStringMap); }
+std::istream& phaser::operator>>(std::istream& _inputStream, MetricChoice& _metric) { return deserializeChoice(_inputStream, _metric, StringToMetricChoiceMap); }
+std::ostream& phaser::operator<<(std::ostream& _outputStream, MetricChoice _metric) { return serializeChoice(_outputStream, _metric, MetricChoiceToStringMap); }
+std::istream& phaser::operator>>(std::istream& _inputStream, MetricAggregatorChoice& _aggregator) { return deserializeChoice(_inputStream, _aggregator, StringToMetricAggregatorChoiceMap); }
+std::ostream& phaser::operator<<(std::ostream& _outputStream, MetricAggregatorChoice _aggregator) { return serializeChoice(_outputStream, _aggregator, MetricAggregatorChoiceToStringMap); }
+std::istream& phaser::operator>>(std::istream& _inputStream, CrossoverChoice& _crossover) { return deserializeChoice(_inputStream, _crossover, StringToCrossoverChoiceMap); }
+std::ostream& phaser::operator<<(std::ostream& _outputStream, CrossoverChoice _crossover) { return serializeChoice(_outputStream, _crossover, CrossoverChoiceToStringMap); }
 
 GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLine(po::variables_map const& _arguments)
 {
@@ -112,17 +111,17 @@ GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLi
 		_arguments["uniform-crossover-swap-chance"].as<double>(),
 		_arguments.count("random-elite-pool-size") > 0 ?
 			_arguments["random-elite-pool-size"].as<double>() :
-			optional<double>{},
+			std::optional<double>{},
 		_arguments["gewep-mutation-pool-size"].as<double>(),
 		_arguments["gewep-crossover-pool-size"].as<double>(),
 		_arguments["gewep-randomisation-chance"].as<double>(),
 		_arguments["gewep-deletion-vs-addition-chance"].as<double>(),
 		_arguments.count("gewep-genes-to-randomise") > 0 ?
 			_arguments["gewep-genes-to-randomise"].as<double>() :
-			optional<double>{},
+			std::optional<double>{},
 		_arguments.count("gewep-genes-to-add-or-delete") > 0 ?
 			_arguments["gewep-genes-to-add-or-delete"].as<double>() :
-			optional<double>{},
+			std::optional<double>{},
 		_arguments["classic-elite-pool-size"].as<double>(),
 		_arguments["classic-crossover-chance"].as<double>(),
 		_arguments["classic-mutation-chance"].as<double>(),
@@ -131,7 +130,7 @@ GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLi
 	};
 }
 
-unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
+std::unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
 	Options const& _options,
 	size_t _populationSize
 )
@@ -147,7 +146,7 @@ unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
 			if (_options.randomElitePoolSize.has_value())
 				elitePoolSize = _options.randomElitePoolSize.value();
 
-			return make_unique<RandomAlgorithm>(RandomAlgorithm::Options{
+			return std::make_unique<RandomAlgorithm>(RandomAlgorithm::Options{
 				/* elitePoolSize = */ elitePoolSize,
 				/* minChromosomeLength = */ _options.minChromosomeLength,
 				/* maxChromosomeLength = */ _options.maxChromosomeLength,
@@ -163,7 +162,7 @@ unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
 			if (_options.gewepGenesToAddOrDelete.has_value())
 				percentGenesToAddOrDelete = _options.gewepGenesToAddOrDelete.value();
 
-			return make_unique<GenerationalElitistWithExclusivePools>(GenerationalElitistWithExclusivePools::Options{
+			return std::make_unique<GenerationalElitistWithExclusivePools>(GenerationalElitistWithExclusivePools::Options{
 				/* mutationPoolSize = */ _options.gewepMutationPoolSize,
 				/* crossoverPoolSize = */ _options.gewepCrossoverPoolSize,
 				/* randomisationChance = */ _options.gewepRandomisationChance,
@@ -176,7 +175,7 @@ unique_ptr<GeneticAlgorithm> GeneticAlgorithmFactory::build(
 		}
 		case Algorithm::Classic:
 		{
-			return make_unique<ClassicGeneticAlgorithm>(ClassicGeneticAlgorithm::Options{
+			return std::make_unique<ClassicGeneticAlgorithm>(ClassicGeneticAlgorithm::Options{
 				/* elitePoolSize = */ _options.classicElitePoolSize,
 				/* crossoverChance = */ _options.classicCrossoverChance,
 				/* mutationChance = */ _options.classicMutationChance,
@@ -222,24 +221,24 @@ FitnessMetricFactory::Options FitnessMetricFactory::Options::fromCommandLine(po:
 	};
 }
 
-unique_ptr<FitnessMetric> FitnessMetricFactory::build(
+std::unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 	Options const& _options,
-	vector<Program> _programs,
-	vector<shared_ptr<ProgramCache>> _programCaches,
+	std::vector<Program> _programs,
+	std::vector<std::shared_ptr<ProgramCache>> _programCaches,
 	CodeWeights const& _weights
 )
 {
 	assert(_programCaches.size() == _programs.size());
 	assert(_programs.size() > 0 && "Validations should prevent this from being executed with zero files.");
 
-	vector<shared_ptr<FitnessMetric>> metrics;
+	std::vector<std::shared_ptr<FitnessMetric>> metrics;
 	switch (_options.metric)
 	{
 		case MetricChoice::CodeSize:
 		{
 			for (size_t i = 0; i < _programs.size(); ++i)
-				metrics.push_back(make_unique<ProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
+				metrics.push_back(std::make_unique<ProgramSize>(
+					_programCaches[i] != nullptr ? std::optional<Program>{} : std::move(_programs[i]),
 					std::move(_programCaches[i]),
 					_weights,
 					_options.chromosomeRepetitions
@@ -250,8 +249,8 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 		case MetricChoice::RelativeCodeSize:
 		{
 			for (size_t i = 0; i < _programs.size(); ++i)
-				metrics.push_back(make_unique<RelativeProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
+				metrics.push_back(std::make_unique<RelativeProgramSize>(
+					_programCaches[i] != nullptr ? std::optional<Program>{} : std::move(_programs[i]),
 					std::move(_programCaches[i]),
 					_options.relativeMetricScale,
 					_weights,
@@ -266,13 +265,13 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 	switch (_options.metricAggregator)
 	{
 		case MetricAggregatorChoice::Average:
-			return make_unique<FitnessMetricAverage>(std::move(metrics));
+			return std::make_unique<FitnessMetricAverage>(std::move(metrics));
 		case MetricAggregatorChoice::Sum:
-			return make_unique<FitnessMetricSum>(std::move(metrics));
+			return std::make_unique<FitnessMetricSum>(std::move(metrics));
 		case MetricAggregatorChoice::Maximum:
-			return make_unique<FitnessMetricMaximum>(std::move(metrics));
+			return std::make_unique<FitnessMetricMaximum>(std::move(metrics));
 		case MetricAggregatorChoice::Minimum:
-			return make_unique<FitnessMetricMinimum>(std::move(metrics));
+			return std::make_unique<FitnessMetricMinimum>(std::move(metrics));
 		default:
 			assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
 	}
@@ -287,20 +286,20 @@ PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::varia
 		_arguments["min-chromosome-length"].as<size_t>(),
 		_arguments["max-chromosome-length"].as<size_t>(),
 		_arguments.count("population") > 0 ?
-			_arguments["population"].as<vector<string>>() :
-			vector<string>{},
+			_arguments["population"].as<std::vector<std::string>>() :
+			std::vector<std::string>{},
 		_arguments.count("random-population") > 0 ?
-			_arguments["random-population"].as<vector<size_t>>() :
-			vector<size_t>{},
+			_arguments["random-population"].as<std::vector<size_t>>() :
+			std::vector<size_t>{},
 		_arguments.count("population-from-file") > 0 ?
-			_arguments["population-from-file"].as<vector<string>>() :
-			vector<string>{},
+			_arguments["population-from-file"].as<std::vector<std::string>>() :
+			std::vector<std::string>{},
 	};
 }
 
 Population PopulationFactory::build(
 	Options const& _options,
-	shared_ptr<FitnessMetric> _fitnessMetric
+	std::shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
 	Population population = buildFromStrings(_options.population, _fitnessMetric);
@@ -316,19 +315,19 @@ Population PopulationFactory::build(
 		_fitnessMetric
 	);
 
-	for (string const& populationFilePath: _options.populationFromFile)
+	for (std::string const& populationFilePath: _options.populationFromFile)
 		population = std::move(population) + buildFromFile(populationFilePath, _fitnessMetric);
 
 	return population;
 }
 
 Population PopulationFactory::buildFromStrings(
-	vector<string> const& _geneSequences,
-	shared_ptr<FitnessMetric> _fitnessMetric
+	std::vector<std::string> const& _geneSequences,
+	std::shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
-	vector<Chromosome> chromosomes;
-	for (string const& geneSequence: _geneSequences)
+	std::vector<Chromosome> chromosomes;
+	for (std::string const& geneSequence: _geneSequences)
 		chromosomes.emplace_back(geneSequence);
 
 	return Population(std::move(_fitnessMetric), std::move(chromosomes));
@@ -338,7 +337,7 @@ Population PopulationFactory::buildRandom(
 	size_t _populationSize,
 	size_t _minChromosomeLength,
 	size_t _maxChromosomeLength,
-	shared_ptr<FitnessMetric> _fitnessMetric
+	std::shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
 	return Population::makeRandom(
@@ -350,8 +349,8 @@ Population PopulationFactory::buildRandom(
 }
 
 Population PopulationFactory::buildFromFile(
-	string const& _filePath,
-	shared_ptr<FitnessMetric> _fitnessMetric
+	std::string const& _filePath,
+	std::shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
 	return buildFromStrings(readLinesFromFile(_filePath), std::move(_fitnessMetric));
@@ -364,14 +363,14 @@ ProgramCacheFactory::Options ProgramCacheFactory::Options::fromCommandLine(po::v
 	};
 }
 
-vector<shared_ptr<ProgramCache>> ProgramCacheFactory::build(
+std::vector<std::shared_ptr<ProgramCache>> ProgramCacheFactory::build(
 	Options const& _options,
-	vector<Program> _programs
+	std::vector<Program> _programs
 )
 {
-	vector<shared_ptr<ProgramCache>> programCaches;
+	std::vector<std::shared_ptr<ProgramCache>> programCaches;
 	for (Program& program: _programs)
-		programCaches.push_back(_options.programCacheEnabled ? make_shared<ProgramCache>(std::move(program)) : nullptr);
+		programCaches.push_back(_options.programCacheEnabled ? std::make_shared<ProgramCache>(std::move(program)) : nullptr);
 
 	return programCaches;
 }
@@ -379,28 +378,28 @@ vector<shared_ptr<ProgramCache>> ProgramCacheFactory::build(
 ProgramFactory::Options ProgramFactory::Options::fromCommandLine(po::variables_map const& _arguments)
 {
 	return {
-		_arguments["input-files"].as<vector<string>>(),
-		_arguments["prefix"].as<string>(),
+		_arguments["input-files"].as<std::vector<std::string>>(),
+		_arguments["prefix"].as<std::string>(),
 	};
 }
 
-vector<Program> ProgramFactory::build(Options const& _options)
+std::vector<Program> ProgramFactory::build(Options const& _options)
 {
-	vector<Program> inputPrograms;
+	std::vector<Program> inputPrograms;
 	for (auto& path: _options.inputFiles)
 	{
 		CharStream sourceCode = loadSource(path);
-		variant<Program, ErrorList> programOrErrors = Program::load(sourceCode);
-		if (holds_alternative<ErrorList>(programOrErrors))
+		std::variant<Program, ErrorList> programOrErrors = Program::load(sourceCode);
+		if (std::holds_alternative<ErrorList>(programOrErrors))
 		{
-			SourceReferenceFormatter{cerr, SingletonCharStreamProvider(sourceCode), true, false}
-				.printErrorInformation(get<ErrorList>(programOrErrors));
-			cerr << endl;
+			SourceReferenceFormatter{std::cerr, SingletonCharStreamProvider(sourceCode), true, false}
+				.printErrorInformation(std::get<ErrorList>(programOrErrors));
+			std::cerr << std::endl;
 			assertThrow(false, InvalidProgram, "Failed to load program " + path);
 		}
 
-		get<Program>(programOrErrors).optimise(Chromosome(_options.prefix).optimisationSteps());
-		inputPrograms.push_back(std::move(get<Program>(programOrErrors)));
+		std::get<Program>(programOrErrors).optimise(Chromosome(_options.prefix).optimisationSteps());
+		inputPrograms.push_back(std::move(std::get<Program>(programOrErrors)));
 	}
 
 	return inputPrograms;
@@ -410,13 +409,13 @@ CharStream ProgramFactory::loadSource(boost::filesystem::path const& _sourcePath
 {
 	assertThrow(boost::filesystem::exists(_sourcePath), MissingFile, "Source file does not exist: " + _sourcePath.string());
 
-	string sourceCode = readFileAsString(_sourcePath);
+	std::string sourceCode = readFileAsString(_sourcePath);
 	return CharStream(sourceCode, _sourcePath.string());
 }
 
 void Phaser::main(int _argc, char** _argv)
 {
-	optional<po::variables_map> arguments = parseCommandLine(_argc, _argv);
+	std::optional<po::variables_map> arguments = parseCommandLine(_argc, _argv);
 	if (!arguments.has_value())
 		return;
 
@@ -447,10 +446,10 @@ Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
 	po::options_description generalDescription("GENERAL", lineLength, minDescriptionLength);
 	generalDescription.add_options()
 		("help", "Show help message and exit.")
-		("input-files", po::value<vector<string>>()->required()->value_name("<PATH>"), "Input files.")
+		("input-files", po::value<std::vector<std::string>>()->required()->value_name("<PATH>"), "Input files.")
 		(
 			"prefix",
-			po::value<string>()->value_name("<CHROMOSOME>")->default_value(""),
+			po::value<std::string>()->value_name("<CHROMOSOME>")->default_value(""),
 			"Initial optimisation steps automatically applied to every input program.\n"
 			"The result is treated as if it was the actual input, i.e. the steps are not considered "
 			"a part of the chromosomes and cannot be mutated. The values of relative metric values "
@@ -615,24 +614,24 @@ Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
 	populationDescription.add_options()
 		(
 			"population",
-			po::value<vector<string>>()->multitoken()->value_name("<CHROMOSOMES>"),
+			po::value<std::vector<std::string>>()->multitoken()->value_name("<CHROMOSOMES>"),
 			"List of chromosomes to be included in the initial population. "
 			"You can specify multiple values separated with spaces or invoke the option multiple times "
 			"and all the values will be included."
 		)
 		(
 			"random-population",
-			po::value<vector<size_t>>()->value_name("<SIZE>"),
+			po::value<std::vector<size_t>>()->value_name("<SIZE>"),
 			"The number of randomly generated chromosomes to be included in the initial population."
 		)
 		(
 			"population-from-file",
-			po::value<vector<string>>()->value_name("<FILE>"),
+			po::value<std::vector<std::string>>()->value_name("<FILE>"),
 			"A text file with a list of chromosomes (one per line) to be included in the initial population."
 		)
 		(
 			"population-autosave",
-			po::value<string>()->value_name("<FILE>"),
+			po::value<std::string>()->value_name("<FILE>"),
 			"If specified, the population is saved in the specified file after each round. (default=autosave disabled)"
 		)
 	;
@@ -756,7 +755,7 @@ Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
 	return {keywordDescription, positionalDescription};
 }
 
-optional<po::variables_map> Phaser::parseCommandLine(int _argc, char** _argv)
+std::optional<po::variables_map> Phaser::parseCommandLine(int _argc, char** _argv)
 {
 	auto [keywordDescription, positionalDescription] = buildCommandLineDescription();
 
@@ -769,8 +768,8 @@ optional<po::variables_map> Phaser::parseCommandLine(int _argc, char** _argv)
 
 	if (arguments.count("help") > 0)
 	{
-		cout << keywordDescription << endl;
-		return nullopt;
+		std::cout << keywordDescription << std::endl;
+		return std::nullopt;
 	}
 
 	if (arguments.count("input-files") == 0)
@@ -789,14 +788,14 @@ void Phaser::initialiseRNG(po::variables_map const& _arguments)
 
 	SimulationRNG::reset(seed);
 	if (_arguments["show-seed"].as<bool>())
-		cout << "Random seed: " << seed << endl;
+		std::cout << "Random seed: " << seed << std::endl;
 }
 
 AlgorithmRunner::Options Phaser::buildAlgorithmRunnerOptions(po::variables_map const& _arguments)
 {
 	return {
-		_arguments.count("rounds") > 0 ? static_cast<optional<size_t>>(_arguments["rounds"].as<size_t>()) : nullopt,
-		_arguments.count("population-autosave") > 0 ? static_cast<optional<string>>(_arguments["population-autosave"].as<string>()) : nullopt,
+		_arguments.count("rounds") > 0 ? static_cast<std::optional<size_t>>(_arguments["rounds"].as<size_t>()) : std::nullopt,
+		_arguments.count("population-autosave") > 0 ? static_cast<std::optional<std::string>>(_arguments["population-autosave"].as<std::string>()) : std::nullopt,
 		!_arguments["no-randomise-duplicates"].as<bool>(),
 		_arguments["min-chromosome-length"].as<size_t>(),
 		_arguments["max-chromosome-length"].as<size_t>(),
@@ -814,10 +813,10 @@ void Phaser::runPhaser(po::variables_map const& _arguments)
 	auto metricOptions = FitnessMetricFactory::Options::fromCommandLine(_arguments);
 	auto populationOptions = PopulationFactory::Options::fromCommandLine(_arguments);
 
-	vector<Program> programs = ProgramFactory::build(programOptions);
-	vector<shared_ptr<ProgramCache>> programCaches = ProgramCacheFactory::build(cacheOptions, programs);
+	std::vector<Program> programs = ProgramFactory::build(programOptions);
+	std::vector<std::shared_ptr<ProgramCache>> programCaches = ProgramCacheFactory::build(cacheOptions, programs);
 	CodeWeights codeWeights = CodeWeightFactory::buildFromCommandLine(_arguments);
-	unique_ptr<FitnessMetric> fitnessMetric = FitnessMetricFactory::build(
+	std::unique_ptr<FitnessMetric> fitnessMetric = FitnessMetricFactory::build(
 		metricOptions,
 		programs,
 		programCaches,
@@ -834,51 +833,51 @@ void Phaser::runPhaser(po::variables_map const& _arguments)
 void Phaser::runAlgorithm(
 	po::variables_map const& _arguments,
 	Population _population,
-	vector<shared_ptr<ProgramCache>> _programCaches
+	std::vector<std::shared_ptr<ProgramCache>> _programCaches
 )
 {
 	auto algorithmOptions = GeneticAlgorithmFactory::Options::fromCommandLine(_arguments);
 
-	unique_ptr<GeneticAlgorithm> geneticAlgorithm = GeneticAlgorithmFactory::build(
+	std::unique_ptr<GeneticAlgorithm> geneticAlgorithm = GeneticAlgorithmFactory::build(
 		algorithmOptions,
 		_population.individuals().size()
 	);
 
-	AlgorithmRunner algorithmRunner(std::move(_population), std::move(_programCaches), buildAlgorithmRunnerOptions(_arguments), cout);
+	AlgorithmRunner algorithmRunner(std::move(_population), std::move(_programCaches), buildAlgorithmRunnerOptions(_arguments), std::cout);
 	algorithmRunner.run(*geneticAlgorithm);
 }
 
 void Phaser::printOptimisedProgramsOrASTs(
 	po::variables_map const& _arguments,
 	Population const& _population,
-	vector<Program> _programs,
+	std::vector<Program> _programs,
 	PhaserMode phaserMode
 )
 {
 	assert(phaserMode == PhaserMode::PrintOptimisedPrograms || phaserMode == PhaserMode::PrintOptimisedASTs);
-	assert(_programs.size() == _arguments["input-files"].as<vector<string>>().size());
+	assert(_programs.size() == _arguments["input-files"].as<std::vector<std::string>>().size());
 
 	if (_population.individuals().size() == 0)
 	{
-		cout << "<EMPTY POPULATION>" << endl;
+		std::cout << "<EMPTY POPULATION>" << std::endl;
 		return;
 	}
 
-	vector<string> const& paths = _arguments["input-files"].as<vector<string>>();
+	std::vector<std::string> const& paths = _arguments["input-files"].as<std::vector<std::string>>();
 	for (auto& individual: _population.individuals())
 	{
-		cout << "Chromosome: " << individual.chromosome << endl;
+		std::cout << "Chromosome: " << individual.chromosome << std::endl;
 
 		for (size_t i = 0; i < _programs.size(); ++i)
 		{
 			for (size_t j = 0; j < _arguments["chromosome-repetitions"].as<size_t>(); ++j)
 				_programs[i].optimise(individual.chromosome.optimisationSteps());
 
-			cout << "Program: " << paths[i] << endl;
+			std::cout << "Program: " << paths[i] << std::endl;
 			if (phaserMode == PhaserMode::PrintOptimisedPrograms)
-				cout << _programs[i] << endl;
+				std::cout << _programs[i] << std::endl;
 			else
-				cout << _programs[i].toJson() << endl;
+				std::cout << _programs[i].toJson() << std::endl;
 		}
 	}
 }
diff --git a/tools/yulPhaser/Population.cpp b/tools/yulPhaser/Population.cpp
index d4fe1f0bd0..e669dafe56 100644
--- a/tools/yulPhaser/Population.cpp
+++ b/tools/yulPhaser/Population.cpp
@@ -28,7 +28,6 @@
 #include <cassert>
 #include <numeric>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -37,12 +36,12 @@ using namespace solidity::phaser;
 namespace solidity::phaser
 {
 
-ostream& operator<<(ostream& _stream, Individual const& _individual);
-ostream& operator<<(ostream& _stream, Population const& _population);
+std::ostream& operator<<(std::ostream& _stream, Individual const& _individual);
+std::ostream& operator<<(std::ostream& _stream, Population const& _population);
 
 }
 
-ostream& phaser::operator<<(ostream& _stream, Individual const& _individual)
+std::ostream& phaser::operator<<(std::ostream& _stream, Individual const& _individual)
 {
 	_stream << _individual.fitness << " " << _individual.chromosome;
 
@@ -59,12 +58,12 @@ bool phaser::isFitter(Individual const& a, Individual const& b)
 }
 
 Population Population::makeRandom(
-	shared_ptr<FitnessMetric> _fitnessMetric,
+	std::shared_ptr<FitnessMetric> _fitnessMetric,
 	size_t _size,
-	function<size_t()> _chromosomeLengthGenerator
+	std::function<size_t()> _chromosomeLengthGenerator
 )
 {
-	vector<Chromosome> chromosomes;
+	std::vector<Chromosome> chromosomes;
 	for (size_t i = 0; i < _size; ++i)
 		chromosomes.push_back(Chromosome::makeRandom(_chromosomeLengthGenerator()));
 
@@ -72,7 +71,7 @@ Population Population::makeRandom(
 }
 
 Population Population::makeRandom(
-	shared_ptr<FitnessMetric> _fitnessMetric,
+	std::shared_ptr<FitnessMetric> _fitnessMetric,
 	size_t _size,
 	size_t _minChromosomeLength,
 	size_t _maxChromosomeLength
@@ -87,25 +86,25 @@ Population Population::makeRandom(
 
 Population Population::select(Selection const& _selection) const
 {
-	vector<Individual> selectedIndividuals;
+	std::vector<Individual> selectedIndividuals;
 	for (size_t i: _selection.materialise(m_individuals.size()))
 		selectedIndividuals.emplace_back(m_individuals[i]);
 
 	return Population(m_fitnessMetric, selectedIndividuals);
 }
 
-Population Population::mutate(Selection const& _selection, function<Mutation> _mutation) const
+Population Population::mutate(Selection const& _selection, std::function<Mutation> _mutation) const
 {
-	vector<Individual> mutatedIndividuals;
+	std::vector<Individual> mutatedIndividuals;
 	for (size_t i: _selection.materialise(m_individuals.size()))
 		mutatedIndividuals.emplace_back(_mutation(m_individuals[i].chromosome), *m_fitnessMetric);
 
 	return Population(m_fitnessMetric, mutatedIndividuals);
 }
 
-Population Population::crossover(PairSelection const& _selection, function<Crossover> _crossover) const
+Population Population::crossover(PairSelection const& _selection, std::function<Crossover> _crossover) const
 {
-	vector<Individual> crossedIndividuals;
+	std::vector<Individual> crossedIndividuals;
 	for (auto const& [i, j]: _selection.materialise(m_individuals.size()))
 	{
 		auto childChromosome = _crossover(
@@ -118,27 +117,27 @@ Population Population::crossover(PairSelection const& _selection, function<Cross
 	return Population(m_fitnessMetric, crossedIndividuals);
 }
 
-tuple<Population, Population> Population::symmetricCrossoverWithRemainder(
+std::tuple<Population, Population> Population::symmetricCrossoverWithRemainder(
 	PairSelection const& _selection,
-	function<SymmetricCrossover> _symmetricCrossover
+	std::function<SymmetricCrossover> _symmetricCrossover
 ) const
 {
-	vector<int> indexSelected(m_individuals.size(), false);
+	std::vector<int> indexSelected(m_individuals.size(), false);
 
-	vector<Individual> crossedIndividuals;
+	std::vector<Individual> crossedIndividuals;
 	for (auto const& [i, j]: _selection.materialise(m_individuals.size()))
 	{
 		auto children = _symmetricCrossover(
 			m_individuals[i].chromosome,
 			m_individuals[j].chromosome
 		);
-		crossedIndividuals.emplace_back(std::move(get<0>(children)), *m_fitnessMetric);
-		crossedIndividuals.emplace_back(std::move(get<1>(children)), *m_fitnessMetric);
+		crossedIndividuals.emplace_back(std::move(std::get<0>(children)), *m_fitnessMetric);
+		crossedIndividuals.emplace_back(std::move(std::get<1>(children)), *m_fitnessMetric);
 		indexSelected[i] = true;
 		indexSelected[j] = true;
 	}
 
-	vector<Individual> remainder;
+	std::vector<Individual> remainder;
 	for (size_t i = 0; i < indexSelected.size(); ++i)
 		if (!indexSelected[i])
 			remainder.emplace_back(m_individuals[i]);
@@ -166,7 +165,7 @@ Population operator+(Population _a, Population _b)
 
 Population Population::combine(std::tuple<Population, Population> _populationPair)
 {
-	return get<0>(_populationPair) + get<1>(_populationPair);
+	return std::get<0>(_populationPair) + std::get<1>(_populationPair);
 }
 
 bool Population::operator==(Population const& _other) const
@@ -177,28 +176,28 @@ bool Population::operator==(Population const& _other) const
 	return m_individuals == _other.m_individuals && m_fitnessMetric == _other.m_fitnessMetric;
 }
 
-ostream& phaser::operator<<(ostream& _stream, Population const& _population)
+std::ostream& phaser::operator<<(std::ostream& _stream, Population const& _population)
 {
 	auto individual = _population.m_individuals.begin();
 	for (; individual != _population.m_individuals.end(); ++individual)
-		_stream << *individual << endl;
+		_stream << *individual << std::endl;
 
 	return _stream;
 }
 
-vector<Individual> Population::chromosomesToIndividuals(
+std::vector<Individual> Population::chromosomesToIndividuals(
 	FitnessMetric& _fitnessMetric,
-	vector<Chromosome> _chromosomes
+	std::vector<Chromosome> _chromosomes
 )
 {
-	vector<Individual> individuals;
+	std::vector<Individual> individuals;
 	for (auto& chromosome: _chromosomes)
 		individuals.emplace_back(std::move(chromosome), _fitnessMetric);
 
 	return individuals;
 }
 
-vector<Individual> Population::sortedIndividuals(vector<Individual> _individuals)
+std::vector<Individual> Population::sortedIndividuals(std::vector<Individual> _individuals)
 {
 	sort(_individuals.begin(), _individuals.end(), isFitter);
 	return _individuals;
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index f24f5e03f4..00abcc8e5c 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -45,7 +45,6 @@
 #include <cassert>
 #include <memory>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::yul;
@@ -55,39 +54,39 @@ using namespace solidity::phaser;
 namespace solidity::phaser
 {
 
-ostream& operator<<(ostream& _stream, Program const& _program);
+std::ostream& operator<<(std::ostream& _stream, Program const& _program);
 
 }
 
 Program::Program(Program const& program):
-	m_ast(make_unique<Block>(get<Block>(ASTCopier{}(*program.m_ast)))),
+	m_ast(std::make_unique<Block>(std::get<Block>(ASTCopier{}(*program.m_ast)))),
 	m_dialect{program.m_dialect},
 	m_nameDispenser(program.m_nameDispenser)
 {
 }
 
-variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
+std::variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 {
 	// ASSUMPTION: parseSource() rewinds the stream on its own
 	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(EVMVersion{});
 
-	variant<unique_ptr<Block>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
-	if (holds_alternative<ErrorList>(astOrErrors))
-		return get<ErrorList>(astOrErrors);
+	std::variant<std::unique_ptr<Block>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
+	if (std::holds_alternative<ErrorList>(astOrErrors))
+		return std::get<ErrorList>(astOrErrors);
 
-	variant<unique_ptr<AsmAnalysisInfo>, ErrorList> analysisInfoOrErrors = analyzeAST(
+	std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> analysisInfoOrErrors = analyzeAST(
 		dialect,
-		*get<unique_ptr<Block>>(astOrErrors)
+		*std::get<std::unique_ptr<Block>>(astOrErrors)
 	);
-	if (holds_alternative<ErrorList>(analysisInfoOrErrors))
-		return get<ErrorList>(analysisInfoOrErrors);
+	if (std::holds_alternative<ErrorList>(analysisInfoOrErrors))
+		return std::get<ErrorList>(analysisInfoOrErrors);
 
 	Program program(
 		dialect,
 		disambiguateAST(
 			dialect,
-			*get<unique_ptr<Block>>(astOrErrors),
-			*get<unique_ptr<AsmAnalysisInfo>>(analysisInfoOrErrors)
+			*std::get<std::unique_ptr<Block>>(astOrErrors),
+			*std::get<std::unique_ptr<AsmAnalysisInfo>>(analysisInfoOrErrors)
 		)
 	);
 	program.optimise({
@@ -99,30 +98,30 @@ variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 	return program;
 }
 
-void Program::optimise(vector<string> const& _optimisationSteps)
+void Program::optimise(std::vector<std::string> const& _optimisationSteps)
 {
 	m_ast = applyOptimisationSteps(m_dialect, m_nameDispenser, std::move(m_ast), _optimisationSteps);
 }
 
-ostream& phaser::operator<<(ostream& _stream, Program const& _program)
+std::ostream& phaser::operator<<(std::ostream& _stream, Program const& _program)
 {
 	return _stream << AsmPrinter()(*_program.m_ast);
 }
 
-string Program::toJson() const
+std::string Program::toJson() const
 {
 	Json serializedAst = AsmJsonConverter(0)(*m_ast);
 	return jsonPrettyPrint(removeNullMembers(std::move(serializedAst)));
 }
 
-variant<unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _dialect, CharStream _source)
+std::variant<std::unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _dialect, CharStream _source)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	auto scanner = make_shared<Scanner>(_source);
+	auto scanner = std::make_shared<Scanner>(_source);
 
 	ObjectParser parser(errorReporter, _dialect);
-	shared_ptr<Object> object = parser.parse(scanner, false);
+	std::shared_ptr<Object> object = parser.parse(scanner, false);
 	if (object == nullptr || !errorReporter.errors().empty())
 		// NOTE: It's possible to get errors even if the returned object is non-null.
 		// For example when there are errors in a nested object.
@@ -150,16 +149,16 @@ variant<unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _diale
 	// The public API of the class does not provide access to the smart pointer so it won't be hard
 	// to switch to shared_ptr if the copying turns out to be an issue (though it would be better
 	// to refactor ObjectParser and Object to use unique_ptr instead).
-	auto astCopy = make_unique<Block>(get<Block>(ASTCopier{}(*selectedObject->code)));
+	auto astCopy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(*selectedObject->code)));
 
-	return variant<unique_ptr<Block>, ErrorList>(std::move(astCopy));
+	return std::variant<std::unique_ptr<Block>, ErrorList>(std::move(astCopy));
 }
 
-variant<unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, Block const& _ast)
+std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, Block const& _ast)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	auto analysisInfo = make_unique<AsmAnalysisInfo>();
+	auto analysisInfo = std::make_unique<AsmAnalysisInfo>();
 	AsmAnalyzer analyzer(*analysisInfo, errorReporter, _dialect);
 
 	bool analysisSuccessful = analyzer.analyze(_ast);
@@ -167,31 +166,31 @@ variant<unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect cons
 		return errors;
 
 	assert(errorReporter.errors().empty());
-	return variant<unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
+	return std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
 }
 
-unique_ptr<Block> Program::disambiguateAST(
+std::unique_ptr<Block> Program::disambiguateAST(
 	Dialect const& _dialect,
 	Block const& _ast,
 	AsmAnalysisInfo const& _analysisInfo
 )
 {
-	set<YulString> const externallyUsedIdentifiers = {};
+	std::set<YulString> const externallyUsedIdentifiers = {};
 	Disambiguator disambiguator(_dialect, _analysisInfo, externallyUsedIdentifiers);
 
-	return make_unique<Block>(get<Block>(disambiguator(_ast)));
+	return std::make_unique<Block>(std::get<Block>(disambiguator(_ast)));
 }
 
-unique_ptr<Block> Program::applyOptimisationSteps(
+std::unique_ptr<Block> Program::applyOptimisationSteps(
 	Dialect const& _dialect,
 	NameDispenser& _nameDispenser,
-	unique_ptr<Block> _ast,
-	vector<string> const& _optimisationSteps
+	std::unique_ptr<Block> _ast,
+	std::vector<std::string> const& _optimisationSteps
 )
 {
 	// An empty set of reserved identifiers. It could be a constructor parameter but I don't
 	// think it would be useful in this tool. Other tools (like yulopti) have it empty too.
-	set<YulString> const externallyUsedIdentifiers = {};
+	std::set<YulString> const externallyUsedIdentifiers = {};
 	OptimiserStepContext context{
 		_dialect,
 		_nameDispenser,
@@ -199,7 +198,7 @@ unique_ptr<Block> Program::applyOptimisationSteps(
 		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 	};
 
-	for (string const& step: _optimisationSteps)
+	for (std::string const& step: _optimisationSteps)
 		OptimiserSuite::allSteps().at(step)->run(context, *_ast);
 
 	return _ast;
diff --git a/tools/yulPhaser/ProgramCache.cpp b/tools/yulPhaser/ProgramCache.cpp
index 351532aa74..f8fae50faa 100644
--- a/tools/yulPhaser/ProgramCache.cpp
+++ b/tools/yulPhaser/ProgramCache.cpp
@@ -22,7 +22,6 @@
 
 #include <libyul/optimiser/Suite.h>
 
-using namespace std;
 using namespace solidity::yul;
 using namespace solidity::phaser;
 
@@ -51,16 +50,16 @@ bool CacheStats::operator==(CacheStats const& _other) const
 }
 
 Program ProgramCache::optimiseProgram(
-	string const& _abbreviatedOptimisationSteps,
-	size_t _repetitionCount
+	std::string const& _abbreviatedOptimisationSteps,
+	std::size_t _repetitionCount
 )
 {
-	string targetOptimisations = _abbreviatedOptimisationSteps;
-	for (size_t i = 1; i < _repetitionCount; ++i)
+	std::string targetOptimisations = _abbreviatedOptimisationSteps;
+	for (std::size_t i = 1; i < _repetitionCount; ++i)
 		targetOptimisations += _abbreviatedOptimisationSteps;
 
-	size_t prefixSize = 0;
-	for (size_t i = 1; i <= targetOptimisations.size(); ++i)
+	std::size_t prefixSize = 0;
+	for (std::size_t i = 1; i <= targetOptimisations.size(); ++i)
 	{
 		auto const& pair = m_entries.find(targetOptimisations.substr(0, i));
 		if (pair != m_entries.end())
@@ -79,9 +78,9 @@ Program ProgramCache::optimiseProgram(
 		m_entries.at(targetOptimisations.substr(0, prefixSize)).program
 	);
 
-	for (size_t i = prefixSize + 1; i <= targetOptimisations.size(); ++i)
+	for (std::size_t i = prefixSize + 1; i <= targetOptimisations.size(); ++i)
 	{
-		string stepName = OptimiserSuite::stepAbbreviationToNameMap().at(targetOptimisations[i - 1]);
+		std::string stepName = OptimiserSuite::stepAbbreviationToNameMap().at(targetOptimisations[i - 1]);
 		intermediateProgram.optimise({stepName});
 
 		m_entries.insert({targetOptimisations.substr(0, i), {intermediateProgram, m_currentRound}});
@@ -91,7 +90,7 @@ Program ProgramCache::optimiseProgram(
 	return intermediateProgram;
 }
 
-void ProgramCache::startRound(size_t _roundNumber)
+void ProgramCache::startRound(std::size_t _roundNumber)
 {
 	assert(_roundNumber > m_currentRound);
 	m_currentRound = _roundNumber;
@@ -113,7 +112,7 @@ void ProgramCache::clear()
 	m_currentRound = 0;
 }
 
-Program const* ProgramCache::find(string const& _abbreviatedOptimisationSteps) const
+Program const* ProgramCache::find(std::string const& _abbreviatedOptimisationSteps) const
 {
 	auto const& pair = m_entries.find(_abbreviatedOptimisationSteps);
 	if (pair == m_entries.end())
@@ -132,18 +131,18 @@ CacheStats ProgramCache::gatherStats() const
 	};
 }
 
-size_t ProgramCache::calculateTotalCachedCodeSize() const
+std::size_t ProgramCache::calculateTotalCachedCodeSize() const
 {
-	size_t size = 0;
+	std::size_t size = 0;
 	for (auto const& pair: m_entries)
 		size += pair.second.program.codeSize(CacheStats::StorageWeights);
 
 	return size;
 }
 
-map<size_t, size_t> ProgramCache::countRoundEntries() const
+std::map<std::size_t, std::size_t> ProgramCache::countRoundEntries() const
 {
-	map<size_t, size_t> counts;
+	std::map<std::size_t, std::size_t> counts;
 	for (auto& pair: m_entries)
 		if (counts.find(pair.second.roundNumber) != counts.end())
 			++counts.at(pair.second.roundNumber);
diff --git a/tools/yulPhaser/Selections.cpp b/tools/yulPhaser/Selections.cpp
index 5c55706454..ca2cefeb4a 100644
--- a/tools/yulPhaser/Selections.cpp
+++ b/tools/yulPhaser/Selections.cpp
@@ -23,14 +23,13 @@
 #include <cmath>
 #include <numeric>
 
-using namespace std;
 using namespace solidity::phaser;
 
-vector<size_t> RangeSelection::materialise(size_t _poolSize) const
+std::vector<size_t> RangeSelection::materialise(size_t _poolSize) const
 {
-	size_t beginIndex = static_cast<size_t>(round(double(_poolSize) * m_startPercent));
-	size_t endIndex = static_cast<size_t>(round(double(_poolSize) * m_endPercent));
-	vector<size_t> selection;
+	size_t beginIndex = static_cast<size_t>(std::round(double(_poolSize) * m_startPercent));
+	size_t endIndex = static_cast<size_t>(std::round(double(_poolSize) * m_endPercent));
+	std::vector<size_t> selection;
 
 	for (size_t i = beginIndex; i < endIndex; ++i)
 		selection.push_back(i);
@@ -38,31 +37,31 @@ vector<size_t> RangeSelection::materialise(size_t _poolSize) const
 	return selection;
 }
 
-vector<size_t> MosaicSelection::materialise(size_t _poolSize) const
+std::vector<size_t> MosaicSelection::materialise(size_t _poolSize) const
 {
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
+	size_t count = static_cast<size_t>(std::round(double(_poolSize) * m_selectionSize));
 
-	vector<size_t> selection;
+	std::vector<size_t> selection;
 	for (size_t i = 0; i < count; ++i)
-		selection.push_back(min(m_pattern[i % m_pattern.size()], _poolSize - 1));
+		selection.push_back(std::min(m_pattern[i % m_pattern.size()], _poolSize - 1));
 
 	return selection;
 }
 
-vector<size_t> RandomSelection::materialise(size_t _poolSize) const
+std::vector<size_t> RandomSelection::materialise(size_t _poolSize) const
 {
-	size_t count = static_cast<size_t>(round(double(_poolSize) * m_selectionSize));
+	size_t count = static_cast<size_t>(std::round(double(_poolSize) * m_selectionSize));
 
-	vector<size_t> selection;
+	std::vector<size_t> selection;
 	for (size_t i = 0; i < count; ++i)
 		selection.push_back(SimulationRNG::uniformInt(0, _poolSize - 1));
 
 	return selection;
 }
 
-vector<size_t> RandomSubset::materialise(size_t _poolSize) const
+std::vector<size_t> RandomSubset::materialise(size_t _poolSize) const
 {
-	vector<size_t> selection;
+	std::vector<size_t> selection;
 	for (size_t index = 0; index < _poolSize; ++index)
 		if (SimulationRNG::bernoulliTrial(m_selectionChance))
 			selection.push_back(index);
diff --git a/tools/yulPhaser/SimulationRNG.cpp b/tools/yulPhaser/SimulationRNG.cpp
index 5fca4d99e5..2306db63a6 100644
--- a/tools/yulPhaser/SimulationRNG.cpp
+++ b/tools/yulPhaser/SimulationRNG.cpp
@@ -28,7 +28,6 @@
 #include <ctime>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::phaser;
 
@@ -51,7 +50,7 @@ size_t SimulationRNG::binomialInt(size_t _numTrials, double _successProbability)
 {
 	// NOTE: binomial_distribution<size_t> would not work because it internally tries to use abs()
 	// and fails to compile due to ambiguous conversion.
-	assert(_numTrials <= static_cast<size_t>(numeric_limits<long>::max()));
+	assert(_numTrials <= static_cast<size_t>(std::numeric_limits<long>::max()));
 
 	boost::random::binomial_distribution<long> distribution(static_cast<long>(_numTrials), _successProbability);
 	return static_cast<size_t>(distribution(s_generator));
@@ -62,5 +61,5 @@ uint32_t SimulationRNG::generateSeed()
 	// This is not a secure way to seed the generator but it's good enough for simulation purposes.
 	// The only thing that matters for us is that the sequence is different on each run and that
 	// it fits the expected distribution. It does not have to be 100% unpredictable.
-	return static_cast<uint32_t>(time(nullptr));
+	return static_cast<uint32_t>(std::time(nullptr));
 }

From eb4b103ddaf0afe3f3ff82ccf1b4897e6e244ca4 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 17 May 2024 16:41:45 +0200
Subject: [PATCH 0860/1140] Remove included directories check for using std

---
 scripts/check_style.sh | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index e9d470b761..dbe470c1ae 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -20,44 +20,6 @@ EXCLUDE_FILES=(
 EXCLUDE_FILES_JOINED=$(printf "%s\|" "${EXCLUDE_FILES[@]}")
 EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
 
-NAMESPACE_STD_FREE_FILES=(
-    libevmasm/*
-    liblangutil/*
-    libsmtutil/*
-    libsolc/*
-    libsolidity/analysis/*
-    libsolidity/ast/*
-    libsolidity/codegen/ir/*
-    libsolidity/codegen/*
-    libsolidity/experimental/*
-    libsolidity/formal/*
-    libsolidity/interface/*
-    libsolidity/lsp/*
-    libsolidity/parsing/*
-    libsolutil/*
-    libyul/*
-    libyul/backends/evm/*
-    libyul/optimiser/*
-    solc/*
-    test/*
-    test/contracts/*
-    test/libevmasm/*
-    test/liblangutil/*
-    test/libsolutil/*
-    test/libsolidity/*
-    test/libsolidity/analysis/*
-    test/libsolidity/interface/*
-    test/libsolidity/util/*
-    test/libyul/*
-    test/solc/*
-    test/tools/*
-    test/tools/ossfuzz/*
-    test/tools/ossfuzz/protomutators/*
-    test/tools/yulInterpreter/*
-    test/yulPhaser/*
-    tools/yulPhaser/*
-)
-
 (
 REPO_ROOT="$(dirname "$0")"/..
 cd "$REPO_ROOT" || exit 1
@@ -104,9 +66,7 @@ FORMATERROR=$(
 # 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[@]}
+    git grep -nIE "using namespace std;" -- '*.h' '*.cpp'
 ) || true
 )
 

From 3e77bdff88b241f9a88852ff73a70381e396bee8 Mon Sep 17 00:00:00 2001
From: Haoyang Ma <haoyanghkust@gmail.com>
Date: Mon, 20 May 2024 09:55:48 +0800
Subject: [PATCH 0861/1140] Update ossfuzz's README.md

---
 test/tools/ossfuzz/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/tools/ossfuzz/README.md b/test/tools/ossfuzz/README.md
index dae3386489..d00cb3d519 100644
--- a/test/tools/ossfuzz/README.md
+++ b/test/tools/ossfuzz/README.md
@@ -32,6 +32,7 @@ $ rm -rf fuzzer-build && mkdir fuzzer-build && cd fuzzer-build
 ## Compile protobuf C++ bindings
 $ protoc --proto_path=../test/tools/ossfuzz yulProto.proto --cpp_out=../test/tools/ossfuzz
 $ protoc --proto_path=../test/tools/ossfuzz abiV2Proto.proto --cpp_out=../test/tools/ossfuzz
+$ protoc --proto_path=../test/tools/ossfuzz solProto.proto --cpp_out=../test/tools/ossfuzz
 ## Run cmake
 $ export CC=clang CXX=clang++
 $ cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/libfuzzer.cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} ..

From 2d0783a74f241777ec01385f9ad55791449a17c4 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sun, 19 May 2024 22:59:35 -0300
Subject: [PATCH 0862/1140] Add stopAfter setting to syntax tests

---
 test/libsolidity/SyntaxTest.cpp | 12 +++++++++++-
 test/libsolidity/SyntaxTest.h   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index f17898c042..f350ea4624 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -51,6 +51,16 @@ SyntaxTest::SyntaxTest(
 	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);
+
+	static std::map<std::string, PipelineStage> const pipelineStages = {
+		{"parsing", PipelineStage::Parsing},
+		{"analysis", PipelineStage::Analysis},
+		{"compilation", PipelineStage::Compilation}
+	};
+	std::string stopAfter = m_reader.stringSetting("stopAfter", "compilation");
+	if (!pipelineStages.count(stopAfter))
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid stopAfter value: " + stopAfter + "."));
+	m_stopAfter = pipelineStages.at(stopAfter);
 }
 
 void SyntaxTest::setupCompiler(CompilerStack& _compiler)
@@ -72,7 +82,7 @@ void SyntaxTest::parseAndAnalyze()
 {
 	try
 	{
-		runFramework(withPreamble(m_sources.sources), PipelineStage::Compilation);
+		runFramework(withPreamble(m_sources.sources), m_stopAfter);
 		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis) && !compiler().isExperimentalAnalysis())
 		{
 			ErrorList const& errors = compiler().errors();
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index 95df3c6cd8..085a32f944 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -55,6 +55,7 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	bool m_optimiseYul{};
 	std::string m_compileViaYul{};
 	langutil::Error::Severity m_minSeverity{};
+	PipelineStage m_stopAfter;
 };
 
 }

From 50ad425948072d74b743641eff5968e1d703881b Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sun, 19 May 2024 23:02:57 -0300
Subject: [PATCH 0863/1140] Add tests

---
 test/libsolidity/syntaxTests/stopAfterAnalysisError.sol   | 8 ++++++++
 .../stopAfterParsingAnalysisErrorNotShowing.sol           | 6 ++++++
 test/libsolidity/syntaxTests/stopAfterParsingError.sol    | 7 +++++++
 3 files changed, 21 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/stopAfterAnalysisError.sol
 create mode 100644 test/libsolidity/syntaxTests/stopAfterParsingAnalysisErrorNotShowing.sol
 create mode 100644 test/libsolidity/syntaxTests/stopAfterParsingError.sol

diff --git a/test/libsolidity/syntaxTests/stopAfterAnalysisError.sol b/test/libsolidity/syntaxTests/stopAfterAnalysisError.sol
new file mode 100644
index 0000000000..ac74ecf3a3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/stopAfterAnalysisError.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(uint[] x) public pure {
+    }
+}
+// ====
+// stopAfter: analysis
+// ----
+// TypeError 6651: (28-36): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/stopAfterParsingAnalysisErrorNotShowing.sol b/test/libsolidity/syntaxTests/stopAfterParsingAnalysisErrorNotShowing.sol
new file mode 100644
index 0000000000..58efffea6f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/stopAfterParsingAnalysisErrorNotShowing.sol
@@ -0,0 +1,6 @@
+contract C {
+    uint x = address(0xabc);
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/stopAfterParsingError.sol b/test/libsolidity/syntaxTests/stopAfterParsingError.sol
new file mode 100644
index 0000000000..911a28d771
--- /dev/null
+++ b/test/libsolidity/syntaxTests/stopAfterParsingError.sol
@@ -0,0 +1,7 @@
+contract C {
+    uint storage x;
+}
+// ====
+// stopAfter:parsing
+// ----
+// ParserError 2314: (22-29): Expected identifier but got 'storage'

From 31aab83b6653160effa363aac87d4669665d11e3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 20 May 2024 13:31:52 +0200
Subject: [PATCH 0864/1140] Set release date for 0.8.26

---
 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 443259806f..0837a7170e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.26 (unreleased)
+### 0.8.26 (2024-05-21)
 
 Language Features:
  * Introduce a new overload ``require(bool, Error)`` that allows usage of ``require`` functions with custom errors. This feature is available in the ``via-ir`` pipeline only.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 52b6c9f48b..037a36341c 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1894,6 +1894,10 @@
         "bugs": [],
         "released": "2024-03-14"
     },
+    "0.8.26": {
+        "bugs": [],
+        "released": "2024-05-21"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 9da33a63ea9da6fa5dc1f80e5c0a7102c0f96dab Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 20 May 2024 13:35:57 +0200
Subject: [PATCH 0865/1140] Set version to 0.8.27

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c1056ec3..b1a307afb9 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.26")
+set(PROJECT_VERSION "0.8.27")
 # 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 0837a7170e..f48fbf080c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.27 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.26 (2024-05-21)
 
 Language Features:

From a8406b5692c00ad4ed7e56c9c00a4f131db06c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Tue, 21 May 2024 10:03:22 +0200
Subject: [PATCH 0866/1140] Revert "Set version to 0 8 27"

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a307afb9..91c1056ec3 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.27")
+set(PROJECT_VERSION "0.8.26")
 # 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 f48fbf080c..0837a7170e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,14 +1,3 @@
-### 0.8.27 (unreleased)
-
-Language Features:
-
-
-Compiler Features:
-
-
-Bugfixes:
-
-
 ### 0.8.26 (2024-05-21)
 
 Language Features:

From 194d3c107945348ce9fca2192b5d77f54d12f9de Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 21 May 2024 12:08:55 +0200
Subject: [PATCH 0867/1140] Set version to 0.8.27

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c1056ec3..b1a307afb9 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.26")
+set(PROJECT_VERSION "0.8.27")
 # 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 0837a7170e..f48fbf080c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.27 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.26 (2024-05-21)
 
 Language Features:

From fe944d34f43ef1aa04fef089b6b9a96133085270 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 May 2024 13:01:50 +0200
Subject: [PATCH 0868/1140] Add exclusion for require with errors to chk pragma
 script

---
 scripts/docs_version_pragma_check.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh
index d56bed3a19..c927cfb1e8 100755
--- a/scripts/docs_version_pragma_check.sh
+++ b/scripts/docs_version_pragma_check.sh
@@ -154,7 +154,8 @@ SOLTMPDIR=$(mktemp -d)
         # We expect errors if explicitly stated, or if imports
         # are used (in the style guide)
         if ( ! grep -E "This will not compile after" "$f" >/dev/null && \
-            grep -E "This will not compile|import \"" "$f" >/dev/null )
+            grep -E "This will not compile|import \"" "$f" >/dev/null || \
+            grep -R "This will only compile via IR" "$f" >/dev/null )
         then
             opts=(--expect-errors)
         fi

From 53370849855d997def412564b73ce8d2c77fd7dc Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Wed, 22 May 2024 21:10:49 +0200
Subject: [PATCH 0869/1140] formal test smod implementation corresponds to EVM
 smod

---
 test/formal/opcodes.py | 10 ++++++-
 test/formal/smod.py    | 65 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 test/formal/smod.py

diff --git a/test/formal/opcodes.py b/test/formal/opcodes.py
index e091e7847b..a70a26fe5c 100644
--- a/test/formal/opcodes.py
+++ b/test/formal/opcodes.py
@@ -25,7 +25,15 @@ 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)
+	return If(
+		y == 0,
+		0,
+		If(
+			x >= 0,
+			If(y >= 0, x % y, x % (-y)),
+			If(y >= 0, -((-x) % y), -((-x) % (-y)))
+		)
+	)
 
 def LT(x, y):
 	return If(ULT(x, y), BitVecVal(1, x.size()), BitVecVal(0, x.size()))
diff --git a/test/formal/smod.py b/test/formal/smod.py
new file mode 100644
index 0000000000..d82578d18c
--- /dev/null
+++ b/test/formal/smod.py
@@ -0,0 +1,65 @@
+from z3 import BitVec
+from rule import Rule
+from opcodes import SMOD
+
+
+n_bits = 256
+X = BitVec('X', n_bits)
+Y = BitVec('Y', n_bits)
+
+
+def smod_test(a, b, r, op=SMOD):
+    r"""
+    Tests SMOD with predefined parameters a,b against an expected result r.
+    """
+    to_check = Rule()
+    to_check.require(X == a)
+    to_check.require(Y == b)
+    to_check.check(op(X, Y), r)
+
+
+# tests from:
+# https://github.com/ethereum/tests/blob/2e37a9f41167534b07e0e8f247ea934a5fe3cac9/src/GeneralStateTestsFiller/VMTests/vmArithmeticTest/smodFiller.yml
+smod_test(2, 3, 2)
+smod_test(-1, 2, -1)
+smod_test(0, -1, 0)
+smod_test(3, 0, 0)
+smod_test(-2, 3, -2)
+smod_test(-2, 3, -2)
+smod_test(16, 0, -1, op=lambda x, y: SMOD(x, y) - 1)
+
+# more tests
+rule = Rule()
+rule.require(X == 7)
+rule.require(Y == 5)
+rule.check(SMOD(X, Y), 2)
+
+rule = Rule()
+rule.require(X == 7)
+rule.require(Y == 5)
+rule.check(SMOD(X, Y), 2)
+
+rule = Rule()
+rule.require(X == -7)
+rule.require(Y == 5)
+rule.check(SMOD(X, Y), -2)
+
+rule = Rule()
+rule.require(X == 7)
+rule.require(Y == -5)
+rule.check(SMOD(X, Y), 2)
+
+rule = Rule()
+rule.require(X == -7)
+rule.require(Y == -5)
+rule.check(SMOD(X, Y), -2)
+
+for k in [-7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7]:
+    for i in [-13, -12, -11, 10, -7, -2, 1, 0, 1, 2, 7, 10, 11, 12, 13]:
+        rule = Rule()
+        rule.require(X == i)
+        rule.require(Y == k)
+        if k != 0:
+            rule.check(SMOD(X, Y) % Y, X % Y)
+        else:
+            rule.check(SMOD(X, Y), 0)

From 6de168040227fe6b2400736812a38f2b305628dd Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Thu, 9 May 2024 13:46:05 +0200
Subject: [PATCH 0870/1140] Remove UnderOverflow verification target for BMC
 engine

---
 libsolidity/formal/BMC.cpp                    | 75 ++++++-------------
 libsolidity/formal/ModelCheckerSettings.h     |  2 +-
 .../blockchain_state/transfer_1.sol           |  2 +-
 .../constructor_state_variable_init.sol       |  2 +-
 .../constructor_state_variable_init.sol       |  1 +
 ...onstructor_state_variable_init_asserts.sol |  1 +
 ...tructor_state_variable_init_chain_tree.sol |  1 +
 .../smtCheckerTests/operators/mod.sol         |  1 +
 .../smtCheckerTests/operators/mod_signed.sol  |  2 +-
 .../user_defined_operations_on_constants.sol  |  2 +-
 ...r_defined_operations_on_constants_fail.sol |  1 +
 ...rator_matches_equivalent_function_call.sol |  7 +-
 .../unchecked/flipping_sign_tests.sol         |  2 +
 13 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 97dd7050fe..2bb794cde4 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -569,11 +569,18 @@ void BMC::endVisit(UnaryOperation const& _op)
 		return;
 
 	if (_op.getOperator() == Token::Sub && smt::isInteger(*_op.annotation().type))
+	{
+		addVerificationTarget(
+			VerificationTargetType::Underflow,
+			expr(_op),
+			&_op
+		);
 		addVerificationTarget(
-			VerificationTargetType::UnderOverflow,
+			VerificationTargetType::Overflow,
 			expr(_op),
 			&_op
 		);
+	}
 }
 
 void BMC::endVisit(BinaryOperation const& _op)
@@ -813,32 +820,29 @@ std::pair<smtutil::Expression, smtutil::Expression> BMC::arithmeticOperation(
 	if (_op == Token::Mod)
 		return values;
 
-	VerificationTargetType type;
 	// The order matters here:
 	// If _op is Div and intType is signed, we only care about overflow.
 	if (_op == Token::Div)
 	{
 		if (intType->isSigned())
 			// Signed division can only overflow.
-			type = VerificationTargetType::Overflow;
+			addVerificationTarget(VerificationTargetType::Overflow, values.second, &_expression);
 		else
 			// Unsigned division cannot underflow/overflow.
 			return values;
 	}
 	else if (intType->isSigned())
-		type = VerificationTargetType::UnderOverflow;
+	{
+		addVerificationTarget(VerificationTargetType::Overflow, values.second, &_expression);
+		addVerificationTarget(VerificationTargetType::Underflow, values.second, &_expression);
+	}
 	else if (_op == Token::Sub)
-		type = VerificationTargetType::Underflow;
+		addVerificationTarget(VerificationTargetType::Underflow, values.second, &_expression);
 	else if (_op == Token::Add || _op == Token::Mul)
-		type = VerificationTargetType::Overflow;
+		addVerificationTarget(VerificationTargetType::Overflow, values.second, &_expression);
 	else
 		solAssert(false, "");
 
-	addVerificationTarget(
-		type,
-		values.second,
-		&_expression
-	);
 	return values;
 }
 
@@ -919,6 +923,12 @@ void BMC::checkVerificationTargets()
 
 void BMC::checkVerificationTarget(BMCVerificationTarget& _target)
 {
+	if (
+		m_solvedTargets.count(_target.expression) &&
+		m_solvedTargets.at(_target.expression).count(_target.type)
+	)
+		return;
+
 	switch (_target.type)
 	{
 		case VerificationTargetType::ConstantCondition:
@@ -930,10 +940,6 @@ void BMC::checkVerificationTarget(BMCVerificationTarget& _target)
 		case VerificationTargetType::Overflow:
 			checkOverflow(_target);
 			break;
-		case VerificationTargetType::UnderOverflow:
-			checkUnderflow(_target);
-			checkOverflow(_target);
-			break;
 		case VerificationTargetType::DivByZero:
 			checkDivByZero(_target);
 			break;
@@ -961,19 +967,10 @@ void BMC::checkConstantCondition(BMCVerificationTarget& _target)
 void BMC::checkUnderflow(BMCVerificationTarget& _target)
 {
 	solAssert(
-		_target.type == VerificationTargetType::Underflow ||
-			_target.type == VerificationTargetType::UnderOverflow,
+		_target.type == VerificationTargetType::Underflow,
 		""
 	);
 
-	if (
-		m_solvedTargets.count(_target.expression) && (
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::Underflow) ||
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::UnderOverflow)
-		)
-	)
-		return;
-
 	auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
 	if (!intType)
 		intType = TypeProvider::uint256();
@@ -994,19 +991,10 @@ void BMC::checkUnderflow(BMCVerificationTarget& _target)
 void BMC::checkOverflow(BMCVerificationTarget& _target)
 {
 	solAssert(
-		_target.type == VerificationTargetType::Overflow ||
-			_target.type == VerificationTargetType::UnderOverflow,
+		_target.type == VerificationTargetType::Overflow,
 		""
 	);
 
-	if (
-		m_solvedTargets.count(_target.expression) && (
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::Overflow) ||
-			m_solvedTargets.at(_target.expression).count(VerificationTargetType::UnderOverflow)
-		)
-	)
-		return;
-
 	auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
 	if (!intType)
 		intType = TypeProvider::uint256();
@@ -1028,12 +1016,6 @@ void BMC::checkDivByZero(BMCVerificationTarget& _target)
 {
 	solAssert(_target.type == VerificationTargetType::DivByZero, "");
 
-	if (
-		m_solvedTargets.count(_target.expression) &&
-		m_solvedTargets.at(_target.expression).count(VerificationTargetType::DivByZero)
-	)
-		return;
-
 	checkCondition(
 		_target,
 		_target.constraints && (_target.value == 0),
@@ -1051,11 +1033,6 @@ void BMC::checkBalance(BMCVerificationTarget& _target)
 {
 	solAssert(_target.type == VerificationTargetType::Balance, "");
 
-	if (
-		m_solvedTargets.count(_target.expression) &&
-		m_solvedTargets.at(_target.expression).count(VerificationTargetType::Balance)
-	)
-		return;
 	checkCondition(
 		_target,
 		_target.constraints && _target.value,
@@ -1072,12 +1049,6 @@ void BMC::checkAssert(BMCVerificationTarget& _target)
 {
 	solAssert(_target.type == VerificationTargetType::Assert, "");
 
-	if (
-		m_solvedTargets.count(_target.expression) &&
-		m_solvedTargets.at(_target.expression).count(_target.type)
-	)
-		return;
-
 	checkCondition(
 		_target,
 		_target.constraints && !_target.value,
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 0cfa370c40..3dbe472b85 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -113,7 +113,7 @@ struct ModelCheckerInvariants
 	std::set<InvariantType> invariants;
 };
 
-enum class VerificationTargetType { ConstantCondition, Underflow, Overflow, UnderOverflow, DivByZero, Balance, Assert, PopEmptyArray, OutOfBounds };
+enum class VerificationTargetType { ConstantCondition, Underflow, Overflow, DivByZero, Balance, Assert, PopEmptyArray, OutOfBounds };
 
 struct ModelCheckerTargets
 {
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
index 3118086b92..169257edff 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer_1.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (166-201): 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.
\ No newline at end of file
+// 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/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 c262e2481b..4728a1cb0e 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,4 +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.
+// 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/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
index d33f9571b0..594580f898 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
@@ -40,3 +40,4 @@ contract C is B {
 // 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.
+// 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/inheritance/constructor_state_variable_init_asserts.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
index 03b634ba94..40ae96db47 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
@@ -38,3 +38,4 @@ contract C is B {
 // 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.
+// 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/inheritance/constructor_state_variable_init_chain_tree.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
index e98ddcb63c..638cb640d3 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
@@ -42,3 +42,4 @@ contract C is B {
 // 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.
+// 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/mod.sol b/test/libsolidity/smtCheckerTests/operators/mod.sol
index a600ef03f1..bd09b82402 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod.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.
+// 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/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
index 2e640f53fd..c995a158a2 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
@@ -13,4 +13,4 @@ contract C {
 // ----
 // 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.
+// 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/operators/userDefined/user_defined_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
index c39360b656..fe12892eab 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
@@ -61,4 +61,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Info 1391: CHC: 21 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/userDefined/user_defined_operations_on_constants_fail.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
index 25674513c0..8afd995ea0 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
@@ -77,3 +77,4 @@ contract C {
 // 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.
+// 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/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
index b734079c7d..b3887bfa00 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
@@ -71,7 +71,12 @@ contract C {
 // Warning 6328: (2209-2235): CHC: Assertion violation might happen here.
 // Warning 6328: (2245-2271): CHC: Assertion violation might happen here.
 // Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 2661: (679-708): BMC: Overflow (resulting value larger than 32767) happens here.
+// Warning 4144: (679-708): BMC: Underflow (resulting value less than -32768) happens here.
+// Warning 2661: (777-806): BMC: Overflow (resulting value larger than 32767) happens here.
+// Warning 2661: (953-982): BMC: Overflow (resulting value larger than 32767) happens here.
+// Warning 4144: (953-982): BMC: Underflow (resulting value less than -32768) happens here.
 // 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: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 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/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
index 96b4150105..59a4b3d26e 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
@@ -11,3 +11,5 @@ contract test {
 // ----
 // 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.
+// Warning 2661: (117-119): BMC: Overflow (resulting value larger than 2**255 - 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.

From f87a88aeab6f93cdbc3bef3ba7a3ee74cd4b0695 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Wed, 22 May 2024 17:08:23 +0200
Subject: [PATCH 0871/1140] SMTChecker: Add CHC engine check for underflow and
 overflow in unary minus operation

---
 Changelog.md                                    |  1 +
 libsolidity/formal/CHC.cpp                      | 17 +++++++++++++++++
 .../constructor_state_variable_init.sol         |  3 +--
 .../constructor_state_variable_init_asserts.sol |  3 +--
 ...nstructor_state_variable_init_chain_tree.sol |  3 +--
 .../smtCheckerTests/operators/mod.sol           |  3 +--
 .../smtCheckerTests/operators/mod_signed.sol    |  4 ++--
 .../operators/unary_minus_bmc.sol               | 11 +++++++++++
 .../operators/unary_minus_chc.sol               | 11 +++++++++++
 .../user_defined_operations_on_constants.sol    |  3 +--
 ...ser_defined_operations_on_constants_fail.sol |  3 +--
 ...perator_matches_equivalent_function_call.sol | 16 +++++++---------
 .../unchecked/flipping_sign_tests.sol           |  7 +++----
 13 files changed, 58 insertions(+), 27 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol

diff --git a/Changelog.md b/Changelog.md
index f48fbf080c..eb9d87ea89 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
 
 
 Bugfixes:
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index b6ffd5954f..c520d13f6b 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -554,6 +554,23 @@ void CHC::endVisit(UnaryOperation const& _op)
 		internalFunctionCall(funDef, std::nullopt, _op.userDefinedFunctionType(), arguments, state().thisAddress());
 
 		createReturnedExpressions(funDef, _op);
+		return;
+	}
+
+	if (
+		_op.annotation().type->category() == Type::Category::RationalNumber ||
+		_op.annotation().type->category() == Type::Category::FixedPoint
+	)
+		return;
+
+	if (_op.getOperator() == Token::Sub && smt::isInteger(*_op.annotation().type))
+	{
+		auto const* intType = dynamic_cast<IntegerType const*>(_op.annotation().type);
+		if (!intType)
+			intType = TypeProvider::uint256();
+
+		verificationTargetEncountered(&_op, VerificationTargetType::Underflow, expr(_op) < intType->minValue());
+		verificationTargetEncountered(&_op, VerificationTargetType::Overflow, expr(_op) > intType->maxValue());
 	}
 }
 
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 594580f898..88036eb550 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
@@ -39,5 +39,4 @@ contract C is B {
 // 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.
-// Info 6002: BMC: 1 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.
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 40ae96db47..db81b1d0fd 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
@@ -37,5 +37,4 @@ contract C is B {
 // 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.
-// Info 6002: BMC: 1 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.
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 638cb640d3..8fe0cb28e0 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
@@ -41,5 +41,4 @@ contract C is B {
 // ----
 // 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.
-// Info 6002: BMC: 1 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/operators/mod.sol b/test/libsolidity/smtCheckerTests/operators/mod.sol
index bd09b82402..d12e5c49d5 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod.sol
@@ -10,5 +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.
-// Info 6002: BMC: 1 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.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
index c995a158a2..c34bd08e3a 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
@@ -12,5 +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: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 5 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/unary_minus_bmc.sol b/test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
new file mode 100644
index 0000000000..052554d21c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
@@ -0,0 +1,11 @@
+contract C
+{
+	function f(int x) public pure {
+		assert(x == -x);
+	}
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 4661: (48-63): 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/operators/unary_minus_chc.sol b/test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol
new file mode 100644
index 0000000000..0d1bf972be
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol
@@ -0,0 +1,11 @@
+contract C
+{
+	function f(int x) public pure {
+		assert(x == -x);
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+//  Warning 6328: (48-63): 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_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
index fe12892eab..49420440f4 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
@@ -60,5 +60,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1391: CHC: 21 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.
+// Info 1391: CHC: 22 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 8afd995ea0..106a7c5f09 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
@@ -76,5 +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.
-// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
index b3887bfa00..33665ee26d 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
@@ -56,27 +56,25 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // 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: (679-708): CHC: Overflow (resulting value larger than 32767) happens here.
+// Warning 3944: (777-806): CHC: Underflow (resulting value less than -32768) might happen here.
 // Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) might happen here.
+// Warning 4984: (870-884): 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: (1051-1080): 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: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (679-708): BMC: Overflow (resulting value larger than 32767) happens here.
+// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4144: (679-708): BMC: Underflow (resulting value less than -32768) happens here.
 // Warning 2661: (777-806): BMC: Overflow (resulting value larger than 32767) happens here.
+// Warning 4144: (777-806): BMC: Underflow (resulting value less than -32768) happens here.
 // Warning 2661: (953-982): BMC: Overflow (resulting value larger than 32767) happens here.
 // Warning 4144: (953-982): BMC: Underflow (resulting value less than -32768) happens here.
-// 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: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
index 59a4b3d26e..536d2a2b44 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
@@ -2,14 +2,13 @@ contract test {
     function f() public pure returns (bool) {
         int256 x = -2**255;
         unchecked { assert(-x == x); }
-        assert(-x == x); // CHC apparently does not create an underflow target for unary minus
+        assert(-x == x);
         return true;
     }
 }
 // ====
 // SMTEngine: all
 // ----
+// Warning 4984: (117-119): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
 // 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.
-// Warning 2661: (117-119): BMC: Overflow (resulting value larger than 2**255 - 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 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From f80d45d07f989315f6d540d629368447397a35ab Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Fri, 24 May 2024 17:26:03 +0200
Subject: [PATCH 0872/1140] SMTChecker: Add SMTShowProvedSafe option for use in
 SMT checker tests

---
 scripts/error_codes.py                                    | 1 -
 test/libsolidity/SMTCheckerTest.cpp                       | 8 ++++++++
 test/libsolidity/SMTCheckerTest.h                         | 2 ++
 .../smtCheckerTests/operators/compound_add.sol            | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 27e7b1102b..8ee5cbbded 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -206,7 +206,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "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"
     test_ids |= white_ids
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 893ccb0f15..e3ec14c97c 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -38,6 +38,14 @@ SMTCheckerTest::SMTCheckerTest(std::string const& _filename): SyntaxTest(_filena
 	else
 		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT external calls mode."));
 
+	auto const& showProvedSafe = m_reader.stringSetting("SMTShowProvedSafe", "no");
+	if (showProvedSafe == "no")
+		m_modelCheckerSettings.showProvedSafe = false;
+	else if (showProvedSafe == "yes")
+		m_modelCheckerSettings.showProvedSafe = true;
+	else
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT \"show proved safe\" choice."));
+
 	auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
 	if (showUnproved == "no")
 		m_modelCheckerSettings.showUnproved = false;
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index d42572dc5b..aa0f92121a 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -52,6 +52,8 @@ class SMTCheckerTest: public SyntaxTest
 		Set in m_ignoreCex.
 	SMTIgnoreInv: `yes`, `no`, where the default is `no`.
 		Set in m_modelCheckerSettings.
+	SMTShowProvedSafe: `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`.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add.sol b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
index 7a18b1c7ee..852956f031 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
@@ -10,6 +10,9 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTShowProvedSafe: yes
 // ----
 // 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.
+// Info 9576: (90-95): CHC: Overflow (resulting value larger than 2**256 - 1) check is safe!
+// Info 9576: (85-95): CHC: Overflow (resulting value larger than 2**256 - 1) check is safe!
+// Info 9576: (99-114): CHC: Assertion violation check is safe!

From 5240ef3ecbefc0ec29f42fc96aa4fc7683b9e41b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 27 May 2024 10:40:08 +0200
Subject: [PATCH 0873/1140] Move type() helper function from TypeChecker to
 ASTUtils

---
 libsolidity/analysis/TypeChecker.cpp | 12 ------------
 libsolidity/analysis/TypeChecker.h   |  6 ------
 libsolidity/ast/ASTUtils.cpp         | 12 ++++++++++++
 libsolidity/ast/ASTUtils.h           |  6 ++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 42c98a8f05..5044414bff 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -80,18 +80,6 @@ bool TypeChecker::checkTypeRequirements(SourceUnit const& _source)
 	return !Error::containsErrors(m_errorReporter.errors());
 }
 
-Type const* TypeChecker::type(Expression const& _expression) const
-{
-	solAssert(!!_expression.annotation().type, "Type requested but not present.");
-	return _expression.annotation().type;
-}
-
-Type const* TypeChecker::type(VariableDeclaration const& _variable) const
-{
-	solAssert(!!_variable.annotation().type, "Type requested but not present.");
-	return _variable.annotation().type;
-}
-
 bool TypeChecker::visit(ContractDefinition const& _contract)
 {
 	m_currentContract = &_contract;
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index 2ef6b818be..d7998d1784 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -56,12 +56,6 @@ class TypeChecker: private ASTConstVisitor
 	/// @returns true iff all checks passed. Note even if all checks passed, errors() can still contain warnings
 	bool checkTypeRequirements(SourceUnit const& _source);
 
-	/// @returns the type of an expression and asserts that it is present.
-	Type const* type(Expression const& _expression) const;
-	/// @returns the type of the given variable and throws if the type is not present
-	/// (this can happen for variables with non-explicit types before their types are resolved)
-	Type const* type(VariableDeclaration const& _variable) const;
-
 	static bool typeSupportedByOldABIEncoder(Type const& _type, bool _isLibraryCall);
 
 private:
diff --git a/libsolidity/ast/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
index 27c0833d26..7d434f896d 100644
--- a/libsolidity/ast/ASTUtils.cpp
+++ b/libsolidity/ast/ASTUtils.cpp
@@ -95,4 +95,16 @@ Expression const* resolveOuterUnaryTuples(Expression const* _expr)
 	return _expr;
 }
 
+Type const* type(Expression const& _expression)
+{
+	solAssert(!!_expression.annotation().type, "Type requested but not present.");
+	return _expression.annotation().type;
+}
+
+Type const* type(VariableDeclaration const& _variable)
+{
+	solAssert(!!_variable.annotation().type, "Type requested but not present.");
+	return _variable.annotation().type;
+}
+
 }
diff --git a/libsolidity/ast/ASTUtils.h b/libsolidity/ast/ASTUtils.h
index f6e3f0641d..b31bd20d58 100644
--- a/libsolidity/ast/ASTUtils.h
+++ b/libsolidity/ast/ASTUtils.h
@@ -42,4 +42,10 @@ ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sour
 /// into unary tuples and returns the contained expression.
 Expression const* resolveOuterUnaryTuples(Expression const* _expr);
 
+/// @returns the type of an expression and asserts that it is present.
+Type const* type(Expression const& _expression);
+/// @returns the type of the given variable and throws if the type is not present
+/// (this can happen for variables with non-explicit types before their types are resolved)
+Type const* type(VariableDeclaration const& _variable);
+
 }

From c285bf3155a522b1c803d4bd811b0b05bd302240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 23 May 2024 19:34:16 +0200
Subject: [PATCH 0874/1140] ReleaseChecklist: Review and approve blog posts 
 before the release starts

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

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 5db731cfc5..30dc30a490 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -38,6 +38,7 @@ At least a day before the release:
 ### Blog Post
  - [ ] 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).
+ - [ ] Get the posts reviewed and approved **before the release starts**.
 
 ### Changelog
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.

From 748d444a232cc4d8a65bd10a2ce333a047390e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 23 May 2024 19:34:30 +0200
Subject: [PATCH 0875/1140] ReleaseChecklist: Fix a misplaced backtick

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

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 30dc30a490..d5e5abdd14 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -82,7 +82,7 @@ At least a day before the release:
 ### 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.
- - [ ] 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.
+ - [ ] 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.
        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.

From 118362f97cdbc899dbdd40bd61b38eadb3adf86a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 23 May 2024 19:34:54 +0200
Subject: [PATCH 0876/1140] ReleaseChecklist: Link to "Learning from Past
 Releases"

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

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index d5e5abdd14..85d1ff82ea 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -24,6 +24,7 @@ At least a day before the release:
        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.
+ - [ ] Review [Learning from Past Releases](https://notes.ethereum.org/@solidity/release-mistakes) to make sure you don't repeat the same mistakes.
 
 ### Drafts
 At least a day before the release:
@@ -117,4 +118,5 @@ At least a day before the release:
  - [ ] 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)
+ - [ ] If anything went wrong this time, mention it in [Learning from Past Releases](https://notes.ethereum.org/@solidity/release-mistakes).
  - [ ] Lean back, wait for bug reports and repeat from step 1 :).

From dc9874127544ee142a977f1c36e8879a6718a8cd Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 24 May 2024 12:13:58 +0200
Subject: [PATCH 0877/1140] ReleaseChecklist: Mention that docs need to be
 built before linkcheck

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

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 85d1ff82ea..8ca2e7f96e 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -15,6 +15,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.
+       **Note**: In order to run the link check, make sure you've built the docs first via ``docs.sh``.
  - [ ] 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:

From 75ebcc0147f47c5f55da44ed64697b3d0572ace4 Mon Sep 17 00:00:00 2001
From: Moritz Hoffmann <clonker@gmail.com>
Date: Tue, 28 May 2024 10:42:07 +0200
Subject: [PATCH 0878/1140] test substitution of unlimited string literal in
 yul

- Defines a contract with a name that exceeds 32 characters
- programSize is defined as datasize(contractName)
- if not correct, programSize can be substituted by optimizations into ctor return value
- this is due to u256 words only capturing first 32 chars
---
 .../long_literals_as_builtin_args.yul         | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul

diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul
new file mode 100644
index 0000000000..34b44aad94
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul
@@ -0,0 +1,28 @@
+object "AccessControlDefaultAdminRules4233_14" {
+    code {
+        let programSize := datasize("AccessControlDefaultAdminRules4233_14")
+        let i := mload(64)
+        // argument of datasize is a literal of length >32 which shares a common substring
+        // of length 32 with programSize, this should not be substituted
+        let j := datasize("AccessControlDefaultAdminRules4233_14_deployed")
+        codecopy(i, dataoffset("AccessControlDefaultAdminRules4233_14_deployed"), j)
+    }
+    object "AccessControlDefaultAdminRules4233_14_deployed" {
+        code {}
+    }
+
+}
+// ----
+// step: commonSubexpressionEliminator
+//
+// object "AccessControlDefaultAdminRules4233_14" {
+//     code {
+//         let programSize := datasize("AccessControlDefaultAdminRules4233_14")
+//         let i := mload(64)
+//         let j := datasize("AccessControlDefaultAdminRules4233_14_deployed")
+//         codecopy(i, dataoffset("AccessControlDefaultAdminRules4233_14_deployed"), j)
+//     }
+//     object "AccessControlDefaultAdminRules4233_14_deployed" {
+//         code { }
+//     }
+// }

From 85396f448f32e8d649e84b84740b52f7f2a605ed Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 27 May 2024 15:54:16 -0300
Subject: [PATCH 0879/1140] Introduce evm version prague

---
 .circleci/soltest_all.sh          |  2 +-
 Changelog.md                      |  1 +
 docs/using-the-compiler.rst       |  3 ++-
 liblangutil/EVMVersion.h          | 34 +++++++++++++++++++++++++++++--
 scripts/tests.sh                  |  2 +-
 solc/CommandLineParser.cpp        |  2 +-
 test/EVMHost.cpp                  |  2 ++
 test/tools/fuzzer_common.cpp      |  3 ++-
 test/tools/ossfuzz/protoToYul.cpp |  2 ++
 test/tools/ossfuzz/yulProto.proto |  1 +
 10 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 009852710e..86c14901b2 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"
 
-DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shanghai cancun)
+DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shanghai cancun prague)
 # Deserialize the EVM_VALUES array if it was provided as argument or
 # set EVM_VALUES to the default values.
 IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
diff --git a/Changelog.md b/Changelog.md
index eb9d87ea89..e7a1d865eb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
 
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 875c15b09d..544f451423 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -181,6 +181,7 @@ at each version. Backward compatibility is not guaranteed between each version.
    - 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>`_).
+- ``prague`` (**experimental**)
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
@@ -344,7 +345,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, paris, shanghai or cancun (default)
+        // petersburg, istanbul, berlin, london, paris, shanghai, cancun (default) or prague.
         "evmVersion": "cancun",
         // 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 58b54f3dca..7742689174 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -60,10 +60,25 @@ class EVMVersion:
 	static EVMVersion paris() { return {Version::Paris}; }
 	static EVMVersion shanghai() { return {Version::Shanghai}; }
 	static EVMVersion cancun() { return {Version::Cancun}; }
+	static EVMVersion prague() { return {Version::Prague}; }
 
 	static std::optional<EVMVersion> fromString(std::string const& _version)
 	{
-		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris(), shanghai(), cancun()})
+		for (auto const& v: {
+			homestead(),
+			tangerineWhistle(),
+			spuriousDragon(),
+			byzantium(),
+			constantinople(),
+			petersburg(),
+			istanbul(),
+			berlin(),
+			london(),
+			paris(),
+			shanghai(),
+			cancun(),
+			prague()
+		})
 			if (_version == v.name())
 				return v;
 		return std::nullopt;
@@ -88,6 +103,7 @@ class EVMVersion:
 		case Version::Paris: return "paris";
 		case Version::Shanghai: return "shanghai";
 		case Version::Cancun: return "cancun";
+		case Version::Prague: return "prague";
 		}
 		return "INVALID";
 	}
@@ -115,7 +131,21 @@ class EVMVersion:
 	bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
 
 private:
-	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai, Cancun };
+	enum class Version {
+		Homestead,
+		TangerineWhistle,
+		SpuriousDragon,
+		Byzantium,
+		Constantinople,
+		Petersburg,
+		Istanbul,
+		Berlin,
+		London,
+		Paris,
+		Shanghai,
+		Cancun,
+		Prague
+	};
 
 	EVMVersion(Version _version): m_version(_version) {}
 
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 26eaf4b4b1..dfbc047734 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 cancun"
+    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris shanghai cancun prague"
 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 824c899110..e61c5ce0a7 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, shanghai or cancun."
+			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris, shanghai, cancun or prague."
 		)
 	;
 	if (!_forHelp) // Note: We intentionally keep this undocumented for now.
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 4ab9b2b08d..5626f8d436 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -119,6 +119,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 		m_evmRevision = EVMC_SHANGHAI;
 	else if (_evmVersion == langutil::EVMVersion::cancun())
 		m_evmRevision = EVMC_CANCUN;
+	else if (_evmVersion == langutil::EVMVersion::prague())
+		m_evmRevision = EVMC_PRAGUE;
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index b054883820..8b7dbffa8c 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -49,7 +49,8 @@ static std::vector<EVMVersion> s_evmVersions = {
 	EVMVersion::istanbul(),
 	EVMVersion::berlin(),
 	EVMVersion::london(),
-	EVMVersion::paris()
+	EVMVersion::paris(),
+	EVMVersion::prague()
 };
 
 void FuzzerUtil::testCompilerJsonInterface(std::string const& _input, bool _optimize, bool _quiet)
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 8822666c8b..7913f4d634 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -119,6 +119,8 @@ EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
 		return EVMVersion::shanghai();
 	case Program::CANCUN:
 		return EVMVersion::cancun();
+	case Program::PRAGUE:
+		return EVMVersion::prague();
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index cf14b887c1..15ac01396b 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -406,6 +406,7 @@ message Program {
     PARIS = 9;
     SHANGHAI = 10;
     CANCUN = 11;
+    PRAGUE = 12;
   }
   oneof program_oneof {
     Block block = 1;

From bbd5e2e130024a4ebb49d078338dc6a90059e779 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Thu, 23 May 2024 13:24:44 +0200
Subject: [PATCH 0880/1140] yul identifiers with leading or trailing dot are
 restricted

---
 Changelog.md                                  |  1 +
 libyul/optimiser/OptimizerUtilities.cpp       | 13 +++++-
 .../leading_and_trailing_dots.yul             | 42 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 test/libyul/objectCompiler/leading_and_trailing_dots.yul

diff --git a/Changelog.md b/Changelog.md
index eb9d87ea89..7689ede6bf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
 
 
 ### 0.8.26 (2024-05-21)
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index 17f912762b..bfa3d888f1 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -36,6 +36,17 @@ using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
 
+namespace
+{
+
+bool hasLeadingOrTrailingDot(std::string_view const _s)
+{
+	yulAssert(!_s.empty());
+	return _s.front() == '.' || _s.back() == '.';
+}
+
+}
+
 void yul::removeEmptyBlocks(Block& _block)
 {
 	auto isEmptyBlock = [](Statement const& _st) -> bool {
@@ -46,7 +57,7 @@ void yul::removeEmptyBlocks(Block& _block)
 
 bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier)
 {
-	return _identifier.empty() || TokenTraits::isYulKeyword(_identifier.str()) || _dialect.reservedIdentifier(_identifier);
+	return _identifier.empty() || hasLeadingOrTrailingDot(_identifier.str()) || TokenTraits::isYulKeyword(_identifier.str()) || _dialect.reservedIdentifier(_identifier);
 }
 
 std::optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulString const& _name)
diff --git a/test/libyul/objectCompiler/leading_and_trailing_dots.yul b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
new file mode 100644
index 0000000000..ea6a8fcd8b
--- /dev/null
+++ b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
@@ -0,0 +1,42 @@
+{
+    function e(_._) {
+        e(0)
+    }
+    e(2)
+    function f(n._) {
+        f(0)
+    }
+    f(2)
+    function g(_.n) {
+        g(0)
+    }
+    g(2)
+}
+// ----
+// Assembly:
+//     /* "source":49:50   */
+//   0x02
+//     /* "source":6:42   */
+// tag_1:
+//     /* "source":34:35   */
+//   0x00
+//     /* "source":32:36   */
+//   tag_1
+//   jump	// in
+//     /* "source":56:92   */
+// tag_2:
+//     /* "source":84:85   */
+//   0x00
+//     /* "source":82:86   */
+//   tag_2
+//   jump	// in
+//     /* "source":106:142   */
+// tag_3:
+//     /* "source":134:135   */
+//   0x00
+//     /* "source":132:136   */
+//   tag_3
+//   jump	// in
+// Bytecode: 60025b5f6002565b5f6007565b5f600c56
+// Opcodes: PUSH1 0x2 JUMPDEST PUSH0 PUSH1 0x2 JUMP JUMPDEST PUSH0 PUSH1 0x7 JUMP JUMPDEST PUSH0 PUSH1 0xC JUMP
+// SourceMappings: 49:1:0:-:0;6:36;34:1;32:4;:::i;56:36::-;84:1;82:4;:::i;106:36::-;134:1;132:4;:::i

From 69c646a6077f49b3ed0a7842b564106ffe156751 Mon Sep 17 00:00:00 2001
From: Daniel Zahariev <daniel.zahariev@monaxlabs.io>
Date: Tue, 28 May 2024 20:53:02 +0300
Subject: [PATCH 0881/1140] Update style-guide.rst

Update function modifier order in the example to match with the guide.
---
 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 0ac890cb34..87e604124b 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -662,7 +662,7 @@ Yes:
         return balanceOf[from];
     }
 
-    function increment(uint x) public onlyOwner pure returns (uint) {
+    function increment(uint x) public pure onlyOwner returns (uint) {
         return x + 1;
     }
 

From 6e6e5e504eb32b42cd522932ce8d07500a8fd2d3 Mon Sep 17 00:00:00 2001
From: shafu <shafu0x@gmail.com>
Date: Wed, 29 May 2024 14:25:31 +0200
Subject: [PATCH 0882/1140] Update assembly.rst

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

diff --git a/docs/assembly.rst b/docs/assembly.rst
index e08ff9f627..224d752082 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -9,7 +9,8 @@ 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,
-which is especially useful when you are enhancing the language by writing libraries.
+which is especially useful when you are enhancing the language by writing libraries or
+trying to optimize gas usage.
 
 The language used for inline assembly in Solidity is called :ref:`Yul <yul>`
 and it is documented in its own section. This section will only cover

From 76e31d9f1af12c2fc80343863589b939b0a0953c Mon Sep 17 00:00:00 2001
From: shafu <shafu0x@gmail.com>
Date: Wed, 29 May 2024 14:27:27 +0200
Subject: [PATCH 0883/1140] Update assembly.rst

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

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 224d752082..cf2ce1bf94 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -10,7 +10,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,
 which is especially useful when you are enhancing the language by writing libraries or
-trying to optimize gas usage.
+optimizing gas usage.
 
 The language used for inline assembly in Solidity is called :ref:`Yul <yul>`
 and it is documented in its own section. This section will only cover

From e32b3ddc8a06888d9af047e2418a8e1f94bb1913 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 23 May 2024 16:48:34 +0200
Subject: [PATCH 0884/1140] Add authentication header to circleci api

---
 .circleci/config.yml                          |  7 ++
 scripts/common/rest_api_helpers.py            | 13 ++--
 scripts/externalTests/download_benchmarks.py  | 20 +++++-
 ...test_externalTests_benchmark_downloader.py | 64 +++++++++++++++----
 4 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6feb033dea..3a246d3a5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1522,6 +1522,13 @@ jobs:
   c_ext_benchmarks:
     <<: *base_node_small
     steps:
+      - run:
+          name: Check CircleCI token presence; Skip job if not set.
+          command: |
+            if [[ -z "$CIRCLECI_TOKEN" ]]; then
+              echo "Skipping benchmarks..."
+              circleci-agent step halt
+            fi
       - install_python3:
           packages: requests
       - checkout
diff --git a/scripts/common/rest_api_helpers.py b/scripts/common/rest_api_helpers.py
index 31f973e818..caae2b5db8 100644
--- a/scripts/common/rest_api_helpers.py
+++ b/scripts/common/rest_api_helpers.py
@@ -1,3 +1,4 @@
+from os import environ
 from pathlib import Path
 from typing import List, Mapping, Optional
 import functools
@@ -42,13 +43,13 @@ class FileAlreadyExists(APIHelperError):
     pass
 
 
-def query_api(url: str, params: Mapping[str, str], debug_requests=False) -> dict:
+def query_api(url: str, params: Mapping[str, str], headers: dict, 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, timeout=60)
+    response = requests.get(url, params=params, headers=headers, timeout=60)
     response.raise_for_status()
 
     if debug_requests:
@@ -63,11 +64,11 @@ def query_api(url: str, params: Mapping[str, str], debug_requests=False) -> dict
     return response.json()
 
 
-def download_file(url: str, target_path: Path, overwrite=False):
+def download_file(url: str, target_path: Path, headers: dict, 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, timeout=60) as request:
+    with requests.get(url, headers, stream=True, timeout=60) as request:
         with open(target_path, 'wb') as target_file:
             shutil.copyfileobj(request.raw, target_file)
 
@@ -86,6 +87,7 @@ 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
         )
 
@@ -108,11 +110,12 @@ def paginated_query_api_iterator(self, url: str, params: Mapping[str, str], max_
 
         page_count = 0
         next_page_token = None
+        headers = {'Circle-Token': str(environ.get('CIRCLECI_TOKEN'))} if 'CIRCLECI_TOKEN' in environ else {}
         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)
+            json_response = query_api(url, params, headers, self.debug_requests)
 
             yield json_response['items']
             next_page_token = json_response['next_page_token']
diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
index 29f5fe4bc7..0f8a650360 100755
--- a/scripts/externalTests/download_benchmarks.py
+++ b/scripts/externalTests/download_benchmarks.py
@@ -2,7 +2,9 @@
 
 from argparse import ArgumentParser, Namespace
 from enum import Enum, unique
+from os import environ
 from pathlib import Path
+from textwrap import dedent
 from typing import Mapping, Optional
 import sys
 
@@ -28,8 +30,13 @@ class Status(Enum):
 
 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."
+        """
+        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.
+
+        The script requires the CIRCLECI_TOKEN environment variable to be set with a valid CircleCI API token.
+        You can generate a new token at https://app.circleci.com/settings/user/tokens.
+        """
     )
 
     parser = ArgumentParser(description=script_description)
@@ -96,9 +103,11 @@ def download_benchmark_artifact(
             print(f"Missing artifact: {artifact_path}.")
         return False
 
+    headers = {'Circle-Token': str(environ.get('CIRCLECI_TOKEN'))} if 'CIRCLECI_TOKEN' in environ else {}
     download_file(
         artifacts[artifact_path]['url'],
         Path(f'{benchmark_name}-{branch}-{commit_hash[:8]}.json'),
+        headers,
         overwrite,
     )
 
@@ -162,6 +171,13 @@ def download_benchmarks(
 
 def main():
     try:
+        if 'CIRCLECI_TOKEN' not in environ:
+            raise RuntimeError(
+               dedent(""" \
+                   CIRCLECI_TOKEN environment variable required but not set.
+                   Please generate a new token at https://app.circleci.com/settings/user/tokens and set CIRCLECI_TOKEN.
+                   """)
+            )
         options = process_commandline()
         return download_benchmarks(
             options.branch,
diff --git a/test/scripts/test_externalTests_benchmark_downloader.py b/test/scripts/test_externalTests_benchmark_downloader.py
index aead618470..f9ca9ae721 100644
--- a/test/scripts/test_externalTests_benchmark_downloader.py
+++ b/test/scripts/test_externalTests_benchmark_downloader.py
@@ -3,6 +3,8 @@
 from pathlib import Path
 from unittest import TestCase
 from unittest.mock import call, Mock, patch
+import os
+import requests
 
 # NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
 # pragma pylint: disable=import-error
@@ -31,7 +33,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, timeout):
+def _requests_get_mock(url, params, headers, timeout):
     response_mock = Mock()
 
     if url == 'https://api.github.com/repos/ethereum/solidity/pulls/12818':
@@ -155,25 +157,37 @@ def _requests_get_mock(url, params, timeout):
         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"
-                }
-            ]
-        }
+        if (
+            os.environ.get('CIRCLECI_TOKEN') == 'valid_token' and
+            headers.get('Circle-Token') == os.environ.get('CIRCLECI_TOKEN')
+        ):
+            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"
+                    }
+                ]
+            }
+        else:
+            response_mock.status_code = 401
+            response_mock.json.return_value = {
+                "message": "Unauthorized"
+            }
+            error = requests.exceptions.HTTPError(f"401 Client Error: Unauthorized for url: {url}")
+            response_mock.raise_for_status.side_effect = error
         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 "") +
+        (f"headers: {headers}\n" if len(headers) > 0 else "") +
         f"timeout: {timeout}\n" +
         "If you have updated the code, please remember to add matching response fixtures above."
     )
@@ -186,17 +200,20 @@ def setUp(self):
     @patch('externalTests.download_benchmarks.download_file')
     @patch('requests.get', _requests_get_mock)
     @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    @patch.dict(os.environ, {'CIRCLECI_TOKEN': 'valid_token'})
     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'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
             call(
                 'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
                 Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
         ])
@@ -205,17 +222,20 @@ def test_download_benchmarks(download_file_mock):
     @patch('externalTests.download_benchmarks.download_file')
     @patch('requests.get', _requests_get_mock)
     @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    @patch.dict(os.environ, {'CIRCLECI_TOKEN': 'valid_token'})
     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'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
             call(
                 'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
                 Path('all-benchmarks-develop-43f29c00.json'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
         ])
@@ -224,17 +244,20 @@ def test_download_benchmarks_branch(download_file_mock):
     @patch('externalTests.download_benchmarks.download_file')
     @patch('requests.get', _requests_get_mock)
     @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    @patch.dict(os.environ, {'CIRCLECI_TOKEN': 'valid_token'})
     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'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
             call(
                 'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
                 Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
         ])
@@ -243,17 +266,30 @@ def test_download_benchmarks_pr(download_file_mock):
     @patch('externalTests.download_benchmarks.download_file')
     @patch('requests.get', _requests_get_mock)
     @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    @patch.dict(os.environ, {'CIRCLECI_TOKEN': 'valid_token'})
     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'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
             call(
                 'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
                 Path('all-benchmarks-develop-43f29c00.json'),
+                {'Circle-Token': 'valid_token'},
                 False
             ),
         ])
+
+    # NOTE: No circleci token is set in the environment
+    @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_unauthorized_request(self, _):
+        with self.assertRaises(requests.exceptions.HTTPError) as manager:
+            download_benchmarks(None, None, None, silent=True)
+
+        self.assertIn('401 Client Error: Unauthorized', str(manager.exception))

From 6ab7795b41d583d7138e99ae5471ecff64a84b53 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 28 May 2024 17:27:41 +0200
Subject: [PATCH 0885/1140] Update scripts/externalTests/download_benchmarks.py
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/externalTests/download_benchmarks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
index 0f8a650360..508e801da3 100755
--- a/scripts/externalTests/download_benchmarks.py
+++ b/scripts/externalTests/download_benchmarks.py
@@ -34,8 +34,8 @@ def process_commandline() -> Namespace:
         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.
 
-        The script requires the CIRCLECI_TOKEN environment variable to be set with a valid CircleCI API token.
-        You can generate a new token at https://app.circleci.com/settings/user/tokens.
+        The script will use the CIRCLECI_TOKEN environment as a CircleCI API token if set.
+        You can generate a new personal token at https://app.circleci.com/settings/user/tokens.
         """
     )
 

From fea0c75a6a4b285ae1438ea7ae5e46102deb548d Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 23 May 2024 16:48:34 +0200
Subject: [PATCH 0886/1140] Add authentication header to circleci api

---
 .circleci/config.yml                         | 24 +++++++++++---------
 scripts/externalTests/download_benchmarks.py |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a246d3a5c..c58d01e329 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1522,13 +1522,6 @@ jobs:
   c_ext_benchmarks:
     <<: *base_node_small
     steps:
-      - run:
-          name: Check CircleCI token presence; Skip job if not set.
-          command: |
-            if [[ -z "$CIRCLECI_TOKEN" ]]; then
-              echo "Skipping benchmarks..."
-              circleci-agent step halt
-            fi
       - install_python3:
           packages: requests
       - checkout
@@ -1540,6 +1533,19 @@ jobs:
       - 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
+      - run:
+          name: Check CircleCI token presence; Skip remaining steps if the token is not present.
+          command: |
+            # NOTE: download_benchmarks.py requires CIRCLECI_TOKEN environment variable to be set to
+            # a valid CircleCI API token to download the benchmark artifacts.
+            if [[ -z "$CIRCLECI_TOKEN" ]]; then
+              echo "Skipping download benchmarks..."
+              circleci-agent step halt
+            fi
       - run:
           name: Download reports from base branch
           command: |
@@ -1584,10 +1590,6 @@ jobs:
                 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:
diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
index 508e801da3..0f8a650360 100755
--- a/scripts/externalTests/download_benchmarks.py
+++ b/scripts/externalTests/download_benchmarks.py
@@ -34,8 +34,8 @@ def process_commandline() -> Namespace:
         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.
 
-        The script will use the CIRCLECI_TOKEN environment as a CircleCI API token if set.
-        You can generate a new personal token at https://app.circleci.com/settings/user/tokens.
+        The script requires the CIRCLECI_TOKEN environment variable to be set with a valid CircleCI API token.
+        You can generate a new token at https://app.circleci.com/settings/user/tokens.
         """
     )
 

From bf4b5e3ce5db68c37e7a512662de400feaac4fae Mon Sep 17 00:00:00 2001
From: Moritz Hoffmann <clonker@gmail.com>
Date: Mon, 3 Jun 2024 10:51:57 +0200
Subject: [PATCH 0887/1140] Fix changelog entry for #15149

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

diff --git a/Changelog.md b/Changelog.md
index 2dca155627..4361f1fec8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,7 +9,7 @@ Compiler Features:
 
 
 Bugfixes:
-Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
+ * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
 
 
 ### 0.8.26 (2024-05-21)

From 52223ff5bd4cd7e21c59705cb6f90bfa98ec4960 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 24 May 2024 11:25:56 +0200
Subject: [PATCH 0888/1140] Fix segfault in nested tuple to tuple assignments

---
 Changelog.md                                  |   1 +
 libsolidity/analysis/StaticAnalyzer.cpp       | 114 +++++++++++++++++-
 libsolidity/analysis/StaticAnalyzer.h         |   5 +
 libsolidity/analysis/TypeChecker.cpp          | 101 ----------------
 libsolidity/analysis/TypeChecker.h            |   3 -
 .../nested_tuple_to_tuple_assignment.sol      |  37 ++++++
 6 files changed, 156 insertions(+), 105 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/tupleAssignments/nested_tuple_to_tuple_assignment.sol

diff --git a/Changelog.md b/Changelog.md
index 4361f1fec8..2101f1ec9b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
 
 
diff --git a/libsolidity/analysis/StaticAnalyzer.cpp b/libsolidity/analysis/StaticAnalyzer.cpp
index 563295e23c..dfd262c8de 100644
--- a/libsolidity/analysis/StaticAnalyzer.cpp
+++ b/libsolidity/analysis/StaticAnalyzer.cpp
@@ -22,10 +22,13 @@
  */
 
 #include <libsolidity/analysis/StaticAnalyzer.h>
-
 #include <libsolidity/analysis/ConstantEvaluator.h>
 #include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTUtils.h>
 #include <liblangutil/ErrorReporter.h>
+
+#include <range/v3/view/enumerate.hpp>
+
 #include <memory>
 
 using namespace solidity;
@@ -88,6 +91,18 @@ bool StaticAnalyzer::analyze(SourceUnit const& _sourceUnit)
 	return !Error::containsErrors(m_errorReporter.errors());
 }
 
+bool StaticAnalyzer::visit(Assignment const& _assignment)
+{
+	Type const* lhsType = _assignment.leftHandSide().annotation().type;
+	Type const* rhsType = _assignment.rightHandSide().annotation().type;
+	solAssert(lhsType && rhsType, "Both left and right hand side expressions in an assignment must have a type.");
+
+	if (dynamic_cast<TupleType const*>(lhsType) && dynamic_cast<TupleType const*>(rhsType))
+		checkDoubleStorageAssignment(_assignment);
+
+	return true;
+}
+
 bool StaticAnalyzer::visit(ContractDefinition const& _contract)
 {
 	m_library = _contract.isLibrary();
@@ -348,3 +363,100 @@ bool StaticAnalyzer::visit(FunctionCall const& _functionCall)
 	}
 	return true;
 }
+
+void StaticAnalyzer::checkDoubleStorageAssignment(Assignment const& _assignment)
+{
+	size_t storageToStorageCopies = 0;
+	size_t toStorageCopies = 0;
+	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));
+		TupleExpression const* lhsResolved = dynamic_cast<TupleExpression const*>(resolveOuterUnaryTuples(&_lhs));
+
+		solAssert(lhsResolved && lhsResolved->components().size() == lhsType.components().size());
+		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->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->numBytes() == 1)
+				{
+					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)
+						{
+							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(lhsResolved->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 (dynamic_cast<TupleType const*>(componentType))
+				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,
+							*rhsNestedType,
+							_recurse
+						);
+		}
+	};
+
+	TupleExpression const* lhsTupleExpression = dynamic_cast<TupleExpression const*>(&_assignment.leftHandSide());
+	if (!lhsTupleExpression)
+	{
+		solAssert(m_errorReporter.hasErrors());
+		return;
+	}
+	count(
+		*lhsTupleExpression,
+		dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide())),
+		count
+	);
+
+	if (storageToStorageCopies >= 1 && toStorageCopies >= 2)
+		m_errorReporter.warning(
+			7238_error,
+			_assignment.location(),
+			"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."
+		);
+
+	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."
+		);
+}
diff --git a/libsolidity/analysis/StaticAnalyzer.h b/libsolidity/analysis/StaticAnalyzer.h
index dc6263d7e5..909af2b02a 100644
--- a/libsolidity/analysis/StaticAnalyzer.h
+++ b/libsolidity/analysis/StaticAnalyzer.h
@@ -65,6 +65,7 @@ class StaticAnalyzer: private ASTConstVisitor
 	bool visit(FunctionDefinition const& _function) override;
 	void endVisit(FunctionDefinition const& _function) override;
 
+	bool visit(Assignment const& _assignment) override;
 	bool visit(ExpressionStatement const& _statement) override;
 	bool visit(VariableDeclaration const& _variable) override;
 	bool visit(Identifier const& _identifier) override;
@@ -74,6 +75,10 @@ class StaticAnalyzer: private ASTConstVisitor
 	bool visit(BinaryOperation const& _operation) override;
 	bool visit(FunctionCall const& _functionCall) override;
 
+	/// Checks (and warns) if a tuple assignment might cause unexpected overwrites in storage.
+	/// Should only be called if the left hand side is tuple-typed.
+	void checkDoubleStorageAssignment(Assignment const& _assignment);
+
 	langutil::ErrorReporter& m_errorReporter;
 
 	/// Flag that indicates whether the current contract definition is a library.
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5044414bff..918e270333 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -94,103 +94,6 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
 	return false;
 }
 
-void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
-{
-	size_t storageToStorageCopies = 0;
-	size_t toStorageCopies = 0;
-	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));
-		TupleExpression const* lhsResolved = dynamic_cast<TupleExpression const*>(resolveOuterUnaryTuples(&_lhs));
-
-		solAssert(!lhsResolved || lhsResolved->components().size() == lhsType.components().size());
-		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(lhsResolved->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(lhsResolved->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*>(lhsResolved->components().at(index).get()))
-					if (auto const* rhsNestedType = dynamic_cast<TupleType const*>(_rhs.components().at(index)))
-						_recurse(
-							*lhsNested,
-							*rhsNestedType,
-							_recurse
-						);
-		}
-	};
-
-	TupleExpression const* lhsTupleExpression = dynamic_cast<TupleExpression const*>(&_assignment.leftHandSide());
-	if (!lhsTupleExpression)
-	{
-		solAssert(m_errorReporter.hasErrors());
-		return;
-	}
-	count(
-		*lhsTupleExpression,
-		dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide())),
-		count
-	);
-
-	if (storageToStorageCopies >= 1 && toStorageCopies >= 2)
-		m_errorReporter.warning(
-			7238_error,
-			_assignment.location(),
-			"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."
-		);
-
-	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)
 {
 	std::vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
@@ -1575,10 +1478,6 @@ bool TypeChecker::visit(Assignment const& _assignment)
 		_assignment.annotation().type = TypeProvider::emptyTuple();
 
 		expectType(_assignment.rightHandSide(), *tupleType);
-
-		// expectType does not cause fatal errors, so we have to check again here.
-		if (dynamic_cast<TupleType const*>(type(_assignment.rightHandSide())))
-			checkDoubleStorageAssignment(_assignment);
 	}
 	else if (_assignment.assignmentOperator() == Token::Assign)
 		expectType(_assignment.rightHandSide(), *t);
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index d7998d1784..b3bd8b91fb 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -61,9 +61,6 @@ class TypeChecker: private ASTConstVisitor
 private:
 
 	bool visit(ContractDefinition const& _contract) override;
-	/// Checks (and warns) if a tuple assignment might cause unexpected overwrites in storage.
-	/// Should only be called if the left hand side is tuple-typed.
-	void checkDoubleStorageAssignment(Assignment const& _assignment);
 	// Checks whether the expression @arg _expression can be assigned from type @arg _type
 	// and reports an error, if not.
 	void checkExpressionAssignment(Type const& _type, Expression const& _expression);
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/nested_tuple_to_tuple_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/nested_tuple_to_tuple_assignment.sol
new file mode 100644
index 0000000000..87ebfbd001
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tupleAssignments/nested_tuple_to_tuple_assignment.sol
@@ -0,0 +1,37 @@
+contract C {
+    bool x;
+
+    function foo() external {
+        (((),x)&x) = ((), true);
+        (((),x)+x) = ((), true);
+        (((),x)-x) = ((), true);
+        (((),x)/x) = ((), true);
+        (((),x)*x) = ((), true);
+        (((),x)|x) = ((), true);
+    }
+}
+// ----
+// TypeError 6473: (66-68): Tuple component cannot be empty.
+// TypeError 2271: (65-73): Built-in binary operator & cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (65-73): Expression has to be an lvalue.
+// TypeError 6473: (78-80): Tuple component cannot be empty.
+// TypeError 6473: (99-101): Tuple component cannot be empty.
+// TypeError 2271: (98-106): Built-in binary operator + cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (98-106): Expression has to be an lvalue.
+// TypeError 6473: (111-113): Tuple component cannot be empty.
+// TypeError 6473: (132-134): Tuple component cannot be empty.
+// TypeError 2271: (131-139): Built-in binary operator - cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (131-139): Expression has to be an lvalue.
+// TypeError 6473: (144-146): Tuple component cannot be empty.
+// TypeError 6473: (165-167): Tuple component cannot be empty.
+// TypeError 2271: (164-172): Built-in binary operator / cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (164-172): Expression has to be an lvalue.
+// TypeError 6473: (177-179): Tuple component cannot be empty.
+// TypeError 6473: (198-200): Tuple component cannot be empty.
+// TypeError 2271: (197-205): Built-in binary operator * cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (197-205): Expression has to be an lvalue.
+// TypeError 6473: (210-212): Tuple component cannot be empty.
+// TypeError 6473: (231-233): Tuple component cannot be empty.
+// TypeError 2271: (230-238): Built-in binary operator | cannot be applied to types tuple(tuple(),bool) and bool.
+// TypeError 4247: (230-238): Expression has to be an lvalue.
+// TypeError 6473: (243-245): Tuple component cannot be empty.

From 03ecb0f6c0ef20b862b1a1a16e2d144d69c902ab Mon Sep 17 00:00:00 2001
From: Tilak Madichetti <tilak.madichetti@gmail.com>
Date: Mon, 3 Jun 2024 22:18:13 +0530
Subject: [PATCH 0889/1140] Update 080-breaking-changes.rst

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

diff --git a/docs/080-breaking-changes.rst b/docs/080-breaking-changes.rst
index 524d12ac3b..9d1f3347b6 100644
--- a/docs/080-breaking-changes.rst
+++ b/docs/080-breaking-changes.rst
@@ -155,7 +155,7 @@ Interface Changes
   ``storage-layout`` are sub-objects now. Before 0.8.0 they used to be serialised as strings.
 
 * The "legacy AST" has been removed (``--ast-json`` on the commandline interface and ``legacyAST`` for standard JSON).
-  Use the "compact AST" (``--ast-compact--json`` resp. ``AST``) as replacement.
+  Use the "compact AST" (``--ast-compact-json`` resp. ``AST``) as replacement.
 
 * The old error reporter (``--old-reporter``) has been removed.
 

From baddb2193c3716fed09c0edb34a4d289ccd05fb6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 5 Jun 2024 12:23:40 +0200
Subject: [PATCH 0890/1140] Fix default EVM version in CI.

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c58d01e329..5826067ddd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,7 +30,7 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c57f2bfb8c15d70fe290629358dd1c73dc126e3760f443b54764797556b887d4"
   evm-version:
     type: string
-    default: london
+    default: cancun
 
 orbs:
   win: circleci/windows@2.2.0

From 9e49b2c5336d93c20d86ade193cdafa6c446db47 Mon Sep 17 00:00:00 2001
From: snoppy <michaleli@foxmail.com>
Date: Thu, 6 Jun 2024 15:22:13 +0800
Subject: [PATCH 0891/1140] chore: fix typos

Signed-off-by: snoppy <michaleli@foxmail.com>
---
 libsolidity/formal/BMC.cpp | 2 +-
 libsolutil/CommonData.h    | 2 +-
 libyul/AsmParser.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 2bb794cde4..e7cf35a7f4 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -376,7 +376,7 @@ bool BMC::visit(WhileStatement const& _node)
 			auto indices = copyVariableIndices();
 			_node.condition().accept(*this);
 			loopCondition = expr(_node.condition());
-			// asseert that the loop is complete
+			// assert that the loop is complete
 			m_context.addAssertion(!loopCondition || broke || !loopConditionOnPreviousIterations);
 			mergeVariables(
 				broke || !loopConditionOnPreviousIterations,
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index de6873845d..c52434451b 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -575,7 +575,7 @@ void iterateReplacingWindow(std::vector<T>& _vector, F const& _f)
 	detail::iterateReplacingWindow(_vector, _f, std::make_index_sequence<N>{});
 }
 
-/// @returns true iff @a _str passess the hex address checksum test.
+/// @returns true iff @a _str passes the hex address checksum test.
 /// @param _strict if false, hex strings with only uppercase or only lowercase letters
 /// are considered valid.
 bool passesAddressChecksum(std::string const& _str, bool _strict);
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index 3e0af66acc..dd91e436e2 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -140,7 +140,7 @@ class Parser: public langutil::ParserBase
 	/// Parses a functional expression that has to push exactly one stack element
 	Expression parseExpression();
 	/// Parses an elementary operation, i.e. a literal, identifier, instruction or
-	/// builtin functian call (only the name).
+	/// builtin function call (only the name).
 	std::variant<Literal, Identifier> parseLiteralOrIdentifier();
 	VariableDeclaration parseVariableDeclaration();
 	FunctionDefinition parseFunctionDefinition();

From c1edf1983b152807f98f374207f8cbc5b89844fc Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 14 May 2024 18:41:56 +0200
Subject: [PATCH 0892/1140] Split docker run command in Dockerfile.emscripten

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 961901f00b..46bf734b61 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -44,8 +44,10 @@ RUN set -ex && \
 		python3 \
 		python3-pip \
 		sudo && \
-	pip3 install requests && \
-	\
+	pip3 install requests;
+
+# Install Z3
+RUN set -ex && \
 	cd /usr/src && \
 	git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \
 	cd z3 && \
@@ -63,9 +65,11 @@ RUN set -ex && \
 		.. && \
 	make && \
 	make install && \
-	rm -r /usr/src/z3 && \
+	rm -r /usr/src/z3
+
+# Install Boost
+RUN set -ex && \
 	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 && \

From e2da441352b5a28acbb8a531452d9c45ac48d104 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 14 May 2024 18:42:46 +0200
Subject: [PATCH 0893/1140] Upgrade to cvc5 in buildpack-deps

---
 .../buildpack-deps/Dockerfile.emscripten      | 11 ++++++++++
 .../Dockerfile.ubuntu.clang.ossfuzz           | 11 ++++++++++
 .../buildpack-deps/Dockerfile.ubuntu2004      | 20 ++++++++++++++++---
 .../buildpack-deps/Dockerfile.ubuntu2204      | 16 ++++++++++++---
 .../Dockerfile.ubuntu2204.clang               | 11 ++++++++++
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 46bf734b61..d2726f9a98 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -83,3 +83,14 @@ RUN set -ex && \
 		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 && \
 	rm -r /usr/src/boost_1_75_0
+
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index f8a4c73ce9..02cb05be5e 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -109,6 +109,17 @@ RUN set -ex; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
 # OSSFUZZ: libprotobuf-mutator
 RUN set -ex; \
 	git clone https://github.com/google/libprotobuf-mutator.git \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 815c93ee84..9f331e1b8b 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -39,7 +39,6 @@ RUN set -ex; \
 		libboost-program-options-dev \
 		libboost-system-dev \
 		libboost-test-dev \
-		libcvc4-dev \
 		libz3-static-dev \
 		lsof \
 		ninja-build \
@@ -47,6 +46,7 @@ RUN set -ex; \
 		python3-sphinx \
 		software-properties-common \
 		sudo \
+		unzip \
 		z3-static; \
 	pip3 install \
 		codecov \
@@ -59,18 +59,32 @@ RUN set -ex; \
 		tabulate \
 		z3-solver;
 
+# TODO: we could eliminate duplication by using a Dockerfile extension like:
+# https://github.com/edrevo/dockerfile-plus?tab=readme-ov-file#dockerfile
+# or mult-stage builds, then we could define a base image which would be included/used by all the other Dockerfiles.
+# Or we could move the common parts to a shell script, copying and calling it from the Dockerfiles.
 # Eldarica
 RUN set -ex; \
 	apt-get update; \
 	apt-get install -qqy \
-		openjdk-11-jre \
-		unzip; \
+		openjdk-11-jre; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
 FROM base AS libraries
 
 # EVMONE
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 254e83b4cf..6bc1df1439 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -40,7 +40,6 @@ RUN set -ex; \
 		libboost-system-dev \
 		libboost-test-dev \
 		libcln-dev \
-		libcvc4-dev \
 		libz3-static-dev \
 		locales-all \
 		lsof \
@@ -49,6 +48,7 @@ RUN set -ex; \
 		python3-sphinx \
 		software-properties-common \
 		sudo \
+		unzip \
 		z3-static \
 		zip; \
 	pip3 install \
@@ -66,14 +66,24 @@ RUN set -ex; \
 RUN set -ex; \
 	apt-get update; \
 	apt-get install -qqy \
-		openjdk-11-jre \
-		unzip; \
+		openjdk-11-jre; \
 	eldarica_version="2.1"; \
 	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
 	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
 FROM base AS libraries
 
 # EVMONE
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index af6155b6e0..de9ce4efb6 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -71,6 +71,17 @@ RUN set -ex; \
 	unzip /opt/eld_binaries.zip -d /opt; \
 	rm -f /opt/eld_binaries.zip;
 
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
 FROM base AS libraries
 
 ENV CC clang

From 3127bbccd66e701498b3066ff301a957aee0a250 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 16 May 2024 16:44:42 +0200
Subject: [PATCH 0894/1140] Bump docker image versions

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz | 2 +-
 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, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index d2726f9a98..478d8d947c 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="17"
+LABEL version="18"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index 02cb05be5e..aae11521e5 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="6"
+LABEL version="7"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 9f331e1b8b..8b94fe9dd9 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="23"
+LABEL version="24"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 6bc1df1439..90d5811c3b 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="8"
+LABEL version="9"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index de9ce4efb6..b2f75b0e43 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="7"
+LABEL version="8"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 128b17259c468fbe8a7b1f8219d9d8ab891f43f2 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 16 May 2024 16:46:24 +0200
Subject: [PATCH 0895/1140] Install cvc5 on OSX

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

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 87383ba8f5..5436c31fe0 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -84,6 +84,16 @@ then
   sudo mv /tmp/eldarica/{eld,eld-client,target,eldEnv} /usr/local/bin
   rm -rf /tmp/{eldarica,eld_binaries.zip}
 
+  #cvc5
+  cvc5_version="1.1.2"
+  wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-macOS-arm64-static.zip" -O /tmp/cvc5.zip
+  validate_checksum /tmp/cvc5.zip 2017d683d924676cb713865c6d4fcf70115c65b7ec2848f242ab938902f115b5
+  unzip /tmp/cvc5.zip -x "cvc5-macOS-arm64-static/lib/cmake/*" -d /tmp
+  sudo mv /tmp/cvc5-macOS-arm64-static/bin/* /usr/local/bin
+  sudo mv /tmp/cvc5-macOS-arm64-static/include/* /usr/local/include
+  sudo mv /tmp/cvc5-macOS-arm64-static/lib/* /usr/local/lib
+  rm -rf /tmp/{cvc5-macOS-arm64-static,cvc5.zip}
+
   # z3
   z3_version="4.12.1"
   z3_dir="z3-z3-$z3_version"

From b8ba5da12f7a6d7622a535b08e6c93bff9384917 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Mon, 6 May 2024 18:58:58 +0200
Subject: [PATCH 0896/1140] SMTChecker: Upgrade CVC4 to cvc5

Instead of compiling `solc` itself with CVC4 support, it is now enough
to have `cvc5` executable on PATH when running the compiler.
Instead of using API of CVC4, we now use SMT-LIB2 interface.
That means we write the queries to temporary SMT-LIB2 files and call
the solver process directly to run on the file.
---
 .circleci/config.yml                          |   4 +-
 CMakeLists.txt                                |  10 +-
 Changelog.md                                  |   1 +
 cmake/EthCompilerSettings.cmake               |   1 -
 cmake/FindCVC4.cmake                          |  33 --
 cmake/toolchains/libfuzzer.cmake              |   3 +-
 cmake/toolchains/ossfuzz.cmake                |   3 +-
 docs/installing-solidity.rst                  |   9 -
 docs/smtchecker.rst                           |   6 +-
 docs/using-the-compiler.rst                   |   2 +-
 libsmtutil/CMakeLists.txt                     |  12 +-
 libsmtutil/CVC4Interface.cpp                  | 336 ------------------
 libsmtutil/CVC4Interface.h                    |  74 ----
 libsmtutil/SMTLib2Interface.cpp               |   6 +-
 libsmtutil/SMTPortfolio.cpp                   |   9 +-
 libsmtutil/SolverInterface.h                  |  18 +-
 libsolidity/formal/BMC.cpp                    |  16 +-
 libsolidity/formal/ModelChecker.cpp           |  14 +-
 libsolidity/interface/CompilerStack.cpp       |   4 +
 libsolidity/interface/SMTSolverCommand.cpp    |  30 +-
 libsolidity/interface/SMTSolverCommand.h      |   1 +
 solc/CommandLineParser.cpp                    |   2 +-
 .../model_checker_print_query_all/err         |   2 +-
 .../model_checker_print_query_bmc/err         |   2 +-
 .../model_checker_solvers_cvc5/args           |   1 +
 .../model_checker_solvers_cvc5/err            |  10 +
 .../model_checker_solvers_cvc5/input.sol      |   7 +
 .../model_checker_solvers_smtlib2/err         |   2 +-
 .../output.json                               |   4 +-
 .../output.json                               |   4 +-
 .../output.json                               |   4 +-
 .../output.json                               |   4 +-
 test/libsolidity/SMTCheckerTest.h             |   2 +-
 .../imports/duplicated_errors_1.sol           |   4 +-
 34 files changed, 99 insertions(+), 541 deletions(-)
 delete mode 100644 cmake/FindCVC4.cmake
 delete mode 100644 libsmtutil/CVC4Interface.cpp
 delete mode 100644 libsmtutil/CVC4Interface.h
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5/args
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5/err
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5/input.sol

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5826067ddd..3e65f4ac16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1044,7 +1044,7 @@ jobs:
     <<: *base_ubuntu2004_xlarge
     environment:
       <<: *base_ubuntu2204_xlarge_env
-      CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
+      CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
       - run_build
@@ -1104,7 +1104,7 @@ jobs:
     environment:
       <<: *base_ubuntu2204_large_env
       CMAKE_BUILD_TYPE: Debug
-      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
+      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20
       MAKEFLAGS: -j 10
     steps:
       - checkout
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a307afb9..71f83b80ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,15 +133,11 @@ elseif (${Z3_FOUND})
   message("Z3 SMT solver found. This enables optional SMT checking with Z3.")
 endif()
 
-find_package(CVC4 QUIET)
-if (${CVC4_FOUND})
-  add_definitions(-DHAVE_CVC4)
-  message("CVC4 SMT solver found. This enables optional SMT checking with CVC4.")
-endif()
+find_program(CVC5_PATH cvc5)
 
-if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
+if (NOT (${Z3_FOUND} OR CVC5_PATH))
   message("No SMT solver found (or it has been forcefully disabled). Optional SMT checking will not be available.\
-  \nPlease install Z3 or CVC4 or remove the option disabling them (USE_Z3, USE_CVC4).")
+  \nPlease install Z3 or cvc5 or remove the option disabling them (USE_Z3).")
 endif()
 
 add_subdirectory(libsolutil)
diff --git a/Changelog.md b/Changelog.md
index 2101f1ec9b..1c15478d19 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
+ * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
 
 
 Bugfixes:
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 5c2802d1fe..eda0e404dd 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -266,7 +266,6 @@ option(USE_Z3 "Allow compiling with Z3 SMT solver integration" ON)
 if(UNIX AND NOT APPLE)
 	option(USE_Z3_DLOPEN "Dynamically load the Z3 SMT solver instead of linking against it." OFF)
 endif()
-option(USE_CVC4 "Allow compiling with CVC4 SMT solver integration" ON)
 
 if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
 	option(USE_LD_GOLD "Use GNU gold linker" ON)
diff --git a/cmake/FindCVC4.cmake b/cmake/FindCVC4.cmake
deleted file mode 100644
index 887b907b83..0000000000
--- a/cmake/FindCVC4.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-if (USE_CVC4)
-    find_path(CVC4_INCLUDE_DIR cvc4/cvc4.h)
-    find_library(CVC4_LIBRARY NAMES cvc4)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(CVC4 DEFAULT_MSG CVC4_LIBRARY CVC4_INCLUDE_DIR)
-    if(CVC4_FOUND)
-        # CVC4 may depend on either CLN or GMP.
-        # We can assume that the one it requires is present on the system,
-        # so we quietly try to find both and link against them, if they are
-        # present.
-        find_package(CLN QUIET)
-        find_package(GMP QUIET)
-
-        set(CVC4_LIBRARIES ${CVC4_LIBRARY})
-
-        if (CLN_FOUND)
-            set(CVC4_LIBRARIES ${CVC4_LIBRARIES} CLN::CLN)
-        endif ()
-
-        if (GMP_FOUND)
-            set(CVC4_LIBRARIES ${CVC4_LIBRARIES} GMP::GMP)
-        endif ()
-
-        if (NOT TARGET CVC4::CVC4)
-            add_library(CVC4::CVC4 UNKNOWN IMPORTED)
-            set_property(TARGET CVC4::CVC4 PROPERTY IMPORTED_LOCATION ${CVC4_LIBRARY})
-            set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_LINK_LIBRARIES ${CVC4_LIBRARIES})
-            set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CVC4_INCLUDE_DIR})
-        endif()
-    endif()
-else()
-    set(CVC4_FOUND FALSE)
-endif()
diff --git a/cmake/toolchains/libfuzzer.cmake b/cmake/toolchains/libfuzzer.cmake
index a734df975e..9d83d504f0 100644
--- a/cmake/toolchains/libfuzzer.cmake
+++ b/cmake/toolchains/libfuzzer.cmake
@@ -1,8 +1,7 @@
 # Inherit default options
 include("${CMAKE_CURRENT_LIST_DIR}/default.cmake")
-# Enable Z3, disable CVC4
+# Enable Z3
 set(USE_Z3 ON CACHE BOOL "Enable Z3" FORCE)
-set(USE_CVC4 OFF CACHE BOOL "Disable CVC4" FORCE)
 # Build fuzzing binaries
 set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
 # Use libfuzzer as the fuzzing back-end
diff --git a/cmake/toolchains/ossfuzz.cmake b/cmake/toolchains/ossfuzz.cmake
index fb7b8d0b36..88018db933 100644
--- a/cmake/toolchains/ossfuzz.cmake
+++ b/cmake/toolchains/ossfuzz.cmake
@@ -1,7 +1,6 @@
 # Inherit default options
 include("${CMAKE_CURRENT_LIST_DIR}/default.cmake")
-# Disable CVC4 and Z3.
-set(USE_CVC4 OFF CACHE BOOL "Disable CVC4" FORCE)
+# Disable Z3.
 set(USE_Z3 OFF CACHE BOOL "Disable Z3" FORCE)
 # Enable fuzzers
 set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index f079fb0245..e37fc19853 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -333,10 +333,7 @@ The following are dependencies for all builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `z3`_ (version 4.8.16+, Optional) | For use with SMT checker.                             |
 +-----------------------------------+-------------------------------------------------------+
-| `cvc4`_ (Optional)                | For use with SMT checker.                             |
-+-----------------------------------+-------------------------------------------------------+
 
-.. _cvc4: https://cvc4.cs.stanford.edu/web/
 .. _Git: https://git-scm.com/download
 .. _Boost: https://www.boost.org
 .. _CMake: https://cmake.org/download/
@@ -543,12 +540,6 @@ Inside the build folder you can disable them, since they are enabled by default:
     # disables only Z3 SMT Solver.
     cmake .. -DUSE_Z3=OFF
 
-    # disables only CVC4 SMT Solver.
-    cmake .. -DUSE_CVC4=OFF
-
-    # disables both Z3 and CVC4
-    cmake .. -DUSE_CVC4=OFF -DUSE_Z3=OFF
-
 The Version String in Detail
 ============================
 
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index dfdcf46519..fc7978256a 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -822,10 +822,10 @@ 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,eld,smtlib2,z3}`` or the JSON option
+option ``--model-checker-solvers {all,cvc5,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``.
+- ``cvc5`` is used via its binary which must be installed in the system. Only BMC uses ``cvc5``.
 - ``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
@@ -849,7 +849,7 @@ concerned about this option. More advanced users might apply this option to try
 alternative solvers on more complex problems.
 
 Please note that certain combinations of chosen engine and solver will lead to
-the SMTChecker doing nothing, for example choosing CHC and ``cvc4``.
+the SMTChecker doing nothing, for example choosing CHC and ``cvc5``.
 
 *******************************
 Abstraction and False Positives
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 544f451423..1eb6631df4 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -486,7 +486,7 @@ Input Description
           "showUnsupported": true,
           // Choose which solvers should be used, if available.
           // See the Formal Verification section for the solvers description.
-          "solvers": ["cvc4", "smtlib2", "z3"],
+          "solvers": ["cvc5", "smtlib2", "z3"],
           // Choose which targets should be checked: constantCondition,
           // underflow, overflow, divByZero, balance, assert, popEmptyArray, outOfBounds.
           // If the option is not given all targets are checked by default,
diff --git a/libsmtutil/CMakeLists.txt b/libsmtutil/CMakeLists.txt
index cb222e22c4..005fbeb804 100644
--- a/libsmtutil/CMakeLists.txt
+++ b/libsmtutil/CMakeLists.txt
@@ -20,12 +20,6 @@ else()
   set(z3_SRCS)
 endif()
 
-if (${CVC4_FOUND})
-  set(cvc4_SRCS CVC4Interface.cpp CVC4Interface.h)
-else()
-  set(cvc4_SRCS)
-endif()
-
 if (${USE_Z3_DLOPEN})
   file(GLOB Z3_HEADERS ${Z3_HEADER_PATH}/z3*.h)
   set(Z3_WRAPPER ${CMAKE_CURRENT_BINARY_DIR}/z3wrapper.cpp)
@@ -38,7 +32,7 @@ if (${USE_Z3_DLOPEN})
   set(z3_SRCS ${z3_SRCS} ${Z3_WRAPPER} Z3Loader.cpp Z3Loader.h)
 endif()
 
-add_library(smtutil ${sources} ${z3_SRCS} ${cvc4_SRCS})
+add_library(smtutil ${sources} ${z3_SRCS})
 target_link_libraries(smtutil PUBLIC solutil Boost::boost)
 
 if (${USE_Z3_DLOPEN})
@@ -47,7 +41,3 @@ if (${USE_Z3_DLOPEN})
 elseif (${Z3_FOUND})
   target_link_libraries(smtutil PUBLIC z3::libz3)
 endif()
-
-if (${CVC4_FOUND})
-  target_link_libraries(smtutil PUBLIC CVC4::CVC4)
-endif()
diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
deleted file mode 100644
index f53c92ab57..0000000000
--- a/libsmtutil/CVC4Interface.cpp
+++ /dev/null
@@ -1,336 +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 <libsmtutil/CVC4Interface.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/Exceptions.h>
-
-#include <cvc4/util/bitvector.h>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-
-CVC4Interface::CVC4Interface(std::optional<unsigned> _queryTimeout):
-	SolverInterface(_queryTimeout),
-	m_solver(&m_context)
-{
-	reset();
-}
-
-void CVC4Interface::reset()
-{
-	m_variables.clear();
-	m_solver.reset();
-	m_solver.setOption("produce-models", true);
-	if (m_queryTimeout)
-		m_solver.setTimeLimit(*m_queryTimeout);
-	else
-		m_solver.setResourceLimit(resourceLimit);
-}
-
-void CVC4Interface::push()
-{
-	m_solver.push();
-}
-
-void CVC4Interface::pop()
-{
-	m_solver.pop();
-}
-
-void CVC4Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
-{
-	smtAssert(_sort, "");
-	m_variables[_name] = m_context.mkVar(_name.c_str(), cvc4Sort(*_sort));
-}
-
-void CVC4Interface::addAssertion(Expression const& _expr)
-{
-	try
-	{
-		m_solver.assertFormula(toCVC4Expr(_expr));
-	}
-	catch (CVC4::TypeCheckingException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::LogicException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::UnsafeInterruptException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::Exception const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-}
-
-std::pair<CheckResult, std::vector<std::string>> CVC4Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
-{
-	CheckResult result;
-	std::vector<std::string> values;
-	try
-	{
-		switch (m_solver.checkSat().isSat())
-		{
-		case CVC4::Result::SAT:
-			result = CheckResult::SATISFIABLE;
-			break;
-		case CVC4::Result::UNSAT:
-			result = CheckResult::UNSATISFIABLE;
-			break;
-		case CVC4::Result::SAT_UNKNOWN:
-			result = CheckResult::UNKNOWN;
-			break;
-		default:
-			smtAssert(false, "");
-		}
-
-		if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
-		{
-			for (Expression const& e: _expressionsToEvaluate)
-				values.push_back(toString(m_solver.getValue(toCVC4Expr(e))));
-		}
-	}
-	catch (CVC4::Exception const&)
-	{
-		result = CheckResult::ERROR;
-		values.clear();
-	}
-
-	return std::make_pair(result, values);
-}
-
-CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
-{
-	// Variable
-	if (_expr.arguments.empty() && m_variables.count(_expr.name))
-		return m_variables.at(_expr.name);
-
-	std::vector<CVC4::Expr> arguments;
-	for (auto const& arg: _expr.arguments)
-		arguments.push_back(toCVC4Expr(arg));
-
-	try
-	{
-		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);
-		// Literal
-		else if (arguments.empty())
-		{
-			if (n == "true")
-				return m_context.mkConst(true);
-			else if (n == "false")
-				return m_context.mkConst(false);
-			else if (auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.sort))
-				return m_context.mkVar(n, cvc4Sort(*sortSort->inner));
-			else
-				try
-				{
-					return m_context.mkConst(CVC4::Rational(n));
-				}
-				catch (CVC4::TypeCheckingException const& _e)
-				{
-					smtAssert(false, _e.what());
-				}
-				catch (CVC4::Exception const& _e)
-				{
-					smtAssert(false, _e.what());
-				}
-		}
-
-		smtAssert(_expr.hasCorrectArity(), "");
-		if (n == "ite")
-			return arguments[0].iteExpr(arguments[1], arguments[2]);
-		else if (n == "not")
-			return arguments[0].notExpr();
-		else if (n == "and")
-			return arguments[0].andExpr(arguments[1]);
-		else if (n == "or")
-			return arguments[0].orExpr(arguments[1]);
-		else if (n == "=>")
-			return m_context.mkExpr(CVC4::kind::IMPLIES, arguments[0], arguments[1]);
-		else if (n == "=")
-			return m_context.mkExpr(CVC4::kind::EQUAL, arguments[0], arguments[1]);
-		else if (n == "<")
-			return m_context.mkExpr(CVC4::kind::LT, arguments[0], arguments[1]);
-		else if (n == "<=")
-			return m_context.mkExpr(CVC4::kind::LEQ, arguments[0], arguments[1]);
-		else if (n == ">")
-			return m_context.mkExpr(CVC4::kind::GT, arguments[0], arguments[1]);
-		else if (n == ">=")
-			return m_context.mkExpr(CVC4::kind::GEQ, arguments[0], arguments[1]);
-		else if (n == "+")
-			return m_context.mkExpr(CVC4::kind::PLUS, arguments[0], arguments[1]);
-		else if (n == "-")
-			return m_context.mkExpr(CVC4::kind::MINUS, arguments[0], arguments[1]);
-		else if (n == "*")
-			return m_context.mkExpr(CVC4::kind::MULT, arguments[0], arguments[1]);
-		else if (n == "div")
-			return m_context.mkExpr(CVC4::kind::INTS_DIVISION_TOTAL, arguments[0], arguments[1]);
-		else if (n == "mod")
-			return m_context.mkExpr(CVC4::kind::INTS_MODULUS, arguments[0], arguments[1]);
-		else if (n == "bvnot")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_NOT, arguments[0]);
-		else if (n == "bvand")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_AND, arguments[0], arguments[1]);
-		else if (n == "bvor")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_OR, arguments[0], arguments[1]);
-		else if (n == "bvxor")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_XOR, arguments[0], arguments[1]);
-		else if (n == "bvshl")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_SHL, arguments[0], arguments[1]);
-		else if (n == "bvlshr")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_LSHR, arguments[0], arguments[1]);
-		else if (n == "bvashr")
-			return m_context.mkExpr(CVC4::kind::BITVECTOR_ASHR, arguments[0], arguments[1]);
-		else if (n == "int2bv")
-		{
-			size_t size = std::stoul(_expr.arguments[1].name);
-			auto i2bvOp = m_context.mkConst(CVC4::IntToBitVector(static_cast<unsigned>(size)));
-			// CVC4 treats all BVs as unsigned, so we need to manually apply 2's complement if needed.
-			return m_context.mkExpr(
-				CVC4::kind::ITE,
-				m_context.mkExpr(CVC4::kind::GEQ, arguments[0], m_context.mkConst(CVC4::Rational(0))),
-				m_context.mkExpr(CVC4::kind::INT_TO_BITVECTOR, i2bvOp, arguments[0]),
-				m_context.mkExpr(
-					CVC4::kind::BITVECTOR_NEG,
-					m_context.mkExpr(CVC4::kind::INT_TO_BITVECTOR, i2bvOp, m_context.mkExpr(CVC4::kind::UMINUS, arguments[0]))
-				)
-			);
-		}
-		else if (n == "bv2int")
-		{
-			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)
-				return nat;
-
-			auto type = arguments[0].getType();
-			smtAssert(type.isBitVector(), "");
-			auto size = CVC4::BitVectorType(type).getSize();
-			// CVC4 treats all BVs as unsigned, so we need to manually apply 2's complement if needed.
-			auto extractOp = m_context.mkConst(CVC4::BitVectorExtract(size - 1, size - 1));
-			return m_context.mkExpr(CVC4::kind::ITE,
-				m_context.mkExpr(
-					CVC4::kind::EQUAL,
-					m_context.mkExpr(CVC4::kind::BITVECTOR_EXTRACT, extractOp, arguments[0]),
-					m_context.mkConst(CVC4::BitVector(1, uint64_t{0}))
-				),
-				nat,
-				m_context.mkExpr(
-					CVC4::kind::UMINUS,
-					m_context.mkExpr(CVC4::kind::BITVECTOR_TO_NAT, m_context.mkExpr(CVC4::kind::BITVECTOR_NEG, arguments[0]))
-				)
-			);
-		}
-		else if (n == "select")
-			return m_context.mkExpr(CVC4::kind::SELECT, arguments[0], arguments[1]);
-		else if (n == "store")
-			return m_context.mkExpr(CVC4::kind::STORE, arguments[0], arguments[1], arguments[2]);
-		else if (n == "const_array")
-		{
-			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")
-		{
-			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();
-			size_t index = std::stoul(_expr.arguments[1].name);
-			CVC4::Expr s = dt[0][index].getSelector();
-			return m_context.mkExpr(CVC4::kind::APPLY_SELECTOR, s, arguments[0]);
-		}
-		else if (n == "tuple_constructor")
-		{
-			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();
-			CVC4::Expr c = dt[0].getConstructor();
-			return m_context.mkExpr(CVC4::kind::APPLY_CONSTRUCTOR, c, arguments);
-		}
-
-		smtAssert(false);
-	}
-	catch (CVC4::TypeCheckingException const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-	catch (CVC4::Exception const& _e)
-	{
-		smtAssert(false, _e.what());
-	}
-
-	smtAssert(false);
-
-	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	util::unreachable();
-}
-
-CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
-{
-	switch (_sort.kind)
-	{
-	case Kind::Bool:
-		return m_context.booleanType();
-	case Kind::Int:
-		return m_context.integerType();
-	case Kind::BitVector:
-		return m_context.mkBitVectorType(dynamic_cast<BitVectorSort const&>(_sort).size);
-	case Kind::Function:
-	{
-		FunctionSort const& fSort = dynamic_cast<FunctionSort const&>(_sort);
-		return m_context.mkFunctionType(cvc4Sort(fSort.domain), cvc4Sort(*fSort.codomain));
-	}
-	case Kind::Array:
-	{
-		auto const& arraySort = dynamic_cast<ArraySort const&>(_sort);
-		return m_context.mkArrayType(cvc4Sort(*arraySort.domain), cvc4Sort(*arraySort.range));
-	}
-	case Kind::Tuple:
-	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		return m_context.mkTupleType(cvc4Sort(tupleSort.components));
-	}
-	default:
-		break;
-	}
-	smtAssert(false, "");
-	// Cannot be reached.
-	return m_context.integerType();
-}
-
-std::vector<CVC4::Type> CVC4Interface::cvc4Sort(std::vector<SortPointer> const& _sorts)
-{
-	std::vector<CVC4::Type> cvc4Sorts;
-	for (auto const& _sort: _sorts)
-		cvc4Sorts.push_back(cvc4Sort(*_sort));
-	return cvc4Sorts;
-}
diff --git a/libsmtutil/CVC4Interface.h b/libsmtutil/CVC4Interface.h
deleted file mode 100644
index cc3c0577ce..0000000000
--- a/libsmtutil/CVC4Interface.h
+++ /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
-
-#pragma once
-
-#include <libsmtutil/SolverInterface.h>
-
-#if defined(__GLIBC__)
-// The CVC4 headers includes the deprecated system headers <ext/hash_map>
-// and <ext/hash_set>. These headers cause a warning that will break the
-// build, unless _GLIBCXX_PERMIT_BACKWARD_HASH is set.
-#define _GLIBCXX_PERMIT_BACKWARD_HASH
-#endif
-
-#include <cvc4/cvc4.h>
-
-#if defined(__GLIBC__)
-#undef _GLIBCXX_PERMIT_BACKWARD_HASH
-#endif
-
-namespace solidity::smtutil
-{
-
-class CVC4Interface: public SolverInterface
-{
-public:
-	/// Noncopyable.
-	CVC4Interface(CVC4Interface const&) = delete;
-	CVC4Interface& operator=(CVC4Interface const&) = delete;
-
-	CVC4Interface(std::optional<unsigned> _queryTimeout = {});
-
-	void reset() override;
-
-	void push() override;
-	void pop() override;
-
-	void declareVariable(std::string const&, SortPointer const&) override;
-
-	void addAssertion(Expression const& _expr) override;
-	std::pair<CheckResult, std::vector<std::string>> check(std::vector<Expression> const& _expressionsToEvaluate) override;
-
-private:
-	CVC4::Expr toCVC4Expr(Expression const& _expr);
-	CVC4::Type cvc4Sort(Sort const& _sort);
-	std::vector<CVC4::Type> cvc4Sort(std::vector<SortPointer> const& _sorts);
-
-	CVC4::ExprManager m_context;
-	CVC4::SmtEngine m_solver;
-	std::map<std::string, CVC4::Expr> m_variables;
-
-	// CVC4 "basic resources" limit.
-	// This is used to make the runs more deterministic and platform/machine independent.
-	// The tests start failing for CVC4 with less than 6000,
-	// so using double that.
-	static int const resourceLimit = 12000;
-};
-
-}
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index 12469a4ae0..cfe1bc0bef 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -123,11 +123,11 @@ std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::ve
 
 	CheckResult result;
 	// TODO proper parsing
-	if (boost::starts_with(response, "sat\n"))
+	if (boost::starts_with(response, "sat"))
 		result = CheckResult::SATISFIABLE;
-	else if (boost::starts_with(response, "unsat\n"))
+	else if (boost::starts_with(response, "unsat"))
 		result = CheckResult::UNSATISFIABLE;
-	else if (boost::starts_with(response, "unknown\n"))
+	else if (boost::starts_with(response, "unknown"))
 		result = CheckResult::UNKNOWN;
 	else
 		result = CheckResult::ERROR;
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index 76c69d0180..1435cc9d80 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -21,9 +21,6 @@
 #ifdef HAVE_Z3
 #include <libsmtutil/Z3Interface.h>
 #endif
-#ifdef HAVE_CVC4
-#include <libsmtutil/CVC4Interface.h>
-#endif
 #include <libsmtutil/SMTLib2Interface.h>
 
 using namespace solidity;
@@ -41,16 +38,12 @@ SMTPortfolio::SMTPortfolio(
 	SolverInterface(_queryTimeout)
 {
 	solAssert(!_printQuery || _enabledSolvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-	if (_enabledSolvers.smtlib2)
+	if (_enabledSolvers.smtlib2 || _enabledSolvers.cvc5)
 		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(std::make_unique<Z3Interface>(m_queryTimeout));
 #endif
-#ifdef HAVE_CVC4
-	if (_enabledSolvers.cvc4)
-		m_solvers.emplace_back(std::make_unique<CVC4Interface>(m_queryTimeout));
-#endif
 }
 
 void SMTPortfolio::reset()
diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index 13803de6e9..92f9c8f75b 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -41,13 +41,13 @@ namespace solidity::smtutil
 
 struct SMTSolverChoice
 {
-	bool cvc4 = false;
+	bool cvc5 = false;
 	bool eld = false;
 	bool smtlib2 = false;
 	bool z3 = false;
 
 	static constexpr SMTSolverChoice All() noexcept { return {true, true, true, true}; }
-	static constexpr SMTSolverChoice CVC4() noexcept { return {true, false, false, false}; }
+	static constexpr SMTSolverChoice CVC5() 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}; }
@@ -65,7 +65,7 @@ struct SMTSolverChoice
 
 	SMTSolverChoice& operator&=(SMTSolverChoice const& _other)
 	{
-		cvc4 &= _other.cvc4;
+		cvc5 &= _other.cvc5;
 		eld &= _other.eld;
 		smtlib2 &= _other.smtlib2;
 		z3 &= _other.z3;
@@ -82,7 +82,7 @@ struct SMTSolverChoice
 
 	bool operator==(SMTSolverChoice const& _other) const noexcept
 	{
-		return cvc4 == _other.cvc4 &&
+		return cvc5 == _other.cvc5 &&
 			eld == _other.eld &&
 			smtlib2 == _other.smtlib2 &&
 			z3 == _other.z3;
@@ -90,11 +90,11 @@ struct SMTSolverChoice
 
 	bool setSolver(std::string const& _solver)
 	{
-		static std::set<std::string> const solvers{"cvc4", "eld", "smtlib2", "z3"};
+		static std::set<std::string> const solvers{"cvc5", "eld", "smtlib2", "z3"};
 		if (!solvers.count(_solver))
 			return false;
-		if (_solver == "cvc4")
-			cvc4 = true;
+		if (_solver == "cvc5")
+			cvc5 = true;
 		if (_solver == "eld")
 			eld = true;
 		else if (_solver == "smtlib2")
@@ -105,8 +105,8 @@ struct SMTSolverChoice
 	}
 
 	bool none() const noexcept { return !some(); }
-	bool some() const noexcept { return cvc4 || eld || smtlib2 || z3; }
-	bool all() const noexcept { return cvc4 && eld && smtlib2 && z3; }
+	bool some() const noexcept { return cvc5 || eld || smtlib2 || z3; }
+	bool all() const noexcept { return cvc5 && eld && smtlib2 && z3; }
 };
 
 enum class CheckResult
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index e7cf35a7f4..bf6080e7f6 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -51,15 +51,15 @@ BMC::BMC(
 	))
 {
 	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 defined (HAVE_Z3)
+	if (m_settings.solvers.z3)
 		if (!_smtlib2Responses.empty())
 			m_errorReporter.warning(
 				5622_error,
 				"SMT-LIB2 query responses were given in the auxiliary input, "
-				"but this Solidity binary uses an SMT solver (Z3/CVC4) directly."
+				"but this Solidity binary uses an SMT solver Z3 directly."
 				"These responses will be ignored."
-				"Consider disabling Z3/CVC4 at compilation time in order to use SMT-LIB2 responses."
+				"Consider disabling Z3 at compilation time in order to use SMT-LIB2 responses."
 			);
 #endif
 }
@@ -67,13 +67,13 @@ BMC::BMC(
 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)
+	if (!m_settings.solvers.cvc5 && !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."
-			" The accepted solvers for BMC are cvc4 and z3."
+			" The accepted solvers for BMC are cvc5 and z3."
 		);
 		return;
 	}
@@ -123,7 +123,7 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
 				);
 
 
-	// If this check is true, Z3 and CVC4 are not available
+	// If this check is true, Z3 and cvc5 are not available
 	// and the query answers were not provided, since SMTPortfolio
 	// guarantees that SmtLib2Interface is the first solver, if enabled.
 	if (
@@ -134,7 +134,7 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
 		m_errorReporter.warning(
 			8084_error,
 			SourceLocation(),
-			"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available."
+			"BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available."
 			" None of the installed solvers was enabled."
 #ifdef HAVE_Z3_DLOPEN
 			" Install libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION) + " to enable Z3."
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index 5632ff5c4e..94a927d3b2 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -24,9 +24,7 @@
 #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>
@@ -163,14 +161,10 @@ std::vector<std::string> ModelChecker::unhandledQueries()
 SMTSolverChoice ModelChecker::availableSolvers()
 {
 	smtutil::SMTSolverChoice available = smtutil::SMTSolverChoice::SMTLIB2();
-#if defined(__linux) || defined(__APPLE__)
 	available.eld = !boost::process::search_path("eld").empty();
-#endif
+	available.cvc5 = !boost::process::search_path("cvc5").empty();
 #ifdef HAVE_Z3
 	available.z3 = solidity::smtutil::Z3Interface::available();
-#endif
-#ifdef HAVE_CVC4
-	available.cvc4 = true;
 #endif
 	return available;
 }
@@ -179,13 +173,13 @@ SMTSolverChoice ModelChecker::checkRequestedSolvers(SMTSolverChoice _enabled, Er
 {
 	SMTSolverChoice availableSolvers{ModelChecker::availableSolvers()};
 
-	if (_enabled.cvc4 && !availableSolvers.cvc4)
+	if (_enabled.cvc5 && !availableSolvers.cvc5)
 	{
-		_enabled.cvc4 = false;
+		_enabled.cvc5 = false;
 		_errorReporter.warning(
 			4902_error,
 			SourceLocation(),
-			"Solver CVC4 was selected for SMTChecker but it is not available."
+			"Solver cvc5 was selected for SMTChecker but it is not available."
 		);
 	}
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 2a90056806..d5fe44ca16 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -656,8 +656,12 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 		{
 			m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
 			if (auto* universalCallback = m_readFile.target<frontend::UniversalCallback>())
+			{
 				if (m_modelCheckerSettings.solvers.eld)
 					universalCallback->smtCommand().setEldarica(m_modelCheckerSettings.timeout, m_modelCheckerSettings.invariants != ModelCheckerInvariants::None());
+				if (m_modelCheckerSettings.solvers.cvc5)
+					universalCallback->smtCommand().setCvc5(m_modelCheckerSettings.timeout);
+			}
 		}
 
 		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 7d814cd9c3..b9eb392c63 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -51,6 +51,22 @@ void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMillisec
 		m_arguments.emplace_back("-ssol");
 }
 
+void SMTSolverCommand::setCvc5(std::optional<unsigned int> timeoutInMilliseconds)
+{
+	m_arguments.clear();
+	m_solverCmd = "cvc5";
+	if (timeoutInMilliseconds)
+	{
+		m_arguments.push_back("--tlimit-per");
+		m_arguments.push_back(std::to_string(timeoutInMilliseconds.value()));
+	}
+	else
+	{
+		m_arguments.push_back("--rlimit");
+		m_arguments.push_back(std::to_string(12000));
+	}
+}
+
 ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
 {
 	try
@@ -68,29 +84,29 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 		auto queryFile = boost::filesystem::ofstream(queryFileName);
 		queryFile << _query << std::flush;
 
-		auto eldBin = boost::process::search_path(m_solverCmd);
+		auto solverBin = boost::process::search_path(m_solverCmd);
 
-		if (eldBin.empty())
+		if (solverBin.empty())
 			return ReadCallback::Result{false, m_solverCmd + " binary not found."};
 
 		auto args = m_arguments;
 		args.push_back(queryFileName.string());
 
 		boost::process::ipstream pipe;
-		boost::process::child eld(
-			eldBin,
+		boost::process::child solverProcess(
+			solverBin,
 			args,
 			boost::process::std_out > pipe,
-			boost::process::std_err >boost::process::null
+			boost::process::std_err > boost::process::null
 		);
 
 		std::vector<std::string> data;
 		std::string line;
-		while (eld.running() && std::getline(pipe, line))
+		while (solverProcess.running() && std::getline(pipe, line))
 			if (!line.empty())
 				data.push_back(line);
 
-		eld.wait();
+		solverProcess.wait();
 
 		return ReadCallback::Result{true, boost::join(data, "\n")};
 	}
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
index 665c19c1b7..3b10227405 100644
--- a/libsolidity/interface/SMTSolverCommand.h
+++ b/libsolidity/interface/SMTSolverCommand.h
@@ -37,6 +37,7 @@ class SMTSolverCommand
 	}
 
 	void setEldarica(std::optional<unsigned int> timeoutInMilliseconds, bool computeInvariants);
+	void setCvc5(std::optional<unsigned int> timeoutInMilliseconds);
 
 private:
 	/// The name of the solver's binary.
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index e61c5ce0a7..2697f7ebd0 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -877,7 +877,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strModelCheckerSolvers.c_str(),
-			po::value<std::string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
+			po::value<std::string>()->value_name("cvc5,eld,z3,smtlib2")->default_value("z3"),
 			"Select model checker solvers."
 		)
 		(
diff --git a/test/cmdlineTests/model_checker_print_query_all/err b/test/cmdlineTests/model_checker_print_query_all/err
index 1a04042cd7..fc3bf7c7a3 100644
--- a/test/cmdlineTests/model_checker_print_query_all/err
+++ b/test/cmdlineTests/model_checker_print_query_all/err
@@ -162,4 +162,4 @@ Info: BMC: Requested query:
 
 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.
+Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/err b/test/cmdlineTests/model_checker_print_query_bmc/err
index 1a59f87b0d..ff8b796f87 100644
--- a/test/cmdlineTests/model_checker_print_query_bmc/err
+++ b/test/cmdlineTests/model_checker_print_query_bmc/err
@@ -29,4 +29,4 @@ Info: BMC: Requested query:
 
 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.
+Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5/args b/test/cmdlineTests/model_checker_solvers_cvc5/args
new file mode 100644
index 0000000000..84280d4061
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-solvers cvc5
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5/err b/test/cmdlineTests/model_checker_solvers_cvc5/err
new file mode 100644
index 0000000000..1c36b103a6
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5/err
@@ -0,0 +1,10 @@
+Warning: BMC: Assertion violation happens here.
+ --> model_checker_solvers_cvc5/input.sol:5:3:
+  |
+5 | 		assert(x > 0);
+  | 		^^^^^^^^^^^^^
+Note: Counterexample:
+  x = 0
+
+Note: Callstack:
+Note:
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5/input.sol b/test/cmdlineTests/model_checker_solvers_cvc5/input.sol
new file mode 100644
index 0000000000..ef11e87eb8
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	function f(uint x) public pure {
+		assert(x > 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_solvers_smtlib2/err b/test/cmdlineTests/model_checker_solvers_smtlib2/err
index 3aa9893489..452e2b31d9 100644
--- a/test/cmdlineTests/model_checker_solvers_smtlib2/err
+++ b/test/cmdlineTests/model_checker_solvers_smtlib2/err
@@ -4,4 +4,4 @@ Warning: CHC analysis was not possible. No Horn solver was available. None of th
 
 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.
+Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
index 16ff42e0c3..97aa885792 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
@@ -519,10 +519,10 @@
         {
             "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.
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) 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.",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.",
             "severity": "warning",
             "type": "Warning"
         }
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
index 1c9826ad22..9fd5f5929a 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
@@ -108,10 +108,10 @@
         {
             "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.
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) 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.",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.",
             "severity": "warning",
             "type": "Warning"
         }
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
index e8de49d1ed..a36195e1ca 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
@@ -13,10 +13,10 @@
         {
             "component": "general",
             "errorCode": "7710",
-            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc4 and z3.
+            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc5 and z3.
 
 ",
-            "message": "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. The accepted solvers for BMC are cvc5 and z3.",
             "severity": "warning",
             "type": "Warning"
         }
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index d3bdc6b7eb..e97227076b 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -187,10 +187,10 @@
         {
             "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.
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or cvc5) 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.",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.",
             "severity": "warning",
             "type": "Warning"
         }
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index aa0f92121a..6a15791522 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -56,7 +56,7 @@ class SMTCheckerTest: public SyntaxTest
 		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`.
+	SMTSolvers: `all`, `cvc5`, `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.
diff --git a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
index a98ba962a7..c225fe0b49 100644
--- a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
@@ -19,8 +19,8 @@ contract C is B {
 // Warning 6328: (b.sol:62-75): 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: (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 8084: BMC analysis was not possible. No SMT solver (Z3 or cvc5) 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.
+// Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or cvc5) was available. None of the installed solvers was enabled.

From 025f9a2cedd54fd77f3b0421887e05fe567527ab Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 15 May 2024 19:08:53 +0200
Subject: [PATCH 0897/1140] Update CI images

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e65f4ac16..d6c3f33da0 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-23
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:84a1fb8771236e8d9aa5c615a425b8929e56a6e4f150a60078c8d74a1ceaa6c2"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-24
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b8b645fa7ab40d55f2d16eac295d16ca01ec51d32be7d668ae6eaecd47dbd763"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-8
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1c3a4118218640b2bf632242979a63d48f3d9c70d48be9574332f2dbbd04b192"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-9
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:80247de9655b1f39afd4ac22b14266bc9b9a0d64b283ae8fb9cb5b8250e4e77d"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-7
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0f47e733e100080c4174381c262cfcf974bc8e7c3c41b8dff611b9641c82f714"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-8
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:2662376fe0e1ec2d346495a19a6d64508c1048d5a7325d8600c33c343fa64a0f"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-6

From 20ae0f2e07e1928f04ba212477019329956f66ad Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Sat, 1 Jun 2024 10:04:28 +0200
Subject: [PATCH 0898/1140] SMTChecker: Allow using multiple external solvers
 in one analysis

We are using SMTCommand inside UniversalCallback to call external
solvers on queries produced my our engines.

Previous mechanism set the external solver once during initialization
and it was not possible to change it later. This meant, that it would
not be possible to use, e.g., Eldarica and cvc5 at the same time.

Here we move the proper setup for SMTCommand just before we call it.
This setup is customized by subclasses of (CHC)SmtLib2Interface, which
call corresponding external solvers.
---
 libsmtutil/CHCSmtLib2Interface.cpp            |  8 ++--
 libsmtutil/CHCSmtLib2Interface.h              | 11 ++---
 libsmtutil/SMTLib2Interface.cpp               |  1 +
 libsmtutil/SMTLib2Interface.h                 |  4 +-
 libsmtutil/SMTPortfolio.cpp                   | 23 +++--------
 libsmtutil/SMTPortfolio.h                     |  8 +---
 libsolidity/CMakeLists.txt                    |  4 ++
 libsolidity/formal/BMC.cpp                    | 24 ++++++++---
 libsolidity/formal/CHC.cpp                    | 17 ++++++--
 libsolidity/formal/Cvc5SMTLib2Interface.cpp   | 35 ++++++++++++++++
 libsolidity/formal/Cvc5SMTLib2Interface.h     | 37 +++++++++++++++++
 .../formal/EldaricaCHCSmtLib2Interface.cpp    | 37 +++++++++++++++++
 .../formal/EldaricaCHCSmtLib2Interface.h      | 41 +++++++++++++++++++
 libsolidity/interface/CompilerStack.cpp       |  9 ----
 .../model_checker_solvers_cvc5_eld/args       |  1 +
 .../model_checker_solvers_cvc5_eld/err        |  8 ++++
 .../model_checker_solvers_cvc5_eld/input.sol  | 10 +++++
 17 files changed, 224 insertions(+), 54 deletions(-)
 create mode 100644 libsolidity/formal/Cvc5SMTLib2Interface.cpp
 create mode 100644 libsolidity/formal/Cvc5SMTLib2Interface.h
 create mode 100644 libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
 create mode 100644 libsolidity/formal/EldaricaCHCSmtLib2Interface.h
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5_eld/args
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5_eld/err
 create mode 100644 test/cmdlineTests/model_checker_solvers_cvc5_eld/input.sol

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 671ec9b51d..a267a843bb 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -43,16 +43,14 @@ using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 CHCSmtLib2Interface::CHCSmtLib2Interface(
-	std::map<h256, std::string> const& _queryResponses,
+	std::map<h256, std::string> _queryResponses,
 	ReadCallback::Callback _smtCallback,
-	SMTSolverChoice _enabledSolvers,
 	std::optional<unsigned> _queryTimeout
 ):
 	CHCSolverInterface(_queryTimeout),
 	m_smtlib2(std::make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
 	m_queryResponses(std::move(_queryResponses)),
-	m_smtCallback(_smtCallback),
-	m_enabledSolvers(_enabledSolvers)
+	m_smtCallback(_smtCallback)
 {
 	reset();
 }
@@ -186,9 +184,9 @@ std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
 	if (m_queryResponses.count(inputHash))
 		return m_queryResponses.at(inputHash);
 
-	smtAssert(m_enabledSolvers.smtlib2 || m_enabledSolvers.eld);
 	if (m_smtCallback)
 	{
+		setupSmtCallback();
 		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
 		if (result.success)
 			return result.responseOrErrorMessage;
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index f7f656fd0b..39131973bf 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -33,9 +33,8 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 {
 public:
 	explicit CHCSmtLib2Interface(
-		std::map<util::h256, std::string> const& _queryResponses = {},
+		std::map<util::h256, std::string> _queryResponses = {},
 		frontend::ReadCallback::Callback _smtCallback = {},
-		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
 		std::optional<unsigned> _queryTimeout = {}
 	);
 
@@ -59,7 +58,7 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	auto const& sortNames() const { return m_smtlib2->sortNames(); }
 
-private:
+protected:
 	std::string toSmtLibSort(SortPointer _sort);
 	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
 
@@ -79,17 +78,19 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 	/// Translates CHC solver response with a model to our representation of invariants. Returns None on error.
 	std::optional<smtutil::Expression> invariantsFromSolverResponse(std::string const& response) const;
 
+	/// Hook to setup external solver call
+	virtual void setupSmtCallback() {}
+
 	/// Used to access toSmtLibSort, SExpr, and handle variables.
 	std::unique_ptr<SMTLib2Interface> m_smtlib2;
 
 	std::string m_accumulatedOutput;
 	std::set<std::string> m_variables;
 
-	std::map<util::h256, std::string> const& m_queryResponses;
+	std::map<util::h256, std::string> m_queryResponses;
 	std::vector<std::string> m_unhandledQueries;
 
 	frontend::ReadCallback::Callback m_smtCallback;
-	SMTSolverChoice m_enabledSolvers;
 };
 
 }
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index cfe1bc0bef..06ed26f2b2 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -322,6 +322,7 @@ std::string SMTLib2Interface::querySolver(std::string const& _input)
 		return m_queryResponses.at(inputHash);
 	if (m_smtCallback)
 	{
+		setupSmtCallback();
 		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
 		if (result.success)
 			return result.responseOrErrorMessage;
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
index fbfde664d5..d60a5bd250 100644
--- a/libsmtutil/SMTLib2Interface.h
+++ b/libsmtutil/SMTLib2Interface.h
@@ -71,7 +71,9 @@ class SMTLib2Interface: public SolverInterface
 
 	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
 
-private:
+protected:
+	virtual void setupSmtCallback() {}
+
 	void declareFunction(std::string const& _name, SortPointer const& _sort);
 
 	void write(std::string _data);
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index 1435cc9d80..196f02fdf9 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -18,9 +18,6 @@
 
 #include <libsmtutil/SMTPortfolio.h>
 
-#ifdef HAVE_Z3
-#include <libsmtutil/Z3Interface.h>
-#endif
 #include <libsmtutil/SMTLib2Interface.h>
 
 using namespace solidity;
@@ -29,22 +26,12 @@ using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 SMTPortfolio::SMTPortfolio(
-	std::map<h256, std::string> _smtlib2Responses,
-	frontend::ReadCallback::Callback _smtCallback,
-	[[maybe_unused]] SMTSolverChoice _enabledSolvers,
-	std::optional<unsigned> _queryTimeout,
-	bool _printQuery
+	std::vector<std::unique_ptr<SolverInterface>> _solvers,
+	std::optional<unsigned> _queryTimeout
 ):
-	SolverInterface(_queryTimeout)
-{
-	solAssert(!_printQuery || _enabledSolvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-	if (_enabledSolvers.smtlib2 || _enabledSolvers.cvc5)
-		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(std::make_unique<Z3Interface>(m_queryTimeout));
-#endif
-}
+	SolverInterface(_queryTimeout), m_solvers(std::move(_solvers))
+{}
+
 
 void SMTPortfolio::reset()
 {
diff --git a/libsmtutil/SMTPortfolio.h b/libsmtutil/SMTPortfolio.h
index cdb33368e8..5ffb37eb32 100644
--- a/libsmtutil/SMTPortfolio.h
+++ b/libsmtutil/SMTPortfolio.h
@@ -42,13 +42,7 @@ class SMTPortfolio: public SolverInterface
 	SMTPortfolio(SMTPortfolio const&) = delete;
 	SMTPortfolio& operator=(SMTPortfolio const&) = delete;
 
-	SMTPortfolio(
-		std::map<util::h256, std::string> _smtlib2Responses = {},
-		frontend::ReadCallback::Callback _smtCallback = {},
-		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
-		std::optional<unsigned> _queryTimeout = {},
-		bool _printQuery = false
-	);
+	SMTPortfolio(std::vector<std::unique_ptr<SolverInterface>> solvers, std::optional<unsigned> _queryTimeout);
 
 	void reset() override;
 
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 3db857241f..0b796035d3 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -109,6 +109,10 @@ set(sources
 	formal/BMC.h
 	formal/CHC.cpp
 	formal/CHC.h
+	formal/Cvc5SMTLib2Interface.cpp
+	formal/Cvc5SMTLib2Interface.h
+	formal/EldaricaCHCSmtLib2Interface.cpp
+	formal/EldaricaCHCSmtLib2Interface.h
 	formal/EncodingContext.cpp
 	formal/EncodingContext.h
 	formal/ExpressionFormatter.cpp
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index bf6080e7f6..916bf5a31d 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -18,9 +18,14 @@
 
 #include <libsolidity/formal/BMC.h>
 
+#include <libsolidity/formal/Cvc5SMTLib2Interface.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
+#include <libsmtutil/SMTLib2Interface.h>
 #include <libsmtutil/SMTPortfolio.h>
+#ifdef HAVE_Z3
+#include <libsmtutil/Z3Interface.h>
+#endif
 
 #include <liblangutil/CharStream.h>
 #include <liblangutil/CharStreamProvider.h>
@@ -35,6 +40,8 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace solidity::frontend::smt;
+using namespace solidity::smtutil;
 
 BMC::BMC(
 	smt::EncodingContext& _context,
@@ -45,12 +52,19 @@ BMC::BMC(
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
-	m_interface(std::make_unique<smtutil::SMTPortfolio>(
-		_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout, _settings.printQuery
-	))
+	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider)
 {
-	solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
+	solAssert(!_settings.printQuery || _settings.solvers == SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
+	std::vector<std::unique_ptr<SolverInterface>> solvers;
+	if (_settings.solvers.smtlib2)
+		solvers.emplace_back(std::make_unique<SMTLib2Interface>(_smtlib2Responses, _smtCallback, _settings.timeout));
+	if (_settings.solvers.cvc5)
+		solvers.emplace_back(std::make_unique<Cvc5SMTLib2Interface>(_smtCallback, _settings.timeout));
+#ifdef HAVE_Z3
+	if (_settings.solvers.z3 && Z3Interface::available())
+		solvers.emplace_back(std::make_unique<Z3Interface>(_settings.timeout));
+#endif
+	m_interface = std::make_unique<SMTPortfolio>(std::move(solvers), _settings.timeout);
 #if defined (HAVE_Z3)
 	if (m_settings.solvers.z3)
 		if (!_smtlib2Responses.empty())
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index c520d13f6b..66ebd47edb 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include <libsolidity/formal/ArraySlicePredicate.h>
+#include <libsolidity/formal/EldaricaCHCSmtLib2Interface.h>
 #include <libsolidity/formal/Invariants.h>
 #include <libsolidity/formal/PredicateInstance.h>
 #include <libsolidity/formal/PredicateSort.h>
@@ -1289,15 +1290,23 @@ void CHC::resetSourceAnalysis()
 		solAssert(false);
 #endif
 	}
-	if (!m_settings.solvers.z3)
+	else
 	{
 		solAssert(m_settings.solvers.smtlib2 || m_settings.solvers.eld);
-
 		if (!m_interface)
-			m_interface = std::make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.solvers, m_settings.timeout);
+		{
+			if (m_settings.solvers.eld)
+				m_interface = std::make_unique<EldaricaCHCSmtLib2Interface>(
+					m_smtCallback,
+					m_settings.timeout,
+					m_settings.invariants != ModelCheckerInvariants::None()
+				);
+			else
+				m_interface = std::make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.timeout);
+		}
 
 		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
-		solAssert(smtlib2Interface, "");
+		solAssert(smtlib2Interface);
 		smtlib2Interface->reset();
 		m_context.setSolver(smtlib2Interface->smtlib2Interface());
 	}
diff --git a/libsolidity/formal/Cvc5SMTLib2Interface.cpp b/libsolidity/formal/Cvc5SMTLib2Interface.cpp
new file mode 100644
index 0000000000..8a399c1356
--- /dev/null
+++ b/libsolidity/formal/Cvc5SMTLib2Interface.cpp
@@ -0,0 +1,35 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+
+#include <libsolidity/formal/Cvc5SMTLib2Interface.h>
+
+#include <libsolidity/interface/UniversalCallback.h>
+
+using namespace solidity::frontend::smt;
+
+Cvc5SMTLib2Interface::Cvc5SMTLib2Interface(
+	frontend::ReadCallback::Callback _smtCallback,
+	std::optional<unsigned int> _queryTimeout
+): SMTLib2Interface({}, std::move(_smtCallback), _queryTimeout)
+{
+}
+
+void Cvc5SMTLib2Interface::setupSmtCallback() {
+	if (auto* universalCallback = m_smtCallback.target<frontend::UniversalCallback>())
+		universalCallback->smtCommand().setCvc5(m_queryTimeout);
+}
diff --git a/libsolidity/formal/Cvc5SMTLib2Interface.h b/libsolidity/formal/Cvc5SMTLib2Interface.h
new file mode 100644
index 0000000000..64bc364da1
--- /dev/null
+++ b/libsolidity/formal/Cvc5SMTLib2Interface.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 <libsmtutil/SMTLib2Interface.h>
+
+namespace solidity::frontend::smt
+{
+
+class Cvc5SMTLib2Interface: public smtutil::SMTLib2Interface
+{
+public:
+	explicit Cvc5SMTLib2Interface(
+		frontend::ReadCallback::Callback _smtCallback = {},
+		std::optional<unsigned> _queryTimeout = {}
+	);
+private:
+	void setupSmtCallback() override;
+};
+
+}
diff --git a/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp b/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
new file mode 100644
index 0000000000..4fa94539d8
--- /dev/null
+++ b/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
@@ -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
+
+#include <libsolidity/formal/EldaricaCHCSmtLib2Interface.h>
+
+#include <libsolidity/interface/UniversalCallback.h>
+
+using namespace solidity::frontend::smt;
+
+EldaricaCHCSmtLib2Interface::EldaricaCHCSmtLib2Interface(
+	frontend::ReadCallback::Callback _smtCallback,
+	std::optional<unsigned int> _queryTimeout,
+	bool computeInvariants
+): CHCSmtLib2Interface({}, std::move(_smtCallback), _queryTimeout), m_computeInvariants(computeInvariants)
+{
+}
+
+void EldaricaCHCSmtLib2Interface::setupSmtCallback()
+{
+	if (auto* universalCallback = m_smtCallback.target<frontend::UniversalCallback>())
+		universalCallback->smtCommand().setEldarica(m_queryTimeout, m_computeInvariants);
+}
diff --git a/libsolidity/formal/EldaricaCHCSmtLib2Interface.h b/libsolidity/formal/EldaricaCHCSmtLib2Interface.h
new file mode 100644
index 0000000000..2c83b194ca
--- /dev/null
+++ b/libsolidity/formal/EldaricaCHCSmtLib2Interface.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 <libsmtutil/CHCSmtLib2Interface.h>
+
+namespace solidity::frontend::smt
+{
+
+class EldaricaCHCSmtLib2Interface: public smtutil::CHCSmtLib2Interface
+{
+public:
+	EldaricaCHCSmtLib2Interface(
+		frontend::ReadCallback::Callback _smtCallback,
+		std::optional<unsigned int> _queryTimeout,
+		bool computeInvariants
+	);
+
+private:
+	void setupSmtCallback() override;
+
+	bool m_computeInvariants;
+};
+
+}
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index d5fe44ca16..f9f1f0e642 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -653,16 +653,7 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 		// 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 (auto* universalCallback = m_readFile.target<frontend::UniversalCallback>())
-			{
-				if (m_modelCheckerSettings.solvers.eld)
-					universalCallback->smtCommand().setEldarica(m_modelCheckerSettings.timeout, m_modelCheckerSettings.invariants != ModelCheckerInvariants::None());
-				if (m_modelCheckerSettings.solvers.cvc5)
-					universalCallback->smtCommand().setCvc5(m_modelCheckerSettings.timeout);
-			}
-		}
 
 		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
 		modelChecker.checkRequestedSourcesAndContracts(allSources);
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5_eld/args b/test/cmdlineTests/model_checker_solvers_cvc5_eld/args
new file mode 100644
index 0000000000..fb0c074ab2
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5_eld/args
@@ -0,0 +1 @@
+--model-checker-engine all --model-checker-solvers cvc5,eld
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5_eld/err b/test/cmdlineTests/model_checker_solvers_cvc5_eld/err
new file mode 100644
index 0000000000..81a9f3a563
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5_eld/err
@@ -0,0 +1,8 @@
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
+Warning: BMC: Condition is always false.
+ --> model_checker_solvers_cvc5_eld/input.sol:6:7:
+  |
+6 | 		if (y == 0)
+  | 		    ^^^^^^
+Note: Callstack:
diff --git a/test/cmdlineTests/model_checker_solvers_cvc5_eld/input.sol b/test/cmdlineTests/model_checker_solvers_cvc5_eld/input.sol
new file mode 100644
index 0000000000..eae2d9b485
--- /dev/null
+++ b/test/cmdlineTests/model_checker_solvers_cvc5_eld/input.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	function f() public pure {
+		uint y = 1;
+		if (y == 0)
+			revert();
+		assert(y > 0);
+	}
+}

From b66df3e36f2660db1ad15e9ddf02042342d9db52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 5 Jun 2024 20:30:36 +0200
Subject: [PATCH 0899/1140] CompilerStack: Remove some misapplied std::
 prefixes from comments and messages

---
 libsolidity/interface/CompilerStack.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index f9f1f0e642..0329aded68 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -279,7 +279,7 @@ void CompilerStack::setOptimiserSettings(OptimiserSettings _settings)
 void CompilerStack::setRevertStringBehaviour(RevertStrings _revertStrings)
 {
 	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set revert std::string settings before parsing.");
+		solThrow(CompilerError, "Must set revert string settings before parsing.");
 	solUnimplementedAssert(_revertStrings != RevertStrings::VerboseDebug);
 	m_revertStrings = _revertStrings;
 }
@@ -984,7 +984,7 @@ evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _con
 	return contract(_contractName).runtimeObject;
 }
 
-/// TODO: cache this std::string
+/// TODO: cache this string
 std::string CompilerStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
 {
 	if (m_stackState != CompilationSuccessful)

From e2fb57b80b08d6d29af5b67aa53ce7341dbcf807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 5 Jun 2024 20:44:59 +0200
Subject: [PATCH 0900/1140] CompilerStack: Convert overzealous input
 validations to assertions

---
 libsolidity/interface/CompilerStack.cpp | 201 +++++++-----------------
 1 file changed, 59 insertions(+), 142 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 0329aded68..a07310e2c9 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -215,8 +215,7 @@ void CompilerStack::findAndReportCyclicContractDependencies()
 
 void CompilerStack::setRemappings(std::vector<ImportRemapper::Remapping> _remappings)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set remappings before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set remappings before parsing.");
 	for (auto const& remapping: _remappings)
 		solAssert(!remapping.prefix.empty(), "");
 	m_importRemapper.setRemappings(std::move(_remappings));
@@ -224,15 +223,13 @@ void CompilerStack::setRemappings(std::vector<ImportRemapper::Remapping> _remapp
 
 void CompilerStack::setViaIR(bool _viaIR)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set viaIR before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set viaIR before parsing.");
 	m_viaIR = _viaIR;
 }
 
 void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set EVM version before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "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.
@@ -241,24 +238,20 @@ void CompilerStack::setEVMVersion(langutil::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.");
+	solAssert(m_stackState < CompilationSuccessful, "Must set EOF version before compiling.");
+	solAssert(!_version || _version == 1, "Invalid EOF version.");
 	m_eofVersion = _version;
 }
 
 void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set model checking settings before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set model checking settings before parsing.");
 	m_modelCheckerSettings = _settings;
 }
 
 void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libraries)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set libraries before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set libraries before parsing.");
 	m_libraries = _libraries;
 }
 
@@ -271,44 +264,38 @@ void CompilerStack::setOptimiserSettings(bool _optimize, size_t _runs)
 
 void CompilerStack::setOptimiserSettings(OptimiserSettings _settings)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set optimiser settings before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set optimiser settings before parsing.");
 	m_optimiserSettings = std::move(_settings);
 }
 
 void CompilerStack::setRevertStringBehaviour(RevertStrings _revertStrings)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set revert string settings before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set revert string settings before parsing.");
 	solUnimplementedAssert(_revertStrings != RevertStrings::VerboseDebug);
 	m_revertStrings = _revertStrings;
 }
 
 void CompilerStack::useMetadataLiteralSources(bool _metadataLiteralSources)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set use literal sources before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set use literal sources before parsing.");
 	m_metadataLiteralSources = _metadataLiteralSources;
 }
 
 void CompilerStack::setMetadataHash(MetadataHash _metadataHash)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set metadata hash before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must set metadata hash before parsing.");
 	m_metadataHash = _metadataHash;
 }
 
 void CompilerStack::selectDebugInfo(DebugInfoSelection _debugInfoSelection)
 {
-	if (m_stackState >= CompilationSuccessful)
-		BOOST_THROW_EXCEPTION(CompilerError() << util::errinfo_comment("Must select debug info components before compilation."));
+	solAssert(m_stackState < CompilationSuccessful, "Must select debug info components before compilation.");
 	m_debugInfoSelection = _debugInfoSelection;
 }
 
 void CompilerStack::addSMTLib2Response(h256 const& _hash, std::string const& _response)
 {
-	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must add SMTLib2 responses before parsing.");
+	solAssert(m_stackState < ParsedAndImported, "Must add SMTLib2 responses before parsing.");
 	m_smtlib2Responses[_hash] = _response;
 }
 
@@ -344,10 +331,8 @@ void CompilerStack::reset(bool _keepSettings)
 
 void CompilerStack::setSources(StringMap _sources)
 {
-	if (m_stackState == SourcesSet)
-		solThrow(CompilerError, "Cannot change sources once set.");
-	if (m_stackState != Empty)
-		solThrow(CompilerError, "Must set sources before parsing.");
+	solAssert(m_stackState != SourcesSet, "Cannot change sources once set.");
+	solAssert(m_stackState == Empty, "Must set sources before parsing.");
 	for (auto source: _sources)
 		m_sources[source.first].charStream = std::make_unique<CharStream>(/*content*/std::move(source.second), /*name*/source.first);
 	m_stackState = SourcesSet;
@@ -355,8 +340,7 @@ void CompilerStack::setSources(StringMap _sources)
 
 bool CompilerStack::parse()
 {
-	if (m_stackState != SourcesSet)
-		solThrow(CompilerError, "Must call parse only after the SourcesSet state.");
+	solAssert(m_stackState == SourcesSet, "Must call parse only after the SourcesSet state.");
 	m_errorReporter.clear();
 
 	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
@@ -426,8 +410,7 @@ bool CompilerStack::parse()
 
 void CompilerStack::importASTs(std::map<std::string, Json> const& _sources)
 {
-	if (m_stackState != Empty)
-		solThrow(CompilerError, "Must call importASTs only before the SourcesSet state.");
+	solAssert(m_stackState == Empty, "Must call importASTs only before the SourcesSet state.");
 	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
 	for (auto& src: reconstructedSources)
 	{
@@ -450,8 +433,7 @@ void CompilerStack::importASTs(std::map<std::string, Json> const& _sources)
 
 bool CompilerStack::analyze()
 {
-	if (m_stackState != ParsedAndImported)
-		solThrow(CompilerError, "Must call analyze only after parsing was successful.");
+	solAssert(m_stackState == ParsedAndImported, "Must call analyze only after parsing was successful.");
 
 	if (!resolveImports())
 		return false;
@@ -797,8 +779,7 @@ void CompilerStack::link()
 
 std::vector<std::string> CompilerStack::contractNames() const
 {
-	if (m_stackState < Parsed)
-		solThrow(CompilerError, "Parsing was not successful.");
+	solAssert(m_stackState >= Parsed, "Parsing was not successful.");
 	std::vector<std::string> contractNames;
 	for (auto const& contract: m_contracts)
 		contractNames.push_back(contract.first);
@@ -807,8 +788,7 @@ std::vector<std::string> CompilerStack::contractNames() const
 
 std::string const CompilerStack::lastContractName(std::optional<std::string> const& _sourceName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Parsing was not successful.");
+	solAssert(m_stackState >= AnalysisSuccessful, "Parsing was not successful.");
 	// try to find some user-supplied contract
 	std::string contractName;
 	for (auto const& it: m_sources)
@@ -820,8 +800,7 @@ std::string const CompilerStack::lastContractName(std::optional<std::string> con
 
 evmasm::AssemblyItems const* CompilerStack::assemblyItems(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& currentContract = contract(_contractName);
 	return currentContract.evmAssembly ? &currentContract.evmAssembly->items() : nullptr;
@@ -829,8 +808,7 @@ evmasm::AssemblyItems const* CompilerStack::assemblyItems(std::string const& _co
 
 evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& currentContract = contract(_contractName);
 	return currentContract.evmRuntimeAssembly ? &currentContract.evmRuntimeAssembly->items() : nullptr;
@@ -838,8 +816,7 @@ evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string con
 
 Json CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& c = contract(_contractName);
 	util::LazyInit<Json const> const& sources =
@@ -880,8 +857,7 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 
 std::string const* CompilerStack::sourceMapping(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& c = contract(_contractName);
 	if (!c.sourceMapping)
@@ -894,8 +870,7 @@ std::string const* CompilerStack::sourceMapping(std::string const& _contractName
 
 std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& c = contract(_contractName);
 	if (!c.runtimeSourceMapping)
@@ -910,8 +885,7 @@ std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contr
 
 std::string const CompilerStack::filesystemFriendlyName(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "No compiled contracts found.");
+	solAssert(m_stackState >= AnalysisSuccessful, "No compiled contracts found.");
 
 	// Look up the contract (by its fully-qualified name)
 	Contract const& matchContract = m_contracts.at(_contractName);
@@ -934,61 +908,46 @@ std::string const CompilerStack::filesystemFriendlyName(std::string const& _cont
 
 std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	return contract(_contractName).yulIR;
 }
 
 Json const& CompilerStack::yulIRAst(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).yulIRAst;
 }
 
 std::string const& CompilerStack::yulIROptimized(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	return contract(_contractName).yulIROptimized;
 }
 
 Json const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).yulIROptimizedAst;
 }
 
 evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	return contract(_contractName).object;
 }
 
 evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	return contract(_contractName).runtimeObject;
 }
 
 /// TODO: cache this string
 std::string CompilerStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
@@ -1000,9 +959,7 @@ std::string CompilerStack::assemblyString(std::string const& _contractName, Stri
 /// TODO: cache the JSON
 Json CompilerStack::assemblyJSON(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
 
 	Contract const& currentContract = contract(_contractName);
@@ -1030,37 +987,28 @@ std::map<std::string, unsigned> CompilerStack::sourceIndices() const
 
 Json const& CompilerStack::contractABI(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	return contractABI(contract(_contractName));
 }
 
 Json const& CompilerStack::contractABI(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
 }
 
 Json const& CompilerStack::storageLayout(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	return storageLayout(contract(_contractName));
 }
 
 Json const& CompilerStack::storageLayout(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
@@ -1068,48 +1016,35 @@ Json const& CompilerStack::storageLayout(Contract const& _contract) const
 
 Json const& CompilerStack::natspecUser(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	return natspecUser(contract(_contractName));
 }
 
 Json const& CompilerStack::natspecUser(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
 }
 
 Json const& CompilerStack::natspecDev(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	return natspecDev(contract(_contractName));
 }
 
 Json const& CompilerStack::natspecDev(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
 Json CompilerStack::interfaceSymbols(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
 
 	Json interfaceSymbols;
@@ -1139,50 +1074,36 @@ Json CompilerStack::interfaceSymbols(std::string const& _contractName) const
 
 bytes CompilerStack::cborMetadata(std::string const& _contractName, bool _forIR) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	return createCBORMetadata(contract(_contractName), _forIR);
 }
 
 std::string const& CompilerStack::metadata(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	solAssert(_contract.contract, "");
-
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return _contract.metadata.init([&]{ return createMetadata(_contract, m_viaIR); });
 }
 
 CharStream const& CompilerStack::charStream(std::string const& _sourceName) const
 {
-	if (m_stackState < SourcesSet)
-		solThrow(CompilerError, "No sources set.");
-
-	solAssert(source(_sourceName).charStream, "");
-
+	solAssert(m_stackState >= SourcesSet, "No sources set.");
+	solAssert(source(_sourceName).charStream);
 	return *source(_sourceName).charStream;
 }
 
 SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 {
-	if (m_stackState < Parsed)
-		solThrow(CompilerError, "Parsing not yet performed.");
-	if (!source(_sourceName).ast)
-		solThrow(CompilerError, "Parsing was not successful.");
-
+	solAssert(m_stackState >= Parsed, "Parsing not yet performed.");
+	solAssert(source(_sourceName).ast, "Parsing was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return *source(_sourceName).ast;
 }
 
 ContractDefinition const& CompilerStack::contractDefinition(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisSuccessful)
-		solThrow(CompilerError, "Analysis was not successful.");
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 
 	return *contract(_contractName).contract;
 }
@@ -1192,8 +1113,7 @@ size_t CompilerStack::functionEntryPoint(
 	FunctionDefinition const& _function
 ) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	for (auto&& [name, data]: contract(_contractName).runtimeObject.functionDebugData)
 		if (data.sourceID == _function.id())
@@ -1629,14 +1549,13 @@ CompilerStack::Contract const& CompilerStack::contract(std::string const& _contr
 	}
 
 	// If we get here, both lookup methods failed.
-	solThrow(CompilerError, "Contract \"" + _contractName + "\" not found.");
+	solAssert(false, "Contract \"" + _contractName + "\" not found.");
 }
 
 CompilerStack::Source const& CompilerStack::source(std::string const& _sourceName) const
 {
 	auto it = m_sources.find(_sourceName);
-	if (it == m_sources.end())
-		solThrow(CompilerError, "Given source file not found: " + _sourceName);
+	solAssert(it != m_sources.end(), "Given source file not found: " + _sourceName);
 
 	return it->second;
 }
@@ -1902,9 +1821,7 @@ Json gasToJson(GasEstimator::GasConsumption const& _gas)
 
 Json CompilerStack::gasEstimates(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
 
 	if (!assemblyItems(_contractName) && !runtimeAssemblyItems(_contractName))

From 12e8b0cda911ed4661773ee6cd9a2e341d8a77ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 20:00:41 +0200
Subject: [PATCH 0901/1140] Use solAssert() instead of throwing
 InternalCompilerError directly

---
 libsolidity/codegen/ExpressionCompiler.cpp | 4 +---
 libsolidity/codegen/LValue.cpp             | 5 +----
 libsolidity/interface/FileReader.cpp       | 1 -
 libsolidity/interface/SMTSolverCommand.cpp | 4 ----
 libsolidity/interface/StandardCompiler.cpp | 9 ++-------
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 54090f9604..c7bc9a8263 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -2952,9 +2952,7 @@ void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaratio
 	else if (m_context.isStateVariable(&_declaration))
 		setLValue<StorageItem>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
 	else
-		BOOST_THROW_EXCEPTION(InternalCompilerError()
-			<< errinfo_sourceLocation(_expression.location())
-			<< util::errinfo_comment("Identifier type not supported or identifier not found."));
+		solAssert(false, "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 3fbf103834..4847cb0938 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -441,10 +441,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 				m_context << Instruction::SWAP1 << Instruction::POP;
 		}
 		else
-			BOOST_THROW_EXCEPTION(
-				InternalCompilerError()
-					<< errinfo_sourceLocation(_location)
-					<< util::errinfo_comment("Invalid non-value type for assignment."));
+			solAssert(false, "Invalid non-value type for assignment.");
 	}
 }
 
diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 158d4dd2c9..15181acf60 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -31,7 +31,6 @@
 #include <functional>
 
 using solidity::frontend::ReadCallback;
-using solidity::langutil::InternalCompilerError;
 using solidity::util::errinfo_comment;
 using solidity::util::readFileAsString;
 using solidity::util::joinHumanReadable;
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index b9eb392c63..75f541692d 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -30,10 +30,6 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/process.hpp>
 
-using solidity::langutil::InternalCompilerError;
-using solidity::util::errinfo_comment;
-
-
 namespace solidity::frontend
 {
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index a54a9aa107..2b36f90323 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1463,13 +1463,8 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	// Note that not completing analysis due to stopAfter does not count as a failure. It's neither failure nor success.
 	bool analysisFailed = !analysisSuccess && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisSuccessful;
 	bool compilationFailed = !compilationSuccess && binariesRequested;
-
-	/// Inconsistent state - stop here to receive error reports from users
-	if (
-		(compilationFailed || analysisFailed || !parsingSuccess) &&
-		errors.empty()
-	)
-		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
+	if (compilationFailed || analysisFailed || !parsingSuccess)
+		solAssert(!errors.empty(), "No error reported, but compilation failed.");
 
 	Json output;
 

From 8d561e36aa1b7c1bb1965c8873657615daf87dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 19:17:28 +0200
Subject: [PATCH 0902/1140] Assert presence of errors in case of FatalError
 instead of rethrowing

---
 libsolidity/analysis/NameAndTypeResolver.cpp  |  16 +-
 libsolidity/interface/CompilerStack.cpp       |   9 +-
 libsolidity/parsing/Parser.cpp                |   5 +-
 libyul/AsmAnalysis.cpp                        |   9 +-
 libyul/AsmParser.cpp                          |   5 +-
 libyul/ObjectParser.cpp                       |   6 +-
 .../more_than_256_analysis_errors.yul         | 279 ++++++++++++++++++
 7 files changed, 304 insertions(+), 25 deletions(-)
 create mode 100644 test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul

diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 642e87a53b..941fbca9bd 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -30,6 +30,7 @@
 #include <boost/algorithm/string.hpp>
 #include <unordered_set>
 
+using namespace std::string_literals;
 using namespace solidity::langutil;
 
 namespace solidity::frontend
@@ -60,10 +61,9 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit, ASTNode
 	{
 		DeclarationRegistrationHelper registrar(m_scopes, _sourceUnit, m_errorReporter, m_globalContext, _currentScope);
 	}
-	catch (langutil::FatalError const&)
+	catch (langutil::FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
@@ -135,10 +135,9 @@ bool NameAndTypeResolver::resolveNamesAndTypes(SourceUnit& _source)
 				return false;
 		}
 	}
-	catch (langutil::FatalError const&)
+	catch (langutil::FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
@@ -151,10 +150,9 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
 		m_scopes[nullptr]->registerDeclaration(_declaration, false, true);
 		solAssert(_declaration.scope() == nullptr, "Updated declaration outside global scope.");
 	}
-	catch (langutil::FatalError const&)
+	catch (langutil::FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a07310e2c9..89a7a441a5 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -489,10 +489,9 @@ bool CompilerStack::analyze()
 		else if (!analyzeLegacy(noErrors))
 			noErrors = false;
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 		noErrors = false;
 	}
 
@@ -1174,9 +1173,9 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 				}
 			}
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		solAssert(m_errorReporter.hasErrors(), "");
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 	}
 	return newSources;
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index f650e0dbf1..15a84c3f49 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -176,10 +176,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 		solAssert(m_recursionDepth == 0, "");
 		return nodeFactory.createNode<SourceUnit>(findLicenseString(nodes), nodes, m_experimentalSolidityEnabledInCurrentSourceUnit);
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 		return nullptr;
 	}
 }
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 1972d26745..f85ef95442 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -74,10 +74,13 @@ bool AsmAnalyzer::analyze(Block const& _block)
 
 		(*this)(_block);
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		// This FatalError con occur if the errorReporter has too many errors.
-		yulAssert(!watcher.ok(), "Fatal error detected, but no error is reported.");
+		// NOTE: There's a cap on the number of reported errors, but watcher.ok() will work fine even if
+		// we exceed it because the reporter keeps counting (it just stops adding errors to the list).
+		// Note also that fact of exceeding the cap triggers a FatalError so one can get thrown even
+		// if we don't make any of our errors fatal.
+		yulAssert(!watcher.ok(), "Unreported fatal error: "s + error.what());
 	}
 	return watcher.ok();
 }
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 3635b096af..7af648a36b 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -37,6 +37,7 @@
 #include <algorithm>
 #include <regex>
 
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -126,9 +127,9 @@ std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scan
 			fetchDebugDataFromComment();
 		return std::make_unique<Block>(parseBlock());
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		yulAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
+		yulAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 	}
 
 	return nullptr;
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index 2038959de4..d0519be0ef 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -32,6 +32,7 @@
 
 #include <regex>
 
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -62,10 +63,9 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 			expectToken(Token::EOS);
 		return object;
 	}
-	catch (FatalError const&)
+	catch (FatalError const& error)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		yulAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
 	}
 	return nullptr;
 }
diff --git a/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
new file mode 100644
index 0000000000..0ae2fb15a7
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
@@ -0,0 +1,279 @@
+{
+    // There's no type called 'x' so every declaration here should trigger an error.
+    // It's only detected during analysis and is not fatal. Any other non-fatal analysis error would do.
+    let $00:x let $10:x let $20:x let $30:x let $40:x let $50:x let $60:x let $70:x let $80:x let $90:x let $a0:x let $b0:x let $c0:x let $d0:x let $e0:x let $f0:x
+    let $01:x let $11:x let $21:x let $31:x let $41:x let $51:x let $61:x let $71:x let $81:x let $91:x let $a1:x let $b1:x let $c1:x let $d1:x let $e1:x let $f1:x
+    let $02:x let $12:x let $22:x let $32:x let $42:x let $52:x let $62:x let $72:x let $82:x let $92:x let $a2:x let $b2:x let $c2:x let $d2:x let $e2:x let $f2:x
+    let $03:x let $13:x let $23:x let $33:x let $43:x let $53:x let $63:x let $73:x let $83:x let $93:x let $a3:x let $b3:x let $c3:x let $d3:x let $e3:x let $f3:x
+    let $04:x let $14:x let $24:x let $34:x let $44:x let $54:x let $64:x let $74:x let $84:x let $94:x let $a4:x let $b4:x let $c4:x let $d4:x let $e4:x let $f4:x
+    let $05:x let $15:x let $25:x let $35:x let $45:x let $55:x let $65:x let $75:x let $85:x let $95:x let $a5:x let $b5:x let $c5:x let $d5:x let $e5:x let $f5:x
+    let $06:x let $16:x let $26:x let $36:x let $46:x let $56:x let $66:x let $76:x let $86:x let $96:x let $a6:x let $b6:x let $c6:x let $d6:x let $e6:x let $f6:x
+    let $07:x let $17:x let $27:x let $37:x let $47:x let $57:x let $67:x let $77:x let $87:x let $97:x let $a7:x let $b7:x let $c7:x let $d7:x let $e7:x let $f7:x
+    let $08:x let $18:x let $28:x let $38:x let $48:x let $58:x let $68:x let $78:x let $88:x let $98:x let $a8:x let $b8:x let $c8:x let $d8:x let $e8:x let $f8:x
+    let $09:x let $19:x let $29:x let $39:x let $49:x let $59:x let $69:x let $79:x let $89:x let $99:x let $a9:x let $b9:x let $c9:x let $d9:x let $e9:x let $f9:x
+    let $0a:x let $1a:x let $2a:x let $3a:x let $4a:x let $5a:x let $6a:x let $7a:x let $8a:x let $9a:x let $aa:x let $ba:x let $ca:x let $da:x let $ea:x let $fa:x
+    let $0b:x let $1b:x let $2b:x let $3b:x let $4b:x let $5b:x let $6b:x let $7b:x let $8b:x let $9b:x let $ab:x let $bb:x let $cb:x let $db:x let $eb:x let $fb:x
+    let $0c:x let $1c:x let $2c:x let $3c:x let $4c:x let $5c:x let $6c:x let $7c:x let $8c:x let $9c:x let $ac:x let $bc:x let $cc:x let $dc:x let $ec:x let $fc:x
+    let $0d:x let $1d:x let $2d:x let $3d:x let $4d:x let $5d:x let $6d:x let $7d:x let $8d:x let $9d:x let $ad:x let $bd:x let $cd:x let $dd:x let $ed:x let $fd:x
+    let $0e:x let $1e:x let $2e:x let $3e:x let $4e:x let $5e:x let $6e:x let $7e:x let $8e:x let $9e:x let $ae:x let $be:x let $ce:x let $de:x let $ee:x let $fe:x
+    let $0f:x let $1f:x let $2f:x let $3f:x let $4f:x let $5f:x let $6f:x let $7f:x let $8f:x let $9f:x let $af:x let $bf:x let $cf:x let $df:x let $ef:x let $ff:x
+    let $100:x
+}
+// ----
+// TypeError 5473: (200-205): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (210-215): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (220-225): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (230-235): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (240-245): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (250-255): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (260-265): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (270-275): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (280-285): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (290-295): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (300-305): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (310-315): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (320-325): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (330-335): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (340-345): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (350-355): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (364-369): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (374-379): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (384-389): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (394-399): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (404-409): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (414-419): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (424-429): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (434-439): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (444-449): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (454-459): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (464-469): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (474-479): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (484-489): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (494-499): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (504-509): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (514-519): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (528-533): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (538-543): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (548-553): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (558-563): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (568-573): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (578-583): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (588-593): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (598-603): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (608-613): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (618-623): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (628-633): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (638-643): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (648-653): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (658-663): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (668-673): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (678-683): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (692-697): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (702-707): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (712-717): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (722-727): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (732-737): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (742-747): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (752-757): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (762-767): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (772-777): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (782-787): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (792-797): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (802-807): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (812-817): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (822-827): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (832-837): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (842-847): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (856-861): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (866-871): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (876-881): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (886-891): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (896-901): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (906-911): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (916-921): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (926-931): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (936-941): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (946-951): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (956-961): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (966-971): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (976-981): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (986-991): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (996-1001): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1006-1011): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1020-1025): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1030-1035): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1040-1045): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1050-1055): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1060-1065): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1070-1075): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1080-1085): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1090-1095): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1100-1105): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1110-1115): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1120-1125): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1130-1135): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1140-1145): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1150-1155): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1160-1165): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1170-1175): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1184-1189): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1194-1199): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1204-1209): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1214-1219): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1224-1229): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1234-1239): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1244-1249): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1254-1259): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1264-1269): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1274-1279): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1284-1289): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1294-1299): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1304-1309): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1314-1319): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1324-1329): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1334-1339): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1348-1353): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1358-1363): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1368-1373): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1378-1383): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1388-1393): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1398-1403): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1408-1413): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1418-1423): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1428-1433): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1438-1443): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1448-1453): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1458-1463): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1468-1473): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1478-1483): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1488-1493): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1498-1503): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1512-1517): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1522-1527): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1532-1537): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1542-1547): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1552-1557): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1562-1567): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1572-1577): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1582-1587): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1592-1597): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1602-1607): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1612-1617): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1622-1627): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1632-1637): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1642-1647): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1652-1657): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1662-1667): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1676-1681): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1686-1691): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1696-1701): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1706-1711): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1716-1721): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1726-1731): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1736-1741): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1746-1751): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1756-1761): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1766-1771): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1776-1781): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1786-1791): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1796-1801): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1806-1811): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1816-1821): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1826-1831): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1840-1845): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1850-1855): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1860-1865): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1870-1875): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1880-1885): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1890-1895): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1900-1905): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1910-1915): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1920-1925): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1930-1935): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1940-1945): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1950-1955): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1960-1965): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1970-1975): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1980-1985): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (1990-1995): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2004-2009): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2014-2019): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2024-2029): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2034-2039): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2044-2049): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2054-2059): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2064-2069): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2074-2079): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2084-2089): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2094-2099): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2104-2109): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2114-2119): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2124-2129): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2134-2139): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2144-2149): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2154-2159): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2168-2173): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2178-2183): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2188-2193): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2198-2203): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2208-2213): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2218-2223): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2228-2233): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2238-2243): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2248-2253): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2258-2263): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2268-2273): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2278-2283): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2288-2293): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2298-2303): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2308-2313): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2318-2323): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2332-2337): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2342-2347): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2352-2357): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2362-2367): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2372-2377): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2382-2387): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2392-2397): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2402-2407): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2412-2417): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2422-2427): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2432-2437): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2442-2447): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2452-2457): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2462-2467): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2472-2477): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2482-2487): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2496-2501): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2506-2511): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2516-2521): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2526-2531): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2536-2541): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2546-2551): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2556-2561): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2566-2571): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2576-2581): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2586-2591): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2596-2601): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2606-2611): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2616-2621): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2626-2631): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2636-2641): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2646-2651): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2660-2665): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2670-2675): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2680-2685): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2690-2695): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2700-2705): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2710-2715): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2720-2725): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2730-2735): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2740-2745): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2750-2755): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2760-2765): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2770-2775): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2780-2785): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2790-2795): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2800-2805): "x" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (2810-2815): "x" is not a valid type (user defined types are not yet supported).
+// Warning 4013: There are more than 256 errors. Aborting.

From 2694190d1dbbc90b001aa76f8d7bd0794923c343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jun 2024 19:32:29 +0200
Subject: [PATCH 0903/1140] Ignore warnings and infos when checking if
 FatalError was reported

---
 libsolidity/analysis/NameAndTypeResolver.cpp | 6 +++---
 libsolidity/interface/CompilerStack.cpp      | 4 ++--
 libsolidity/parsing/Parser.cpp               | 2 +-
 libyul/AsmParser.cpp                         | 2 +-
 libyul/ObjectParser.cpp                      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 941fbca9bd..32ef6d476b 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -63,7 +63,7 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit, ASTNode
 	}
 	catch (langutil::FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
@@ -137,7 +137,7 @@ bool NameAndTypeResolver::resolveNamesAndTypes(SourceUnit& _source)
 	}
 	catch (langutil::FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
@@ -152,7 +152,7 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
 	}
 	catch (langutil::FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		return false;
 	}
 	return true;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 89a7a441a5..2299155383 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -491,7 +491,7 @@ bool CompilerStack::analyze()
 	}
 	catch (FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		noErrors = false;
 	}
 
@@ -1175,7 +1175,7 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 	}
 	catch (FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 	}
 	return newSources;
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 15a84c3f49..7e2fe030af 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -178,7 +178,7 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 	}
 	catch (FatalError const& error)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		return nullptr;
 	}
 }
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 7af648a36b..a009b005d6 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -129,7 +129,7 @@ std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scan
 	}
 	catch (FatalError const& error)
 	{
-		yulAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		yulAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 	}
 
 	return nullptr;
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index d0519be0ef..a02b9660b9 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -65,7 +65,7 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 	}
 	catch (FatalError const& error)
 	{
-		yulAssert(!m_errorReporter.errors().empty(), "Unreported fatal error: "s + error.what());
+		yulAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 	}
 	return nullptr;
 }

From 1ca70c8dc089f6a84dea0d13d70934edd7e78789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 15:17:40 +0200
Subject: [PATCH 0904/1140] .gitignore: Mark directories as directories

---
 .gitignore | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ca5f86e7e..dc88e1c67e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 *.o
 *.obj
 *.pyc
-__pycache__
+__pycache__/
 
 # Precompiled Headers
 *.gch
@@ -36,12 +36,12 @@ __pycache__
 *.app
 
 # Build directory
-/build*
+/build*/
 emscripten_build/
-/docs/_build
+/docs/_build/
 /docs/_static/robots.txt
-/deps
-/reports
+/deps/
+/reports/
 
 # vim stuff
 [._]*.sw[a-p]

From e05c596bd5e931aa4e4c291b76a7765a1437c88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 5 Jun 2024 14:47:28 +0200
Subject: [PATCH 0905/1140] Setup for benchmarking solc using external projects
 and foundry

---
 .gitignore                        |   3 +
 test/benchmarks/external-setup.sh | 113 ++++++++++++++++++++++++++++++
 test/benchmarks/external.sh       | 108 ++++++++++++++++++++++++++++
 3 files changed, 224 insertions(+)
 create mode 100755 test/benchmarks/external-setup.sh
 create mode 100755 test/benchmarks/external.sh

diff --git a/.gitignore b/.gitignore
index dc88e1c67e..aafe93f97a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,10 @@ emscripten_build/
 /docs/_build/
 /docs/_static/robots.txt
 /deps/
+
+# Reports and benchmarks
 /reports/
+/benchmarks/
 
 # vim stuff
 [._]*.sw[a-p]
diff --git a/test/benchmarks/external-setup.sh b/test/benchmarks/external-setup.sh
new file mode 100755
index 0000000000..b995e8e9fd
--- /dev/null
+++ b/test/benchmarks/external-setup.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Downloads and configures external projects used for benchmarking by external.sh.
+#
+# By default the download location is the benchmarks/ dir at the repository root.
+# A different directory can be provided via the BENCHMARK_DIR variable.
+#
+# Dependencies: foundry, git.
+# ------------------------------------------------------------------------------
+# 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) 2024 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+repo_root=$(cd "$(dirname "$0")/../../" && pwd)
+BENCHMARK_DIR="${BENCHMARK_DIR:-${repo_root}/benchmarks}"
+
+function neutralize_version_pragmas {
+    find . -name '*.sol' -type f -print0 | xargs -0 \
+        sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity *;/'
+}
+
+function neutralize_via_ir {
+    sed -i '/^via_ir\s*=.*$/d' foundry.toml
+}
+
+mkdir -p "$BENCHMARK_DIR"
+cd "$BENCHMARK_DIR"
+
+if [[ ! -e openzeppelin/ ]]; then
+    git clone --depth=1 https://github.com/OpenZeppelin/openzeppelin-contracts openzeppelin/ --branch v5.0.2
+    pushd openzeppelin/
+    forge install
+    neutralize_via_ir
+    popd
+else
+    echo "Skipped openzeppelin/. Already exists."
+fi
+
+if [[ ! -e uniswap-v4/ ]]; then
+    git clone --single-branch https://github.com/Uniswap/v4-core uniswap-v4/
+    pushd uniswap-v4/
+    git checkout d0700ceb251afa48df8cc26d593fe04ee5e6b775 # branch main as of 2024-05-10
+    forge install
+    neutralize_via_ir
+    popd
+else
+    echo "Skipped uniswap-v4/. Already exists."
+fi
+
+if [[ ! -e seaport/ ]]; then
+    git clone --single-branch https://github.com/ProjectOpenSea/seaport
+    pushd seaport/
+    # NOTE: Can't select the tag with `git clone` because a branch of the same name exists.
+    git checkout tags/1.6
+    forge install
+    neutralize_via_ir
+    neutralize_version_pragmas
+    popd
+else
+    echo "Skipped seaport/. Already exists."
+fi
+
+if [[ ! -e eigenlayer/ ]]; then
+    git clone --depth=1 https://github.com/Layr-Labs/eigenlayer-contracts eigenlayer/ --branch v0.3.0-holesky-rewards
+    pushd eigenlayer/
+    neutralize_via_ir
+    forge install
+    popd
+else
+    echo "Skipped eigenlayer/. Already exists."
+fi
+
+if [[ ! -e sablier-v2/ ]]; then
+    git clone --depth=1 https://github.com/sablier-labs/v2-core sablier-v2/ --branch v1.1.2
+    pushd sablier-v2/
+    # NOTE: To avoid hard-coding dependency versions here we'd have to install them from npm
+    forge install --no-commit \
+        foundry-rs/forge-std@v1.5.6 \
+        OpenZeppelin/openzeppelin-contracts@v4.9.2 \
+        PaulRBerg/prb-math@v4.0.2 \
+        PaulRBerg/prb-test@v0.6.4 \
+        evmcheb/solarray@a547630 \
+        Vectorized/solady@v0.0.129
+   cat <<EOF > remappings.txt
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+forge-std/=lib/forge-std/
+@prb/math/=lib/prb-math/
+@prb/test/=lib/prb-test/
+solarray/=lib/solarray/
+solady/=lib/solady/
+EOF
+    neutralize_via_ir
+    popd
+else
+    echo "Skipped sablier-v2/. Already exists."
+fi
diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh
new file mode 100755
index 0000000000..b37c9105d6
--- /dev/null
+++ b/test/benchmarks/external.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Benchmarks a solc binary by compiling several external projects, with and without IR.
+#
+# The script expects each project to be already downloaded and set up by external-setup.sh.
+# A different directory can be provided via the BENCHMARK_DIR variable.
+#
+# The script will by default attempt to use a solc from the default build directory,
+# relative to the script directory. To use a different binary you can provide a different
+# location of the build directory (via SOLIDITY_BUILD_DIR variable) or simply specify
+# the full path to the binary as the script argument.
+#
+# Dependencies: foundry, time.
+# ------------------------------------------------------------------------------
+# 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) 2024 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+repo_root=$(cd "$(dirname "$0")/../../" && pwd)
+SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${repo_root}/build}
+BENCHMARK_DIR="${BENCHMARK_DIR:-${repo_root}/benchmarks}"
+
+# shellcheck source=scripts/common.sh
+source "${repo_root}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${repo_root}/scripts/common_cmdline.sh"
+
+(( $# <= 1 )) || fail "Too many arguments. Usage: external.sh [<solc-path>]"
+
+solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
+command_available "$solc" --version
+
+function benchmark_project {
+    local pipeline="$1"
+    local project="$2"
+    [[ $pipeline == legacy || $pipeline == ir ]] || assertFail
+
+    cd "$project"
+    local foundry_command=(forge build --use "$solc" --optimize --offline --no-cache)
+    [[ $pipeline == ir ]] && foundry_command+=(--via-ir)
+    local time_file="../time-and-status-${project}-${pipeline}.txt"
+
+    # NOTE: The pipeline may fail with "Stack too deep" in some cases. That's fine.
+    # We note the exit code and will later show full output.
+    "$time_bin_path" \
+        --output "$time_file" \
+        --quiet \
+        --format '%e s |         %x' \
+            "${foundry_command[@]}" \
+            > /dev/null \
+            2> "../stderr-${project}-${pipeline}.log" || true
+
+    printf '| %-20s | %8s | %21s |\n' \
+        "$project" \
+        "$pipeline" \
+        "$(cat "$time_file")"
+    cd ..
+}
+
+benchmarks=(
+    # Fastest ones first so that we get *some* output quickly
+    openzeppelin
+    uniswap-v4
+    eigenlayer
+    seaport
+    sablier-v2
+)
+time_bin_path=$(type -P time)
+
+mkdir -p "$BENCHMARK_DIR"
+cd "$BENCHMARK_DIR"
+
+echo "| Project              | Pipeline | Time      | Exit code |"
+echo "|----------------------|----------|----------:|----------:|"
+
+for project in "${benchmarks[@]}"; do
+    benchmark_project legacy "$project"
+    benchmark_project ir     "$project"
+done
+
+for project in "${benchmarks[@]}"; do
+    for pipeline in legacy ir; do
+        if [[ -s stderr-${project}-${pipeline}.log ]]; then
+            echo
+            echo "=================================="
+            echo "stderr for ${project} via ${pipeline}"
+            echo "=================================="
+            cat "stderr-${project}-${pipeline}.log"
+        fi
+    done
+done

From e1bc6cb95ba8c1786327a7d9e15090378be8160e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 12:42:36 +0200
Subject: [PATCH 0906/1140] benchmarks: Update Uniswap to the latest revision

---
 test/benchmarks/external-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/benchmarks/external-setup.sh b/test/benchmarks/external-setup.sh
index b995e8e9fd..2316d83d58 100755
--- a/test/benchmarks/external-setup.sh
+++ b/test/benchmarks/external-setup.sh
@@ -56,7 +56,7 @@ fi
 if [[ ! -e uniswap-v4/ ]]; then
     git clone --single-branch https://github.com/Uniswap/v4-core uniswap-v4/
     pushd uniswap-v4/
-    git checkout d0700ceb251afa48df8cc26d593fe04ee5e6b775 # branch main as of 2024-05-10
+    git checkout ae86975b058d386c9be24e8994236f662affacdb # branch main as of 2024-06-06
     forge install
     neutralize_via_ir
     popd

From 732658fd59d7263a77b37abb2ba3f60f0ebc8834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 17:51:22 +0200
Subject: [PATCH 0907/1140] Rename benchmarks/run.sh to benchmarks/local.sh

---
 test/benchmarks/{run.sh => local.sh} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/benchmarks/{run.sh => local.sh} (97%)

diff --git a/test/benchmarks/run.sh b/test/benchmarks/local.sh
similarity index 97%
rename from test/benchmarks/run.sh
rename to test/benchmarks/local.sh
index 1784b3700b..9d4f498c1a 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/local.sh
@@ -31,7 +31,7 @@ source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
-(( $# <= 1 )) || fail "Too many arguments. Usage: run.sh [<solc-path>]"
+(( $# <= 1 )) || fail "Too many arguments. Usage: local.sh [<solc-path>]"
 
 solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
 command_available "$solc" --version

From 9aceb3a3f716c2eea5bef45724ae5df36d19b2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Jun 2024 15:25:44 +0200
Subject: [PATCH 0908/1140] Move bytecode_size helper to common.sh

---
 scripts/common_cmdline.sh | 8 ++++++++
 test/benchmarks/local.sh  | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
index 5e32a76dc9..819a4b1c8e 100644
--- a/scripts/common_cmdline.sh
+++ b/scripts/common_cmdline.sh
@@ -169,3 +169,11 @@ function stripEmptyLines
 {
     sed -e '/^\s*$/d'
 }
+
+# Calculates the total size of bytecode of one or more contracts in bytes.
+# Expects the output from `solc --bin` on standard input.
+function bytecode_size {
+    local bytecode_chars
+    bytecode_chars=$(stripCLIDecorations | stripEmptyLines | wc --chars)
+    echo $(( bytecode_chars / 2 ))
+}
diff --git a/test/benchmarks/local.sh b/test/benchmarks/local.sh
index 9d4f498c1a..16a0c3afe3 100755
--- a/test/benchmarks/local.sh
+++ b/test/benchmarks/local.sh
@@ -45,12 +45,6 @@ function cleanup() {
 
 trap cleanup SIGINT SIGTERM
 
-function bytecode_size {
-    local bytecode_chars
-    bytecode_chars=$(stripCLIDecorations | stripEmptyLines | wc --chars)
-    echo $(( bytecode_chars / 2 ))
-}
-
 function benchmark_contract {
     local pipeline="$1"
     local input_path="$2"

From bb168489d270916aeff498963feb407aebeb83d1 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 30 May 2024 23:15:43 -0300
Subject: [PATCH 0909/1140] Catch and report UnimplementedFeatureError

---
 Changelog.md                                  |   1 +
 liblangutil/ErrorReporter.cpp                 |  10 +
 liblangutil/ErrorReporter.h                   |   2 +
 libsolidity/interface/CompilerStack.cpp       | 134 ++++++-------
 libsolidity/interface/CompilerStack.h         |   2 +
 libsolidity/interface/StandardCompiler.cpp    |  17 +-
 libsolutil/Assertions.h                       |  15 +-
 libsolutil/CommonData.h                       |  10 +
 libsolutil/Exceptions.cpp                     |  10 +
 libsolutil/Exceptions.h                       |   5 +
 libyul/YulStack.cpp                           | 189 ++++++++++++------
 libyul/YulStack.h                             |  16 +-
 scripts/error_codes.py                        |   2 +-
 solc/CommandLineInterface.cpp                 |   6 +
 solc/main.cpp                                 |   6 -
 test/libsolidity/SyntaxTest.cpp               |  49 ++---
 .../operators/shifts/shr_unused.sol           |   2 +-
 .../array/nested_calldata_storage.sol         |   2 +-
 .../array/nested_calldata_storage2.sol        |   2 +-
 .../constants/mod_div_rational.sol            |   2 +-
 .../errors/require_custom_legacy.sol          |   2 +-
 .../builtin/builtin_type_definition.sol       |   2 +-
 .../inline_array_fixed_types.sol              |   2 +-
 .../inline_arrays/inline_array_rationals.sol  |   2 +-
 .../303_fixed_type_int_conversion.sol         |   2 +-
 ...304_fixed_type_rational_int_conversion.sol |   2 +-
 ...ixed_type_rational_fraction_conversion.sol |   2 +-
 .../307_rational_unary_minus_operation.sol    |   2 +-
 .../312_leading_zero_rationals_convert.sol    |   2 +-
 .../314_fixed_type_zero_handling.sol          |   2 +-
 ..._fixed_type_valid_explicit_conversions.sol |   2 +-
 .../323_mapping_with_fixed_literal.sol        |   2 +-
 .../324_fixed_points_inside_structs.sol       |   2 +-
 ...8_rational_to_fixed_literal_expression.sol |   2 +-
 .../343_integer_and_fixed_interaction.sol     |   2 +-
 .../declaring_fixed_and_ufixed_variables.sol  |   2 +-
 .../lexer_numbers_with_underscores_fixed.sol  |   2 +-
 ...ional_number_literal_to_fixed_implicit.sol |   2 +-
 38 files changed, 307 insertions(+), 211 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1c15478d19..29fb86250b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Error Reporting: Unimplemented features are now properly reported as errors instead of being handled as if they were bugs.
  * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
index bf10483aa5..ddb6b70d12 100644
--- a/liblangutil/ErrorReporter.cpp
+++ b/liblangutil/ErrorReporter.cpp
@@ -263,6 +263,16 @@ void ErrorReporter::docstringParsingError(ErrorId _error, SourceLocation const&
 	);
 }
 
+void ErrorReporter::unimplementedFeatureError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
+{
+	error(
+		_error,
+		Error::Type::UnimplementedFeatureError,
+		_location,
+		_description
+	);
+}
+
 void ErrorReporter::info(
 	ErrorId _error,
 	SourceLocation const& _location,
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index c78b6f498d..d7e280ed90 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -118,6 +118,8 @@ class ErrorReporter
 
 	void docstringParsingError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
 
+	void unimplementedFeatureError(ErrorId _error, SourceLocation const& _location, std::string const& _description);
+
 	ErrorList const& errors() const;
 
 	void clear();
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 2299155383..0a5fed3338 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -346,64 +346,71 @@ 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};
+	try
+	{
+		Parser parser{m_errorReporter, m_evmVersion};
 
-	std::vector<std::string> sourcesToParse;
-	for (auto const& s: m_sources)
-		sourcesToParse.push_back(s.first);
+		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)
-	{
-		std::string const& path = sourcesToParse[i];
-		Source& source = m_sources[path];
-		source.ast = parser.parse(*source.charStream);
-		if (!source.ast)
-			solAssert(Error::containsErrors(m_errorReporter.errors()), "Parser returned null but did not report error.");
-		else
+		for (size_t i = 0; i < sourcesToParse.size(); ++i)
 		{
-			source.ast->annotation().path = path;
-
-			for (auto const& import: ASTNode::filteredNodes<ImportDirective>(source.ast->nodes()))
+			std::string const& path = sourcesToParse[i];
+			Source& source = m_sources[path];
+			source.ast = parser.parse(*source.charStream);
+			if (!source.ast)
+				solAssert(Error::containsErrors(m_errorReporter.errors()), "Parser returned null but did not report error.");
+			else
 			{
-				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())
+				source.ast->annotation().path = path;
+
+				for (auto const& import: ASTNode::filteredNodes<ImportDirective>(source.ast->nodes()))
 				{
-					auto [name, content] = *it;
-					m_sources[name].charStream = std::make_unique<CharStream>(content, name);
-					sourcesToParse.push_back(name);
+					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 = std::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
+					// as seen globally.
+					import->annotation().absolutePath = applyRemapping(util::absolutePath(
+						import->path(),
+						path
+					), path);
 				}
 
-				// 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))
+					{
+						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);
+					}
 			}
-
-			if (m_stopAfter >= ParsedAndImported)
-				for (auto const& newSource: loadMissingSources(*source.ast))
-				{
-					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);
-				}
 		}
-	}
 
-	if (Error::containsErrors(m_errorReporter.errors()))
-		return false;
+		if (Error::containsErrors(m_errorReporter.errors()))
+			return false;
 
-	m_stackState = (m_stopAfter <= Parsed ? Parsed : ParsedAndImported);
-	storeContractDefinitions();
+		m_stackState = (m_stopAfter <= Parsed ? Parsed : ParsedAndImported);
+		storeContractDefinitions();
 
-	solAssert(!m_maxAstId.has_value());
-	m_maxAstId = parser.maxID();
+		solAssert(!m_maxAstId.has_value());
+		m_maxAstId = parser.maxID();
+	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
+	}
 
 	return true;
 }
@@ -494,6 +501,11 @@ bool CompilerStack::analyze()
 		solAssert(m_errorReporter.hasErrors(), "Unreported fatal error: "s + error.what());
 		noErrors = false;
 	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
+		noErrors = false;
+	}
 
 	if (!noErrors)
 		return false;
@@ -737,28 +749,10 @@ bool CompilerStack::compile(State _stopAfter)
 						m_errorReporter.error(_error.errorId(), _error.type(), SourceLocation(), _error.what());
 						return false;
 					}
-					catch (UnimplementedFeatureError const& _unimplementedError)
+					catch (UnimplementedFeatureError const& _error)
 					{
-						if (
-							SourceLocation const* sourceLocation =
-							boost::get_error_info<langutil::errinfo_sourceLocation>(_unimplementedError)
-						)
-						{
-							std::string const* comment = _unimplementedError.comment();
-							m_errorReporter.error(
-								1834_error,
-								Error::Type::CodeGenerationError,
-								*sourceLocation,
-								fmt::format(
-									"Unimplemented feature error {} in {}",
-									(comment && !comment->empty()) ? ": " + *comment : "",
-									_unimplementedError.lineInfo()
-								)
-							);
-							return false;
-						}
-						else
-							throw;
+						reportUnimplementedFeatureError(_error);
+						return false;
 					}
 				}
 	m_stackState = CompilationSuccessful;
@@ -1908,3 +1902,9 @@ experimental::Analysis const& CompilerStack::experimentalAnalysis() const
 	solAssert(!!m_experimentalAnalysis);
 	return *m_experimentalAnalysis;
 }
+
+void CompilerStack::reportUnimplementedFeatureError(UnimplementedFeatureError const& _error)
+{
+	solAssert(_error.comment(), "Unimplemented feature errors must include a message for the user");
+	m_errorReporter.unimplementedFeatureError(1834_error, _error.sourceLocation(), *_error.comment());
+}
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index ef76764faf..672067d81c 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -503,6 +503,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		FunctionDefinition const& _function
 	) const;
 
+	void reportUnimplementedFeatureError(langutil::UnimplementedFeatureError const& _error);
+
 	ReadCallback::Callback m_readFile;
 	OptimiserSettings m_optimiserSettings;
 	RevertStrings m_revertStrings = RevertStrings::Default;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 2b36f90323..80f788cb61 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -49,6 +49,7 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
+using namespace solidity::util;
 using namespace std::string_literals;
 
 namespace
@@ -1402,13 +1403,8 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	}
 	catch (UnimplementedFeatureError const& _exception)
 	{
-		errors.emplace_back(formatErrorWithException(
-			compilerStack,
-			_exception,
-			Error::Type::UnimplementedFeatureError,
-			"general",
-			"Unimplemented feature (" + _exception.lineInfo() + ")"
-		));
+		// let StandardCompiler::compile handle this
+		throw _exception;
 	}
 	catch (yul::YulException const& _exception)
 	{
@@ -1469,7 +1465,7 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	Json output;
 
 	if (errors.size() > 0)
-		output["errors"] = std::move(errors);
+	output["errors"] = std::move(errors);
 
 	if (!compilerStack.unhandledSMTLib2Queries().empty())
 		for (std::string const& query: compilerStack.unhandledSMTLib2Queries())
@@ -1783,6 +1779,11 @@ Json StandardCompiler::compile(Json const& _input) noexcept
 	{
 		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
 	}
+	catch (UnimplementedFeatureError const& _exception)
+	{
+		solAssert(_exception.comment(), "Unimplemented feature errors must include a message for the user");
+		return formatFatalError(Error::Type::UnimplementedFeatureError, stringOrDefault(_exception.comment()));
+	}
 	catch (util::Exception const& _exception)
 	{
 		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " + boost::diagnostic_information(_exception));
diff --git a/libsolutil/Assertions.h b/libsolutil/Assertions.h
index 4879299bf0..dcceb1cfc1 100644
--- a/libsolutil/Assertions.h
+++ b/libsolutil/Assertions.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <libsolutil/Exceptions.h>
+#include <libsolutil/CommonData.h>
 
 #include <string>
 #include <utility>
@@ -63,18 +64,6 @@ namespace solidity::util
 }
 #endif
 
-namespace assertions
-{
-
-inline std::string stringOrDefault(std::string _string, std::string _defaultString)
-{
-	// NOTE: Putting this in a function rather than directly in a macro prevents the string from
-	// being evaluated multiple times if it's not just a literal.
-	return (!_string.empty() ? std::move(_string) : std::move(_defaultString));
-}
-
-}
-
 /// Base macro that can be used to implement assertion macros.
 /// Throws an exception containing the given description if the condition is not met.
 /// Allows you to provide the default description for the case where the user of your macro does
@@ -86,7 +75,7 @@ inline std::string stringOrDefault(std::string _string, std::string _defaultStri
 		if (!(_condition)) \
 			solThrow( \
 				_exceptionType, \
-				::solidity::util::assertions::stringOrDefault((_description), (_defaultDescription)) \
+				::solidity::util::stringOrDefault((_description), (_defaultDescription)) \
 			); \
 	} \
 	while (false)
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index c52434451b..6e17e674d6 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -632,4 +632,14 @@ std::vector<T> make_vector(Args&&... _args)
 	return result;
 }
 
+inline std::string stringOrDefault(std::string _string, std::string _defaultString = "")
+{
+	return (!_string.empty() ? std::move(_string) : std::move(_defaultString));
+}
+
+inline std::string stringOrDefault(std::string const* _string, std::string const& _defaultString = "")
+{
+	return (_string ? stringOrDefault(*_string, _defaultString) : _defaultString);
+}
+
 }
diff --git a/libsolutil/Exceptions.cpp b/libsolutil/Exceptions.cpp
index 00fe3e26ce..ba431a808c 100644
--- a/libsolutil/Exceptions.cpp
+++ b/libsolutil/Exceptions.cpp
@@ -17,8 +17,10 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolutil/Exceptions.h>
+#include <liblangutil/Exceptions.h>
 
 using namespace solidity::util;
+using namespace solidity::langutil;
 
 char const* Exception::what() const noexcept
 {
@@ -49,3 +51,11 @@ std::string const* Exception::comment() const noexcept
 {
 	return boost::get_error_info<errinfo_comment>(*this);
 }
+
+SourceLocation Exception::sourceLocation() const noexcept
+{
+	if (SourceLocation const* sourceLocation = boost::get_error_info<errinfo_sourceLocation>(*this))
+		return *sourceLocation;
+
+	return SourceLocation{};
+}
diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index 7dd9b6769a..2ad2713c35 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <liblangutil/SourceLocation.h>
+
 #include <boost/exception/exception.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/exception/info_tuple.hpp>
@@ -39,6 +41,9 @@ struct Exception: virtual std::exception, virtual boost::exception
 
 	/// @returns the errinfo_comment of this exception.
 	std::string const* comment() const noexcept;
+
+	/// @returns the errinfo_sourceLocation of this exception
+	langutil::SourceLocation sourceLocation() const noexcept;
 };
 
 /// Throws an exception with a given description and extra information about the location the
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index a4341cba30..94e9ad7a8d 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -71,15 +71,35 @@ CharStream const& YulStack::charStream(std::string const& _sourceName) const
 	return *m_charStream;
 }
 
+bool YulStack::parse(std::string const& _sourceName, std::string const& _source)
+{
+	yulAssert(m_stackState == Empty);
+	try
+	{
+		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);
+	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
+	}
+
+	if (m_errorReporter.errors().empty())
+		m_stackState = Parsed;
+
+	return m_stackState == Parsed;
+}
+
 bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
 {
 	m_errors.clear();
-	m_analysisSuccessful = false;
-	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())
+	yulAssert(m_stackState == Empty);
+
+	if (!parse(_sourceName, _source))
 		return false;
+
+	yulAssert(m_stackState == Parsed);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 
@@ -88,30 +108,37 @@ bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const
 
 void YulStack::optimize()
 {
-	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
+	yulAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	yulAssert(m_parserResult);
 
-	if (
-		!m_optimiserSettings.runYulOptimiser &&
-		yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
-	)
-		return;
+	try
+	{
+		if (
+			!m_optimiserSettings.runYulOptimiser &&
+			yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
+		)
+			return;
 
-	m_analysisSuccessful = false;
-	yulAssert(m_parserResult, "");
-	optimize(*m_parserResult, true);
-	yulAssert(analyzeParsed(), "Invalid source code after optimization.");
+		m_stackState = Parsed;
+		optimize(*m_parserResult, true);
+		yulAssert(analyzeParsed(), "Invalid source code after optimization.");
+	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
+	}
 }
 
 bool YulStack::analyzeParsed()
 {
+	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
-	m_analysisSuccessful = analyzeParsed(*m_parserResult);
-	return m_analysisSuccessful;
+	return analyzeParsed(*m_parserResult);
 }
 
 bool YulStack::analyzeParsed(Object& _object)
 {
+	yulAssert(m_stackState >= Parsed);
 	yulAssert(_object.code, "");
 	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>();
 
@@ -122,11 +149,25 @@ bool YulStack::analyzeParsed(Object& _object)
 		{},
 		_object.qualifiedDataNames()
 	);
-	bool success = analyzer.analyze(*_object.code);
-	for (auto& subNode: _object.subObjects)
-		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
-			if (!analyzeParsed(*subObject))
-				success = false;
+
+	bool success = false;
+	try
+	{
+		success = analyzer.analyze(*_object.code);
+		for (auto& subNode: _object.subObjects)
+			if (auto subObject = dynamic_cast<Object*>(subNode.get()))
+				if (!analyzeParsed(*subObject))
+					success = false;
+	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
+		success = false;
+	}
+
+	if (success)
+		m_stackState = AnalysisSuccessful;
+
 	return success;
 }
 
@@ -204,9 +245,9 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 	);
 }
 
-MachineAssemblyObject YulStack::assemble(Machine _machine) const
+MachineAssemblyObject YulStack::assemble(Machine _machine)
 {
-	yulAssert(m_analysisSuccessful, "");
+	yulAssert(m_stackState >= AnalysisSuccessful);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 	yulAssert(m_parserResult->analysisInfo, "");
@@ -221,43 +262,50 @@ MachineAssemblyObject YulStack::assemble(Machine _machine) const
 }
 
 std::pair<MachineAssemblyObject, MachineAssemblyObject>
-YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName) const
+YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 {
 	auto [creationAssembly, deployedAssembly] = assembleEVMWithDeployed(_deployName);
 	yulAssert(creationAssembly, "");
 	yulAssert(m_charStream, "");
 
 	MachineAssemblyObject creationObject;
-	creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
-	yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
-	creationObject.assembly = creationAssembly->assemblyString(m_debugInfoSelection);
-	creationObject.sourceMappings = std::make_unique<std::string>(
-		evmasm::AssemblyItem::computeSourceMapping(
-			creationAssembly->items(),
-			{{m_charStream->name(), 0}}
-		)
-	);
-
 	MachineAssemblyObject deployedObject;
-	if (deployedAssembly)
+	try
 	{
-		deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
-		deployedObject.assembly = deployedAssembly->assemblyString(m_debugInfoSelection);
-		deployedObject.sourceMappings = std::make_unique<std::string>(
+		creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
+		yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
+		creationObject.assembly = creationAssembly->assemblyString(m_debugInfoSelection);
+		creationObject.sourceMappings = std::make_unique<std::string>(
 			evmasm::AssemblyItem::computeSourceMapping(
-				deployedAssembly->items(),
+				creationAssembly->items(),
 				{{m_charStream->name(), 0}}
 			)
 		);
+
+		if (deployedAssembly)
+		{
+			deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
+			deployedObject.assembly = deployedAssembly->assemblyString(m_debugInfoSelection);
+			deployedObject.sourceMappings = std::make_unique<std::string>(
+				evmasm::AssemblyItem::computeSourceMapping(
+					deployedAssembly->items(),
+					{{m_charStream->name(), 0}}
+				)
+			);
+		}
+	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		reportUnimplementedFeatureError(_error);
 	}
 
 	return {std::move(creationObject), std::move(deployedObject)};
 }
 
 std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
-YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName) const
+YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName)
 {
-	yulAssert(m_analysisSuccessful, "");
+	yulAssert(m_stackState >= AnalysisSuccessful);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 	yulAssert(m_parserResult->analysisInfo, "");
@@ -272,32 +320,39 @@ YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName) c
 		!m_optimiserSettings.runYulOptimiser &&
 		!yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
 	);
-	compileEVM(adapter, optimize);
+	try
+	{
+		compileEVM(adapter, optimize);
 
-	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
+		assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
 
-	std::optional<size_t> subIndex;
+		std::optional<size_t> subIndex;
 
-	// Pick matching assembly if name was given
-	if (_deployName.has_value())
-	{
-		for (size_t i = 0; i < assembly.numSubs(); i++)
-			if (assembly.sub(i).name() == _deployName)
-			{
-				subIndex = i;
-				break;
-			}
+		// Pick matching assembly if name was given
+		if (_deployName.has_value())
+		{
+			for (size_t i = 0; i < assembly.numSubs(); i++)
+				if (assembly.sub(i).name() == _deployName)
+				{
+					subIndex = i;
+					break;
+				}
+
+			solAssert(subIndex.has_value(), "Failed to find object to be deployed.");
+		}
+		// Otherwise use heuristic: If there is a single sub-assembly, this is likely the object to be deployed.
+		else if (assembly.numSubs() == 1)
+			subIndex = 0;
 
-		solAssert(subIndex.has_value(), "Failed to find object to be deployed.");
+		if (subIndex.has_value())
+		{
+			evmasm::Assembly& runtimeAssembly = assembly.sub(*subIndex);
+			return {std::make_shared<evmasm::Assembly>(assembly), std::make_shared<evmasm::Assembly>(runtimeAssembly)};
+		}
 	}
-	// Otherwise use heuristic: If there is a single sub-assembly, this is likely the object to be deployed.
-	else if (assembly.numSubs() == 1)
-		subIndex = 0;
-
-	if (subIndex.has_value())
+	catch (UnimplementedFeatureError const& _error)
 	{
-		evmasm::Assembly& runtimeAssembly = assembly.sub(*subIndex);
-		return {std::make_shared<evmasm::Assembly>(assembly), std::make_shared<evmasm::Assembly>(runtimeAssembly)};
+		reportUnimplementedFeatureError(_error);
 	}
 
 	return {std::make_shared<evmasm::Assembly>(assembly), {}};
@@ -307,6 +362,7 @@ std::string YulStack::print(
 	CharStreamProvider const* _soliditySourceProvider
 ) const
 {
+	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
@@ -314,6 +370,7 @@ std::string YulStack::print(
 
 Json YulStack::astJson() const
 {
+	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 	return  m_parserResult->toJson();
@@ -321,8 +378,14 @@ Json YulStack::astJson() const
 
 std::shared_ptr<Object> YulStack::parserResult() const
 {
-	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
+	yulAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
 	return m_parserResult;
 }
+
+void YulStack::reportUnimplementedFeatureError(UnimplementedFeatureError const& _error)
+{
+	solAssert(_error.comment(), "Unimplemented feature errors must include a message for the user");
+	m_errorReporter.unimplementedFeatureError(1920_error, _error.sourceLocation(), *_error.comment());
+}
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 27f530b44c..d75ff200f5 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -67,6 +67,11 @@ class YulStack: public langutil::CharStreamProvider
 public:
 	enum class Language { Yul, Assembly, StrictAssembly };
 	enum class Machine { EVM };
+	enum State {
+		Empty,
+		Parsed,
+		AnalysisSuccessful
+	};
 
 	YulStack():
 		YulStack(
@@ -105,7 +110,7 @@ class YulStack: public langutil::CharStreamProvider
 	void optimize();
 
 	/// Run the assembly step (should only be called after parseAndAnalyze).
-	MachineAssemblyObject assemble(Machine _machine) const;
+	MachineAssemblyObject assemble(Machine _machine);
 
 	/// Run the assembly step (should only be called after parseAndAnalyze).
 	/// In addition to the value returned by @a assemble, returns
@@ -114,7 +119,7 @@ class YulStack: public langutil::CharStreamProvider
 	std::pair<MachineAssemblyObject, MachineAssemblyObject>
 	assembleWithDeployed(
 		std::optional<std::string_view> _deployName = {}
-	) const;
+	);
 
 	/// Run the assembly step (should only be called after parseAndAnalyze).
 	/// Similar to @a assemblyWithDeployed, but returns EVM assembly objects.
@@ -122,7 +127,7 @@ class YulStack: public langutil::CharStreamProvider
 	std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
 	assembleEVMWithDeployed(
 		std::optional<std::string_view> _deployName = {}
-	) const;
+	);
 
 	/// @returns the errors generated during parsing, analysis (and potentially assembly).
 	langutil::ErrorList const& errors() const { return m_errors; }
@@ -136,6 +141,7 @@ class YulStack: public langutil::CharStreamProvider
 	std::shared_ptr<Object> parserResult() const;
 
 private:
+	bool parse(std::string const& _sourceName, std::string const& _source);
 	bool analyzeParsed();
 	bool analyzeParsed(yul::Object& _object);
 
@@ -143,6 +149,8 @@ class YulStack: public langutil::CharStreamProvider
 
 	void optimize(yul::Object& _object, bool _isCreation);
 
+	void reportUnimplementedFeatureError(langutil::UnimplementedFeatureError const& _error);
+
 	Language m_language = Language::Assembly;
 	langutil::EVMVersion m_evmVersion;
 	std::optional<uint8_t> m_eofVersion;
@@ -151,7 +159,7 @@ class YulStack: public langutil::CharStreamProvider
 
 	std::unique_ptr<langutil::CharStream> m_charStream;
 
-	bool m_analysisSuccessful = false;
+	State m_stackState = Empty;
 	std::shared_ptr<yul::Object> m_parserResult;
 	langutil::ErrorList m_errors;
 	langutil::ErrorReporter m_errorReporter;
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 8ee5cbbded..24ec2b06d6 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -201,7 +201,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
                 # The warning may or may not exist in a compiler build.
         "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
+        "1920", # Unimplemented feature error from YulStack (currently there are no UnimplementedFeatureErrors thrown by libyul)
         "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
         "2961", # SMTChecker, covered by CL tests
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 514f84c209..edfd4d52c6 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -691,6 +691,12 @@ bool CommandLineInterface::run(int _argc, char const* const* _argv)
 
 		return false;
 	}
+	catch (UnimplementedFeatureError const& _error)
+	{
+		solAssert(_error.comment(), "Unimplemented feature errors must include a message for the user");
+		report(Error::Severity::Error, stringOrDefault(_error.comment(), "Unimplemented feature"));
+		return false;
+	}
 }
 
 bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
diff --git a/solc/main.cpp b/solc/main.cpp
index 4237f9ac6d..c6c3df7a2e 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -45,12 +45,6 @@ int main(int argc, char** argv)
 		std::cerr << boost::diagnostic_information(_exception);
 		return 2;
 	}
-	catch (langutil::UnimplementedFeatureError const& _exception)
-	{
-		std::cerr << "Unimplemented feature:" << std::endl;
-		std::cerr << boost::diagnostic_information(_exception);
-		return 2;
-	}
 	catch (langutil::InternalCompilerError const& _exception)
 	{
 		std::cerr << "Internal compiler error:" << std::endl;
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index f350ea4624..41c1d0568b 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -24,6 +24,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
+#include <range/v3/algorithm/find_if.hpp>
 #include <fstream>
 #include <memory>
 #include <stdexcept>
@@ -80,34 +81,28 @@ void SyntaxTest::setupCompiler(CompilerStack& _compiler)
 
 void SyntaxTest::parseAndAnalyze()
 {
-	try
+	runFramework(withPreamble(m_sources.sources), m_stopAfter);
+	if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis) && !compiler().isExperimentalAnalysis())
 	{
-		runFramework(withPreamble(m_sources.sources), m_stopAfter);
-		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis) && !compiler().isExperimentalAnalysis())
-		{
-			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(std::runtime_error("Compilation failed even though analysis was successful."));
-		}
-	}
-	catch (UnimplementedFeatureError const& _e)
-	{
-		m_errorList.emplace_back(SyntaxTestError{
-			Error::Type::UnimplementedFeatureError,
-			std::nullopt,
-			errorMessage(_e),
-			"",
-			-1,
-			-1
-		});
+		ErrorList const& errors = compiler().errors();
+		static auto isInternalError = [](std::shared_ptr<Error const> const& _error) {
+			return
+				Error::isError(_error->type()) &&
+				_error->type() != Error::Type::CodeGenerationError &&
+				_error->type() != Error::Type::UnimplementedFeatureError
+			;
+		};
+		// Most errors are detected during analysis, and should not happen during code generation.
+		// There are some exceptions, e.g. unimplemented features or stack too deep, but anything else at this stage
+		// is an internal error that signals a bug in the compiler (rather than in user's code).
+		if (
+			auto error = ranges::find_if(errors, isInternalError);
+			error != ranges::end(errors)
+		)
+			BOOST_THROW_EXCEPTION(std::runtime_error(
+				"Unexpected " + Error::formatErrorType((*error)->type()) + " at compilation stage."
+				" This error should NOT be encoded as expectation and should be fixed instead."
+			));
 	}
 
 	filterObtainedErrors();
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
index 8f34b530b9..5043817589 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
@@ -7,5 +7,5 @@ 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.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol b/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol
index e9878fc223..18bf550c06 100644
--- a/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol
+++ b/test/libsolidity/syntaxTests/array/nested_calldata_storage.sol
@@ -6,4 +6,4 @@ contract C {
 }
 
 // ----
-// UnimplementedFeatureError: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
+// UnimplementedFeatureError 1834: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
diff --git a/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol b/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol
index 2d1c1f5866..9f5bb8eab5 100644
--- a/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol
+++ b/test/libsolidity/syntaxTests/array/nested_calldata_storage2.sol
@@ -6,4 +6,4 @@ contract C {
 }
 
 // ----
-// UnimplementedFeatureError: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
+// UnimplementedFeatureError 1834: Copying nested calldata dynamic arrays to storage is not implemented in the old code generator.
diff --git a/test/libsolidity/syntaxTests/constants/mod_div_rational.sol b/test/libsolidity/syntaxTests/constants/mod_div_rational.sol
index d983fa1ee9..5c127eb4a2 100644
--- a/test/libsolidity/syntaxTests/constants/mod_div_rational.sol
+++ b/test/libsolidity/syntaxTests/constants/mod_div_rational.sol
@@ -5,4 +5,4 @@ contract C {
     fixed a4 = 0 / -0.123;
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol b/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
index 334b847393..c1eae591f2 100644
--- a/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
+++ b/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// UnimplementedFeatureError: Require with a custom error is only available using the via-ir pipeline.
+// UnimplementedFeatureError 1834: Require with a custom error is only available using the via-ir pipeline.
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
index 373d76c339..ed7db1ec6c 100644
--- a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
@@ -33,7 +33,6 @@ contract C {
 // 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
@@ -90,3 +89,4 @@ contract C {
 // Info 4164: (563-574): Inferred type: (bool, word) -> word
 // Info 4164: (563-567): Inferred type: (?bm:type, ?bn:type)
 // Info 4164: (575-576): Inferred type: (bool, word)
+// UnimplementedFeatureError 1834: No support for calling functions pointers yet.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
index 56a4d0e201..604f9b0298 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
@@ -4,6 +4,6 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2072: (50-67): Unused local variable.
 // Warning 2018: (20-119): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
index 78aa35de7c..63df5c0449 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
@@ -4,6 +4,6 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2072: (50-73): Unused local variable.
 // Warning 2018: (20-118): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol
index ba1eb80691..58c74b9ad0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/303_fixed_type_int_conversion.sol
@@ -8,5 +8,5 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2018: (20-147): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol
index 81ad7dbe8a..404cbc4bce 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/304_fixed_type_rational_int_conversion.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2018: (20-104): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol
index b7642e16a1..b113c6bcce 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/305_fixed_type_rational_fraction_conversion.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2018: (20-108): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol
index b8b2f12b51..e80024a98a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/307_rational_unary_minus_operation.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol
index 082514ebcf..20be0208c1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/312_leading_zero_rationals_convert.sol
@@ -8,4 +8,4 @@ contract A {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol
index 1d1e62cf36..7415ed6e85 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/314_fixed_type_zero_handling.sol
@@ -5,5 +5,5 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2018: (20-104): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol
index 4899b3d786..fa32ec7dd8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/317_fixed_type_valid_explicit_conversions.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2018: (20-182): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol
index 20ebcb1fef..cb730221df 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/323_mapping_with_fixed_literal.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol
index 24a090127c..9bc6243029 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/324_fixed_points_inside_structs.sol
@@ -6,4 +6,4 @@ contract test {
     myStruct a = myStruct(3.125, 3);
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
index 4dbcb3f206..8391734aec 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
@@ -11,6 +11,6 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2519: (238-252): This declaration shadows an existing declaration.
 // Warning 2018: (20-339): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
index ad7b34fd76..15ca25931e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
@@ -4,6 +4,6 @@ contract test {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
 // Warning 2072: (50-58): Unused local variable.
 // Warning 2018: (20-89): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
index e34522540e..ea41bbf3ec 100644
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
@@ -6,9 +6,9 @@ contract A {
     }
 }
 // ----
-// UnimplementedFeatureError: Fixed point types not implemented.
 // Warning 5667: (52-60): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 5667: (62-74): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 2072: (93-104): Unused local variable.
 // Warning 2072: (114-121): Unused local variable.
 // Warning 2018: (41-128): Function state mutability can be restricted to pure
+// UnimplementedFeatureError 1834: Fixed point types not implemented.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol
index 00ed4f6540..9932c4c3d4 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol
index 5bceec6095..a93555fd71 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_literal_to_fixed_implicit.sol
@@ -13,4 +13,4 @@ contract C {
     }
 }
 // ----
-// UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// UnimplementedFeatureError 1834: Not yet implemented - FixedPointType.

From 48f97a377aa92b7a466df826a5a57d6de92accc0 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Mon, 10 Jun 2024 17:33:11 +0200
Subject: [PATCH 0910/1140] SMTChecker: Fix error that reported invalid number
 of verified checks for BMC and CHC engines

---
 Changelog.md                                          |  1 +
 libsolidity/formal/BMC.cpp                            |  7 ++++++-
 libsolidity/formal/BMC.h                              |  5 ++++-
 .../constructor_state_variable_init.sol               |  2 +-
 .../smtCheckerTests/operators/unary_minus_bmc.sol     |  2 +-
 ...ined_operator_matches_equivalent_function_call.sol |  2 +-
 .../overflow/overflow_and_underflow_bmc.sol           | 11 +++++++++++
 7 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc.sol

diff --git a/Changelog.md b/Changelog.md
index 29fb86250b..de3fc3d6cf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix error that reports invalid number of verified checks for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
 
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 916bf5a31d..b1a326fc77 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -118,13 +118,18 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
 		);
 
 	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
+	{
+		std::size_t provedSafeNum = 0;
+		for (auto&& [_, targets]: m_safeTargets)
+			provedSafeNum += targets.size();
 		m_errorReporter.info(
 			6002_error,
 			"BMC: " +
-			std::to_string(m_safeTargets.size()) +
+			std::to_string(provedSafeNum) +
 			" 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)
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 1f97cbeef4..5ed61b8399 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -149,7 +149,10 @@ class BMC: public SMTEncoder
 
 		friend bool operator<(BMCVerificationTarget const& _a, BMCVerificationTarget const& _b)
 		{
-			return _a.expression->id() < _b.expression->id();
+			if (_a.expression->id() == _b.expression->id())
+				return _a.type < _b.type;
+			else
+				return _a.expression->id() < _b.expression->id();
 		}
 	};
 
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 4728a1cb0e..a5ec4d87f5 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,4 +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: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/operators/unary_minus_bmc.sol b/test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
index 052554d21c..66e80539d0 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_minus_bmc.sol
@@ -8,4 +8,4 @@ contract C
 // SMTEngine: bmc
 // ----
 // Warning 4661: (48-63): 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.
+// 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/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 33665ee26d..9872a6a92b 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
@@ -77,4 +77,4 @@ contract C {
 // Warning 4144: (953-982): BMC: Underflow (resulting value less than -32768) 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: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 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/overflow/overflow_and_underflow_bmc.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc.sol
new file mode 100644
index 0000000000..b788acebf3
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc.sol
@@ -0,0 +1,11 @@
+contract C {
+	function f(int x, int y) public pure returns (int) {
+		require(x == 0);
+		require(y == 0);
+		return x + y;
+	}
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 6ccb3a340c363558900f59c3773cce11ed4957df Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Mon, 10 Jun 2024 17:33:11 +0200
Subject: [PATCH 0911/1140] SMTChecker: Fix internal compiler error on
 reporting proved targets

---
 Changelog.md                                     |  3 ++-
 libsolidity/formal/BMC.cpp                       |  6 +++---
 libsolidity/formal/BMC.h                         |  1 +
 libsolidity/formal/CHC.cpp                       | 12 +++++++++---
 libsolidity/formal/CHC.h                         | 16 ++++++++++++++--
 libsolidity/formal/ModelChecker.cpp              | 11 +++++++++--
 libsolidity/formal/ModelChecker.h                |  6 ++++++
 libsolidity/formal/SMTEncoder.cpp                |  2 ++
 libsolidity/formal/SMTEncoder.h                  |  2 ++
 scripts/error_codes.py                           |  1 -
 .../push_as_lhs_compound_assignment.sol          |  2 +-
 .../constructor_state_variable_init.sol          |  2 +-
 .../constructor_state_variable_init_asserts.sol  |  2 +-
 ...onstructor_state_variable_init_chain_tree.sol |  2 +-
 .../inheritance/diamond_super_3.sol              |  2 +-
 .../assignment_contract_member_variable.sol      |  2 +-
 ...ssignment_module_contract_member_variable.sol |  2 +-
 .../smtCheckerTests/operators/division_4.sol     |  2 +-
 .../operators/division_truncates_correctly_2.sol |  2 +-
 .../operators/division_truncates_correctly_3.sol |  2 +-
 .../operators/division_truncates_correctly_4.sol |  2 +-
 .../operators/division_truncates_correctly_5.sol |  2 +-
 .../smtCheckerTests/operators/mod.sol            |  2 +-
 .../smtCheckerTests/operators/mod_signed.sol     |  2 +-
 .../operators/unary_add_array_push_2.sol         |  2 +-
 .../operators/unary_minus_chc.sol                |  2 +-
 .../user_defined_operations_on_constants.sol     |  2 +-
 ...user_defined_operations_on_constants_fail.sol |  2 +-
 .../overflow_and_underflow_bmc_show_proved.sol   | 13 +++++++++++++
 .../overflow/overflow_and_underflow_chc.sol      | 11 +++++++++++
 .../overflow/signed_guard_sum_overflow.sol       |  2 +-
 .../smtCheckerTests/try_catch/try_3.sol          |  2 +-
 .../smtCheckerTests/typecast/downcast.sol        |  2 +-
 .../unchecked/flipping_sign_tests.sol            |  2 +-
 34 files changed, 94 insertions(+), 34 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc_show_proved.sol
 create mode 100644 test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_chc.sol

diff --git a/Changelog.md b/Changelog.md
index de3fc3d6cf..8343d2f728 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,8 @@ Compiler Features:
 
 
 Bugfixes:
- * SMTChecker: Fix error that reports invalid number of verified checks for BMC engine.
+ * SMTChecker: Fix error that reports invalid number of verified checks for BMC and CHC engines.
+ * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
 
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index b1a326fc77..46812c409b 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -47,12 +47,13 @@ BMC::BMC(
 	smt::EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
 	UniqueErrorReporter& _unsupportedErrorReporter,
+	ErrorReporter& _provedSafeReporter,
 	std::map<h256, std::string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider)
+	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _provedSafeReporter, _charStreamProvider)
 {
 	solAssert(!_settings.printQuery || _settings.solvers == SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
 	std::vector<std::unique_ptr<SolverInterface>> solvers;
@@ -133,7 +134,7 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
 	else if (m_settings.showProvedSafe)
 		for (auto const& [node, targets]: m_safeTargets)
 			for (auto const& target: targets)
-				m_errorReporter.info(
+				m_provedSafeReporter.info(
 					2961_error,
 					node->location(),
 					"BMC: " +
@@ -141,7 +142,6 @@ void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<V
 					" check is safe!"
 				);
 
-
 	// If this check is true, Z3 and cvc5 are not available
 	// and the query answers were not provided, since SMTPortfolio
 	// guarantees that SmtLib2Interface is the first solver, if enabled.
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 5ed61b8399..bbd8c10173 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -62,6 +62,7 @@ class BMC: public SMTEncoder
 		smt::EncodingContext& _context,
 		langutil::UniqueErrorReporter& _errorReporter,
 		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
+		langutil::ErrorReporter& _provedSafeReporter,
 		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 66ebd47edb..357291f279 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -63,12 +63,13 @@ CHC::CHC(
 	EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
 	UniqueErrorReporter& _unsupportedErrorReporter,
+	ErrorReporter& _provedSafeReporter,
 	std::map<util::h256, std::string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
+	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _provedSafeReporter, _charStreamProvider),
 	m_smtlib2Responses(_smtlib2Responses),
 	m_smtCallback(_smtCallback)
 {
@@ -2113,17 +2114,22 @@ void CHC::checkVerificationTargets()
 		);
 
 	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
+	{
+		std::size_t provedSafeNum = 0;
+		for (auto&& [_, targets]: m_safeTargets)
+			provedSafeNum += targets.size();
 		m_errorReporter.info(
 			1391_error,
 			"CHC: " +
-			std::to_string(m_safeTargets.size()) +
+			std::to_string(provedSafeNum) +
 			" 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(
+				m_provedSafeReporter.info(
 					9576_error,
 					node->location(),
 					"CHC: " +
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index be150baf1b..b60e5c3f77 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -58,6 +58,7 @@ class CHC: public SMTEncoder
 		smt::EncodingContext& _context,
 		langutil::UniqueErrorReporter& _errorReporter,
 		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
+		langutil::ErrorReporter& _provedSafeReporter,
 		std::map<util::h256, std::string> const& _smtlib2Responses,
 		ReadCallback::Callback const& _smtCallback,
 		ModelCheckerSettings _settings,
@@ -77,6 +78,17 @@ class CHC: public SMTEncoder
 		}
 	};
 
+	struct SafeTargetsCompare
+	{
+		bool operator()(CHCVerificationTarget const & _lhs, CHCVerificationTarget const & _rhs) const
+		{
+			if (_lhs.errorNode->id() == _rhs.errorNode->id())
+				return _lhs.type  < _rhs.type;
+			else
+				return _lhs.errorNode->id() == _rhs.errorNode->id();
+		}
+	};
+
 	struct ReportTargetInfo
 	{
 		langutil::ErrorId error;
@@ -84,7 +96,7 @@ class CHC: public SMTEncoder
 		std::string message;
 	};
 
-	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
+	std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, 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.
@@ -423,7 +435,7 @@ class CHC: public SMTEncoder
 	std::map<unsigned, CHCVerificationTarget> m_verificationTargets;
 
 	/// Targets proved safe.
-	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
+	std::map<ASTNode const*, std::set<CHCVerificationTarget, SafeTargetsCompare>, 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 94a927d3b2..91b88cb9c8 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -43,10 +43,11 @@ ModelChecker::ModelChecker(
 	ReadCallback::Callback const& _smtCallback
 ):
 	m_errorReporter(_errorReporter),
+	m_provedSafeReporter(m_provedSafeLogs),
 	m_settings(std::move(_settings)),
 	m_context(),
-	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)
+	m_bmc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, m_provedSafeReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider),
+	m_chc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, m_provedSafeReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider)
 {
 }
 
@@ -151,6 +152,12 @@ void ModelChecker::analyze(SourceUnit const& _source)
 
 	m_errorReporter.append(m_uniqueErrorReporter.errors());
 	m_uniqueErrorReporter.clear();
+
+	if (m_settings.showProvedSafe)
+	{
+		m_errorReporter.append(m_provedSafeReporter.errors());
+		m_provedSafeReporter.clear();
+	}
 }
 
 std::vector<std::string> ModelChecker::unhandledQueries()
diff --git a/libsolidity/formal/ModelChecker.h b/libsolidity/formal/ModelChecker.h
index 4c795fa707..2fd4885d5a 100644
--- a/libsolidity/formal/ModelChecker.h
+++ b/libsolidity/formal/ModelChecker.h
@@ -95,6 +95,12 @@ class ModelChecker
 	/// to m_errorReporter at the end of the analysis.
 	langutil::UniqueErrorReporter m_unsupportedErrorReporter;
 
+	langutil::ErrorList m_provedSafeLogs;
+	/// Used by SMTEncoder, BMC and CHC to accumulate info about proved targets.
+	/// This is local to ModelChecker, so needs to be appended
+	/// to m_errorReporter at the end of the analysis.
+	langutil::ErrorReporter m_provedSafeReporter;
+
 	ModelCheckerSettings m_settings;
 
 	/// Stores the context of the encoding.
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index c92c5399a6..44282289d1 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -51,10 +51,12 @@ SMTEncoder::SMTEncoder(
 	ModelCheckerSettings _settings,
 	UniqueErrorReporter& _errorReporter,
 	UniqueErrorReporter& _unsupportedErrorReporter,
+	ErrorReporter& _provedSafeReporter,
 	langutil::CharStreamProvider const& _charStreamProvider
 ):
 	m_errorReporter(_errorReporter),
 	m_unsupportedErrors(_unsupportedErrorReporter),
+	m_provedSafeReporter(_provedSafeReporter),
 	m_context(_context),
 	m_settings(std::move(_settings)),
 	m_charStreamProvider(_charStreamProvider)
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index bea3a85ef9..c017d5c123 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -57,6 +57,7 @@ class SMTEncoder: public ASTConstVisitor
 		ModelCheckerSettings _settings,
 		langutil::UniqueErrorReporter& _errorReporter,
 		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
+		langutil::ErrorReporter& _provedSafeReporter,
 		langutil::CharStreamProvider const& _charStreamProvider
 	);
 
@@ -450,6 +451,7 @@ class SMTEncoder: public ASTConstVisitor
 
 	langutil::UniqueErrorReporter& m_errorReporter;
 	langutil::UniqueErrorReporter& m_unsupportedErrors;
+	langutil::ErrorReporter& m_provedSafeReporter;
 
 	/// Stores the current function/modifier call/invocation path.
 	std::vector<CallStackEntry> m_callStack;
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 24ec2b06d6..6ca9dd0852 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -204,7 +204,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "1920", # Unimplemented feature error from YulStack (currently there are no UnimplementedFeatureErrors thrown by libyul)
         "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
-        "2961", # SMTChecker, covered by CL tests
         "6240", # SMTChecker, covered by CL tests
     }
     assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
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 4d20c8ae9b..b059482ac2 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
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // ----
 // 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.
+// 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/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 88036eb550..69be20b532 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
@@ -39,4 +39,4 @@ contract C is B {
 // 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: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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_asserts.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
index db81b1d0fd..23f831d713 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
@@ -37,4 +37,4 @@ contract C is B {
 // 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: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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 8fe0cb28e0..767d28d52b 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
@@ -41,4 +41,4 @@ contract C is B {
 // ----
 // Warning 6328: (403-417): CHC: Assertion violation happens here.
 // Warning 6328: (450-463): 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.
+// 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/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
index f6674021eb..68bfb883a3 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
@@ -34,4 +34,4 @@ contract E is C,D {
 // SMTIgnoreCex: no
 // ----
 // 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.
+// 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.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index 40eb48672e..2c5fdbf003 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -30,4 +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.
+// 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/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
index baa1c75a47..c943dc8001 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
@@ -31,4 +31,4 @@ contract A {
 // ----
 // 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.
+// Info 1391: CHC: 25 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 54403b1ec1..134ddfc524 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_4.sol
@@ -8,4 +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.
+// 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 29af565a22..a0ce8024c6 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
@@ -8,4 +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.
+// 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/division_truncates_correctly_3.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
index 573f6d2468..82aac9d4fd 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
@@ -8,4 +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.
+// 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/division_truncates_correctly_4.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
index 6610bc5244..a565945546 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
@@ -8,4 +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.
+// 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/division_truncates_correctly_5.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
index 97faba60fb..2b93bbae13 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
@@ -8,4 +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.
+// 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.sol b/test/libsolidity/smtCheckerTests/operators/mod.sol
index d12e5c49d5..b5aae4d40e 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod.sol
@@ -10,4 +10,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.
+// 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/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
index c34bd08e3a..3741b53479 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
@@ -12,5 +12,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (131-148): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 5 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.
 // 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/unary_add_array_push_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
index a6cacac08a..a6e0780916 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 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/unary_minus_chc.sol b/test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol
index 0d1bf972be..d36978c688 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_minus_chc.sol
@@ -8,4 +8,4 @@ contract C
 // SMTEngine: chc
 // ----
 //  Warning 6328: (48-63): 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 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/userDefined/user_defined_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
index 49420440f4..7f3f9702ce 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
@@ -60,4 +60,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1391: CHC: 22 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/userDefined/user_defined_operations_on_constants_fail.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
index 106a7c5f09..dc624393b4 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
@@ -76,4 +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: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/overflow/overflow_and_underflow_bmc_show_proved.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc_show_proved.sol
new file mode 100644
index 0000000000..2674890f6b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_bmc_show_proved.sol
@@ -0,0 +1,13 @@
+contract C {
+	function f(int x, int y) public pure returns (int) {
+		require(x == 0);
+		require(y == 0);
+		return x + y;
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTShowProvedSafe: yes
+// ----
+// Info 2961: (114-119): BMC: Underflow (resulting value less than -2**255) check is safe!
+// Info 2961: (114-119): BMC: Overflow (resulting value larger than 2**255 - 1) check is safe!
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_chc.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_chc.sol
new file mode 100644
index 0000000000..783d12b51a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_and_underflow_chc.sol
@@ -0,0 +1,11 @@
+contract C {
+	function f(int x, int y) public pure returns (int) {
+		require(x == 0);
+		require(y == 0);
+		return x + y;
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// 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/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
index 7704e2d7e0..58b582b4ba 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
@@ -10,4 +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.
+// 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 7698eed0f0..aa4b1eed15 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
@@ -25,4 +25,4 @@ contract C {
 // ----
 // 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
-// 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: 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/typecast/downcast.sol b/test/libsolidity/smtCheckerTests/typecast/downcast.sol
index bba3585f26..d2bb89bae0 100644
--- a/test/libsolidity/smtCheckerTests/typecast/downcast.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/downcast.sol
@@ -46,4 +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.
+// 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/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
index 536d2a2b44..71cc3754da 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
@@ -11,4 +11,4 @@ contract test {
 // ----
 // Warning 4984: (117-119): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
 // Warning 6328: (110-125): 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.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 050a3a109cc78654bb9c3bbf63101dfc2771b1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 5 Jun 2024 21:38:49 +0200
Subject: [PATCH 0912/1140] Remove overly specific handlers for internal errors
 and unexpected exceptions

---
 libsolidity/interface/FileReader.cpp          | 10 +---
 libsolidity/interface/SMTSolverCommand.cpp    |  2 +-
 libsolidity/interface/StandardCompiler.cpp    | 53 -------------------
 libsolidity/lsp/FileRepository.cpp            |  6 +--
 test/libsolidity/InlineAssembly.cpp           | 15 ++----
 .../SolidityExpressionCompiler.cpp            |  5 --
 test/libyul/ObjectParser.cpp                  | 26 ++++-----
 test/libyul/Parser.cpp                        | 41 ++++++--------
 test/soltest.cpp                              | 10 +---
 test/tools/fuzzer_common.cpp                  |  3 --
 test/tools/isoltest.cpp                       | 14 +----
 11 files changed, 34 insertions(+), 151 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 15181acf60..913051293d 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -164,17 +164,9 @@ ReadCallback::Result FileReader::readFile(std::string const& _kind, std::string
 		m_sourceCodes[_sourceUnitName] = contents;
 		return ReadCallback::Result{true, contents};
 	}
-	catch (util::Exception const& _exception)
-	{
-		return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
-	}
-	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()};
+		return ReadCallback::Result{false, "Exception in read callback: " + boost::current_exception_diagnostic_information()};
 	}
 }
 
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 75f541692d..7dfb448f8b 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -108,7 +108,7 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 	}
 	catch (...)
 	{
-		return ReadCallback::Result{false, "Unknown exception in SMTQuery callback: " + boost::current_exception_diagnostic_information()};
+		return ReadCallback::Result{false, "Exception in SMTQuery callback: " + boost::current_exception_diagnostic_information()};
 	}
 }
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 80f788cb61..e95dd53bde 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1372,15 +1372,6 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 			"Uncaught error: "
 		));
 	}
-	/// This should not be leaked from compile().
-	catch (FatalError const& _exception)
-	{
-		errors.emplace_back(formatError(
-			Error::Type::FatalError,
-			"general",
-			"Uncaught fatal error: " + boost::diagnostic_information(_exception)
-		));
-	}
 	catch (CompilerError const& _exception)
 	{
 		errors.emplace_back(formatErrorWithException(
@@ -1426,22 +1417,6 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 			"SMT logic exception"
 		));
 	}
-	catch (util::Exception const& _exception)
-	{
-		errors.emplace_back(formatError(
-			Error::Type::Exception,
-			"general",
-			"Exception during compilation: " + boost::diagnostic_information(_exception)
-		));
-	}
-	catch (std::exception const& _exception)
-	{
-		errors.emplace_back(formatError(
-			Error::Type::Exception,
-			"general",
-			"Unknown exception during compilation: " + boost::diagnostic_information(_exception)
-		));
-	}
 	catch (...)
 	{
 		errors.emplace_back(formatError(
@@ -1755,39 +1730,11 @@ Json StandardCompiler::compile(Json const& _input) noexcept
 		else
 			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\", \"SolidityAST\" or \"EVMAssembly\" is supported as a language.");
 	}
-	catch (Json::parse_error const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON parse_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
-	catch (Json::invalid_iterator const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON invalid_iterator exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
-	catch (Json::type_error const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON type_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
-	catch (Json::out_of_range const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON out_of_range exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
-	catch (Json::other_error const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON other_error exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
-	catch (Json::exception const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + util::removeNlohmannInternalErrorIdentifier(_exception.what()));
-	}
 	catch (UnimplementedFeatureError const& _exception)
 	{
 		solAssert(_exception.comment(), "Unimplemented feature errors must include a message for the user");
 		return formatFatalError(Error::Type::UnimplementedFeatureError, stringOrDefault(_exception.comment()));
 	}
-	catch (util::Exception const& _exception)
-	{
-		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " + boost::diagnostic_information(_exception));
-	}
 	catch (...)
 	{
 		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " +  boost::current_exception_diagnostic_information());
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index 7138cbd86a..7ba37a7310 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -170,13 +170,9 @@ frontend::ReadCallback::Result FileRepository::readFile(std::string const& _kind
 		m_sourceCodes[_sourceUnitName] = contents;
 		return ReadCallback::Result{true, std::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()};
+		return ReadCallback::Result{false, "Exception in read callback: " + boost::current_exception_diagnostic_information()};
 	}
 }
 
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index 1c848d600d..a0aa39be49 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -66,18 +66,9 @@ std::optional<Error> parseAndReturnFirstError(
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::None()
 	);
-	bool success = false;
-	try
-	{
-		success = stack.parseAndAnalyze("", _source);
-		if (success && _assemble)
-			stack.assemble(_machine);
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
-		success = false;
-	}
+	bool success = stack.parseAndAnalyze("", _source);
+	if (success && _assemble)
+		stack.assemble(_machine);
 	std::shared_ptr<Error const> error;
 	for (auto const& e: stack.errors())
 	{
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 1df1d94300..4810b01439 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -112,11 +112,6 @@ bytes compileFirstExpression(
 		if (!sourceUnit)
 			return bytes();
 	}
-	catch (boost::exception const& _e)
-	{
-		std::string msg = "Parsing source code failed with:\n" + boost::diagnostic_information(_e);
-		BOOST_FAIL(msg);
-	}
 	catch (...)
 	{
 		std::string msg = "Parsing source code failed with:\n" + boost::current_exception_diagnostic_information();
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index d9623384a0..b23e530601 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -55,23 +55,15 @@ namespace
 
 std::pair<bool, ErrorList> parse(std::string const& _source)
 {
-	try
-	{
-		YulStack asmStack(
-			solidity::test::CommonOptions::get().evmVersion(),
-			solidity::test::CommonOptions::get().eofVersion(),
-			YulStack::Language::StrictAssembly,
-			solidity::frontend::OptimiserSettings::none(),
-			DebugInfoSelection::All()
-		);
-		bool success = asmStack.parseAndAnalyze("source", _source);
-		return {success, asmStack.errors()};
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
-	}
-	return {false, {}};
+	YulStack asmStack(
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
+		YulStack::Language::StrictAssembly,
+		solidity::frontend::OptimiserSettings::none(),
+		DebugInfoSelection::All()
+	);
+	bool success = asmStack.parseAndAnalyze("source", _source);
+	return {success, asmStack.errors()};
 }
 
 std::optional<Error> parseAndReturnFirstError(std::string const& _source, bool _allowWarningsAndInfos = true)
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 69314abee1..46c4f11a8c 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -54,32 +54,25 @@ namespace
 
 std::shared_ptr<Block> parse(std::string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
 {
-	try
+	auto stream = CharStream(_source, "");
+	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,
+		_dialect,
+		std::move(indicesToSourceNames)
+	).parse(stream);
+	if (parserResult)
 	{
-		auto stream = CharStream(_source, "");
-		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(
+		yul::AsmAnalysisInfo analysisInfo;
+		if (yul::AsmAnalyzer(
+			analysisInfo,
 			errorReporter,
-			_dialect,
-			std::move(indicesToSourceNames)
-		).parse(stream);
-		if (parserResult)
-		{
-			yul::AsmAnalysisInfo analysisInfo;
-			if (yul::AsmAnalyzer(
-				analysisInfo,
-				errorReporter,
-				_dialect
-			).analyze(*parserResult))
-				return parserResult;
-		}
-	}
-	catch (FatalError const&)
-	{
-		BOOST_FAIL("Fatal error leaked.");
+			_dialect
+		).analyze(*parserResult))
+			return parserResult;
 	}
 	return {};
 }
diff --git a/test/soltest.cpp b/test/soltest.cpp
index 5fde4bda56..8e7a3ddcd4 100644
--- a/test/soltest.cpp
+++ b/test/soltest.cpp
@@ -115,17 +115,9 @@ void runTestCase(TestCase::Config const& _config, TestCase::TestCaseCreator cons
 					break;
 			}
 	}
-	catch (boost::exception const& _e)
-	{
-		BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e));
-	}
-	catch (std::exception const& _e)
-	{
-		BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e));
-	}
 	catch (...)
 	{
-		BOOST_ERROR("Unknown exception during extracted test: " << boost::current_exception_diagnostic_information());
+		BOOST_ERROR("Exception during extracted test: " << boost::current_exception_diagnostic_information());
 	}
 }
 
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 8b7dbffa8c..a469cbebab 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -131,9 +131,6 @@ void FuzzerUtil::testCompiler(
 	catch (Error const&)
 	{
 	}
-	catch (FatalError const&)
-	{
-	}
 	catch (UnimplementedFeatureError const&)
 	{
 	}
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index fa56b35d7d..57ab4af160 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -191,22 +191,10 @@ TestTool::Result TestTool::process()
 		else
 			return Result::Skipped;
 	}
-	catch (boost::exception const& _e)
-	{
-		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << std::endl;
-		return Result::Exception;
-	}
-	catch (std::exception const& _e)
-	{
-		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
-			"Exception during test: " << boost::diagnostic_information(_e) << std::endl;
-		return Result::Exception;
-	}
 	catch (...)
 	{
 		AnsiColorized(std::cout, formatted, {BOLD, RED}) <<
-			"Unknown exception during test: " << boost::current_exception_diagnostic_information() << std::endl;
+			"Unhandled exception during test: " << boost::current_exception_diagnostic_information() << std::endl;
 		return Result::Exception;
 	}
 }

From 9b67a390df98195cab0e77dc5723c83431b6a8f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 5 Jun 2024 21:02:26 +0200
Subject: [PATCH 0913/1140] DocumentationParsingError is never thrown and does
 not need to be caught

---
 solc/CommandLineInterface.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index edfd4d52c6..a51b77e8e4 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -923,17 +923,9 @@ void CommandLineInterface::compile()
 	}
 	catch (Error const& _error)
 	{
-		if (_error.type() == Error::Type::DocstringParsingError)
-		{
-			report(Error::Severity::Error, *boost::get_error_info<errinfo_comment>(_error));
-			solThrow(CommandLineExecutionError, "Documentation parsing failed.");
-		}
-		else
-		{
-			m_hasOutput = true;
-			formatter.printErrorInformation(_error);
-			solThrow(CommandLineExecutionError, "");
-		}
+		m_hasOutput = true;
+		formatter.printErrorInformation(_error);
+		solThrow(CommandLineExecutionError, "");
 	}
 }
 

From c2c8c2876822792ba4e1f6d779a13d0359fd3fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Jun 2024 20:19:54 +0200
Subject: [PATCH 0914/1140] Treat util::Error as unexpected outside of codegen

- In analysis we use an error reporter and never just throw util::Error. We do it in one case in the codegen (CodeGenerationError) but outside of that case this should not be treated as a proper way to report an error.
- Now such errors will be treated as unexpected. They're bugs that should be fixed.
---
 libsolidity/interface/CompilerStack.cpp    |  6 ++++--
 libsolidity/interface/StandardCompiler.cpp | 11 -----------
 solc/CommandLineInterface.cpp              |  6 ------
 test/tools/fuzzer_common.cpp               |  3 ---
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 0a5fed3338..8ee55d87f5 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -744,8 +744,10 @@ bool CompilerStack::compile(State _stopAfter)
 					}
 					catch (Error const& _error)
 					{
-						if (_error.type() != Error::Type::CodeGenerationError)
-							throw;
+						// Since codegen has no access to the error reporter, the only way for it to
+						// report an error is to throw. In most cases it uses dedicated exceptions,
+						// but CodeGenerationError is one case where someone decided to just throw Error.
+						solAssert(_error.type() == Error::Type::CodeGenerationError);
 						m_errorReporter.error(_error.errorId(), _error.type(), SourceLocation(), _error.what());
 						return false;
 					}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index e95dd53bde..5510b54307 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1361,17 +1361,6 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 				));
 		}
 	}
-	/// This is only thrown in a very few locations.
-	catch (Error const& _error)
-	{
-		errors.emplace_back(formatErrorWithException(
-			compilerStack,
-			_error,
-			_error.type(),
-			"general",
-			"Uncaught error: "
-		));
-	}
 	catch (CompilerError const& _exception)
 	{
 		errors.emplace_back(formatErrorWithException(
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index a51b77e8e4..367434c93f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -921,12 +921,6 @@ void CommandLineInterface::compile()
 		);
 		solThrow(CommandLineExecutionError, "");
 	}
-	catch (Error const& _error)
-	{
-		m_hasOutput = true;
-		formatter.printErrorInformation(_error);
-		solThrow(CommandLineExecutionError, "");
-	}
 }
 
 void CommandLineInterface::handleCombinedJSON()
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index a469cbebab..adf5a064be 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -128,9 +128,6 @@ void FuzzerUtil::testCompiler(
 	{
 		compiler.compile();
 	}
-	catch (Error const&)
-	{
-	}
 	catch (UnimplementedFeatureError const&)
 	{
 	}

From ad2644c52b3afbe80801322c5fe44edb59383500 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sat, 6 Apr 2024 17:17:51 -0300
Subject: [PATCH 0915/1140] Make parser accept transient as location (but not a
 keyword)

---
 Changelog.md                                  |  1 +
 docs/grammar/SolidityLexer.g4                 |  1 +
 docs/grammar/SolidityParser.g4                |  5 ++--
 .../analysis/DeclarationTypeChecker.cpp       | 27 +++++++++++++++++--
 libsolidity/ast/AST.cpp                       |  4 ++-
 libsolidity/ast/AST.h                         |  2 +-
 libsolidity/ast/ASTJsonExporter.cpp           |  2 ++
 libsolidity/ast/ASTJsonImporter.cpp           |  2 ++
 libsolidity/ast/Types.cpp                     | 17 ++++++++++++
 libsolidity/ast/Types.h                       |  2 +-
 libsolidity/codegen/ArrayUtils.cpp            |  6 +++++
 libsolidity/codegen/CompilerUtils.cpp         |  9 +++++++
 libsolidity/codegen/ContractCompiler.cpp      |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    |  6 +++++
 libsolidity/codegen/YulUtilFunctions.cpp      |  3 +++
 .../codegen/ir/IRGeneratorForStatements.cpp   | 13 +++++++++
 libsolidity/formal/BMC.cpp                    |  3 +++
 libsolidity/formal/CHC.cpp                    |  3 +++
 libsolidity/formal/SMTEncoder.h               | 13 +++++++++
 libsolidity/interface/StorageLayout.cpp       |  1 +
 libsolidity/parsing/Parser.cpp                | 13 +++++++++
 scripts/error_codes.py                        |  1 +
 .../in.sol                                    | 10 +++++++
 .../input.json                                | 13 +++++++++
 .../output.json                               | 11 ++++++++
 .../transient_data_location.sol               |  8 ++++++
 .../transient_storage_state_variable.sol      |  8 ++++++
 ...onstant_state_variable_named_transient.sol |  4 +++
 .../constant_transient_state_variable.sol     |  5 ++++
 .../data_location_in_function_type_fail.sol   |  3 +++
 ...tion_specifier_test_external_transient.sol |  5 ++++
 ...tion_specifier_test_internal_transient.sol |  5 ++++
 ..._function_with_data_location_transient.sol | 19 +++++++++++++
 ...tion_specifier_test_external_transient.sol |  5 ++++
 ...tion_specifier_test_internal_transient.sol |  5 ++++
 ...sient_data_location_function_parameter.sol |  6 +++++
 ...function_parameters_location_transient.sol |  5 ++++
 ...n_return_parameters_location_transient.sol |  5 ++++
 ...cation_specifier_test_public_transient.sol |  5 ++++
 ...n_return_parameters_location_transient.sol |  5 ++++
 ...state_variable_storage_named_transient.sol |  5 ++++
 .../state_variable_storage_transient.sol      |  5 ++++
 .../state_variable_transient_storage.sol      |  5 ++++
 ...transient_dynamic_array_state_variable.sol |  7 +++++
 .../transient_fixed_array_state_variable.sol  |  7 +++++
 .../dataLocations/transient_function_type.sol | 11 ++++++++
 .../transient_function_type_parameter.sol     |  5 ++++
 .../transient_local_variable.sol              |  7 +++++
 .../transient_mapping_state_variable.sol      |  7 +++++
 .../transient_state_variable_visibility.sol   | 12 +++++++++
 .../transient_struct_state_variable.sol       | 12 +++++++++
 .../transient_value_type_state_variables.sol  | 12 +++++++++
 ..._value_type_state_variables_assignment.sol | 10 +++++++
 .../errors/invalid_parameter_location.sol     |  5 ++++
 .../events/invalid_parameter_location.sol     |  5 ++++
 .../events/transient_indexed_parameter.sol    |  5 ++++
 .../function_type_with_transient_param.sol    |  8 ++++++
 ...nction_type_with_param_named_transient.sol |  6 +++++
 ...ent_function_type_with_transient_param.sol |  5 ++++
 .../immutable_state_var_named_transient.sol   |  4 +++
 .../state_var_transient_data_location.sol     |  5 ++++
 .../modifiers/multiple_parameter_location.sol |  7 +++++
 .../modifiers/transient_parameter.sol         |  5 ++++
 .../operators/transient_value_type.sol        | 11 ++++++++
 .../parsing/contract_named_transient.sol      |  1 +
 .../transient_data_location_member.sol        |  5 ++++
 ...ate_variable_address_payable_transient.sol |  6 +++++
 ...ate_variable_address_transient_payable.sol |  5 ++++
 .../transient_as_identifier.sol               | 25 +++++++++++++++++
 ...nsient_as_identifier_and_data_location.sol |  6 +++++
 70 files changed, 474 insertions(+), 7 deletions(-)
 create mode 100644 test/cmdlineTests/storage_layout_transient_value_types/in.sol
 create mode 100644 test/cmdlineTests/storage_layout_transient_value_types/input.json
 create mode 100644 test/cmdlineTests/storage_layout_transient_value_types/output.json
 create mode 100644 test/libsolidity/astPropertyTests/transient_data_location.sol
 create mode 100644 test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_state_variable_named_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/multiple_transient_data_location_function_parameter.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_location_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_location_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_location_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/state_variable_storage_named_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/state_variable_storage_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/state_variable_transient_storage.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_function_type_parameter.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_local_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
 create mode 100644 test/libsolidity/syntaxTests/events/transient_indexed_parameter.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_param_named_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_transient_param.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/immutable_state_var_named_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
 create mode 100644 test/libsolidity/syntaxTests/modifiers/transient_parameter.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/transient_value_type.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/contract_named_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/structs/transient_data_location_member.sol
 create mode 100644 test/libsolidity/syntaxTests/types/address/state_variable_address_payable_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/types/address/state_variable_address_transient_payable.sol
 create mode 100644 test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier.sol
 create mode 100644 test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier_and_data_location.sol

diff --git a/Changelog.md b/Changelog.md
index de3fc3d6cf..8ac9a7895f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.27 (unreleased)
 
 Language Features:
+ * Accept declarations of state variables with ``transient`` data location (parser support only, no code generation yet).
 
 
 Compiler Features:
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 43648ceb5d..f994c331d5 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -85,6 +85,7 @@ SignedIntegerType:
 Storage: 'storage';
 String: 'string';
 Struct: 'struct';
+Transient: 'transient';  // not a real keyword
 True: 'true';
 Try: 'try';
 Type: 'type';
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index e6d3ed7cca..a344fad544 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -262,7 +262,7 @@ userDefinedValueTypeDefinition:
  * The declaration of a state variable.
  */
 stateVariableDeclaration
-locals [boolean constantnessSet = false, boolean visibilitySet = false, boolean overrideSpecifierSet = false]
+locals [boolean constantnessSet = false, boolean visibilitySet = false, boolean overrideSpecifierSet = false, boolean locationSet = false]
 :
 	type=typeName
 	(
@@ -272,6 +272,7 @@ locals [boolean constantnessSet = false, boolean visibilitySet = false, boolean
 		| {!$constantnessSet}? Constant {$constantnessSet = true;}
 		| {!$overrideSpecifierSet}? overrideSpecifier {$overrideSpecifierSet = true;}
 		| {!$constantnessSet}? Immutable {$constantnessSet = true;}
+		| {!$locationSet}? Transient {$locationSet = true;}
 	)*
 	name=identifier
 	(Assign initialValue=expression)?
@@ -419,7 +420,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 | Global;
+identifier: Identifier | From | Error | Revert | Global | Transient;
 
 literal: stringLiteral | numberLiteral | booleanLiteral | hexStringLiteral | unicodeStringLiteral;
 
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 28c051c0a0..7e6ab98e1e 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -407,6 +407,7 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			{
 				case Location::Memory: return "\"memory\"";
 				case Location::Storage: return "\"storage\"";
+				case Location::Transient: return "\"transient\"";
 				case Location::CallData: return "\"calldata\"";
 				case Location::Unspecified: return "none";
 			}
@@ -456,8 +457,24 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 	}
 	else if (_variable.isStateVariable())
 	{
-		solAssert(varLoc == Location::Unspecified, "");
-		typeLoc = (_variable.isConstant() || _variable.immutable()) ? DataLocation::Memory : DataLocation::Storage;
+		switch (varLoc)
+		{
+			case Location::Unspecified:
+				typeLoc = (_variable.isConstant() || _variable.immutable()) ? DataLocation::Memory : DataLocation::Storage;
+				break;
+			case Location::Transient:
+				if (_variable.isConstant() || _variable.immutable())
+					m_errorReporter.declarationError(
+						2197_error,
+						_variable.location(),
+						"Transient cannot be used as data location for constant or immutable variables."
+					);
+				typeLoc = DataLocation::Transient;
+				break;
+			default:
+				solAssert(false);
+				break;
+		}
 	}
 	else if (
 		dynamic_cast<StructDefinition const*>(_variable.scope()) ||
@@ -477,6 +494,9 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			case Location::CallData:
 				typeLoc = DataLocation::CallData;
 				break;
+			case Location::Transient:
+				solUnimplemented("Transient data location cannot be used in this kind of variable or parameter declaration.");
+				break;
 			case Location::Unspecified:
 				solAssert(!_variable.hasReferenceOrMappingType(), "Data location not properly set.");
 		}
@@ -497,6 +517,9 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Only constants of value type and byte array type are implemented.");
 	}
 
+	if (!type->isValueType())
+		solUnimplementedAssert(typeLoc != DataLocation::Transient, "Transient data location is only supported for value types.");
+
 	_variable.annotation().type = type;
 }
 
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index bae1696759..a3aab07fba 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -816,7 +816,9 @@ std::set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocation
 {
 	using Location = VariableDeclaration::Location;
 
-	if (!hasReferenceOrMappingType() || isStateVariable() || isEventOrErrorParameter())
+	if (isStateVariable())
+		return std::set<Location>{Location::Unspecified, Location::Transient};
+	else if (!hasReferenceOrMappingType() || isEventOrErrorParameter())
 		return std::set<Location>{ Location::Unspecified };
 	else if (isCallableOrCatchParameter())
 	{
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index d8b178377b..3494ab94b9 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1052,7 +1052,7 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 class VariableDeclaration: public Declaration, public StructurallyDocumented
 {
 public:
-	enum Location { Unspecified, Storage, Memory, CallData };
+	enum Location { Unspecified, Storage, Transient, Memory, CallData };
 	enum class Mutability { Mutable, Immutable, Constant };
 	static std::string mutabilityToString(Mutability _mutability)
 	{
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index f94b91674b..69f51618e3 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -1058,6 +1058,8 @@ std::string ASTJsonExporter::location(VariableDeclaration::Location _location)
 		return "memory";
 	case VariableDeclaration::Location::CallData:
 		return "calldata";
+	case VariableDeclaration::Location::Transient:
+		return "transient";
 	}
 	// To make the compiler happy
 	return {};
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 5c1d4bdc0c..728d77c0de 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -1190,6 +1190,8 @@ VariableDeclaration::Location ASTJsonImporter::location(Json const& _node)
 		return VariableDeclaration::Location::Memory;
 	else if (storageLocStr == "calldata")
 		return VariableDeclaration::Location::CallData;
+	else if (storageLocStr == "transient")
+		return VariableDeclaration::Location::Transient;
 	else
 		astAssert(false, "Unknown location declaration");
 
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 028b766732..a37cc78a41 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1544,6 +1544,8 @@ TypeResult ReferenceType::unaryOperatorResult(Token _operator) const
 		return TypeProvider::emptyTuple();
 	case DataLocation::Storage:
 		return isPointer() ? nullptr : TypeProvider::emptyTuple();
+	case DataLocation::Transient:
+		solUnimplemented("Transient data location is only supported for value types.");
 	}
 	return nullptr;
 }
@@ -1571,6 +1573,9 @@ std::string ReferenceType::stringForReferencePart() const
 		return "calldata";
 	case DataLocation::Memory:
 		return "memory";
+	case DataLocation::Transient:
+		solUnimplemented("Transient data location is only supported for value types.");
+		break;
 	}
 	solAssert(false, "");
 	return "";
@@ -1584,6 +1589,9 @@ std::string ReferenceType::identifierLocationSuffix() const
 	case DataLocation::Storage:
 		id += "_storage";
 		break;
+	case DataLocation::Transient:
+		solUnimplemented("Transient data location is only supported for value types.");
+		break;
 	case DataLocation::Memory:
 		id += "_memory";
 		break;
@@ -1748,6 +1756,9 @@ BoolResult ArrayType::validForLocation(DataLocation _loc) const
 			if (storageSizeUpperBound() >= bigint(1) << 256)
 				return BoolResult::err("Type too large for storage.");
 			break;
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 	}
 	return true;
 }
@@ -1828,6 +1839,9 @@ std::vector<std::tuple<std::string, Type const*>> ArrayType::makeStackItems() co
 		case DataLocation::Storage:
 			// byte offset inside storage value is omitted
 			return {std::make_tuple("slot", TypeProvider::uint256())};
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 	}
 	solAssert(false, "");
 }
@@ -2568,6 +2582,9 @@ std::vector<std::tuple<std::string, Type const*>> StructType::makeStackItems() c
 			return {std::make_tuple("mpos", TypeProvider::uint256())};
 		case DataLocation::Storage:
 			return {std::make_tuple("slot", TypeProvider::uint256())};
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 	}
 	solAssert(false, "");
 }
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 3ab4a1d97e..1817c97af4 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -70,7 +70,7 @@ inline rational makeRational(bigint const& _numerator, bigint const& _denominato
 		return rational(_numerator, _denominator);
 }
 
-enum class DataLocation { Storage, CallData, Memory };
+enum class DataLocation { Storage, Transient, CallData, Memory };
 
 
 /**
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index e73ddfbae8..e653239cfa 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -1021,6 +1021,9 @@ void ArrayUtils::retrieveLength(ArrayType const& _arrayType, unsigned _stackDept
 			if (_arrayType.isByteArrayOrString())
 				m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
 			break;
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 		}
 	}
 }
@@ -1118,6 +1121,9 @@ void ArrayUtils::accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck, b
 		m_context << endTag;
 		break;
 	}
+	case DataLocation::Transient:
+		solUnimplemented("Transient data location is only supported for value types.");
+		break;
 	}
 }
 
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index bf4f25bf28..822d9d3dab 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -1024,6 +1024,9 @@ void CompilerUtils::convertType(
 				"Invalid conversion to storage type."
 			);
 			break;
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 		case DataLocation::Memory:
 		{
 			// Copy the array to a free position in memory, unless it is already in memory.
@@ -1168,6 +1171,9 @@ void CompilerUtils::convertType(
 				"Invalid conversion to storage type."
 			);
 			break;
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 		case DataLocation::Memory:
 			// Copy the array to a free position in memory, unless it is already in memory.
 			switch (typeOnStack.location())
@@ -1207,6 +1213,9 @@ void CompilerUtils::convertType(
 					conversionImpl(m_context);
 				break;
 			}
+			case DataLocation::Transient:
+				solUnimplemented("Transient data location is only supported for value types.");
+				break;
 			case DataLocation::CallData:
 			{
 				if (typeOnStack.isDynamicallyEncoded())
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 186cebc787..32fb9cae7b 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -592,6 +592,7 @@ void ContractCompiler::initializeStateVariables(ContractDefinition const& _contr
 bool ContractCompiler::visit(VariableDeclaration const& _variableDeclaration)
 {
 	solAssert(_variableDeclaration.isStateVariable(), "Compiler visit to non-state variable declaration.");
+	solUnimplementedAssert(_variableDeclaration.referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
 	CompilerContext::LocationSetter locationSetter(m_context, _variableDeclaration);
 
 	m_context.startFunction(_variableDeclaration);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index c7bc9a8263..6027e04048 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -2047,6 +2047,9 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 					ArrayUtils(m_context).retrieveLength(type);
 					m_context << Instruction::SWAP1 << Instruction::POP;
 					break;
+				case DataLocation::Transient:
+					solUnimplemented("Transient data location is only supported for value types.");
+					break;
 				case DataLocation::Memory:
 					m_context << Instruction::MLOAD;
 					break;
@@ -2193,6 +2196,9 @@ bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
 					else
 						setLValueToStorageItem(_indexAccess);
 					break;
+				case DataLocation::Transient:
+					solUnimplemented("Transient data location is only supported for value types.");
+					break;
 				case DataLocation::Memory:
 					ArrayUtils(m_context).accessIndex(arrayType);
 					setLValue<MemoryItem>(_indexAccess, *_indexAccess.annotation().type, !arrayType.isByteArrayOrString());
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 9d1929fe1e..ebf1d384aa 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -2563,6 +2563,9 @@ std::string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
 			templ("advance", toCompactHexWithPrefix(size));
 			break;
 		}
+		case DataLocation::Transient:
+			solUnimplemented("Transient data location is only supported for value types.");
+			break;
 		case DataLocation::CallData:
 		{
 			u256 size = _type.calldataStride();
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 2464fefc43..2f823fcbf6 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -47,6 +47,7 @@
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Visitor.h>
 
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view/transform.hpp>
 
 using namespace solidity;
@@ -374,6 +375,15 @@ void IRGeneratorForStatements::endVisit(VariableDeclarationStatement const& _var
 {
 	setLocation(_varDeclStatement);
 
+	auto static notTransient = [](std::shared_ptr<VariableDeclaration> const& _varDeclaration) {
+		return (_varDeclaration ? _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient : true);
+	};
+
+	solUnimplementedAssert(
+		ranges::all_of(_varDeclStatement.declarations(), notTransient),
+		"Transient storage variables are not supported."
+	);
+
 	if (Expression const* expression = _varDeclStatement.initialValue())
 	{
 		if (_varDeclStatement.declarations().size() > 1)
@@ -2314,6 +2324,9 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 
 				break;
 			}
+			case DataLocation::Transient:
+				solUnimplemented("Transient data location is only supported for value types.");
+				break;
 			case DataLocation::Memory:
 			{
 				std::string const indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index b1a326fc77..2fc24f1f66 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -184,6 +184,9 @@ bool BMC::shouldInlineFunctionCall(
 
 bool BMC::visit(ContractDefinition const& _contract)
 {
+	// Raises UnimplementedFeatureError in the presence of transient storage variables
+	TransientDataLocationChecker checker(_contract);
+
 	initContract(_contract);
 
 	SMTEncoder::visit(_contract);
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 66ebd47edb..5e37277124 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -143,6 +143,9 @@ bool CHC::visit(ContractDefinition const& _contract)
 	if (!shouldAnalyze(_contract))
 		return false;
 
+	// Raises UnimplementedFeatureError in the presence of transient storage variables
+	TransientDataLocationChecker checker(_contract);
+
 	resetContractAnalysis();
 	initContract(_contract);
 	clearIndices(&_contract);
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index bea3a85ef9..77e618fedf 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -129,6 +129,19 @@ class SMTEncoder: public ASTConstVisitor
 	static std::set<SourceUnit const*, ASTNode::CompareByID> sourceDependencies(SourceUnit const& _source);
 
 protected:
+	struct TransientDataLocationChecker: ASTConstVisitor
+	{
+		TransientDataLocationChecker(ContractDefinition const& _contract) { _contract.accept(*this); }
+
+		void endVisit(VariableDeclaration const& _var)
+		{
+			solUnimplementedAssert(
+				_var.referenceLocation() != VariableDeclaration::Location::Transient,
+				"Transient storage variables are not supported."
+			);
+		}
+	};
+
 	void resetSourceAnalysis();
 
 	// TODO: Check that we do not have concurrent reads and writes to a variable,
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index 7f344f6edf..0153af1a29 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -46,6 +46,7 @@ Json StorageLayout::generate(ContractDefinition const& _contractDef)
 
 Json StorageLayout::generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset)
 {
+	solUnimplementedAssert(_var.referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage layout is not supported yet.");
 	Json varEntry;
 	Type const* varType = _var.type();
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 7e2fe030af..b51eb9c440 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -885,6 +885,19 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
 					}
 				}
 			}
+			else if (
+				_options.kind == VarDeclKind::State &&
+				token == Token::Identifier &&
+				m_scanner->currentLiteral() == "transient" &&
+				m_scanner->peekNextToken() != Token::Assign &&
+				m_scanner->peekNextToken() != Token::Semicolon
+			)
+			{
+				if (location != VariableDeclaration::Location::Unspecified)
+					parserError(ErrorId{3548}, "Location already specified.");
+				else
+					location = VariableDeclaration::Location::Transient;
+			}
 			else
 				break;
 			nodeFactory.markEndPosition();
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 24ec2b06d6..54dd00c267 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -202,6 +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.
         "1920", # Unimplemented feature error from YulStack (currently there are no UnimplementedFeatureErrors thrown by libyul)
+        "7053", # Unimplemented feature error (parsing stage), currently has no tests
         "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
         "2961", # SMTChecker, covered by CL tests
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/in.sol b/test/cmdlineTests/storage_layout_transient_value_types/in.sol
new file mode 100644
index 0000000000..ba7943c6a1
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_transient_value_types/in.sol
@@ -0,0 +1,10 @@
+//SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract A {
+    uint transient x;
+    uint y;
+    bytes32 transient b;
+    bytes32 c;
+    address transient a;
+    address z;
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/input.json b/test/cmdlineTests/storage_layout_transient_value_types/input.json
new file mode 100644
index 0000000000..96d71ed30e
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_transient_value_types/input.json
@@ -0,0 +1,13 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {"urls": ["storage_layout_transient_value_types/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["storageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/output.json b/test/cmdlineTests/storage_layout_transient_value_types/output.json
new file mode 100644
index 0000000000..a446210485
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_transient_value_types/output.json
@@ -0,0 +1,11 @@
+{
+    "errors": [
+        {
+            "component": "general",
+            "formattedMessage": "Transient storage layout is not supported yet.",
+            "message": "Transient storage layout is not supported yet.",
+            "severity": "error",
+            "type": "UnimplementedFeatureError"
+        }
+    ]
+}
diff --git a/test/libsolidity/astPropertyTests/transient_data_location.sol b/test/libsolidity/astPropertyTests/transient_data_location.sol
new file mode 100644
index 0000000000..6a937414d6
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/transient_data_location.sol
@@ -0,0 +1,8 @@
+contract C {
+    /// TestVarDataLocation: storageLocation
+    /// TestVarName: name
+    uint transient transient;
+}
+// ----
+// TestVarDataLocation: transient
+// TestVarName: transient
diff --git a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
new file mode 100644
index 0000000000..b2dbc8efe5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
@@ -0,0 +1,8 @@
+contract C {
+    uint transient x = 42;
+    function test() public view { assert(x == 42); }
+}
+// ====
+// SMTEngine: all
+// ----
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/constants/constant_state_variable_named_transient.sol b/test/libsolidity/syntaxTests/constants/constant_state_variable_named_transient.sol
new file mode 100644
index 0000000000..4d9873d36d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_state_variable_named_transient.sol
@@ -0,0 +1,4 @@
+contract C {
+    int constant public transient = 0;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
new file mode 100644
index 0000000000..f9a722a1b4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
@@ -0,0 +1,5 @@
+contract C {
+    int constant public transient x = 0;
+}
+// ----
+// DeclarationError 2197: (17-52): Transient cannot be used as data location for constant or immutable variables.
diff --git a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
index 4e5091e8c1..cd46b15b07 100644
--- a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
@@ -2,7 +2,10 @@ library L {
     struct Nested { uint y; }
     function b(function(Nested calldata) external returns (uint)[] storage) external pure {}
     function d(function(Nested storage) external returns (uint)[] storage) external pure {}
+    function f(function(Nested transient) external returns (uint)[] storage) external pure {}
 }
 
 // ----
+// Warning 6162: (251-267): Naming function type parameters is deprecated.
 // TypeError 6651: (159-173): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (251-267): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_transient.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_transient.sol
new file mode 100644
index 0000000000..98fbb2d5ee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_transient.sol
@@ -0,0 +1,5 @@
+contract test {
+    function f(bytes transient) external;
+}
+// ----
+// TypeError 6651: (31-46): Data location must be "memory" or "calldata" for parameter in external function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_transient.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_transient.sol
new file mode 100644
index 0000000000..4a5b6f999d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/function_argument_location_specifier_test_internal_transient.sol
@@ -0,0 +1,5 @@
+contract test {
+    function f(bytes transient) internal {}
+}
+// ----
+// TypeError 6651: (31-46): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_transient.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_transient.sol
new file mode 100644
index 0000000000..75253342c4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_transient.sol
@@ -0,0 +1,19 @@
+library L {
+    function f1(uint[] transient) private pure { }
+    function f2() private pure returns (uint[] transient) { }
+    function g1(uint[] transient) internal pure { }
+    function g2() internal pure returns (uint[] transient) { }
+    function h1(uint[] transient) public pure { }
+    function h2() public pure returns (uint[] transient) { }
+    function i1(uint[] transient) external pure { }
+    function i2() external pure returns (uint[] transient) { }
+}
+// ----
+// TypeError 6651: (28-44): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (103-119): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (141-157): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (218-234): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (256-272): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (329-345): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (367-383): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
+// TypeError 6651: (444-460): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_transient.sol b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_transient.sol
new file mode 100644
index 0000000000..1dcedf49ad
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/libraryExternalFunction/function_argument_location_specifier_test_external_transient.sol
@@ -0,0 +1,5 @@
+library test {
+    function f(bytes transient) external {}
+}
+// ----
+// TypeError 6651: (30-45): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_transient.sol b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_transient.sol
new file mode 100644
index 0000000000..d66fa7fadd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/libraryInternalFunction/function_argument_location_specifier_test_internal_transient.sol
@@ -0,0 +1,5 @@
+library test {
+    function f(bytes transient) internal pure {}
+}
+// ----
+// TypeError 6651: (30-45): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/multiple_transient_data_location_function_parameter.sol b/test/libsolidity/syntaxTests/dataLocations/multiple_transient_data_location_function_parameter.sol
new file mode 100644
index 0000000000..193565b2a0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/multiple_transient_data_location_function_parameter.sol
@@ -0,0 +1,6 @@
+contract C {
+    function f(uint[] transient transient x) public pure { }
+}
+
+// ----
+// ParserError 2314: (45-54): Expected ',' but got identifier
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_location_transient.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_location_transient.sol
new file mode 100644
index 0000000000..750aa4fee5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_location_transient.sol
@@ -0,0 +1,5 @@
+contract C {
+    function f(uint[] transient) private pure {}
+}
+// ----
+// TypeError 6651: (28-44): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_location_transient.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_location_transient.sol
new file mode 100644
index 0000000000..d1bf876248
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_location_transient.sol
@@ -0,0 +1,5 @@
+contract C {
+    function f() private pure returns (uint[] transient) {}
+}
+// ----
+// TypeError 6651: (52-68): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_transient.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_transient.sol
new file mode 100644
index 0000000000..ce4f42f469
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_transient.sol
@@ -0,0 +1,5 @@
+contract test {
+    function f(bytes transient) public;
+}
+// ----
+// TypeError 6651: (31-46): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_location_transient.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_location_transient.sol
new file mode 100644
index 0000000000..862b7d236b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_location_transient.sol
@@ -0,0 +1,5 @@
+contract C {
+    function h() public pure returns(uint[] transient) {}
+}
+// ----
+// TypeError 6651: (50-66): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_named_transient.sol b/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_named_transient.sol
new file mode 100644
index 0000000000..afa6fd2503
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_named_transient.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint storage transient;
+}
+// ----
+// ParserError 2314: (22-29): Expected identifier but got 'storage'
diff --git a/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_transient.sol b/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_transient.sol
new file mode 100644
index 0000000000..d3fb023e0d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/state_variable_storage_transient.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint storage transient x;
+}
+// ----
+// ParserError 2314: (22-29): Expected identifier but got 'storage'
diff --git a/test/libsolidity/syntaxTests/dataLocations/state_variable_transient_storage.sol b/test/libsolidity/syntaxTests/dataLocations/state_variable_transient_storage.sol
new file mode 100644
index 0000000000..53260194d1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/state_variable_transient_storage.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint transient storage x;
+}
+// ----
+// ParserError 2314: (32-39): Expected identifier but got 'storage'
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
new file mode 100644
index 0000000000..b82f40267e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
@@ -0,0 +1,7 @@
+contract C {
+	uint[] transient x;
+}
+// ====
+// stopAfter: analysis
+// ----
+// UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
new file mode 100644
index 0000000000..3f7cec2a75
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
@@ -0,0 +1,7 @@
+contract C {
+	uint[3] transient x;
+}
+// ====
+// stopAfter: analysis
+// ----
+// UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
new file mode 100644
index 0000000000..9deba463c1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
@@ -0,0 +1,11 @@
+contract C {
+    function () transient f;
+    function (uint) external transient y;
+    function () transient internal fti;
+    function () internal transient fit;
+    function () internal transient internal fiti;
+    function () internal internal transient fiit;
+}
+// ====
+// stopAfter: analysis
+// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_function_type_parameter.sol b/test/libsolidity/syntaxTests/dataLocations/transient_function_type_parameter.sol
new file mode 100644
index 0000000000..04f20e85c0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_function_type_parameter.sol
@@ -0,0 +1,5 @@
+contract C {
+    function (uint transient) external y;
+}
+// ----
+// Warning 6162: (27-41): Naming function type parameters is deprecated.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_local_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_local_variable.sol
new file mode 100644
index 0000000000..7602a4cb92
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_local_variable.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public pure {
+        uint transient x = 0;
+    }
+}
+// ----
+// ParserError 2314: (67-68): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
new file mode 100644
index 0000000000..cd762df30e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
@@ -0,0 +1,7 @@
+contract C {
+	mapping(uint => uint) transient y;
+}
+// ====
+// stopAfter: analysis
+// ----
+// UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
new file mode 100644
index 0000000000..2579d5532f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
@@ -0,0 +1,12 @@
+contract C {
+    uint public transient pubt;
+    uint internal transient it;
+    uint private transient prvt;
+
+    uint transient public tpub;
+    uint transient internal ti;
+    uint transient private tprv;
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
new file mode 100644
index 0000000000..19612b9c57
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
@@ -0,0 +1,12 @@
+struct S {
+	uint x;
+	address a;
+}
+
+contract C {
+	S transient s;
+}
+// ====
+// stopAfter: analysis
+// ----
+// UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
new file mode 100644
index 0000000000..55faa1495d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
@@ -0,0 +1,12 @@
+contract D { }
+
+contract C {
+	address transient a;
+	bool transient b;
+	D transient d;
+	uint transient x;
+	bytes32 transient y;
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
new file mode 100644
index 0000000000..10dad9e32f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
@@ -0,0 +1,10 @@
+contract D { }
+
+contract C {
+	int transient x = -99;
+	address transient a = address(0xABC);
+	bool transient b = x > 0 ? false : true;
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
index a116188d23..38f1bd9af5 100644
--- a/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
+++ b/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
@@ -10,7 +10,12 @@ contract test {
 contract test {
     error e1(string calldata a);
 }
+==== Source: D ====
+contract test {
+    error e1(string transient 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'
+// ParserError 2314: (D:46-47): Expected ',' but got identifier
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
index 04ee9b7bc4..1f13bbf908 100644
--- a/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
+++ b/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
@@ -10,7 +10,12 @@ contract test {
 contract test {
     event e1(string calldata a);
 }
+==== Source: D ====
+contract test {
+    event e1(string transient 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'
+// ParserError 2314: (D:46-47): Expected ',' but got identifier
diff --git a/test/libsolidity/syntaxTests/events/transient_indexed_parameter.sol b/test/libsolidity/syntaxTests/events/transient_indexed_parameter.sol
new file mode 100644
index 0000000000..718451de2f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/transient_indexed_parameter.sol
@@ -0,0 +1,5 @@
+contract C {
+    event e(string indexed transient a);
+}
+// ----
+// ParserError 2314: (50-51): Expected ',' but got identifier
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol
new file mode 100644
index 0000000000..b38e37177e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol
@@ -0,0 +1,8 @@
+contract C {
+    function (uint transient) external y;
+    function (uint[] transient) external z;
+}
+// ----
+// Warning 6162: (27-41): Naming function type parameters is deprecated.
+// Warning 6162: (69-85): Naming function type parameters is deprecated.
+// TypeError 6651: (69-85): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_param_named_transient.sol b/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_param_named_transient.sol
new file mode 100644
index 0000000000..fd28841431
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_param_named_transient.sol
@@ -0,0 +1,6 @@
+contract C {
+    function (uint transient) external transient y;
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_transient_param.sol b/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_transient_param.sol
new file mode 100644
index 0000000000..74e5b3413d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/transient_function_type_with_transient_param.sol
@@ -0,0 +1,5 @@
+contract C {
+    function (uint transient x) external transient y;
+}
+// ----
+// ParserError 2314: (42-43): Expected ',' but got identifier
diff --git a/test/libsolidity/syntaxTests/immutable/immutable_state_var_named_transient.sol b/test/libsolidity/syntaxTests/immutable/immutable_state_var_named_transient.sol
new file mode 100644
index 0000000000..c0ac3a8abb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/immutable_state_var_named_transient.sol
@@ -0,0 +1,4 @@
+contract C {
+    address public immutable transient;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol b/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
new file mode 100644
index 0000000000..a3d93848d9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint public immutable transient x;
+}
+// ----
+// DeclarationError 2197: (17-50): Transient cannot be used as data location for constant or immutable variables.
diff --git a/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol b/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
index e264a593ff..24bb1cc32e 100644
--- a/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
+++ b/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
@@ -8,6 +8,12 @@ contract A {
     modifier mod7(string calldata storage a) { _; }
     modifier mod8(string calldata memory a) { _; }
     modifier mod9(string calldata calldata a) { _; }
+    modifier modA(string transient storage a) { _; }
+    modifier modB(string transient memory a) { _; }
+    modifier modC(string transient calldata a) { _; }
+    modifier modD(string storage transient a) { _; }
+    modifier modE(string memory transient a) { _; }
+    modifier modF(string calldata transient a) { _; }
 }
 // ----
 // ParserError 3548: (46-53): Location already specified.
@@ -19,3 +25,4 @@ contract A {
 // ParserError 3548: (350-357): Location already specified.
 // ParserError 3548: (402-408): Location already specified.
 // ParserError 3548: (453-461): Location already specified.
+// ParserError 2314: (507-514): Expected ',' but got 'storage'
diff --git a/test/libsolidity/syntaxTests/modifiers/transient_parameter.sol b/test/libsolidity/syntaxTests/modifiers/transient_parameter.sol
new file mode 100644
index 0000000000..be90ca54dc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/transient_parameter.sol
@@ -0,0 +1,5 @@
+contract A {
+    modifier mod2(uint[] transient) { _; }
+}
+// ----
+// TypeError 6651: (31-47): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/operators/transient_value_type.sol b/test/libsolidity/syntaxTests/operators/transient_value_type.sol
new file mode 100644
index 0000000000..3d83fe2407
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/transient_value_type.sol
@@ -0,0 +1,11 @@
+contract C {
+    int transient x;
+    function f() public view returns (int) {
+        int y = x;
+        int w = -x;
+        return (x + w) * (y / x);
+    }
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/contract_named_transient.sol b/test/libsolidity/syntaxTests/parsing/contract_named_transient.sol
new file mode 100644
index 0000000000..853396f21b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/contract_named_transient.sol
@@ -0,0 +1 @@
+contract transient {}
diff --git a/test/libsolidity/syntaxTests/structs/transient_data_location_member.sol b/test/libsolidity/syntaxTests/structs/transient_data_location_member.sol
new file mode 100644
index 0000000000..110d4969a6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/structs/transient_data_location_member.sol
@@ -0,0 +1,5 @@
+struct S {
+    int transient x;
+}
+// ----
+// ParserError 2314: (29-30): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/types/address/state_variable_address_payable_transient.sol b/test/libsolidity/syntaxTests/types/address/state_variable_address_payable_transient.sol
new file mode 100644
index 0000000000..0cab967225
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/address/state_variable_address_payable_transient.sol
@@ -0,0 +1,6 @@
+contract C {
+    address payable transient a;
+}
+// ====
+// stopAfter: parsing
+// ----
diff --git a/test/libsolidity/syntaxTests/types/address/state_variable_address_transient_payable.sol b/test/libsolidity/syntaxTests/types/address/state_variable_address_transient_payable.sol
new file mode 100644
index 0000000000..16d8adb493
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/address/state_variable_address_transient_payable.sol
@@ -0,0 +1,5 @@
+contract C {
+    address transient payable a;
+}
+// ----
+// ParserError 2314: (35-42): Expected identifier but got 'payable'
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier.sol b/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier.sol
new file mode 100644
index 0000000000..ced189faf0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier.sol
@@ -0,0 +1,25 @@
+contract C {
+    function transient() public pure { }
+}
+
+error CustomError(uint transient);
+event e1(uint transient);
+event e2(uint indexed transient);
+
+struct S {
+    int transient;
+}
+
+contract D {
+    function f() public pure returns (uint) {
+        uint transient = 1;
+        return transient;
+    }
+
+    function g(int transient) public pure { }
+
+    modifier m(address transient) {
+        _;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier_and_data_location.sol b/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier_and_data_location.sol
new file mode 100644
index 0000000000..532df5ba00
--- /dev/null
+++ b/test/libsolidity/syntaxTests/variableDeclaration/transient_as_identifier_and_data_location.sol
@@ -0,0 +1,6 @@
+contract C {
+	uint transient transient;
+}
+// ====
+// stopAfter: parsing
+// ----

From 06c27a5e06683a23e31413215e6561d33acf32ea Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Sun, 2 Jun 2024 20:45:27 +0200
Subject: [PATCH 0916/1140] Require with custom error for legacy pipeline

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    | 49 +++++++++++++++++--
 ...quire_different_errors_same_parameters.sol |  2 -
 ...re_error_condition_evaluated_only_once.sol | 24 +++++++++
 ...l => require_error_evaluation_order_1.sol} |  2 -
 .../require_error_evaluation_order_2.sol      | 16 ++++++
 .../require_error_evaluation_order_3.sol      | 15 ++++++
 ...quire_error_function_join_control_flow.sol | 18 +++++++
 ...quire_error_function_pointer_parameter.sol |  2 -
 .../require_error_multiple_arguments.sol      |  2 -
 .../errors/require_error_stack_check.sol      | 19 +++++++
 .../errors/require_error_string_literal.sol   |  2 -
 .../errors/require_error_string_memory.sol    |  2 -
 .../errors/require_error_uint256.sol          |  6 +--
 .../errors/require_inherited_error.sol        |  2 -
 .../syntaxTests/errors/require_custom.sol     |  2 -
 .../errors/require_custom_legacy.sol          |  8 ---
 .../syntaxTests/errors/require_nested.sol     |  2 -
 18 files changed, 139 insertions(+), 35 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_condition_evaluated_only_once.sol
 rename test/libsolidity/semanticTests/errors/{require_evaluation_order.sol => require_error_evaluation_order_1.sol} (92%)
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_evaluation_order_2.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_evaluation_order_3.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_function_join_control_flow.sol
 create mode 100644 test/libsolidity/semanticTests/errors/require_error_stack_check.sol
 delete mode 100644 test/libsolidity/syntaxTests/errors/require_custom_legacy.sol

diff --git a/Changelog.md b/Changelog.md
index 8ac9a7895f..9d1aa77c64 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * Accept declarations of state variables with ``transient`` data location (parser support only, no code generation yet).
+ * Make ``require(bool, Error)`` available when using the legacy pipeline.
 
 
 Compiler Features:
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 6027e04048..368ee77a86 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -990,6 +990,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		}
 		case FunctionType::Kind::Error:
 		{
+			// This case is part of the ``revert <error>`` path of the codegen.
+			// For ``require(bool, <error>)`` refer to the ``Kind::Require`` case.
 			_functionCall.expression().accept(*this);
 			std::vector<Type const*> argumentTypes;
 			for (ASTPointer<Expression const> const& arg: _functionCall.sortedArguments())
@@ -1249,9 +1251,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::Require:
 		{
 			acceptAndConvert(*arguments.front(), *function.parameterTypes().front(), false);
-
+			// stack: <condition>
 			bool haveReasonString = arguments.size() > 1 && m_context.revertStrings() != RevertStrings::Strip;
-
 			if (arguments.size() > 1)
 			{
 				// Users probably expect the second argument to be evaluated
@@ -1259,11 +1260,49 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				// function call.
 				solAssert(arguments.size() == 2, "");
 				solAssert(function.kind() == FunctionType::Kind::Require, "");
-				// Check if the function call matches ``require(bool, error)``, and throw an unimplemented error,
-				// as require with custom errors is not supported in legacy codegen.
 				auto const* magicType = dynamic_cast<MagicType const*>(arguments[1]->annotation().type);
 				if (magicType && magicType->kind() == MagicType::Kind::Error)
-					solUnimplemented("Require with a custom error is only available using the via-ir pipeline.");
+				{
+					// Make sure that error constructor arguments are evaluated regardless of the require condition
+					auto const& errorConstructorCall = dynamic_cast<FunctionCall const&>(*arguments[1]);
+					errorConstructorCall.expression().accept(*this);
+					std::vector<Type const*> errorConstructorArgumentTypes{};
+					for (ASTPointer<Expression const> const& errorConstructorArgument: errorConstructorCall.sortedArguments())
+					{
+						errorConstructorArgument->accept(*this);
+						errorConstructorArgumentTypes.push_back(errorConstructorArgument->annotation().type);
+					}
+					unsigned const sizeOfConditionArgument = arguments.at(0)->annotation().type->sizeOnStack();
+					unsigned const sizeOfErrorArguments = CompilerUtils::sizeOnStack(errorConstructorArgumentTypes);
+					// stack: <condition> <arg0> <arg1> ... <argN>
+					try
+					{
+						// Move condition to the top of the stack
+						utils().moveToStackTop(sizeOfErrorArguments, sizeOfConditionArgument);
+					}
+					catch (StackTooDeepError const& _exception)
+					{
+						_exception << errinfo_sourceLocation(errorConstructorCall.location());
+						throw _exception;
+					}
+					// stack: <arg0> <arg1> ... <argN> <condition>
+					m_context << Instruction::ISZERO << Instruction::ISZERO;
+					AssemblyItem successBranchTag = m_context.appendConditionalJump();
+
+					auto const* errorDefinition = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(errorConstructorCall.expression()));
+					solAssert(errorDefinition && errorDefinition->functionType(true));
+					utils().revertWithError(
+						errorDefinition->functionType(true)->externalSignature(),
+						errorDefinition->functionType(true)->parameterTypes(),
+						errorConstructorArgumentTypes
+					);
+					// Here, the argument is consumed, but in the other branch, it is still there.
+					m_context.adjustStackOffset(static_cast<int>(sizeOfErrorArguments));
+					m_context << successBranchTag;
+					// In case of the success branch i.e. require(true, ...), pop error constructor arguments
+					utils().popStackSlots(sizeOfErrorArguments);
+					break;
+				}
 
 				if (m_context.revertStrings() == RevertStrings::Strip)
 				{
diff --git a/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol b/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
index 37cbb207da..957cb0bb11 100644
--- a/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
+++ b/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
@@ -14,8 +14,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"f55fefe3", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"44a06798", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_condition_evaluated_only_once.sol b/test/libsolidity/semanticTests/errors/require_error_condition_evaluated_only_once.sol
new file mode 100644
index 0000000000..e344af43f8
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_condition_evaluated_only_once.sol
@@ -0,0 +1,24 @@
+contract C {
+    uint256 counter = 0;
+
+    error CustomError(uint256);
+
+    function getCounter() public view returns (uint256) {
+        return counter;
+    }
+
+    function g(bool condition) internal returns (bool) {
+        counter++;
+        return condition;
+    }
+
+    function f(bool condition) external {
+        require(g(condition), CustomError(counter));
+    }
+}
+
+// ----
+// f(bool): false -> FAILURE, hex"110b3655", 1
+// getCounter() -> 0
+// f(bool): true ->
+// getCounter() -> 1
diff --git a/test/libsolidity/semanticTests/errors/require_evaluation_order.sol b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_1.sol
similarity index 92%
rename from test/libsolidity/semanticTests/errors/require_evaluation_order.sol
rename to test/libsolidity/semanticTests/errors/require_error_evaluation_order_1.sol
index 4733b3aee7..019c282c6b 100644
--- a/test/libsolidity/semanticTests/errors/require_evaluation_order.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_1.sol
@@ -21,8 +21,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> 7
 // g() -> 7
diff --git a/test/libsolidity/semanticTests/errors/require_error_evaluation_order_2.sol b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_2.sol
new file mode 100644
index 0000000000..610caeef6f
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_2.sol
@@ -0,0 +1,16 @@
+contract C {
+    uint y;
+    function g(bool x) internal returns (bool) {
+        y = 42;
+        return x;
+    }
+    error E(uint256);
+    function h() internal returns (uint256) { return y; }
+    function f(bool c) public {
+        require(g(c), E(h()));
+    }
+}
+
+// ----
+// f(bool): false -> FAILURE, hex"002ff067", 42
+// f(bool): true ->
diff --git a/test/libsolidity/semanticTests/errors/require_error_evaluation_order_3.sol b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_3.sol
new file mode 100644
index 0000000000..0d70b16b98
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_evaluation_order_3.sol
@@ -0,0 +1,15 @@
+contract C {
+    string failureMessage = "Failure Message";
+    function g(bool x) internal returns (bool) {
+        failureMessage = "Intercepted failure message";
+        return x;
+    }
+    function h() internal returns (string memory) { return failureMessage; }
+    function f(bool c) public {
+        require(g(c), h());
+    }
+}
+
+// ----
+// f(bool): false -> FAILURE, hex"08c379a0", 0x20, 0x1b, "Intercepted failure message"
+// f(bool): true ->
diff --git a/test/libsolidity/semanticTests/errors/require_error_function_join_control_flow.sol b/test/libsolidity/semanticTests/errors/require_error_function_join_control_flow.sol
new file mode 100644
index 0000000000..e3d7e5fdde
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_function_join_control_flow.sol
@@ -0,0 +1,18 @@
+contract C {
+    uint x = 0;
+    uint y = 42;
+    error E(uint);
+    function f(bool c) public returns (uint256, uint256, uint256) {
+        uint z = x;
+        if (y == 42) {
+            x = 21;
+        } else {
+            require(c, E(y));
+        }
+        y /= 2;
+        return (x,y,z);
+    }
+}
+// ----
+// f(bool): true -> 0x15, 0x15, 0
+// f(bool): false -> FAILURE, hex"002ff067", 21
diff --git a/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol b/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
index 2e1dcdd588..3af19ca64f 100644
--- a/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
@@ -14,7 +14,5 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"271b1dfa", hex"c06afe3a8444fc0004668591e8306bfb9968e79ef37cdc8e0000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol b/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
index 6c8521f9d2..98254cf08d 100644
--- a/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_stack_check.sol b/test/libsolidity/semanticTests/errors/require_error_stack_check.sol
new file mode 100644
index 0000000000..0f77e252de
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/require_error_stack_check.sol
@@ -0,0 +1,19 @@
+// The purpose of this test is to make sure that error constructor call
+// stack items are popped from the stack in the success branch, i.e. when
+// require condition is true.
+contract C {
+    error E(uint, uint, uint, function(uint256) external pure returns (uint256));
+    uint public x;
+
+    function e(uint256 y) external pure returns (uint256) {
+        return y;
+    }
+
+    function f(bool condition, uint a, uint b, uint c) public {
+        require(condition, E(a, b, c, this.e));
+        x = b;
+    }
+}
+// ----
+// f(bool,uint256,uint256,uint256): true, 42, 4242, 424242 ->
+// x() -> 4242
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_literal.sol b/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
index 5a3a140d0b..6e72253ea1 100644
--- a/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_memory.sol b/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
index 13947d3990..15178d859e 100644
--- a/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
@@ -15,8 +15,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_uint256.sol b/test/libsolidity/semanticTests/errors/require_error_uint256.sol
index d400e5fa7c..3b8915f8d0 100644
--- a/test/libsolidity/semanticTests/errors/require_error_uint256.sol
+++ b/test/libsolidity/semanticTests/errors/require_error_uint256.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
-// f() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000001"
-// g() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000002"
+// f() -> FAILURE, hex"110b3655", 1
+// g() -> FAILURE, hex"110b3655", 2
diff --git a/test/libsolidity/semanticTests/errors/require_inherited_error.sol b/test/libsolidity/semanticTests/errors/require_inherited_error.sol
index 24b544b73c..33cf0e9625 100644
--- a/test/libsolidity/semanticTests/errors/require_inherited_error.sol
+++ b/test/libsolidity/semanticTests/errors/require_inherited_error.sol
@@ -11,7 +11,5 @@ contract C is Base
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/syntaxTests/errors/require_custom.sol b/test/libsolidity/syntaxTests/errors/require_custom.sol
index f428390277..0530e8432a 100644
--- a/test/libsolidity/syntaxTests/errors/require_custom.sol
+++ b/test/libsolidity/syntaxTests/errors/require_custom.sol
@@ -4,6 +4,4 @@ contract C {
         require(c, E(2, 7));
     }
 }
-// ====
-// compileViaYul: true
 // ----
diff --git a/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol b/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
deleted file mode 100644
index c1eae591f2..0000000000
--- a/test/libsolidity/syntaxTests/errors/require_custom_legacy.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-error E(uint a, uint b);
-contract C {
-    function f(bool c) public pure {
-        require(c, E(2, 7));
-    }
-}
-// ----
-// UnimplementedFeatureError 1834: Require with a custom error is only available using the via-ir pipeline.
diff --git a/test/libsolidity/syntaxTests/errors/require_nested.sol b/test/libsolidity/syntaxTests/errors/require_nested.sol
index c5dc018242..0129959a02 100644
--- a/test/libsolidity/syntaxTests/errors/require_nested.sol
+++ b/test/libsolidity/syntaxTests/errors/require_nested.sol
@@ -9,7 +9,5 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // TypeError 9322: (118-125): No matching declaration found after argument-dependent lookup.

From 20213011040ac85e14ced4bedd20f66d480efa2c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 11 Jun 2024 16:09:32 +0200
Subject: [PATCH 0917/1140] Changelog and docs

---
 docs/contracts/errors.rst   | 3 +--
 docs/control-structures.rst | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index 8c57586e96..d345b4eacf 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -19,7 +19,7 @@ as well as the newer approach with ``require`` in function ``transferWithRequire
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity ^0.8.26;
+    pragma solidity ^0.8.27;
 
     /// Insufficient balance for transfer. Needed `required` but only
     /// `available` available.
@@ -27,7 +27,6 @@ as well as the newer approach with ``require`` in function ``transferWithRequire
     /// @param required requested amount to transfer.
     error InsufficientBalance(uint256 available, uint256 required);
 
-    // This will only compile via IR
     contract TestToken {
         mapping(address => uint) balance;
         function transferWithRevertError(address to, uint256 amount) public {
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 81e62ec57b..238d261152 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -639,10 +639,6 @@ The ``require`` function provides three overloads:
     For example, in ``require(condition, CustomError(f()));`` and ``require(condition, f());``,
     function ``f()`` will be called regardless of whether the supplied condition is ``true`` or ``false``.
 
-.. note::
-    Using custom errors with ``require`` is only supported by the via IR pipeline, i.e. compilation via Yul.
-    For the legacy pipeline, please use ``if (!condition) revert CustomError();`` instead.
-
 An ``Error(string)`` exception (or an exception without data) is generated
 by the compiler in the following situations:
 

From 933598d2eac23bc96521a3cf8febcfe685b48a9f Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Mon, 17 Jun 2024 21:56:19 +0200
Subject: [PATCH 0918/1140] SMTChecker: Methods returning callback can be const

---
 libsolidity/interface/SMTSolverCommand.cpp | 2 +-
 libsolidity/interface/SMTSolverCommand.h   | 4 ++--
 libsolidity/interface/UniversalCallback.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 7dfb448f8b..1eaa3f38ca 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -63,7 +63,7 @@ void SMTSolverCommand::setCvc5(std::optional<unsigned int> timeoutInMilliseconds
 	}
 }
 
-ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
+ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query) const
 {
 	try
 	{
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
index 3b10227405..c948ec5d2d 100644
--- a/libsolidity/interface/SMTSolverCommand.h
+++ b/libsolidity/interface/SMTSolverCommand.h
@@ -29,9 +29,9 @@ class SMTSolverCommand
 {
 public:
 	/// Calls an SMT solver with the given query.
-	frontend::ReadCallback::Result solve(std::string const& _kind, std::string const& _query);
+	frontend::ReadCallback::Result solve(std::string const& _kind, std::string const& _query) const;
 
-	frontend::ReadCallback::Callback solver()
+	frontend::ReadCallback::Callback solver() const
 	{
 		return [this](std::string const& _kind, std::string const& _query) { return solve(_kind, _query); };
 	}
diff --git a/libsolidity/interface/UniversalCallback.h b/libsolidity/interface/UniversalCallback.h
index ef5450a1c5..943d7e50cb 100644
--- a/libsolidity/interface/UniversalCallback.h
+++ b/libsolidity/interface/UniversalCallback.h
@@ -46,7 +46,7 @@ class UniversalCallback
 		solAssert(false, "Unknown callback kind.");
 	}
 
-	frontend::ReadCallback::Callback callback()
+	frontend::ReadCallback::Callback callback() const
 	{
 		return *this;
 	}

From 3e5516cee5903d6940dd42ee97a8dad21a22c6ec Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Mon, 17 Jun 2024 21:57:49 +0200
Subject: [PATCH 0919/1140] SMTChecker: Add SMT callback to SMTChecker tests

---
 test/libsolidity/SMTCheckerTest.cpp |  9 ++++++++-
 test/libsolidity/SMTCheckerTest.h   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index e3ec14c97c..8149f3130c 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -25,8 +25,11 @@ using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
+using namespace solidity::test;
 
-SMTCheckerTest::SMTCheckerTest(std::string const& _filename): SyntaxTest(_filename, EVMVersion{})
+SMTCheckerTest::SMTCheckerTest(std::string const& _filename):
+	SyntaxTest(_filename, EVMVersion{}),
+	universalCallback(nullptr, smtCommand)
 {
 	auto contract = m_reader.stringSetting("SMTContract", "");
 	if (!contract.empty())
@@ -168,3 +171,7 @@ void SMTCheckerTest::printUpdatedExpectations(std::ostream &_stream, const std::
 	else
 		CommonSyntaxTest::printUpdatedExpectations(_stream, _linePrefix);
 }
+
+std::unique_ptr<CompilerStack> SMTCheckerTest::createStack() const {
+	return std::make_unique<CompilerStack>(universalCallback.callback());
+}
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 6a15791522..07ae3728d4 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -24,6 +24,9 @@
 
 #include <libsolidity/formal/ModelChecker.h>
 
+#include <libsolidity/interface/SMTSolverCommand.h>
+#include <libsolidity/interface/UniversalCallback.h>
+
 #include <string>
 
 namespace solidity::frontend::test
@@ -36,7 +39,7 @@ class SMTCheckerTest: public SyntaxTest
 	{
 		return std::make_unique<SMTCheckerTest>(_config.filename);
 	}
-	SMTCheckerTest(std::string const& _filename);
+	explicit SMTCheckerTest(std::string const& _filename);
 
 	void setupCompiler(CompilerStack& _compiler) override;
 	void filterObtainedErrors() override;
@@ -44,6 +47,8 @@ class SMTCheckerTest: public SyntaxTest
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
 
 protected:
+	std::unique_ptr<CompilerStack> createStack() const override;
+
 	/*
 	Options that can be set in the test:
 	SMTEngine: `all`, `chc`, `bmc`, `none`, where the default is `all`.
@@ -56,7 +61,7 @@ class SMTCheckerTest: public SyntaxTest
 		Set in m_modelCheckerSettings.
 	SMTShowUnproved: `yes`, `no`, where the default is `yes`.
 		Set in m_modelCheckerSettings.
-	SMTSolvers: `all`, `cvc5`, `z3`, `none`, where the default is `all`.
+	SMTSolvers: `all`, `cvc5`, `z3`, `eld`, `none`, where the default is `z3`.
 		Set in m_modelCheckerSettings.
 	BMCLoopIterations: number of loop iterations for BMC engine, the default is 1.
 		Set in m_modelCheckerSettings.
@@ -67,6 +72,9 @@ class SMTCheckerTest: public SyntaxTest
 	bool m_ignoreCex = false;
 
 	std::vector<SyntaxTestError> m_unfilteredErrorList;
+
+	SMTSolverCommand smtCommand;
+	UniversalCallback universalCallback;
 };
 
 }

From f9be1e3812e426fde2d8ae59c5241cd6969c15cc Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Mon, 17 Jun 2024 22:01:21 +0200
Subject: [PATCH 0920/1140] SMTChecker: Bring back assertions in
 "external_calls" SMTChecker tests

Several assertions were commented out because of nondeterminism we
observed in Spacer, which made these tests brittle.
Spacer can now solve some of them, others we can now solve with
Eldarica.

Note that running Eldarica seems to come with significant overhead,
because it starts a new Eldarica process (which starts new JVM) for
every query.
---
 .../external_calls/call_with_value_3.sol              | 11 ++++++-----
 .../external_calls/external_call_with_value_1.sol     | 10 +++++-----
 .../external_hash_known_code_state_reentrancy.sol     |  7 +++----
 .../external_calls/external_reentrancy_3.sol          |  8 ++++----
 .../external_calls/mutex_f_no_guard.sol               |  7 +++----
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
index 6cbe241362..4b3dcd091b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
@@ -3,13 +3,14 @@ contract C {
 		require(address(this).balance > 100);
 		i.call{value: 20}("");
 		assert(address(this).balance > 0); // should hold
-		// Disabled due to Spacer nondeterminism
-		//assert(address(this).balance == 0); // should fail
+		assert(address(this).balance == 0); // should fail
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
+// SMTIgnoreCex: yes
+// SMTSolvers: eld
 // ----
 // Warning 9302: (95-116): Return value of low-level calls not used.
-// Warning 6328: (120-153): CHC: Assertion violation might happen here.
-// Warning 4661: (120-153): BMC: Assertion violation happens here.
+// Warning 6328: (172-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/external_calls/external_call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol
index a5ac8ded97..3ecdb00bd3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_1.sol
@@ -7,12 +7,12 @@ contract C {
 		require(address(this).balance == 100);
 		i.f{value: 10}();
 		assert(address(this).balance == 90); // should hold
-		// Disabled due to Spacer nondeterminism
-		//assert(address(this).balance == 100); // should fail
+		assert(address(this).balance == 100); // should fail
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
+// SMTSolvers: eld
 // ----
-// Warning 6328: (151-186): CHC: Assertion violation might happen here.
-// Warning 4661: (151-186): BMC: Assertion violation happens here.
+// Warning 6328: (205-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/external_calls/external_hash_known_code_state_reentrancy.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
index 29d1848959..69f76be6b7 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
@@ -19,8 +19,7 @@ contract C {
 		address prevOwner = owner;
 		uint z = s.f();
 		assert(z == y);
-		// Disabled because of Spacer nondeterminism.
-		//assert(prevOwner == owner);
+		assert(prevOwner == owner);
 	}
 
 	function g() public view returns (uint) {
@@ -31,5 +30,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (219-236): Unused local variable.
-// Warning 6328: (266-280): CHC: Assertion violation happens here.
+// Warning 6328: (266-280): CHC: Assertion violation happens here.\nCounterexample:\nowner = 0x0, y = 0, s = 0\nprevOwner = 0x0\nz = 1\n\nTransaction trace:\nC.constructor(){ msg.sender: 0x0 }\nState: owner = 0x0, y = 0, s = 0\nC.f()\n    s.f() -- untrusted external 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/external_calls/external_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
index cfe12434c3..bdae00667b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
@@ -21,15 +21,15 @@ contract C is A {
 
 	function f() public view override {
 		assert(x == 1); // should hold
-		//Disabled because of Spacer nondeterminism.
-		//assert(x == 0); // should fail
+		assert(x == 0); // should fail
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
 // SMTIgnoreCex: yes
 // SMTIgnoreInv: yes
-// SMTIgnoreOS: macos
+// SMTSolvers: eld
 // ----
 // Warning 6328: (154-168): CHC: Assertion violation happens here.
+// Warning 6328: (352-366): 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/mutex_f_no_guard.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
index 76568adf65..7e66c51e17 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
@@ -21,12 +21,11 @@ contract C {
 	function f() public {
 		uint y = x;
 		d.d();
-		// Disabled because of Spacer nondeterminism.
-		//assert(y == x);
+		assert(y == x);
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (251-257): Unused local variable.
+// Warning 6328: (274-288): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0, lock = false\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0, lock = false\nC.set(1)\nState: x = 1, d = 0, lock = false\nC.f()\n    d.d() -- untrusted external call, synthesized as:\n        C.set(0) -- reentrant call

From fbb5eede41433c91ae94e776fdd173435d01e23c Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 19 Jun 2024 17:42:38 +0200
Subject: [PATCH 0921/1140] Docs: Small update regarding the use of Eldarica

---
 docs/contributing.rst        |  8 ++++++--
 docs/installing-solidity.rst | 13 +++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 8ce402680b..36b8586794 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -93,7 +93,8 @@ 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>`_).
+`libz3 <https://github.com/Z3Prover/z3>`_, `Eldarica <https://github.com/uuverifiers/eldarica/>`_,
+`cvc5 <https://github.com/cvc5/cvc5>`).
 
 On macOS systems, some of the testing scripts expect GNU coreutils to be installed.
 This can be easiest accomplished using Homebrew: ``brew install coreutils``.
@@ -133,11 +134,14 @@ extension ``.so`` on Linux, ``.dll`` on Windows systems and ``.dylib`` on macOS.
 
 For running SMT tests, the ``libz3`` library must be installed and locatable
 by ``cmake`` during compiler configure stage.
+A few SMT tests use ``Eldarica`` instead of ``Z3``.
+``Eldarica`` is a runtime dependency, its executable (``eld``) must be present in ``PATH`` for the tests to pass.
+However, if ``Eldarica`` is not found, these tests will be automatically skipped.
 
 If the ``libz3`` library is not installed on your system, you should disable the
 SMT tests by exporting ``SMT_FLAGS=--no-smt`` before running ``./scripts/tests.sh`` or
 running ``./scripts/soltest.sh --no-smt``.
-These tests are ``libsolidity/smtCheckerTests`` and ``libsolidity/smtCheckerTestsJSON``.
+These tests are ``libsolidity/smtCheckerTests``.
 
 .. note::
 
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index e37fc19853..b1b3e1a3fb 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -527,19 +527,24 @@ 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.
+Solidity can be built against Z3 SMT solver and will do so by default if
+it is found in the system. Z3 can be disabled by a ``cmake`` option.
 
 *Note: In some cases, this can also be a potential workaround for build failures.*
 
 
-Inside the build folder you can disable them, since they are enabled by default:
+Inside the build folder you can disable Z3, since it is enabled by default:
 
 .. code-block:: bash
 
-    # disables only Z3 SMT Solver.
+    # disables Z3 SMT Solver.
     cmake .. -DUSE_Z3=OFF
 
+.. note::
+
+    Solidity can optionally use other solvers, namely ``cvc5`` and ``Eldarica``,
+    but their presence is checked only at runtime, they are not needed for the build to succeed.
+
 The Version String in Detail
 ============================
 

From d51dbe83a4020b7888b207204576fd9d8b786fbf Mon Sep 17 00:00:00 2001
From: ToonVanHove <9501896+ToonVanHove@users.noreply.github.com>
Date: Fri, 21 Jun 2024 09:17:57 +0200
Subject: [PATCH 0922/1140] doc: better specify blobhash() behaviour

---
 docs/cheatsheet.rst                 | 1 +
 docs/units-and-global-variables.rst | 1 +
 docs/yul.rst                        | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 6b69b81be3..79aa6e65d5 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -66,6 +66,7 @@ Block and Transaction Properties
 - ``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>`_).
+  Returns zero if no blob with the given index exists.
 - ``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 a743441d56..fce4cf96d9 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -77,6 +77,7 @@ Block and Transaction Properties
 - ``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>`_).
+  Returns zero if no blob with the given index exists.
 - ``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/yul.rst b/docs/yul.rst
index 3cf2785fc4..0932c8fa63 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -934,7 +934,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                       |
+| blobhash(i)             |     | N | versioned hash of transaction's i-th blob, 0 if blob does not   |
+|                         |     |   | exist                                                           |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | coinbase()              |     | F | current mining beneficiary                                      |
 +-------------------------+-----+---+-----------------------------------------------------------------+

From dd60886c88ad78dccd2ab78dc8a4ab8cf0d7dfe3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 24 Jun 2024 16:02:33 +0200
Subject: [PATCH 0923/1140] Error out on transient usage in TypeChecker

---
 libsolidity/analysis/TypeChecker.cpp          |  7 +++
 libsolidity/codegen/ContractCompiler.cpp      |  3 +
 libsolidity/codegen/ir/IRGenerator.cpp        |  3 +
 .../output.json                               | 57 ++++++++++++++++++-
 .../transient_data_location.sol               |  8 ---
 .../transient_storage_state_variable.sol      |  2 +-
 ...transient_dynamic_array_state_variable.sol |  2 -
 .../transient_fixed_array_state_variable.sol  |  2 -
 .../dataLocations/transient_function_type.sol |  8 ++-
 .../transient_mapping_state_variable.sol      |  3 +-
 .../transient_state_variable_visibility.sol   |  8 ++-
 .../transient_struct_state_variable.sol       |  2 -
 .../transient_value_type_state_variables.sol  |  7 ++-
 ..._value_type_state_variables_assignment.sol |  5 +-
 14 files changed, 89 insertions(+), 28 deletions(-)
 delete mode 100644 test/libsolidity/astPropertyTests/transient_data_location.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 918e270333..dfd334295a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -478,6 +478,13 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 	Type const* varType = _variable.annotation().type;
 	solAssert(!!varType, "Variable type not provided.");
 
+	if (_variable.referenceLocation() == VariableDeclaration::Location::Transient)
+		m_errorReporter.unimplementedFeatureError(
+			6715_error,
+			_variable.location(),
+			"Transient storage is not yet implemented."
+		);
+
 	if (_variable.value())
 	{
 		if (_variable.isStateVariable() && varType->containsNestedMapping())
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 32fb9cae7b..2326d33363 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -585,8 +585,11 @@ void ContractCompiler::initializeStateVariables(ContractDefinition const& _contr
 {
 	solAssert(!_contract.isLibrary(), "Tried to initialize state variables of library.");
 	for (VariableDeclaration const* variable: _contract.stateVariables())
+	{
+		solUnimplementedAssert(variable->referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
 		if (variable->value() && !variable->isConstant())
 			ExpressionCompiler(m_context, m_optimiserSettings.runOrderLiterals).appendStateVariableInitialization(*variable);
+	}
 }
 
 bool ContractCompiler::visit(VariableDeclaration const& _variableDeclaration)
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 59585c762e..93136a1a26 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -821,8 +821,11 @@ std::string IRGenerator::initStateVariables(ContractDefinition const& _contract)
 {
 	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
 	for (VariableDeclaration const* variable: _contract.stateVariables())
+	{
+		solUnimplementedAssert(variable->referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
 		if (!variable->isConstant())
 			generator.initializeStateVar(*variable);
+	}
 
 	return generator.code();
 }
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/output.json b/test/cmdlineTests/storage_layout_transient_value_types/output.json
index a446210485..b77de93262 100644
--- a/test/cmdlineTests/storage_layout_transient_value_types/output.json
+++ b/test/cmdlineTests/storage_layout_transient_value_types/output.json
@@ -2,10 +2,61 @@
     "errors": [
         {
             "component": "general",
-            "formattedMessage": "Transient storage layout is not supported yet.",
-            "message": "Transient storage layout is not supported yet.",
+            "errorCode": "6715",
+            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
+ --> fileA:4:5:
+  |
+4 |     uint transient x;
+  |     ^^^^^^^^^^^^^^^^
+
+",
+            "message": "Transient storage is not yet implemented.",
             "severity": "error",
+            "sourceLocation": {
+                "end": 91,
+                "file": "fileA",
+                "start": 75
+            },
+            "type": "UnimplementedFeatureError"
+        },
+        {
+            "component": "general",
+            "errorCode": "6715",
+            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
+ --> fileA:6:5:
+  |
+6 |     bytes32 transient b;
+  |     ^^^^^^^^^^^^^^^^^^^
+
+",
+            "message": "Transient storage is not yet implemented.",
+            "severity": "error",
+            "sourceLocation": {
+                "end": 128,
+                "file": "fileA",
+                "start": 109
+            },
+            "type": "UnimplementedFeatureError"
+        },
+        {
+            "component": "general",
+            "errorCode": "6715",
+            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
+ --> fileA:8:5:
+  |
+8 |     address transient a;
+  |     ^^^^^^^^^^^^^^^^^^^
+
+",
+            "message": "Transient storage is not yet implemented.",
+            "severity": "error",
+            "sourceLocation": {
+                "end": 168,
+                "file": "fileA",
+                "start": 149
+            },
             "type": "UnimplementedFeatureError"
         }
-    ]
+    ],
+    "sources": {}
 }
diff --git a/test/libsolidity/astPropertyTests/transient_data_location.sol b/test/libsolidity/astPropertyTests/transient_data_location.sol
deleted file mode 100644
index 6a937414d6..0000000000
--- a/test/libsolidity/astPropertyTests/transient_data_location.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    /// TestVarDataLocation: storageLocation
-    /// TestVarName: name
-    uint transient transient;
-}
-// ----
-// TestVarDataLocation: transient
-// TestVarName: transient
diff --git a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
index b2dbc8efe5..cdb4461656 100644
--- a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
+++ b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// UnimplementedFeatureError 1834: Transient storage variables are not supported.
+// UnimplementedFeatureError 6715: (17-38): Transient storage is not yet implemented.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
index b82f40267e..7a3caa86e5 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
@@ -1,7 +1,5 @@
 contract C {
 	uint[] transient x;
 }
-// ====
-// stopAfter: analysis
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
index 3f7cec2a75..10b942e236 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
@@ -1,7 +1,5 @@
 contract C {
 	uint[3] transient x;
 }
-// ====
-// stopAfter: analysis
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
index 9deba463c1..a3d741bbe2 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
@@ -6,6 +6,10 @@ contract C {
     function () internal transient internal fiti;
     function () internal internal transient fiit;
 }
-// ====
-// stopAfter: analysis
 // ----
+// UnimplementedFeatureError 6715: (17-40): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (46-82): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (88-122): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (128-162): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (168-212): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (218-262): Transient storage is not yet implemented.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
index cd762df30e..2a21b3e00a 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
@@ -1,7 +1,6 @@
 contract C {
 	mapping(uint => uint) transient y;
 }
-// ====
-// stopAfter: analysis
+
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
index 2579d5532f..561d9f21da 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
@@ -7,6 +7,10 @@ contract C {
     uint transient internal ti;
     uint transient private tprv;
 }
-// ====
-// stopAfter: parsing
 // ----
+// UnimplementedFeatureError 6715: (17-43): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (49-75): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (81-108): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (115-141): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (147-173): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (179-206): Transient storage is not yet implemented.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
index 19612b9c57..f89608be42 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
@@ -6,7 +6,5 @@ struct S {
 contract C {
 	S transient s;
 }
-// ====
-// stopAfter: analysis
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
index 55faa1495d..ce2db200bb 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
@@ -7,6 +7,9 @@ contract C {
 	uint transient x;
 	bytes32 transient y;
 }
-// ====
-// stopAfter: parsing
 // ----
+// UnimplementedFeatureError 6715: (30-49): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (52-68): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (71-84): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (87-103): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (106-125): Transient storage is not yet implemented.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
index 10dad9e32f..33b7bb28cb 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
@@ -5,6 +5,7 @@ contract C {
 	address transient a = address(0xABC);
 	bool transient b = x > 0 ? false : true;
 }
-// ====
-// stopAfter: parsing
 // ----
+// UnimplementedFeatureError 6715: (30-51): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (54-90): Transient storage is not yet implemented.
+// UnimplementedFeatureError 6715: (93-132): Transient storage is not yet implemented.

From 0d01c93d96c6bed69b81f5fe784842125f9a887b Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 25 Jun 2024 16:28:45 +0200
Subject: [PATCH 0924/1140] SMTChecker: Fix formatting of unary minus
 expressions in invariants

Previously, unary minus expressions actually ended up formatted as
binary expressions in infix format, which meant that the unary minus
operator actually disappeared.

Additionally, SMTCheckerTest was actually always ignoring the invariant
message, and we fix that as well.
---
 Changelog.md                                        |  1 +
 libsolidity/formal/ExpressionFormatter.cpp          |  4 +++-
 scripts/error_codes.py                              |  1 -
 test/libsolidity/SMTCheckerTest.cpp                 |  5 +++--
 .../invariants/unary_minus_formatting.sol           | 13 +++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/invariants/unary_minus_formatting.sol

diff --git a/Changelog.md b/Changelog.md
index 698c7fb5d2..442c4e34f3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@ Compiler Features:
 
 Bugfixes:
  * SMTChecker: Fix error that reports invalid number of verified checks for BMC and CHC engines.
+ * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
diff --git a/libsolidity/formal/ExpressionFormatter.cpp b/libsolidity/formal/ExpressionFormatter.cpp
index cf2f2c3b81..5a3d11dbef 100644
--- a/libsolidity/formal/ExpressionFormatter.cpp
+++ b/libsolidity/formal/ExpressionFormatter.cpp
@@ -115,6 +115,8 @@ std::string formatUnaryOp(smtutil::Expression const& _expr, std::vector<std::str
 {
 	if (_expr.name == "not")
 		return "!" + _args.at(0);
+	if (_expr.name == "-")
+		return "-" + _args.at(0);
 	// Other operators such as exists may end up here.
 	return formatGenericOp(_expr, _args);
 }
@@ -166,7 +168,7 @@ std::string toSolidityStr(smtutil::Expression const& _expr)
 		{"mod", "%"}
 	};
 	// Some of these (and, or, +, *) may have >= 2 arguments from z3.
-	if (infixOps.count(op))
+	if (infixOps.count(op) && args.size() >= 2)
 		return formatInfixOp(infixOps.at(op), strArgs);
 
 	static std::set<std::string> const arrayOps{"select", "store", "const_array"};
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 6171714bd7..fcb6f0e7f5 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -203,7 +203,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
                 # Due to 3805, the warning lists look different for different compiler builds.
         "1920", # Unimplemented feature error from YulStack (currently there are no UnimplementedFeatureErrors thrown by libyul)
         "7053", # Unimplemented feature error (parsing stage), currently has no tests
-        "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
         "6240", # SMTChecker, covered by CL tests
     }
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 8149f3130c..c25025ccf7 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -107,8 +107,6 @@ SMTCheckerTest::SMTCheckerTest(std::string const& _filename):
 				filtered.emplace_back(e);
 		return filtered;
 	};
-	if (m_modelCheckerSettings.invariants.invariants.empty())
-		m_expectations = removeInv(std::move(m_expectations));
 
 	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "yes");
 	if (ignoreInv == "no")
@@ -118,6 +116,9 @@ SMTCheckerTest::SMTCheckerTest(std::string const& _filename):
 	else
 		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT invariant choice."));
 
+	if (m_modelCheckerSettings.invariants.invariants.empty())
+		m_expectations = removeInv(std::move(m_expectations));
+
 	auto const& ignoreOSSetting = m_reader.stringSetting("SMTIgnoreOS", "none");
 	for (std::string const& os: ignoreOSSetting | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
 	{
diff --git a/test/libsolidity/smtCheckerTests/invariants/unary_minus_formatting.sol b/test/libsolidity/smtCheckerTests/invariants/unary_minus_formatting.sol
new file mode 100644
index 0000000000..a413299019
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/invariants/unary_minus_formatting.sol
@@ -0,0 +1,13 @@
+contract C {
+        int x = -1;
+	function i() public view {
+		assert(x == -1);
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTIgnoreInv: no
+// SMTSolvers: eld
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1180: Contract invariant(s) for :C:\n(x = -1)\n

From 477c413bd9a5ddfa21f3c421210e0bd0bdb8a513 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Wed, 15 May 2024 17:29:39 +0200
Subject: [PATCH 0925/1140] yul literal value is struct of u256 + optional
 formatting hint or 'unlimited'

- unlimited is a string literal for which bytes restrictions don't hold; can occur in builtin function arguments
---
 .../codegen/ir/IRGeneratorForStatements.cpp   |   3 +-
 libsolutil/CommonData.cpp                     |   4 +-
 libsolutil/CommonData.h                       |   4 +-
 libyul/AST.cpp                                |  80 +++++++++
 libyul/AST.h                                  |  29 +++-
 libyul/ASTForward.h                           |   1 +
 libyul/AsmAnalysis.cpp                        |  40 +++--
 libyul/AsmJsonConverter.cpp                   |  17 +-
 libyul/AsmJsonImporter.cpp                    |  24 +--
 libyul/AsmParser.cpp                          |  20 ++-
 libyul/AsmParser.h                            |   4 +-
 libyul/AsmPrinter.cpp                         |  14 +-
 libyul/CMakeLists.txt                         |   1 +
 libyul/Dialect.cpp                            |  10 +-
 libyul/Dialect.h                              |   3 +-
 libyul/Utilities.cpp                          | 152 ++++++++++++++----
 libyul/Utilities.h                            |  21 ++-
 libyul/backends/evm/ConstantOptimiser.cpp     |   6 +-
 .../backends/evm/ControlFlowGraphBuilder.cpp  |   6 +-
 libyul/backends/evm/EVMCodeTransform.cpp      |   2 +-
 libyul/backends/evm/EVMDialect.cpp            |  16 +-
 libyul/backends/evm/EVMMetrics.cpp            |   2 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |   2 +-
 libyul/optimiser/BlockHasher.cpp              |  28 ++--
 libyul/optimiser/BlockHasher.h                |  11 +-
 .../CommonSubexpressionEliminator.cpp         |   2 +-
 libyul/optimiser/ConditionalUnsimplifier.cpp  |   4 +-
 libyul/optimiser/DataFlowAnalyzer.cpp         |   2 +-
 libyul/optimiser/DataFlowAnalyzer.h           |   2 +-
 libyul/optimiser/ExpressionSimplifier.cpp     |   4 +-
 libyul/optimiser/ForLoopConditionIntoBody.cpp |   2 +-
 .../optimiser/ForLoopConditionOutOfBody.cpp   |   2 +-
 libyul/optimiser/KnowledgeBase.cpp            |   4 +-
 libyul/optimiser/LoadResolver.cpp             |   5 +-
 libyul/optimiser/Metrics.cpp                  |   8 +-
 libyul/optimiser/SSAValueTracker.h            |   2 +-
 libyul/optimiser/SimplificationRules.cpp      |   6 +-
 libyul/optimiser/StackLimitEvader.cpp         |   4 +-
 libyul/optimiser/StackToMemoryMover.cpp       |  34 ++--
 libyul/optimiser/StackToMemoryMover.h         |   6 +-
 libyul/optimiser/StructuralSimplifier.cpp     |   6 +-
 libyul/optimiser/SyntacticalEquality.cpp      |  12 +-
 libyul/optimiser/SyntacticalEquality.h        |   3 +
 libyul/optimiser/UnusedStoreEliminator.cpp    |   6 +-
 .../disambiguator/similar_literals.yul        |  23 +++
 .../string_as_hex_and_hex_as_string.yul       |  13 ++
 .../constant_representation.yul               |  17 +-
 .../constant_representation_datasize.yul      |  48 ++++++
 .../yulSyntaxTests/switch_duplicate_case.yul  |   2 +-
 ...witch_duplicate_case_different_literal.yul |   2 +-
 .../EVMInstructionInterpreter.cpp             |   3 +-
 test/tools/yulInterpreter/Interpreter.cpp     |  18 +--
 52 files changed, 535 insertions(+), 205 deletions(-)
 create mode 100644 libyul/AST.cpp
 create mode 100644 test/libyul/yulOptimizerTests/disambiguator/similar_literals.yul
 create mode 100644 test/libyul/yulOptimizerTests/disambiguator/string_as_hex_and_hex_as_string.yul
 create mode 100644 test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation_datasize.yul

diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 2f823fcbf6..1c212cd828 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -37,6 +37,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
+#include <libyul/Utilities.h>
 #include <libyul/optimiser/ASTCopier.h>
 
 #include <liblangutil/Exceptions.h>
@@ -203,7 +204,7 @@ struct CopyTranslate: public yul::ASTCopier
 			solAssert(false);
 
 		if (isDigit(value.front()))
-			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::YulString{value}, {}};
+			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::valueOfNumberLiteral(value), {}};
 		else
 			return yul::Identifier{_identifier.debugData, yul::YulString{value}};
 	}
diff --git a/libsolutil/CommonData.cpp b/libsolutil/CommonData.cpp
index 69f08308c2..7b86bae9f4 100644
--- a/libsolutil/CommonData.cpp
+++ b/libsolutil/CommonData.cpp
@@ -161,7 +161,7 @@ std::string solidity::util::getChecksummedAddress(std::string const& _addr)
 	return ret;
 }
 
-bool solidity::util::isValidHex(std::string const& _string)
+bool solidity::util::isValidHex(std::string_view const _string)
 {
 	if (_string.substr(0, 2) != "0x")
 		return false;
@@ -170,7 +170,7 @@ bool solidity::util::isValidHex(std::string const& _string)
 	return true;
 }
 
-bool solidity::util::isValidDecimal(std::string const& _string)
+bool solidity::util::isValidDecimal(std::string_view const _string)
 {
 	if (_string.empty())
 		return false;
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index 6e17e674d6..c64b3913fc 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -584,8 +584,8 @@ bool passesAddressChecksum(std::string const& _str, bool _strict);
 /// @param hex strings that look like an address
 std::string getChecksummedAddress(std::string const& _addr);
 
-bool isValidHex(std::string const& _string);
-bool isValidDecimal(std::string const& _string);
+bool isValidHex(std::string_view _string);
+bool isValidDecimal(std::string_view _string);
 
 /// @returns a quoted string if all characters are printable ASCII chars,
 /// or its hex representation otherwise.
diff --git a/libyul/AST.cpp b/libyul/AST.cpp
new file mode 100644
index 0000000000..8c9f376415
--- /dev/null
+++ b/libyul/AST.cpp
@@ -0,0 +1,80 @@
+/*
+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/Exceptions.h>
+
+namespace solidity::yul
+{
+
+LiteralValue::LiteralValue(std::string _builtinStringLiteralValue):
+	m_numericValue(std::nullopt),
+	m_stringValue(std::make_shared<std::string>(std::move(_builtinStringLiteralValue)))
+{ }
+
+LiteralValue::LiteralValue(solidity::yul::LiteralValue::Data const& _data, std::optional<std::string> const& _hint):
+	m_numericValue(_data),
+	m_stringValue(_hint ? std::make_shared<std::string>(*_hint) : nullptr)
+{ }
+
+LiteralValue::Data const& LiteralValue::value() const
+{
+	yulAssert(!unlimited());
+	return *m_numericValue;
+}
+
+LiteralValue::BuiltinStringLiteralData const& LiteralValue::builtinStringLiteralValue() const
+{
+	yulAssert(unlimited());
+	return *m_stringValue;
+}
+
+bool LiteralValue::unlimited() const
+{
+	return !m_numericValue.has_value();
+}
+
+LiteralValue::RepresentationHint const& LiteralValue::hint() const
+{
+	yulAssert(!unlimited());
+	return m_stringValue;
+}
+
+bool LiteralValue::operator==(LiteralValue const& _rhs) const
+{
+	if (unlimited() != _rhs.unlimited())
+		return false;
+
+	if (unlimited())
+		return builtinStringLiteralValue() == _rhs.builtinStringLiteralValue();
+
+	return value() == _rhs.value();
+}
+
+bool LiteralValue::operator<(solidity::yul::LiteralValue const& _rhs) const
+{
+	if (unlimited() != _rhs.unlimited())
+		return unlimited() < _rhs.unlimited();
+
+	if (unlimited())
+		return builtinStringLiteralValue() < _rhs.builtinStringLiteralValue();
+
+	return value() < _rhs.value();
+}
+
+}
diff --git a/libyul/AST.h b/libyul/AST.h
index 4e3e92de3d..ad60e46859 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -28,6 +28,8 @@
 
 #include <liblangutil/DebugData.h>
 
+#include <libsolutil/Numeric.h>
+
 #include <memory>
 #include <optional>
 
@@ -41,7 +43,32 @@ using TypedNameList = std::vector<TypedName>;
 
 /// Literal number or string (up to 32 bytes)
 enum class LiteralKind { Number, Boolean, String };
-struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; YulString value; Type type; };
+/// Literal value that holds a u256 word of data, can be of LiteralKind type and - in case of arguments to
+/// builtins - exceed the u256 word (32 bytes), in which case the value is stored as string. The former is constructed
+/// via u256 word and optional hint and leads to unlimited == false, the latter is
+/// constructed via the string constructor and leads to unlimited == true.
+class LiteralValue {
+public:
+	using Data = u256;
+	using BuiltinStringLiteralData = std::string;
+	using RepresentationHint = std::shared_ptr<std::string>;
+
+	LiteralValue() = default;
+	explicit LiteralValue(std::string _builtinStringLiteralValue);
+	explicit LiteralValue(Data const& _data, std::optional<std::string> const& _hint = std::nullopt);
+
+	bool operator==(LiteralValue const& _rhs) const;
+	bool operator<(LiteralValue const& _rhs) const;
+	Data const& value() const;
+	BuiltinStringLiteralData const& builtinStringLiteralValue() const;
+	bool unlimited() const;
+	RepresentationHint const& hint() const;
+
+private:
+	std::optional<Data> m_numericValue;
+	std::shared_ptr<std::string> m_stringValue;
+};
+struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; LiteralValue value; Type type; };
 /// External / internal identifier or label reference
 struct Identifier { langutil::DebugData::ConstPtr debugData; YulString name; };
 /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
index a4dc5be3f8..12992edf88 100644
--- a/libyul/ASTForward.h
+++ b/libyul/ASTForward.h
@@ -29,6 +29,7 @@ namespace solidity::yul
 {
 
 enum class LiteralKind;
+class LiteralValue;
 struct Literal;
 struct Label;
 struct Identifier;
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index f85ef95442..ac97f988d4 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -41,7 +41,6 @@
 
 #include <fmt/format.h>
 
-#include <memory>
 #include <functional>
 
 using namespace std::string_literals;
@@ -104,24 +103,32 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect,
 std::vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
 {
 	expectValidType(_literal.type, nativeLocationOf(_literal));
-	if (_literal.kind == LiteralKind::String && _literal.value.str().size() > 32)
+	bool erroneousLiteralValue = false;
+	if (_literal.kind == LiteralKind::String && !_literal.value.unlimited() && _literal.value.hint() && _literal.value.hint()->size() > 32)
+	{
+		erroneousLiteralValue = true;
 		m_errorReporter.typeError(
 			3069_error,
 			nativeLocationOf(_literal),
-			"String literal too long (" + std::to_string(_literal.value.str().size()) + " > 32)"
+			"String literal too long (" + std::to_string(formatLiteral(_literal, false /* _validated */ ).size()) + " > 32)"
 		);
-	else if (_literal.kind == LiteralKind::Number && bigint(_literal.value.str()) > u256(-1))
+	}
+	else if (_literal.kind == LiteralKind::Number && _literal.value.hint() && bigint(*_literal.value.hint()) > u256(-1))
+	{
+		erroneousLiteralValue = true;
 		m_errorReporter.typeError(6708_error, nativeLocationOf(_literal), "Number literal too large (> 256 bits)");
-	else if (_literal.kind == LiteralKind::Boolean)
-		yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "");
+	}
 
 	if (!m_dialect.validTypeForLiteral(_literal.kind, _literal.value, _literal.type))
+	{
 		m_errorReporter.typeError(
 			5170_error,
 			nativeLocationOf(_literal),
-			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + _literal.value.str() + "\"."
+			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + formatLiteral(_literal) + "\"."
 		);
+	}
 
+	yulAssert(erroneousLiteralValue ^ validLiteral(_literal), "Invalid literal after validating it through AsmAnalyzer.");
 	return {_literal.type};
 }
 
@@ -420,23 +427,25 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				std::string functionName = _funCall.functionName.name.str();
 				if (functionName == "datasize" || functionName == "dataoffset")
 				{
-					if (!m_dataNames.count(std::get<Literal>(arg).value))
+					auto const& argumentAsLiteral = std::get<Literal>(arg);
+					if (!m_dataNames.count(YulString(formatLiteral(argumentAsLiteral))))
 						m_errorReporter.typeError(
 							3517_error,
 							nativeLocationOf(arg),
-							"Unknown data object \"" + std::get<Literal>(arg).value.str() + "\"."
+							"Unknown data object \"" + formatLiteral(argumentAsLiteral) + "\"."
 						);
 				}
 				else if (functionName.substr(0, "verbatim_"s.size()) == "verbatim_")
 				{
-					if (std::get<Literal>(arg).value.empty())
+					auto const& literalValue = std::get<Literal>(arg).value;
+					yulAssert(literalValue.unlimited());  // verbatim literals are always unlimited
+					if (literalValue.builtinStringLiteralValue().empty())
 						m_errorReporter.typeError(
 							1844_error,
 							nativeLocationOf(arg),
 							"The \"verbatim_*\" builtins cannot be used with empty bytecode."
 						);
 				}
-
 				argTypes.emplace_back(expectUnlimitedStringLiteral(std::get<Literal>(arg)));
 				continue;
 			}
@@ -495,12 +504,12 @@ void AsmAnalyzer::operator()(Switch const& _switch)
 			(*this)(*_case.value);
 
 			/// Note: the parser ensures there is only one default case
-			if (watcher.ok() && !cases.insert(valueOfLiteral(*_case.value)).second)
+			if (watcher.ok() && !cases.insert(_case.value->value.value()).second)
 				m_errorReporter.declarationError(
 					6792_error,
 					nativeLocationOf(_case),
 					"Duplicate case \"" +
-					valueOfLiteral(*_case.value).str() +
+					formatLiteral(*_case.value) +
 					"\" defined."
 				);
 		}
@@ -560,8 +569,9 @@ YulString AsmAnalyzer::expectExpression(Expression const& _expr)
 
 YulString AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 {
-	yulAssert(_literal.kind == LiteralKind::String, "");
-	yulAssert(m_dialect.validTypeForLiteral(LiteralKind::String, _literal.value, _literal.type), "");
+	yulAssert(_literal.kind == LiteralKind::String);
+	yulAssert(m_dialect.validTypeForLiteral(LiteralKind::String, _literal.value, _literal.type));
+	yulAssert(_literal.value.unlimited());
 
 	return {_literal.type};
 }
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index a89e4967aa..6047549754 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -20,9 +20,10 @@
  * Converts inline assembly AST to JSON format
  */
 
-#include <libyul/AsmJsonConverter.h>
 #include <libyul/AST.h>
+#include <libyul/AsmJsonConverter.h>
 #include <libyul/Exceptions.h>
+#include <libyul/Utilities.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/UTF8.h>
 
@@ -47,14 +48,11 @@ Json AsmJsonConverter::operator()(TypedName const& _node) const
 
 Json AsmJsonConverter::operator()(Literal const& _node) const
 {
+	yulAssert(validLiteral(_node));
 	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLiteral");
 	switch (_node.kind)
 	{
 	case LiteralKind::Number:
-		yulAssert(
-			util::isValidDecimal(_node.value.str()) || util::isValidHex(_node.value.str()),
-			"Invalid number literal"
-		);
 		ret["kind"] = "number";
 		break;
 	case LiteralKind::Boolean:
@@ -62,12 +60,15 @@ Json AsmJsonConverter::operator()(Literal const& _node) const
 		break;
 	case LiteralKind::String:
 		ret["kind"] = "string";
-		ret["hexValue"] = util::toHex(util::asBytes(_node.value.str()));
+		ret["hexValue"] = util::toHex(util::asBytes(formatLiteral(_node)));
 		break;
 	}
 	ret["type"] = _node.type.str();
-	if (util::validateUTF8(_node.value.str()))
-		ret["value"] = _node.value.str();
+	{
+		auto const formattedLiteral = formatLiteral(_node);
+		if (util::validateUTF8(formattedLiteral))
+			ret["value"] = formattedLiteral;
+	}
 	return ret;
 }
 
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 41e0658535..63b1d65d26 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -25,6 +25,7 @@
 #include <libyul/AsmJsonImporter.h>
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
+#include <libyul/Utilities.h>
 
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/Scanner.h>
@@ -165,26 +166,25 @@ Literal AsmJsonImporter::createLiteral(Json const& _node)
 	std::string kind = member(_node, "kind").get<std::string>();
 
 	solAssert(member(_node, "hexValue").is_string() || member(_node, "value").is_string(), "");
+	std::string value;
 	if (_node.contains("hexValue"))
-		lit.value = YulString{util::asString(util::fromHex(member(_node, "hexValue").get<std::string>()))};
+		value = util::asString(util::fromHex(member(_node, "hexValue").get<std::string>()));
 	else
-		lit.value = YulString{member(_node, "value").get<std::string>()};
-
-	lit.type= YulString{member(_node, "type").get<std::string>()};
-
+		value = member(_node, "value").get<std::string>();
+	lit.type = YulString{member(_node, "type").get<std::string>()};
 	if (kind == "number")
 	{
-		langutil::CharStream charStream(lit.value.str(), "");
+		langutil::CharStream charStream(value, "");
 		langutil::Scanner scanner{charStream};
 		lit.kind = LiteralKind::Number;
 		yulAssert(
 			scanner.currentToken() == Token::Number,
-			"Expected number but got " + langutil::TokenTraits::friendlyName(scanner.currentToken()) + std::string(" while scanning ") + lit.value.str()
+			"Expected number but got " + langutil::TokenTraits::friendlyName(scanner.currentToken()) + std::string(" while scanning ") + value
 		);
 	}
 	else if (kind == "bool")
 	{
-		langutil::CharStream charStream(lit.value.str(), "");
+		langutil::CharStream charStream(value, "");
 		langutil::Scanner scanner{charStream};
 		lit.kind = LiteralKind::Boolean;
 		yulAssert(
@@ -197,13 +197,17 @@ Literal AsmJsonImporter::createLiteral(Json const& _node)
 	{
 		lit.kind = LiteralKind::String;
 		yulAssert(
-			lit.value.str().size() <= 32,
-			"String literal too long (" + std::to_string(lit.value.str().size()) + " > 32)"
+			value.size() <= 32,
+			"String literal too long (" + std::to_string(value.size()) + " > 32)"
 		);
 	}
 	else
 		yulAssert(false, "unknown type of literal");
 
+	// import only for inline assembly, no unlimited string literals there
+	lit.value = valueOfLiteral(value, lit.kind, false /* _unlimitedLiteralArgument */);
+
+	yulAssert(validLiteral(lit));
 	return lit;
 }
 
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index a009b005d6..ecf3475a8a 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -24,6 +24,7 @@
 #include <libyul/AST.h>
 #include <libyul/AsmParser.h>
 #include <libyul/Exceptions.h>
+#include <libyul/Utilities.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/Scanner.h>
@@ -470,11 +471,11 @@ ForLoop Parser::parseForLoop()
 	return forLoop;
 }
 
-Expression Parser::parseExpression()
+Expression Parser::parseExpression(bool _unlimitedLiteralArgument)
 {
 	RecursionGuard recursionGuard(*this);
 
-	std::variant<Literal, Identifier> operation = parseLiteralOrIdentifier();
+	std::variant<Literal, Identifier> operation = parseLiteralOrIdentifier(_unlimitedLiteralArgument);
 	return visit(GenericVisitor{
 		[&](Identifier& _identifier) -> Expression
 		{
@@ -495,7 +496,7 @@ Expression Parser::parseExpression()
 	}, operation);
 }
 
-std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
+std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimitedLiteralArgument)
 {
 	RecursionGuard recursionGuard(*this);
 	switch (currentToken())
@@ -535,7 +536,7 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
 		Literal literal{
 			createDebugData(),
 			kind,
-			YulString{currentLiteral()},
+			valueOfLiteral(currentLiteral(), kind, _unlimitedLiteralArgument && kind == LiteralKind::String),
 			kind == LiteralKind::Boolean ? m_dialect.boolType : m_dialect.defaultType
 		};
 		advance();
@@ -639,15 +640,20 @@ FunctionCall Parser::parseCall(std::variant<Literal, Identifier>&& _initialOp)
 	FunctionCall ret;
 	ret.functionName = std::move(std::get<Identifier>(_initialOp));
 	ret.debugData = ret.functionName.debugData;
-
+	auto const isUnlimitedLiteralArgument = [f=m_dialect.builtin(ret.functionName.name)](size_t const index) {
+		if (f && index < f->literalArguments.size())
+			return f->literalArgument(index).has_value();
+		return false;
+	};
+	size_t argumentIndex {0};
 	expectToken(Token::LParen);
 	if (currentToken() != Token::RParen)
 	{
-		ret.arguments.emplace_back(parseExpression());
+		ret.arguments.emplace_back(parseExpression(isUnlimitedLiteralArgument(argumentIndex++)));
 		while (currentToken() != Token::RParen)
 		{
 			expectToken(Token::Comma);
-			ret.arguments.emplace_back(parseExpression());
+			ret.arguments.emplace_back(parseExpression(isUnlimitedLiteralArgument(argumentIndex++)));
 		}
 	}
 	updateLocationEndFrom(ret.debugData, currentLocation());
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index dd91e436e2..3348904091 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -138,10 +138,10 @@ class Parser: public langutil::ParserBase
 	Case parseCase();
 	ForLoop parseForLoop();
 	/// Parses a functional expression that has to push exactly one stack element
-	Expression parseExpression();
+	Expression parseExpression(bool _unlimitedLiteralArgument = false);
 	/// Parses an elementary operation, i.e. a literal, identifier, instruction or
 	/// builtin function call (only the name).
-	std::variant<Literal, Identifier> parseLiteralOrIdentifier();
+	std::variant<Literal, Identifier> parseLiteralOrIdentifier(bool _unlimitedLiteralArgument = false);
 	VariableDeclaration parseVariableDeclaration();
 	FunctionDefinition parseFunctionDefinition();
 	FunctionCall parseCall(std::variant<Literal, Identifier>&& _initialOp);
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index b27af03713..191fc5d2d6 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -25,6 +25,7 @@
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Dialect.h>
+#include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/StringUtils.h>
@@ -34,8 +35,8 @@
 
 #include <range/v3/view/transform.hpp>
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 using namespace solidity;
 using namespace solidity::langutil;
@@ -44,21 +45,22 @@ using namespace solidity::yul;
 
 std::string AsmPrinter::operator()(Literal const& _literal)
 {
+	yulAssert(validLiteral(_literal));
+
 	std::string const locationComment = formatDebugData(_literal);
+	std::string const formattedValue = formatLiteral(_literal);
 
 	switch (_literal.kind)
 	{
 	case LiteralKind::Number:
-		yulAssert(isValidDecimal(_literal.value.str()) || isValidHex(_literal.value.str()), "Invalid number literal");
-		return locationComment + _literal.value.str() + appendTypeName(_literal.type);
+		return locationComment + formattedValue + appendTypeName(_literal.type);
 	case LiteralKind::Boolean:
-		yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "Invalid bool literal.");
-		return locationComment + ((_literal.value == "true"_yulstring) ? "true" : "false") + appendTypeName(_literal.type, true);
+		return locationComment + formattedValue + appendTypeName(_literal.type, true);
 	case LiteralKind::String:
 		break;
 	}
 
-	return locationComment + escapeAndQuoteString(_literal.value.str()) + appendTypeName(_literal.type);
+	return locationComment + escapeAndQuoteString(formattedValue) + appendTypeName(_literal.type);
 }
 
 std::string AsmPrinter::operator()(Identifier const& _identifier)
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 811a6239b7..92b03facfe 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(yul
 	AsmAnalysis.h
 	AsmAnalysisInfo.h
 	AST.h
+	AST.cpp
 	ASTForward.h
 	AsmJsonConverter.h
 	AsmJsonConverter.cpp
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index 8440698f13..69ca1e9dc6 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -28,20 +28,20 @@ using namespace solidity::langutil;
 Literal Dialect::zeroLiteralForType(solidity::yul::YulString _type) const
 {
 	if (_type == boolType && _type != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, "false"_yulstring, _type};
-	return {DebugData::create(), LiteralKind::Number, "0"_yulstring, _type};
+		return {DebugData::create(), LiteralKind::Boolean, LiteralValue(false), _type};
+	return {DebugData::create(), LiteralKind::Number, LiteralValue(0, std::nullopt), _type};
 }
 
 
 Literal Dialect::trueLiteral() const
 {
 	if (boolType != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, "true"_yulstring, boolType};
+		return {DebugData::create(), LiteralKind::Boolean, LiteralValue(true), boolType};
 	else
-		return {DebugData::create(), LiteralKind::Number, "1"_yulstring, defaultType};
+		return {DebugData::create(), LiteralKind::Number, LiteralValue(1), defaultType};
 }
 
-bool Dialect::validTypeForLiteral(LiteralKind _kind, YulString, YulString _type) const
+bool Dialect::validTypeForLiteral(LiteralKind _kind, LiteralValue const&, YulString _type) const
 {
 	if (_kind == LiteralKind::Boolean)
 		return _type == boolType;
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
index e7a5e48273..e3f270357f 100644
--- a/libyul/Dialect.h
+++ b/libyul/Dialect.h
@@ -35,6 +35,7 @@ namespace solidity::yul
 class YulString;
 using Type = YulString;
 enum class LiteralKind;
+class LiteralValue;
 struct Literal;
 
 struct BuiltinFunction
@@ -85,7 +86,7 @@ struct Dialect
 
 	/// Check whether the given type is legal for the given literal value.
 	/// Should only be called if the type exists in the dialect at all.
-	virtual bool validTypeForLiteral(LiteralKind _kind, YulString _value, YulString _type) const;
+	virtual bool validTypeForLiteral(LiteralKind _kind, LiteralValue const& _value, YulString _type) const;
 
 	virtual Literal zeroLiteralForType(YulString _type) const;
 	virtual Literal trueLiteral() const;
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index 8242553d37..6a78441cba 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -86,56 +86,134 @@ std::string solidity::yul::reindent(std::string const& _code)
 	return out.str();
 }
 
-u256 solidity::yul::valueOfNumberLiteral(Literal const& _literal)
+LiteralValue solidity::yul::valueOfNumberLiteral(std::string_view const _literal)
 {
-	yulAssert(_literal.kind == LiteralKind::Number, "Expected number literal!");
+	return LiteralValue{LiteralValue::Data(_literal), std::string(_literal)};
+}
+
+LiteralValue solidity::yul::valueOfStringLiteral(std::string_view const _literal)
+{
+	std::string const s(_literal);
+	return LiteralValue{u256(h256(s, h256::FromBinary, h256::AlignLeft)), s};
+}
+
+LiteralValue solidity::yul::valueOfBuiltinStringLiteralArgument(std::string_view _literal)
+{
+	return LiteralValue{std::string(_literal)};
+}
 
-	static std::map<YulString, u256> numberCache;
-	static YulStringRepository::ResetCallback callback{[&] { numberCache.clear(); }};
+LiteralValue solidity::yul::valueOfBoolLiteral(std::string_view const _literal)
+{
+	if (_literal == "true")
+		return LiteralValue{true};
+	else if (_literal == "false")
+		return LiteralValue{false};
+
+	yulAssert(false, "Unexpected bool literal value!");
+}
 
-	auto&& [it, isNew] = numberCache.try_emplace(_literal.value, 0);
-	if (isNew)
+LiteralValue solidity::yul::valueOfLiteral(std::string_view const _literal, LiteralKind const& _kind, bool const _unlimitedLiteralArgument)
+{
+	switch (_kind)
 	{
-		std::string const& literalString = _literal.value.str();
-		yulAssert(isValidDecimal(literalString) || isValidHex(literalString), "Invalid number literal!");
-		it->second = u256(literalString);
+	case LiteralKind::Number:
+		return valueOfNumberLiteral(_literal);
+	case LiteralKind::Boolean:
+		return valueOfBoolLiteral(_literal);
+	case LiteralKind::String:
+		return _unlimitedLiteralArgument ? valueOfBuiltinStringLiteralArgument(_literal) : valueOfStringLiteral(_literal);
 	}
-	return it->second;
+	util::unreachable();
 }
 
-u256 solidity::yul::valueOfStringLiteral(Literal const& _literal)
+std::string solidity::yul::formatLiteral(solidity::yul::Literal const& _literal, bool const _validated)
 {
-	yulAssert(_literal.kind == LiteralKind::String, "Expected string literal!");
-	yulAssert(_literal.value.str().size() <= 32, "Literal string too long!");
+	if (_validated)
+		yulAssert(validLiteral(_literal), "Encountered invalid literal in formatLiteral.");
+
+	if (_literal.value.unlimited())
+		return _literal.value.builtinStringLiteralValue();
+
+	if (_literal.value.hint())
+		return *_literal.value.hint();
+
+	if (_literal.kind == LiteralKind::Boolean)
+		return _literal.value.value() == false ? "false" : "true";
 
-	return u256(h256(_literal.value.str(), h256::FromBinary, h256::AlignLeft));
+	// if there is no hint and it is not a boolean, just stringify the u256 word
+	return _literal.value.value().str();
 }
 
-u256 yul::valueOfBoolLiteral(Literal const& _literal)
+bool solidity::yul::validLiteral(solidity::yul::Literal const& _literal)
 {
-	yulAssert(_literal.kind == LiteralKind::Boolean, "Expected bool literal!");
+	switch (_literal.kind)
+	{
+	case LiteralKind::Number:
+		return validNumberLiteral(_literal);
+	case LiteralKind::Boolean:
+		return validBoolLiteral(_literal);
+	case LiteralKind::String:
+		return validStringLiteral(_literal);
+	}
+	util::unreachable();
+}
 
-	if (_literal.value == "true"_yulstring)
-		return u256(1);
-	else if (_literal.value == "false"_yulstring)
-		return u256(0);
+bool solidity::yul::validStringLiteral(solidity::yul::Literal const& _literal)
+{
+	if (_literal.kind != LiteralKind::String)
+		return false;
 
-	yulAssert(false, "Unexpected bool literal value!");
+	if (_literal.value.unlimited())
+		return true;
+
+	if (_literal.value.hint())
+		return _literal.value.hint()->size() <= 32 && _literal.value.value() == valueOfLiteral(*_literal.value.hint(), _literal.kind).value();
+
+	return true;
 }
 
-u256 solidity::yul::valueOfLiteral(Literal const& _literal)
+bool solidity::yul::validNumberLiteral(solidity::yul::Literal const& _literal)
 {
-	switch (_literal.kind)
+	if (_literal.kind != LiteralKind::Number || _literal.value.unlimited())
+		return false;
+
+	if (!_literal.value.hint())
+		return true;
+
+	auto const& repr = *_literal.value.hint();
+
+	if (!isValidDecimal(repr) && !isValidHex(repr))
+		return false;
+
+	if (bigint(repr) > u256(-1))
+		return false;
+
+	if (_literal.value.value() != valueOfLiteral(repr, _literal.kind).value())
+		return false;
+
+	return true;
+}
+
+bool solidity::yul::validBoolLiteral(solidity::yul::Literal const& _literal)
+{
+	if (_literal.kind != LiteralKind::Boolean || _literal.value.unlimited())
+		return false;
+
+	if (_literal.value.hint() && !(*_literal.value.hint() == "true" || *_literal.value.hint() == "false"))
+		return false;
+
+	yulAssert(u256(0) == u256(false));
+	yulAssert(u256(1) == u256(true));
+
+	if (_literal.value.hint())
 	{
-		case LiteralKind::Number:
-			return valueOfNumberLiteral(_literal);
-		case LiteralKind::Boolean:
-			return valueOfBoolLiteral(_literal);
-		case LiteralKind::String:
-			return valueOfStringLiteral(_literal);
-		default:
-			yulAssert(false, "Unexpected literal kind!");
+		if (*_literal.value.hint() == "false")
+			return _literal.value.value() == false;
+		else
+			return _literal.value.value() == true;
 	}
+
+	return _literal.value.value() == true || _literal.value.value() == false;
 }
 
 template<>
@@ -144,10 +222,14 @@ bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const
 	if (std::make_tuple(_lhs.kind, _lhs.type) != std::make_tuple(_rhs.kind, _rhs.type))
 		return std::make_tuple(_lhs.kind, _lhs.type) < std::make_tuple(_rhs.kind, _rhs.type);
 
-	if (_lhs.kind == LiteralKind::Number)
-		return valueOfNumberLiteral(_lhs) < valueOfNumberLiteral(_rhs);
-	else
-		return _lhs.value < _rhs.value;
+	if (_lhs.value.unlimited() && _rhs.value.unlimited())
+		yulAssert(
+			_lhs.kind == LiteralKind::String && _rhs.kind == LiteralKind::String,
+			"Cannot have unlimited value that is not of String kind."
+		);
+
+	return _lhs.value < _rhs.value;
+
 }
 
 bool SwitchCaseCompareByLiteralValue::operator()(Case const* _lhs, Case const* _rhs) const
diff --git a/libyul/Utilities.h b/libyul/Utilities.h
index e4d496cd4e..434c5e9c5a 100644
--- a/libyul/Utilities.h
+++ b/libyul/Utilities.h
@@ -25,15 +25,28 @@
 #include <libsolutil/Numeric.h>
 #include <libyul/ASTForward.h>
 
+#include <string_view>
+
 namespace solidity::yul
 {
 
 std::string reindent(std::string const& _code);
 
-u256 valueOfNumberLiteral(Literal const& _literal);
-u256 valueOfStringLiteral(Literal const& _literal);
-u256 valueOfBoolLiteral(Literal const& _literal);
-u256 valueOfLiteral(Literal const& _literal);
+LiteralValue valueOfNumberLiteral(std::string_view _literal);
+LiteralValue valueOfStringLiteral(std::string_view _literal);
+LiteralValue valueOfBuiltinStringLiteralArgument(std::string_view _literal);
+LiteralValue valueOfBoolLiteral(std::string_view _literal);
+LiteralValue valueOfLiteral(std::string_view _literal, LiteralKind const& _kind, bool _unlimitedLiteralArgument = false);
+bool validLiteral(Literal const& _literal);
+bool validStringLiteral(Literal const& _literal);
+bool validNumberLiteral(Literal const& _literal);
+bool validBoolLiteral(Literal const& _literal);
+
+/// Produces a string representation of a Literal instance.
+/// @param _literal the Literal to be formatted
+/// @param _validated whether the Literal was already validated, i.e., assumptions are asserted in the method
+/// @returns the literal's string representation
+std::string formatLiteral(Literal const& _literal, bool _validated = true);
 
 /**
  * Linear order on Yul AST nodes.
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index c5a33e52f4..7b17f7d890 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -81,7 +81,7 @@ struct MiniEVMInterpreter
 	}
 	u256 operator()(Literal const& _literal)
 	{
-		return valueOfLiteral(_literal);
+		return _literal.value.value();
 	}
 	u256 operator()(Identifier const&) { yulAssert(false, ""); }
 
@@ -100,7 +100,7 @@ void ConstantOptimiser::visit(Expression& _e)
 		if (
 			Expression const* repr =
 				RepresentationFinder(m_dialect, m_meter, debugDataOf(_e), m_cache)
-				.tryFindRepresentation(valueOfLiteral(literal))
+				.tryFindRepresentation(literal.value.value())
 		)
 			_e = ASTCopier{}.translate(*repr);
 	}
@@ -179,7 +179,7 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 Representation RepresentationFinder::represent(u256 const& _value) const
 {
 	Representation repr;
-	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, YulString{formatNumber(_value)}, {}});
+	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, LiteralValue{_value, formatNumber(_value)}, {}});
 	repr.cost = m_meter.costs(*repr.expression);
 	return repr;
 }
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index f048e5717e..a5e9613b58 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -245,7 +245,7 @@ ControlFlowGraphBuilder::ControlFlowGraphBuilder(
 
 StackSlot ControlFlowGraphBuilder::operator()(Literal const& _literal)
 {
-	return LiteralSlot{valueOfLiteral(_literal), _literal.debugData};
+	return LiteralSlot{_literal.value.value(), _literal.debugData};
 }
 
 StackSlot ControlFlowGraphBuilder::operator()(Identifier const& _identifier)
@@ -361,7 +361,7 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 			{*_case.value, Identifier{{}, ghostVariableName}}
 		});
 		CFG::Operation& operation = m_currentBlock->operations.emplace_back(CFG::Operation{
-			Stack{ghostVarSlot, LiteralSlot{valueOfLiteral(*_case.value), debugDataOf(*_case.value)}},
+			Stack{ghostVarSlot, LiteralSlot{_case.value->value.value(), debugDataOf(*_case.value)}},
 			Stack{TemporarySlot{ghostCall, 0}},
 			CFG::BuiltinCall{debugDataOf(_case), *equalityBuiltin, ghostCall, 2},
 		});
@@ -399,7 +399,7 @@ void ControlFlowGraphBuilder::operator()(ForLoop const& _loop)
 
 	std::optional<bool> constantCondition;
 	if (auto const* literalCondition = std::get_if<yul::Literal>(_loop.condition.get()))
-		constantCondition = valueOfLiteral(*literalCondition) != 0;
+		constantCondition = literalCondition->value.value() != 0;
 
 	CFG::BasicBlock& loopCondition = m_graph.makeBlock(debugDataOf(*_loop.condition));
 	CFG::BasicBlock& loopBody = m_graph.makeBlock(debugDataOf(_loop.body));
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 50e48f7681..bdce395ef8 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -297,7 +297,7 @@ void CodeTransform::operator()(Identifier const& _identifier)
 void CodeTransform::operator()(Literal const& _literal)
 {
 	m_assembly.setSourceLocation(originLocationOf(_literal));
-	m_assembly.appendConstant(valueOfLiteral(_literal));
+	m_assembly.appendConstant(_literal.value.value());
 }
 
 void CodeTransform::operator()(If const& _if)
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 6a3b34f977..856689c91a 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -219,7 +219,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 		) {
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
-			_assembly.appendLinkerSymbol(std::get<Literal>(arg).value.str());
+			_assembly.appendLinkerSymbol(formatLiteral(std::get<Literal>(arg)));
 		}));
 
 		builtins.emplace(createFunction(
@@ -236,7 +236,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 				yulAssert(_call.arguments.size() == 1, "");
 				Literal const* literal = std::get_if<Literal>(&_call.arguments.front());
 				yulAssert(literal, "");
-				_assembly.appendConstant(valueOfLiteral(*literal));
+				_assembly.appendConstant(literal->value.value());
 			})
 		);
 
@@ -248,7 +248,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_context.currentObject, "No object available.");
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
-			YulString dataName = std::get<Literal>(arg).value;
+			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
 			if (_context.currentObject->name == dataName)
 				_assembly.appendAssemblySize();
 			else
@@ -269,7 +269,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_context.currentObject, "No object available.");
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
-			YulString dataName = std::get<Literal>(arg).value;
+			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
 			if (_context.currentObject->name == dataName)
 				_assembly.appendConstant(0);
 			else
@@ -328,8 +328,8 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 				BuiltinContext&
 			) {
 				yulAssert(_call.arguments.size() == 3, "");
-				YulString identifier = std::get<Literal>(_call.arguments[1]).value;
-				_assembly.appendImmutableAssignment(identifier.str());
+				auto const identifier = (formatLiteral(std::get<Literal>(_call.arguments[1])));
+				_assembly.appendImmutableAssignment(identifier);
 			}
 		));
 		builtins.emplace(createFunction(
@@ -344,7 +344,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 				BuiltinContext&
 			) {
 				yulAssert(_call.arguments.size() == 1, "");
-				_assembly.appendImmutable(std::get<Literal>(_call.arguments.front()).value.str());
+				_assembly.appendImmutable(formatLiteral(std::get<Literal>(_call.arguments.front())));
 			}
 		));
 	}
@@ -450,7 +450,7 @@ BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, siz
 				Expression const& bytecode = _call.arguments.front();
 
 				_assembly.appendVerbatim(
-					asBytes(std::get<Literal>(bytecode).value.str()),
+					asBytes(formatLiteral(std::get<Literal>(bytecode))),
 					_arguments,
 					_returnVariables
 				);
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index 09c6abdd14..84ebdab1d2 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -91,7 +91,7 @@ void GasMeterVisitor::operator()(Literal const& _lit)
 	m_dataGas +=
 		singleByteDataGas() +
 		evmasm::GasMeter::dataGas(
-			toCompactBigEndian(valueOfLiteral(_lit), 1),
+			toCompactBigEndian(_lit.value.value(), 1),
 			m_isCreation,
 			m_dialect.evmVersion()
 		);
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index a3052a542f..047014e3dc 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -224,7 +224,7 @@ void OptimizedEVMCodeTransform::validateSlot(StackSlot const& _slot, Expression
 	std::visit(util::GenericVisitor{
 		[&](yul::Literal const& _literal) {
 			auto* literalSlot = std::get_if<LiteralSlot>(&_slot);
-			yulAssert(literalSlot && valueOfLiteral(_literal) == literalSlot->value, "");
+			yulAssert(literalSlot && _literal.value.value() == literalSlot->value, "");
 		},
 		[&](yul::Identifier const& _identifier) {
 			auto* variableSlot = std::get_if<VariableSlot>(&_slot);
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 380cc15fb3..d5febca932 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -41,6 +41,18 @@ static constexpr uint64_t compileTimeLiteralHash(char const (&_literal)[N])
 }
 }
 
+void ASTHasherBase::hashLiteral(solidity::yul::Literal const& _literal)
+{
+	hash64(compileTimeLiteralHash("Literal"));
+	if (!_literal.value.unlimited())
+		hash64(std::hash<u256>{}(_literal.value.value()));
+	else
+		hash64(std::hash<std::string>{}(_literal.value.builtinStringLiteralValue()));
+	hash64(_literal.type.hash());
+	hash8(static_cast<uint8_t>(_literal.kind));
+	hash8(_literal.value.unlimited());
+}
+
 std::map<Block const*, uint64_t> BlockHasher::run(Block const& _block)
 {
 	std::map<Block const*, uint64_t> result;
@@ -51,13 +63,7 @@ std::map<Block const*, uint64_t> BlockHasher::run(Block const& _block)
 
 void BlockHasher::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));
+	hashLiteral(_literal);
 }
 
 void BlockHasher::operator()(Identifier const& _identifier)
@@ -203,13 +209,7 @@ uint64_t ExpressionHasher::run(Expression const& _e)
 
 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));
+	hashLiteral(_literal);
 }
 
 void ExpressionHasher::operator()(Identifier const& _identifier)
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
index 6dc55371cc..2b9a71f101 100644
--- a/libyul/optimiser/BlockHasher.h
+++ b/libyul/optimiser/BlockHasher.h
@@ -55,10 +55,15 @@ class HasherBase
 		hash32(static_cast<uint32_t>(_value >> 32));
 	}
 
-
 	uint64_t m_hash = fnvEmptyHash;
 };
 
+class ASTHasherBase: public HasherBase
+{
+protected:
+	void hashLiteral(solidity::yul::Literal const& _literal);
+};
+
 /**
  * Optimiser component that calculates hash values for blocks.
  * Syntactically equal blocks will have identical hashes and
@@ -73,7 +78,7 @@ class HasherBase
  *
  * Prerequisite: Disambiguator, ForLoopInitRewriter
  */
-class BlockHasher: public ASTWalker, public HasherBase
+class BlockHasher: public ASTWalker, public ASTHasherBase
 {
 public:
 
@@ -120,7 +125,7 @@ class BlockHasher: public ASTWalker, public HasherBase
  * 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
+class ExpressionHasher: public ASTWalker, public ASTHasherBase
 {
 public:
 	/// Computes a hash of an expression that (in contrast to the behaviour of the class)
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index ae55f75e98..1c7879056d 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -114,7 +114,7 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 				if (
 					m_returnVariables.count(variable) &&
 					std::holds_alternative<Literal>(*value->value) &&
-					valueOfLiteral(std::get<Literal>(*value->value)) == 0
+					std::get<Literal>(*value->value).value.value() == 0
 				)
 					continue;
 				// We check for syntactic equality again because the value might have changed.
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index 2af09af04b..104ec1e4f0 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -59,7 +59,7 @@ void ConditionalUnsimplifier::operator()(Switch& _switch)
 					assignment.variableNames.size() == 1 &&
 					assignment.variableNames.front().name == expr &&
 					std::holds_alternative<Literal>(*assignment.value) &&
-					valueOfLiteral(std::get<Literal>(*assignment.value)) == valueOfLiteral(*_case.value)
+					std::get<Literal>(*assignment.value).value == _case.value->value
 				)
 					_case.body.statements.erase(_case.body.statements.begin());
 			}
@@ -95,7 +95,7 @@ void ConditionalUnsimplifier::operator()(Block& _block)
 							assignment.variableNames.size() == 1 &&
 							assignment.variableNames.front().name == condition &&
 							std::holds_alternative<Literal>(*assignment.value) &&
-							valueOfLiteral(std::get<Literal>(*assignment.value)) == 0
+							std::get<Literal>(*assignment.value).value.value() == 0
 						)
 							return {make_vector<Statement>(std::move(_stmt1))};
 					}
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 5992c9b985..5ec3cf248d 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -414,7 +414,7 @@ std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name)
 {
 	if (AssignedValue const* value = variableValue(_name))
 		if (Literal const* literal = std::get_if<Literal>(value->value))
-			return valueOfLiteral(*literal);
+			return literal->value.value();
 	return std::nullopt;
 }
 
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index b449357e66..e41620b15f 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -217,7 +217,7 @@ class DataFlowAnalyzer: public ASTModifier
 	};
 	/// Special expression whose address will be used in m_value.
 	/// YulString does not need to be reset because DataFlowAnalyzer is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
+	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue{0, "0"}, {}}};
 	/// List of scopes.
 	std::vector<Scope> m_variableScopes;
 };
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index c87c5df23f..6d0a8c9d74 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -60,14 +60,14 @@ void ExpressionSimplifier::visit(Expression& _expression)
 						!knownToBeZero(startArgument) &&
 						!std::holds_alternative<FunctionCall>(startArgument)
 					)
-						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, "0"_yulstring, {}};
+						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, LiteralValue{0, "0"}, {}};
 				}
 }
 
 bool ExpressionSimplifier::knownToBeZero(Expression const& _expression) const
 {
 	if (auto const* literal = std::get_if<Literal>(&_expression))
-		return valueOfLiteral(*literal) == 0;
+		return literal->value.value() == 0;
 	else if (auto const* identifier = std::get_if<Identifier>(&_expression))
 		return valueOfIdentifier(identifier->name) == 0;
 	else
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index 33d8496f08..df9847376a 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -58,7 +58,7 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 			Literal {
 				debugData,
 				LiteralKind::Boolean,
-				"true"_yulstring,
+				LiteralValue{true},
 				m_dialect.boolType
 			}
 		);
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index e2451bc6c6..83b1e20a8e 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -38,7 +38,7 @@ void ForLoopConditionOutOfBody::operator()(ForLoop& _forLoop)
 	if (
 		!m_dialect.booleanNegationFunction() ||
 		!std::holds_alternative<Literal>(*_forLoop.condition) ||
-		valueOfLiteral(std::get<Literal>(*_forLoop.condition)) == u256(0) ||
+		std::get<Literal>(*_forLoop.condition).value.value() == 0 ||
 		_forLoop.body.statements.empty() ||
 		!std::holds_alternative<If>(_forLoop.body.statements.front())
 	)
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index c280ecf14e..79eb2b3179 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -78,7 +78,7 @@ std::optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expre
 	if (Identifier const* ident = std::get_if<Identifier>(&_expression))
 		return valueIfKnownConstant(ident->name);
 	else if (Literal const* lit = std::get_if<Literal>(&_expression))
-		return valueOfLiteral(*lit);
+		return lit->value.value();
 	else
 		return std::nullopt;
 }
@@ -113,7 +113,7 @@ KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
 {
 	if (Literal const* literal = std::get_if<Literal>(&_value))
-		return VariableOffset{YulString{}, valueOfLiteral(*literal)};
+		return VariableOffset{YulString{}, literal->value.value()};
 	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
 		return explore(identifier->name);
 	else if (FunctionCall const* f = std::get_if<FunctionCall>(&_value))
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index 84094c33e0..170eefc902 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -125,7 +125,7 @@ void LoadResolver::tryEvaluateKeccak(
 			{},
 			LiteralKind::Number,
 			// a dummy 256-bit number to represent the Keccak256 hash.
-			YulString{std::numeric_limits<u256>::max().str()},
+			LiteralValue{std::numeric_limits<u256>::max()},
 			{}
 		}
 	);
@@ -146,10 +146,11 @@ void LoadResolver::tryEvaluateKeccak(
 		{
 			bytes contentAsBytes = toBigEndian(*memoryContent);
 			contentAsBytes.resize(static_cast<size_t>(*byteLength));
+			u256 const contentHash (keccak256(contentAsBytes));
 			_e = Literal{
 				debugDataOf(_e),
 				LiteralKind::Number,
-				YulString{u256(keccak256(contentAsBytes)).str()},
+				LiteralValue{contentHash},
 				m_dialect.defaultType
 			};
 		}
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index 42845f3b66..2f1dee93ea 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -71,7 +71,7 @@ size_t CodeWeights::costOf(Expression const& _expression) const
 	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)
+		if (literal->kind != LiteralKind::String && literal->value.value() == 0)
 			return literalZeroCost;
 		else
 			return literalCost;
@@ -155,15 +155,15 @@ void CodeCost::operator()(Literal const& _literal)
 	case LiteralKind::Boolean:
 		break;
 	case LiteralKind::Number:
-		for (u256 n = u256(_literal.value.str()); n >= 0x100; n >>= 8)
+		for (u256 n = _literal.value.value(); n >= 0x100; n >>= 8)
 			cost++;
-		if (valueOfLiteral(_literal) == 0)
+		if (_literal.value.value() == 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();
+		cost = formatLiteral(_literal).size();
 		break;
 	}
 
diff --git a/libyul/optimiser/SSAValueTracker.h b/libyul/optimiser/SSAValueTracker.h
index f1c93ff229..5a7eee5124 100644
--- a/libyul/optimiser/SSAValueTracker.h
+++ b/libyul/optimiser/SSAValueTracker.h
@@ -57,7 +57,7 @@ class SSAValueTracker: public ASTWalker
 
 	/// Special expression whose address will be used in m_values.
 	/// YulString does not need to be reset because SSAValueTracker is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
+	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
 	std::map<YulString, Expression const*> m_values;
 };
 
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 7fe56026ac..e2d4683290 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -160,7 +160,7 @@ bool Pattern::matches(
 		Literal const& literal = std::get<Literal>(*expr);
 		if (literal.kind != LiteralKind::Number)
 			return false;
-		if (m_data && *m_data != u256(literal.value.str()))
+		if (m_data && *m_data != literal.value.value())
 			return false;
 		assertThrow(m_arguments.empty(), OptimizerException, "");
 	}
@@ -241,7 +241,7 @@ Expression Pattern::toExpression(langutil::DebugData::ConstPtr const& _debugData
 	if (m_kind == PatternKind::Constant)
 	{
 		assertThrow(m_data, OptimizerException, "No match group and no constant value given.");
-		return Literal{_debugData, LiteralKind::Number, YulString{formatNumber(*m_data)}, {}};
+		return Literal{_debugData, LiteralKind::Number, LiteralValue{*m_data, formatNumber(*m_data)}, {}};
 	}
 	else if (m_kind == PatternKind::Operation)
 	{
@@ -261,7 +261,7 @@ Expression Pattern::toExpression(langutil::DebugData::ConstPtr const& _debugData
 
 u256 Pattern::d() const
 {
-	return valueOfNumberLiteral(std::get<Literal>(matchGroupValue()));
+	return std::get<Literal>(matchGroupValue()).value.value();
 }
 
 Expression const& Pattern::matchGroupValue() const
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 5d7f7fe5d4..904ee77e00 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -113,7 +113,7 @@ u256 literalArgumentValue(FunctionCall const& _call)
 	yulAssert(_call.arguments.size() == 1, "");
 	Literal const* literal = std::get_if<Literal>(&_call.arguments.front());
 	yulAssert(literal && literal->kind == LiteralKind::Number, "");
-	return valueOfLiteral(*literal);
+	return literal->value.value();
 }
 }
 
@@ -210,6 +210,6 @@ void StackLimitEvader::run(
 	{
 		Literal* literal = std::get_if<Literal>(&memoryGuardCall->arguments.front());
 		yulAssert(literal && literal->kind == LiteralKind::Number, "");
-		literal->value = YulString{toCompactHexWithPrefix(reservedMemory)};
+		literal->value = LiteralValue{reservedMemory, toCompactHexWithPrefix(reservedMemory)};
 	}
 }
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index dedb5cd382..dbf3183fb4 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -20,6 +20,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libyul/AST.h>
+#include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>
 
@@ -37,7 +38,7 @@ namespace
 std::vector<Statement> generateMemoryStore(
 	Dialect const& _dialect,
 	langutil::DebugData::ConstPtr const& _debugData,
-	YulString _mpos,
+	LiteralValue const& _mpos,
 	Expression _value
 )
 {
@@ -55,7 +56,7 @@ std::vector<Statement> generateMemoryStore(
 	return result;
 }
 
-FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::ConstPtr const& _debugData, YulString _mpos)
+FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::ConstPtr const& _debugData, LiteralValue const& _mpos)
 {
 	BuiltinFunction const* memoryLoadFunction = _dialect.memoryLoadFunction(_dialect.defaultType);
 	yulAssert(memoryLoadFunction, "");
@@ -139,7 +140,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 				m_context.dialect,
 				returnVariable.debugData,
 				*slot,
-				Literal{returnVariable.debugData, LiteralKind::Number, "0"_yulstring, {}}
+				Literal{returnVariable.debugData, LiteralKind::Number, LiteralValue(u256{0}), {}}
 			);
 
 	// Special case of a function with a single return argument that needs to move to memory.
@@ -208,36 +209,36 @@ void StackToMemoryMover::operator()(Block& _block)
 		auto debugData = _stmt.debugData;
 		if (_lhsVars.size() == 1)
 		{
-			if (std::optional<YulString> offset = m_memoryOffsetTracker(_lhsVars.front().name))
+			if (auto offset = m_memoryOffsetTracker(_lhsVars.front().name))
 				return generateMemoryStore(
 					m_context.dialect,
 					debugData,
 					*offset,
-					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, "0"_yulstring, {}}
+					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, LiteralValue(u256{0}), {}}
 				);
 			else
 				return {};
 		}
-		std::vector<std::optional<YulString>> rhsMemorySlots;
+		std::vector<std::optional<LiteralValue>> rhsMemorySlots;
 		if (_stmt.value)
 		{
 			FunctionCall const* functionCall = std::get_if<FunctionCall>(_stmt.value.get());
 			yulAssert(functionCall, "");
 			if (m_context.dialect.builtin(functionCall->functionName.name))
-				rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
+				rhsMemorySlots = std::vector<std::optional<LiteralValue>>(_lhsVars.size(), std::nullopt);
 			else
 				rhsMemorySlots =
 					m_functionReturnVariables.at(functionCall->functionName.name) |
 					ranges::views::transform(m_memoryOffsetTracker) |
-					ranges::to<std::vector<std::optional<YulString>>>;
+					ranges::to<std::vector<std::optional<LiteralValue>>>;
 		}
 		else
-			rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
+			rhsMemorySlots = std::vector<std::optional<LiteralValue>>(_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, [](std::optional<YulString> const& _slot) { return _slot.has_value(); }) &&
+			ranges::none_of(rhsMemorySlots, [](std::optional<LiteralValue> const& _slot) { return _slot.has_value(); }) &&
 			!util::contains_if(_lhsVars, m_memoryOffsetTracker)
 		)
 			return {};
@@ -259,7 +260,7 @@ void StackToMemoryMover::operator()(Block& _block)
 				rhs = std::make_unique<Expression>(Identifier{debugData, tempVarName});
 			}
 
-			if (std::optional<YulString> offset = m_memoryOffsetTracker(lhsVar.name))
+			if (auto offset = m_memoryOffsetTracker(lhsVar.name))
 				memoryAssignments += generateMemoryStore(
 					m_context.dialect,
 					_stmt.debugData,
@@ -304,28 +305,29 @@ void StackToMemoryMover::visit(Expression& _expression)
 {
 	ASTModifier::visit(_expression);
 	if (Identifier* identifier = std::get_if<Identifier>(&_expression))
-		if (std::optional<YulString> offset = m_memoryOffsetTracker(identifier->name))
+		if (auto offset = m_memoryOffsetTracker(identifier->name))
 			_expression = generateMemoryLoad(m_context.dialect, identifier->debugData, *offset);
 }
 
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString _variable) const
+std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString const& _variable) const
 {
 	if (m_memorySlots.count(_variable))
 	{
 		uint64_t slot = m_memorySlots.at(_variable);
 		yulAssert(slot < m_numRequiredSlots, "");
-		return YulString{toCompactHexWithPrefix(m_reservedMemory + 32 * (m_numRequiredSlots - slot - 1))};
+		auto const memoryOffset = m_reservedMemory + 32 * (m_numRequiredSlots - slot - 1);
+		return valueOfNumberLiteral(toCompactHexWithPrefix(memoryOffset));
 	}
 	else
 		return std::nullopt;
 }
 
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
+std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
 {
 	return (*this)(_variable.name);
 }
 
-std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(Identifier const& _variable) const
+std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(Identifier const& _variable) const
 {
 	return (*this)(_variable.name);
 }
diff --git a/libyul/optimiser/StackToMemoryMover.h b/libyul/optimiser/StackToMemoryMover.h
index 64c661c0bf..79c7276ede 100644
--- a/libyul/optimiser/StackToMemoryMover.h
+++ b/libyul/optimiser/StackToMemoryMover.h
@@ -165,13 +165,13 @@ class StackToMemoryMover: ASTModifier
 
 		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(YulString _variable) const;
+		std::optional<LiteralValue> operator()(YulString const& _variable) const;
 		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(TypedName const& _variable) const;
+		std::optional<LiteralValue> operator()(TypedName const& _variable) const;
 		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
-		std::optional<YulString> operator()(Identifier const& _variable) const;
+		std::optional<LiteralValue> operator()(Identifier const& _variable) const;
 
 	private:
 		u256 m_reservedMemory;
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index 2af0f7bac0..896c855b0d 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -36,7 +36,7 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const
 
 	for (auto& _case: _switchStmt.cases)
 	{
-		if (_case.value && valueOfLiteral(*_case.value) == _constExprVal)
+		if (_case.value && _case.value->value.value() == _constExprVal)
 		{
 			matchingCaseBlock = &_case.body;
 			break;
@@ -57,9 +57,9 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const
 std::optional<u256> hasLiteralValue(Expression const& _expression)
 {
 	if (std::holds_alternative<Literal>(_expression))
-		return valueOfLiteral(std::get<Literal>(_expression));
+		return std::get<Literal>(_expression).value.value();
 	else
-		return std::optional<u256>();
+		return std::nullopt;
 }
 
 bool expressionAlwaysTrue(Expression const& _expression)
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index 6f7753827d..db562716a2 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -22,6 +22,7 @@
 
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolutil/CommonData.h>
 
@@ -63,12 +64,13 @@ bool SyntacticallyEqual::expressionEqual(Identifier const& _lhs, Identifier cons
 }
 bool SyntacticallyEqual::expressionEqual(Literal const& _lhs, Literal const& _rhs)
 {
-	if (_lhs.kind != _rhs.kind || _lhs.type != _rhs.type)
+	yulAssert(validLiteral(_lhs), "Invalid lhs literal during syntactical equality check");
+	yulAssert(validLiteral(_rhs), "Invalid rhs literal during syntactical equality check");
+
+	if (_lhs.type != _rhs.type)
 		return false;
-	if (_lhs.kind == LiteralKind::Number)
-		return valueOfNumberLiteral(_lhs) == valueOfNumberLiteral(_rhs);
-	else
-		return _lhs.value == _rhs.value;
+
+	return _lhs.value == _rhs.value;
 }
 
 bool SyntacticallyEqual::statementEqual(ExpressionStatement const& _lhs, ExpressionStatement const& _rhs)
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index 319da763e8..5a8d2b49b2 100644
--- a/libyul/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -34,6 +34,9 @@ namespace solidity::yul
 /**
  * Component that can compare ASTs for equality on a syntactic basis.
  * Ignores source locations and allows for different variable names but requires exact matches otherwise.
+ * Literals are compared based on their values, e.g., `0x01`, `1`, `"\x01"` and `true` all evaluate as equal.
+ * Note that this does not apply to unlimited literal strings, which are never considered equal to normal literals,
+ * even when the values would look like identical strings in the source.
  *
  * Prerequisite: Disambiguator (unless only expressions are compared)
  */
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index ed3394847c..6a0ab1518d 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -61,9 +61,9 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 	std::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"}, {}}};
+	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
+	Expression const oneLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{1}), {}}};
+	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{32}), {}}};
 	values[YulString{zero}] = AssignedValue{&zeroLiteral, {}};
 	values[YulString{one}] = AssignedValue{&oneLiteral, {}};
 	values[YulString{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
diff --git a/test/libyul/yulOptimizerTests/disambiguator/similar_literals.yul b/test/libyul/yulOptimizerTests/disambiguator/similar_literals.yul
new file mode 100644
index 0000000000..87c7d4a197
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/disambiguator/similar_literals.yul
@@ -0,0 +1,23 @@
+{
+    let a := 1234
+    let a_hex := 0x4d2
+    let b := "1234"
+    let b_hex := "0x4d2"
+    let c := '1234'
+    let c_hex := '0x4d2'
+    let d := hex"1234"
+    let d_hex := hex"04d2"
+}
+// ----
+// step: disambiguator
+//
+// {
+//     let a := 1234
+//     let a_hex := 0x4d2
+//     let b := "1234"
+//     let b_hex := "0x4d2"
+//     let c := "1234"
+//     let c_hex := "0x4d2"
+//     let d := "\x124"
+//     let d_hex := "\x04\xd2"
+// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/string_as_hex_and_hex_as_string.yul b/test/libyul/yulOptimizerTests/disambiguator/string_as_hex_and_hex_as_string.yul
new file mode 100644
index 0000000000..f0db2af1b2
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/disambiguator/string_as_hex_and_hex_as_string.yul
@@ -0,0 +1,13 @@
+object "A" {
+    code {
+        pop(datasize(hex'616263'))
+    }
+    data 'abc' "1234"
+}
+// ----
+// step: disambiguator
+//
+// object "A" {
+//     code { pop(datasize("abc")) }
+//     data "abc" hex"31323334"
+// }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
index b7a815dd97..77df0ae20a 100644
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
+++ b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
@@ -1,8 +1,10 @@
 {
   f()
   g()
-  function f() { mstore(0x01, mload(0x00)) }
-  function g() { mstore(1, mload(0)) }
+  h()
+  function f() { mstore(29400335157912315244266070412362164103369332044010299463143527189509193072640, mload(0x00)) }
+  function g() { mstore(0x4100000000000000000000000000000000000000000000000000000000000000, mload(0x00)) }
+  function h() { mstore("A", mload(0)) }
 }
 // ----
 // step: equivalentFunctionCombiner
@@ -10,8 +12,15 @@
 // {
 //     f()
 //     f()
+//     h()
 //     function f()
-//     { mstore(0x01, mload(0x00)) }
+//     {
+//         mstore(29400335157912315244266070412362164103369332044010299463143527189509193072640, mload(0x00))
+//     }
 //     function g()
-//     { mstore(1, mload(0)) }
+//     {
+//         mstore(0x4100000000000000000000000000000000000000000000000000000000000000, mload(0x00))
+//     }
+//     function h()
+//     { mstore("A", mload(0)) }
 // }
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation_datasize.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation_datasize.yul
new file mode 100644
index 0000000000..301f50c6ea
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation_datasize.yul
@@ -0,0 +1,48 @@
+object "test"
+{
+  code
+  {
+    f()
+    g()
+    h()
+    i()
+    function f()
+    {
+      let x := datasize("A")
+    }
+    function g()
+    {
+      let x := datasize(hex"41")
+    }
+    function h()
+    {
+      let x := datasize("\x41")
+    }
+    function i()
+    {
+      let x := datasize("\u0041")
+    }
+  }
+  data 'A' "A"
+}
+
+// ----
+// step: equivalentFunctionCombiner
+//
+// object "test" {
+//     code {
+//         f()
+//         f()
+//         f()
+//         f()
+//         function f()
+//         { let x := datasize("A") }
+//         function g()
+//         { let x_1 := datasize("A") }
+//         function h()
+//         { let x_2 := datasize("A") }
+//         function i()
+//         { let x_3 := datasize("A") }
+//     }
+//     data "A" hex"41"
+// }
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
index 861f721acd..7417f32d63 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-50): Duplicate case "0" defined.
+// DeclarationError 6792: (34-50): Duplicate case "0x0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
index e3367b175b..91f19efae1 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-49): Duplicate case "0" defined.
+// DeclarationError 6792: (34-49): Duplicate case "" defined.
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 2fe2b21847..d2cbdb11b3 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -25,6 +25,7 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/AST.h>
+#include <libyul/Utilities.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/SemanticInformation.h>
@@ -508,7 +509,7 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 	// Evaluate datasize/offset/copy instructions
 	if (fun == "datasize" || fun == "dataoffset")
 	{
-		std::string arg = std::get<Literal>(_arguments.at(0)).value.str();
+		std::string arg = formatLiteral(std::get<Literal>(_arguments.at(0)));
 		if (arg.length() < 32)
 			arg.resize(32, 0);
 		if (fun == "datasize")
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index a8658e9211..6a0f3a9997 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -296,10 +296,7 @@ void Interpreter::incrementStep()
 void ExpressionEvaluator::operator()(Literal const& _literal)
 {
 	incrementStep();
-	static YulString const trueString("true");
-	static YulString const falseString("false");
-
-	setValue(valueOfLiteral(_literal));
+	setValue(_literal.value.value());
 }
 
 void ExpressionEvaluator::operator()(Identifier const& _identifier)
@@ -389,16 +386,13 @@ void ExpressionEvaluator::evaluateArgs(
 			visit(expr);
 		else
 		{
-			std::string literal = std::get<Literal>(expr).value.str();
-
-			try
-			{
-				m_values = {u256(literal)};
-			}
-			catch (std::exception&)
+			if (std::get<Literal>(expr).value.unlimited())
 			{
-				m_values = {u256(0)};
+				yulAssert(std::get<Literal>(expr).kind == LiteralKind::String);
+				m_values = {0xdeadbeef};
 			}
+			else
+				m_values = {std::get<Literal>(expr).value.value()};
 		}
 
 		values.push_back(value());

From 21e3b22c900e951d61b3c2d585bfc1893ca49b6e Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Fri, 28 Jun 2024 12:34:22 +0200
Subject: [PATCH 0926/1140] SMTChecker: Do not depend on predicate name
 containing numbers

---
 libsolidity/formal/CHC.cpp                    | 19 +++++++------------
 .../operators/slice_access.sol                | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/slice_access.sol

diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index f0c6ec33a1..ff3a6f1da6 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -2419,22 +2419,17 @@ std::map<unsigned, std::vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::
 			// nondet_call_<CALLID>_<suffix>
 			// Those have the extra unique <CALLID> numbers based on the traversal order, and are necessary
 			// to infer the call order so that's shown property in the counterexample trace.
-			// Predicates that do not have a CALLID have a predicate id at the end of <suffix>,
-			// so the assertion below should still hold.
+			// For other predicates, we do not care.
 			auto beg = _s.data();
 			while (beg != _s.data() + _s.size() && !isDigit(*beg)) ++beg;
-			auto end = beg;
-			while (end != _s.data() + _s.size() && isDigit(*end)) ++end;
-
-			solAssert(beg != end, "Expected to find numerical call or predicate id.");
-
-			int result;
-			auto [p, ec] = std::from_chars(beg, end, result);
-			solAssert(ec == std::errc(), "Id should be a number.");
-
+			int result = -1;
+			static_cast<void>(std::from_chars(beg, _s.data() + _s.size(), result));
 			return result;
 		};
-		return extract(_graph.nodes.at(_a).name) > extract(_graph.nodes.at(_b).name);
+		auto anum = extract(_graph.nodes.at(_a).name);
+		auto bnum = extract(_graph.nodes.at(_b).name);
+		// The second part of the condition is needed to ensure that two different predicates are not considered equal
+		return (anum > bnum) || (anum == bnum && _graph.nodes.at(_a).name > _graph.nodes.at(_b).name);
 	};
 
 	std::queue<std::pair<unsigned, unsigned>> q;
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_access.sol b/test/libsolidity/smtCheckerTests/operators/slice_access.sol
new file mode 100644
index 0000000000..6accc54c0e
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/slice_access.sol
@@ -0,0 +1,16 @@
+contract C {
+function f(int[] calldata b) public pure {
+    require(b.length == 3);
+    require(b[0] == 0);
+    require(b[1] == 1);
+    require(b[2] == 2);
+    assert(b[1:3][0] == 1); // should hold
+    assert(b[1:3][1] == 1); // should fail
+}
+}
+// ====
+// SMTEngine: chc
+// SMTIgnoreCex: no
+// ----
+// Warning 6328: (203-225): CHC: Assertion violation happens here.\nCounterexample:\n\nb = [0, 1, 2]\n\nTransaction trace:\nC.constructor()\nC.f([0, 1, 2])
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 762ebc1ce51c5c016df4e49be06f96d048312cfd Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 1 Jul 2024 10:02:52 +0200
Subject: [PATCH 0927/1140] Yul fuzzer: Skip tstore generation for older EVM
 versions.

---
 test/tools/ossfuzz/protoToYul.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 7913f4d634..5a57b779dc 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -1162,6 +1162,11 @@ void ProtoConverter::visit(IfStmt const& _x)
 void ProtoConverter::visit(StoreFunc const& _x)
 {
 	auto storeType = _x.st();
+	// Skip statement generation if tstore is not
+	// supported in EVM version
+	if (storeType == StoreFunc::TSTORE && !m_evmVersion.supportsTransientStorage())
+		return;
+
 	switch (storeType)
 	{
 	case StoreFunc::MSTORE:

From 81966bc5f6b504df18bd5a09f23a13008d1ff378 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 26 Jun 2024 21:38:53 +0200
Subject: [PATCH 0928/1140] SMTChecker: Simplify CHC predicate representation

There is no need to represent predicates using the symbolic variables.
These are not variables that correspond to expression in the code.
It is sufficient to store the name of the predicate and its signature
(sort), which we can do with the SMT Expression.
---
 libsmtutil/Z3CHCInterface.cpp                 |   2 +
 libsolidity/formal/CHC.cpp                    |   5 -
 libsolidity/formal/CHC.h                      |   1 -
 libsolidity/formal/Predicate.cpp              |  29 +--
 libsolidity/formal/Predicate.h                |  20 +-
 .../model_checker_invariants_reentrancy/err   |   2 +-
 .../model_checker_print_query_all/err         |  70 +++---
 .../model_checker_print_query_chc/err         |  70 +++---
 .../output.json                               |   4 +-
 .../output.json                               | 212 +++++++++---------
 .../output.json                               | 212 +++++++++---------
 .../output.json                               |  72 +++---
 .../deployment/deploy_trusted_flow.sol        |   4 +-
 ...n_code_state_reentrancy_unsafe_trusted.sol |   2 +-
 .../underflow_only_in_external_call.sol       |   4 +-
 .../operators/index_access_for_bytesNN.sol    |   3 +-
 .../operators/index_access_side_effect.sol    |   5 +-
 ...rator_matches_equivalent_function_call.sol |  14 +-
 .../smtCheckerTests/out_of_bounds/array_1.sol |   4 +-
 .../smtCheckerTests/types/array_branch_3d.sol |  14 +-
 .../types/array_branches_3d.sol               |   1 +
 .../types/array_branches_3d_show_unproved.sol |   1 +
 .../types/struct_array_branches_2d.sol        |   4 +-
 23 files changed, 368 insertions(+), 387 deletions(-)

diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
index a25890e8d1..787d46d72e 100644
--- a/libsmtutil/Z3CHCInterface.cpp
+++ b/libsmtutil/Z3CHCInterface.cpp
@@ -58,6 +58,8 @@ void Z3CHCInterface::declareVariable(std::string const& _name, SortPointer const
 
 void Z3CHCInterface::registerRelation(Expression const& _expr)
 {
+	smtAssert(_expr.sort->kind == Kind::Function);
+	m_z3Interface->declareVariable(_expr.name, _expr.sort);
 	m_solver.register_relation(m_z3Interface->functions().at(_expr.name));
 }
 
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index ff3a6f1da6..73b9793642 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1657,11 +1657,6 @@ smtutil::Expression CHC::error()
 	return (*m_errorPredicate)({});
 }
 
-smtutil::Expression CHC::error(unsigned _idx)
-{
-	return m_errorPredicate->functor(_idx)({});
-}
-
 smtutil::Expression CHC::initializer(ContractDefinition const& _contract, ContractDefinition const& _contractContext)
 {
 	return predicate(*m_contractInitializers.at(&_contractContext).at(&_contract));
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index b60e5c3f77..8a40ecb223 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -225,7 +225,6 @@ class CHC: public SMTEncoder
 	smtutil::Expression interface(ContractDefinition const& _contract);
 	/// Error predicate over current variables.
 	smtutil::Expression error();
-	smtutil::Expression error(unsigned _idx);
 
 	/// Creates a block for the given _node.
 	Predicate const* createBlock(ASTNode const* _node, PredicateType _predType, std::string const& _prefix = "");
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 01316d75ff..75314d7e94 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -49,26 +49,25 @@ Predicate const* Predicate::create(
 	std::vector<ScopeOpener const*> _scopeStack
 )
 {
-	smt::SymbolicFunctionVariable predicate{_sort, std::move(_name), _context};
-	std::string functorName = predicate.currentName();
-	solAssert(!m_predicates.count(functorName), "");
+	solAssert(!m_predicates.count(_name), "");
 	return &m_predicates.emplace(
 		std::piecewise_construct,
-		std::forward_as_tuple(functorName),
-		std::forward_as_tuple(std::move(predicate), _type, _context.state().hasBytesConcatFunction(),
+		std::forward_as_tuple(_name),
+		std::forward_as_tuple(_name, std::move(_sort), _type, _context.state().hasBytesConcatFunction(),
 			_node, _contractContext, std::move(_scopeStack))
 	).first->second;
 }
 
 Predicate::Predicate(
-	smt::SymbolicFunctionVariable&& _predicate,
+	std::string _name,
+	SortPointer _sort,
 	PredicateType _type,
 	bool _bytesConcatFunctionInContext,
 	ASTNode const* _node,
 	ContractDefinition const* _contractContext,
 	std::vector<ScopeOpener const*> _scopeStack
 ):
-	m_predicate(std::move(_predicate)),
+	m_functor(std::move(_name), {}, std::move(_sort)),
 	m_type(_type),
 	m_node(_node),
 	m_contractContext(_contractContext),
@@ -89,22 +88,12 @@ void Predicate::reset()
 
 smtutil::Expression Predicate::operator()(std::vector<smtutil::Expression> const& _args) const
 {
-	return m_predicate(_args);
-}
-
-smtutil::Expression Predicate::functor() const
-{
-	return m_predicate.currentFunctionValue();
-}
-
-smtutil::Expression Predicate::functor(unsigned _idx) const
-{
-	return m_predicate.functionValueAtIndex(_idx);
+	return smtutil::Expression(m_functor.name, _args, SortProvider::boolSort);
 }
 
-void Predicate::newFunctor()
+smtutil::Expression const& Predicate::functor() const
 {
-	m_predicate.increaseIndex();
+	return m_functor;
 }
 
 ASTNode const* Predicate::programNode() const
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
index 638354f921..a7df446218 100644
--- a/libsolidity/formal/Predicate.h
+++ b/libsolidity/formal/Predicate.h
@@ -18,11 +18,10 @@
 
 #pragma once
 
-#include <libsolidity/formal/SymbolicVariables.h>
-#include <libsolidity/formal/SymbolicVariables.h>
 
 #include <libsolidity/ast/AST.h>
 
+#include <libsmtutil/SolverInterface.h>
 #include <libsmtutil/Sorts.h>
 
 #include <map>
@@ -37,6 +36,11 @@ class CharStreamProvider;
 namespace solidity::frontend
 {
 
+namespace smt
+{
+class EncodingContext;
+}
+
 enum class PredicateType
 {
 	Interface,
@@ -69,7 +73,8 @@ class Predicate
 	);
 
 	Predicate(
-		smt::SymbolicFunctionVariable&& _predicate,
+		std::string _name,
+		smtutil::SortPointer _sort,
 		PredicateType _type,
 		bool _bytesConcatFunctionInContext,
 		ASTNode const* _node = nullptr,
@@ -91,11 +96,7 @@ class Predicate
 	smtutil::Expression operator()(std::vector<smtutil::Expression> const& _args) const;
 
 	/// @returns the function declaration of the predicate.
-	smtutil::Expression functor() const;
-	/// @returns the function declaration of the predicate with index _idx.
-	smtutil::Expression functor(unsigned _idx) const;
-	/// Increases the index of the function declaration of the predicate.
-	void newFunctor();
+	smtutil::Expression const& functor() const;
 
 	/// @returns the program node this predicate represents.
 	ASTNode const* programNode() const;
@@ -204,8 +205,7 @@ class Predicate
 	/// @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;
+	smtutil::Expression m_functor;
 
 	/// The type of this predicate.
 	PredicateType m_type;
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
index bdd19fa18f..68ef6404cd 100644
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/err
@@ -7,6 +7,6 @@ Warning: Return value of low-level calls not used.
 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)
+(((!(x <= 0) || !(<errorCode> >= 1)) && (!(x <= 0) || !(x' >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_print_query_all/err b/test/cmdlineTests/model_checker_print_query_all/err
index fc3bf7c7a3..7fbaba3ebe 100644
--- a/test/cmdlineTests/model_checker_print_query_all/err
+++ b/test/cmdlineTests/model_checker_print_query_all/err
@@ -7,120 +7,120 @@ Info: CHC: Requested query:
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 
 
diff --git a/test/cmdlineTests/model_checker_print_query_chc/err b/test/cmdlineTests/model_checker_print_query_chc/err
index 1dd7f0c988..4da0a7cb5a 100644
--- a/test/cmdlineTests/model_checker_print_query_chc/err
+++ b/test/cmdlineTests/model_checker_print_query_chc/err
@@ -7,120 +7,120 @@ Info: CHC: Requested query:
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 
 
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
index bf6b296cdf..760f1d7a75 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -33,14 +33,14 @@
             "component": "general",
             "errorCode": "1180",
             "formattedMessage": "Info: Reentrancy property(ies) for A:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
+(((!(x <= 0) || !(<errorCode> >= 1)) && (!(x <= 0) || !(x' >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 
 
 ",
             "message": "Reentrancy property(ies) for A:test:
-(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
+(((!(x <= 0) || !(<errorCode> >= 1)) && (!(x <= 0) || !(x' >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 ",
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
index 97aa885792..4b5782de31 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
@@ -1,7 +1,7 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
+            "0xcbd85fe3127d1edfce70355ba6da5a3e9573873d8596ee8b1cfc2222af166628": "(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)))))
@@ -9,120 +9,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 ",
             "0xcbfcc2413b217c6564ee01f322c9ca1f34fd79d19961dc3e62aa9c2e5dcb6efc": "(set-option :produce-models true)
@@ -170,120 +170,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 
 
@@ -297,120 +297,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 ",
             "severity": "info",
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
index a9b0df0fb6..a9956d82b0 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
@@ -1,7 +1,7 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
+            "0xcbd85fe3127d1edfce70355ba6da5a3e9573873d8596ee8b1cfc2222af166628": "(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)))))
@@ -9,120 +9,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 "
         }
@@ -140,120 +140,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 
 
@@ -267,120 +267,120 @@
 (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)
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16| (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))))
+(=> (= error_0 0) (nondet_interface_1_C_16 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)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16| (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))))
+(=> (and (and (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 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)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16| (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)))
+(block_5_function_f__15_16 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))))
+(=> (and (and (block_5_function_f__15_16 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 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)
+(declare-fun |block_7_return_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16| (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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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))))
+(=> (and (and (block_6_f_14_16 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 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))))
+(=> (and (and (block_7_return_function_f__15_16 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 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)
+(declare-fun |block_9_function_f__15_16| (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)))
+(block_9_function_f__15_16 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))))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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))))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 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)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 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)
+(declare-fun |contract_initializer_after_init_12_C_16| (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))))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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))))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 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)
+(declare-fun |implicit_constructor_entry_13_C_16| (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))))
+(=> (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 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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))))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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))))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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)))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3_0 false)))
+(=> error_target_3 false)))
 (check-sat)
 ",
             "severity": "info",
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index e97227076b..9dff9a3bd4 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -28,127 +28,127 @@
 (check-sat)
 (get-value (|EVALEXPR_0| ))
 ",
-            "0xe3dc20257e2b1bd9c6eb77b75913ec3a5752be174e0fd56af16d9fc95afa1b15": "(set-logic HORN)
+            "0xf090d88ff3260790818d140ca909b8f4cb311a0d905e4e0318ad4dd790ff5f19": "(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)
+(declare-fun |interface_0_C_14| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_14| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_14| (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_14_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+(=> (= error_0 0) (nondet_interface_1_C_14 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
 
 
-(declare-fun |summary_3_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |summary_4_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |summary_3_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |summary_4_function_f__13_14| (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) (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 (nondet_interface_1_C_14_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 x_3_0 state_2 x_3_1))) (nondet_interface_1_C_14_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+(=> (and (and (nondet_interface_1_C_14 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 x_3_0 state_2 x_3_1))) (nondet_interface_1_C_14 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
 
 
-(declare-fun |block_5_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_6_f_12_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |block_5_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |block_6_f_12_14| (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) (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))
-(block_5_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)))
+(block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_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_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_5_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 (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true)) true) (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 (and (block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true)) true) (block_6_f_12_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
-(declare-fun |block_7_return_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |block_7_return_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__13_14| (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 (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))))
+(=> (and (and (block_6_f_12_14 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
 (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))
-(=> (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) (summary_3_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))))
+(=> (block_8_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (summary_3_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
 (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 (= error_1 error_0) (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)))))))) true) (block_7_return_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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= error_1 error_0) (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)))))))) true) (block_7_return_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
 (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_7_return_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) true) true) (summary_3_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 (and (block_7_return_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) true) true) (summary_3_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
-(declare-fun |block_9_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
+(declare-fun |block_9_function_f__13_14| (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))
-(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)))
+(block_9_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
 
 
 (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.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))))
+(=> (and (and (block_9_function_f__13_14 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2))))
 
 
 (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 (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 0))) (interface_0_C_14_0 this_0 abi_0 crypto_0 state_1))))
+(=> (and (and (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 0))) (interface_0_C_14 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |contract_initializer_10_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_10_C_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_14| (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 (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
 
 
-(declare-fun |contract_initializer_after_init_12_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_after_init_12_C_14| (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 (contract_initializer_entry_11_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+(=> (and (and (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_14 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_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 (contract_initializer_after_init_12_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+(=> (and (and (contract_initializer_after_init_12_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
 
 
-(declare-fun |implicit_constructor_entry_13_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |implicit_constructor_entry_13_C_14| (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 (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))))
+(=> (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 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_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 (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+(=> (and (and (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_14 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_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 (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+(=> (and (and (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_14 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_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.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))))
+(=> (and (and (summary_constructor_2_C_14 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 this_0 abi_0 crypto_0 state_1))))
 
 
-(declare-fun |error_target_3_0| () Bool)
+(declare-fun |error_target_3| () 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 (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)))
+(=> (and (and (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 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)))
 
 
 
 (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)))
+(=> error_target_3 false)))
 (check-sat)
 "
         }
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index 09f001719f..2148324ad9 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -21,10 +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: (267-285): CHC: Assertion violation might happen here.
 // Warning 6328: (304-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.
 // 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/external_hash_known_code_state_reentrancy_unsafe_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
index 4d179ddf82..afd1f111b6 100644
--- 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
@@ -40,5 +40,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (396-410): CHC: Assertion violation might happen here.
 // Warning 6328: (429-455): 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/underflow_only_in_external_call.sol b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
index 0b5c8fa07d..68f5ea0498 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
@@ -4,7 +4,7 @@ contract C {
 	bool guard = true;
 
 	function dec() public returns (uint) {
-		if (guard) return 0;
+		require(!guard);
 		--v;
 		return v;
 	}
@@ -21,4 +21,4 @@ contract C {
 // SMTIgnoreCex: no
 // SMTTargets: underflow
 // ----
-// 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
+// Warning 3944: (105-108): 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/operators/index_access_for_bytesNN.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
index c516675d6e..b18d5426f5 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
@@ -8,5 +8,4 @@ contract C {
 // SMTEngine: all
 // 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.
+// 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 32c9780d11..d3b6f5895b 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
 // ----
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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.
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 9872a6a92b..206c630424 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
@@ -53,28 +53,32 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // ----
 // 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) happens 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) might happen here.
 // Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) might happen here.
+// Warning 3944: (870-884): CHC: Underflow (resulting value less than -32768) might happen here.
 // Warning 4984: (870-884): 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 happens here.
+// Warning 4281: (1051-1080): CHC: Division by zero might happen 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: 13 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 2661: (679-708): BMC: Overflow (resulting value larger than 32767) happens here.
 // Warning 4144: (679-708): BMC: Underflow (resulting value less than -32768) happens here.
 // Warning 2661: (777-806): BMC: Overflow (resulting value larger than 32767) happens here.
 // Warning 4144: (777-806): BMC: Underflow (resulting value less than -32768) happens here.
 // Warning 2661: (953-982): BMC: Overflow (resulting value larger than 32767) happens here.
 // Warning 4144: (953-982): BMC: Underflow (resulting value less than -32768) happens here.
+// 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: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 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/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index bc37a31301..65a1dfd390 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -21,8 +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.
-// 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: 3 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/types/array_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
index 8ba3f01370..3aced164c8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
@@ -7,20 +7,14 @@ contract C
 		c[0][0].push();
 	}
 	function f(bool b) public {
-		c[0][0][0] = 0;
 		if (b)
 			c[0][0][0] = 1;
 		assert(c[0][0][0] > 0);
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
+// SMTSolvers: eld
 // ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// 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.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 6328: (152-174): 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_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
index ecd419eea6..8e9499183a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
@@ -15,6 +15,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (124-131): CHC: Out of bounds access might happen here.
 // Warning 6368: (124-134): CHC: Out of bounds access might happen here.
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 acd5744726..7e9aad5b01 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
@@ -16,6 +16,7 @@ contract C
 // ====
 // SMTEngine: all
 // SMTShowUnproved: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (124-131): CHC: Out of bounds access might happen here.
 // Warning 6368: (124-134): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
index 0d45aee142..d5daba6999 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
@@ -15,7 +15,5 @@ contract C
 }
 // ====
 // SMTEngine: all
-// 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.
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From c012b725bb8ce755b93ce0dd05e83c34c499acd6 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Mon, 1 Jul 2024 18:27:27 +0200
Subject: [PATCH 0929/1140] Scanner: Add SpecialComment mode

---
 liblangutil/Scanner.cpp      | 50 +++++++++++++++++++++++++-----------
 liblangutil/Scanner.h        | 11 ++++----
 test/liblangutil/Scanner.cpp | 46 +++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index 806efa3116..4a41cb97a5 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -826,31 +826,48 @@ Token Scanner::scanString(bool const _isUnicode)
 	char const quote = m_char;
 	advance();  // consume quote
 	LiteralScope literal(this, LITERAL_TYPE_STRING);
-	while (m_char != quote && !isSourcePastEndOfInput() && !isUnicodeLinebreak())
+	// for source location comments we allow multiline string literals
+	while (m_char != quote && !isSourcePastEndOfInput() && (!isUnicodeLinebreak() || m_kind == ScannerKind::SpecialComment))
 	{
 		char c = m_char;
 		advance();
-		if (c == '\\')
+
+		if (m_kind == ScannerKind::SpecialComment)
 		{
-			if (isSourcePastEndOfInput() || !scanEscape())
-				return setError(ScannerError::IllegalEscapeSequence);
+			if (c == '\\')
+			{
+				if (isSourcePastEndOfInput())
+					return setError(ScannerError::IllegalEscapeSequence);
+				advance();
+			}
+			else
+				addLiteralChar(c);
 		}
 		else
 		{
-			// Report error on non-printable characters in string literals, however
-			// allow anything for unicode string literals, because their validity will
-			// be verified later (in the syntax checker).
-			//
-			// 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))
+			if (c == '\\')
 			{
-				if (m_kind == ScannerKind::Yul)
-					return setError(ScannerError::IllegalCharacterInString);
-				return setError(ScannerError::UnicodeCharacterInNonUnicodeString);
+				if (isSourcePastEndOfInput() || !scanEscape())
+					return setError(ScannerError::IllegalEscapeSequence);
+			}
+			else
+			{
+				// Report error on non-printable characters in string literals, however
+				// allow anything for unicode string literals, because their validity will
+				// be verified later (in the syntax checker).
+				//
+				// 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))
+				{
+					if (m_kind == ScannerKind::Yul)
+						return setError(ScannerError::IllegalCharacterInString);
+					return setError(ScannerError::UnicodeCharacterInNonUnicodeString);
+				}
+				addLiteralChar(c);
 			}
-			addLiteralChar(c);
 		}
+
 	}
 	if (m_char != quote)
 		return setError(ScannerError::IllegalStringEndQuote);
@@ -1023,6 +1040,9 @@ std::tuple<Token, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
 	auto const token = TokenTraits::fromIdentifierOrKeyword(m_tokens[NextNext].literal);
 	switch (m_kind)
 	{
+	case ScannerKind::SpecialComment:
+		// there are no keywords in special comments
+		return std::make_tuple(Token::Identifier, 0, 0);
 	case ScannerKind::Solidity:
 		// Turn experimental Solidity keywords that are not keywords in legacy Solidity into identifiers.
 		if (TokenTraits::isExperimentalSolidityOnlyKeyword(std::get<0>(token)))
diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
index eaa2b3b54d..c734a368cc 100644
--- a/liblangutil/Scanner.h
+++ b/liblangutil/Scanner.h
@@ -62,15 +62,12 @@
 namespace solidity::langutil
 {
 
-class AstRawString;
-class AstValueFactory;
-class ParserRecorder;
-
 enum class ScannerKind
 {
 	Solidity,
 	Yul,
-	ExperimentalSolidity
+	ExperimentalSolidity,
+	SpecialComment
 };
 
 enum class ScannerError
@@ -102,11 +99,13 @@ class Scanner
 {
 	friend class LiteralScope;
 public:
-	explicit Scanner(CharStream& _source):
+	explicit Scanner(CharStream& _source, ScannerKind _kind = ScannerKind::Solidity):
 		m_source(_source),
 		m_sourceName{std::make_shared<std::string>(_source.name())}
 	{
 		reset();
+		if (_kind != ScannerKind::Solidity)
+			setScannerMode(_kind);
 	}
 
 	/// Resets scanner to the start of input.
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
index 8c961a3bab..b4043fe86a 100644
--- a/test/liblangutil/Scanner.cpp
+++ b/test/liblangutil/Scanner.cpp
@@ -1026,6 +1026,52 @@ BOOST_AUTO_TEST_CASE(yul_function_with_whitespace)
 	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
 }
 
+BOOST_AUTO_TEST_CASE(special_comment_with_invalid_escapes)
+{
+	std::string input(R"("test\x\f\g\u\g\a\u\g\a12\uö\xyoof")");
+	std::string expectedOutput(R"(test12öyoof)");
+	CharStream stream(input, "");
+	Scanner scanner(stream, ScannerKind::SpecialComment);
+	BOOST_REQUIRE(scanner.currentToken() == Token::StringLiteral);
+	BOOST_REQUIRE(scanner.currentLiteral() == expectedOutput);
+}
+
+BOOST_AUTO_TEST_CASE(special_comment_with_valid_and_invalid_escapes)
+{
+	std::string input(R"("test\n\x61\t\u01A9test\f")");
+	std::string expectedOutput(R"(test6101A9test)");
+	CharStream stream(input, "");
+	Scanner scanner(stream, ScannerKind::SpecialComment);
+	BOOST_REQUIRE(scanner.currentToken() == Token::StringLiteral);
+	BOOST_REQUIRE(scanner.currentLiteral() == expectedOutput);
+}
+
+BOOST_AUTO_TEST_CASE(special_comment_with_unterminated_escape_sequence_at_eos)
+{
+	CharStream stream(R"("test\)", "");
+	std::string expectedOutput(R"(test6101A9test)");
+	Scanner scanner(stream, ScannerKind::SpecialComment);
+	BOOST_REQUIRE(scanner.currentToken() == Token::Illegal);
+	BOOST_REQUIRE(scanner.currentError() == ScannerError::IllegalEscapeSequence);
+}
+
+BOOST_AUTO_TEST_CASE(special_comment_with_escaped_quotes)
+{
+	CharStream stream(R"("test\\\"")", "");
+	std::string expectedOutput(R"(test)");
+	Scanner scanner(stream, ScannerKind::SpecialComment);
+	BOOST_REQUIRE(scanner.currentToken() == Token::StringLiteral);
+	BOOST_REQUIRE(scanner.currentLiteral() == expectedOutput);
+}
+
+BOOST_AUTO_TEST_CASE(special_comment_with_unterminated_string)
+{
+	CharStream stream(R"("test)", "");
+	Scanner scanner(stream, ScannerKind::SpecialComment);
+	BOOST_REQUIRE(scanner.currentToken() == Token::Illegal);
+	BOOST_REQUIRE(scanner.currentError() == ScannerError::IllegalStringEndQuote);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // end namespaces

From ef9aa908b6cb8f8cd6d2b287a8778ca162e5cc04 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Mon, 1 Jul 2024 18:29:07 +0200
Subject: [PATCH 0930/1140] AsmParser: Use scanner instead of regex for source
 comment parsing

---
 Changelog.md           |  2 +
 libyul/AsmParser.cpp   | 82 ++++++++++++++++++++++++-----------
 test/libyul/Parser.cpp | 98 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+), 24 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 442c4e34f3..cba038a56b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 Language Features:
  * Accept declarations of state variables with ``transient`` data location (parser support only, no code generation yet).
  * Make ``require(bool, Error)`` available when using the legacy pipeline.
+ * Yul: Parsing rules for source location comments have been relaxed: Whitespace between the location components as well as single-quoted code snippets are now allowed.
 
 
 Compiler Features:
@@ -18,6 +19,7 @@ Bugfixes:
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
+ * Yul Parser: Fix segfault when parsing very long location comments.
 
 
 ### 0.8.26 (2024-05-21)
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index ecf3475a8a..2ae4dd805b 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -28,11 +28,10 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/Scanner.h>
+#include <liblangutil/Common.h>
 #include <libsolutil/Common.h>
 #include <libsolutil/Visitor.h>
 
-#include <range/v3/view/subrange.hpp>
-
 #include <boost/algorithm/string.hpp>
 
 #include <algorithm>
@@ -53,7 +52,7 @@ std::optional<int> toInt(std::string const& _value)
 	{
 		return stoi(_value);
 	}
-	catch (...)
+	catch (std::out_of_range const&)
 	{
 		return std::nullopt;
 	}
@@ -193,13 +192,41 @@ std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComme
 	langutil::SourceLocation const& _commentLocation
 )
 {
-	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\";..."
-		std::regex_constants::ECMAScript | std::regex_constants::optimize
-	);
-	std::match_results<std::string_view::const_iterator> match;
-	if (!regex_search(_arguments.cbegin(), _arguments.cend(), match, argsRegex))
+	CharStream argumentStream(std::string(_arguments), "");
+	Scanner scanner(argumentStream, ScannerKind::SpecialComment);
+
+	std::string_view tail{_arguments.substr(_arguments.size())};
+	auto const parseLocationComponent = [](Scanner& _scanner, bool expectTrailingColon) -> std::optional<std::string>
+	{
+		bool negative = false;
+		if (_scanner.currentToken() == Token::Sub)
+		{
+			negative = true;
+			_scanner.next();
+		}
+		if (_scanner.currentToken() != Token::Number)
+			return std::nullopt;
+		if (expectTrailingColon && _scanner.peekNextToken() != Token::Colon)
+			return std::nullopt;
+		if (!isValidDecimal(_scanner.currentLiteral()))
+			return std::nullopt;
+		std::string decimal = (negative ? "-" : "") + _scanner.currentLiteral();
+		_scanner.next();
+		if (expectTrailingColon)
+			_scanner.next();
+		return decimal;
+	};
+	std::optional<std::string> rawSourceIndex = parseLocationComponent(scanner, true);
+	std::optional<std::string> rawStart = parseLocationComponent(scanner, true);
+	std::optional<std::string> rawEnd = parseLocationComponent(scanner, false);
+
+	size_t const snippetStart = static_cast<size_t>(scanner.currentLocation().start);
+	bool const locationScannedSuccessfully = rawSourceIndex && rawStart && rawEnd;
+	bool const locationIsWhitespaceSeparated =
+		scanner.peekNextToken() == Token::EOS ||
+		(snippetStart > 0 && langutil::isWhiteSpace(_arguments[snippetStart - 1]));
+
+	if (!locationScannedSuccessfully || !locationIsWhitespaceSeparated)
 	{
 		m_errorReporter.syntaxError(
 			8387_error,
@@ -209,13 +236,16 @@ std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComme
 		return std::nullopt;
 	}
 
-	solAssert(match.size() == 5, "");
-	std::string_view tail = _arguments.substr(static_cast<size_t>(match.position() + match.length()));
+	// captures error cases `"test` (illegal end quote) and `"test\` (illegal escape sequence / dangling backslash)
+	bool const illegalLiteral = scanner.currentToken() == Token::Illegal && (scanner.currentError() == ScannerError::IllegalStringEndQuote || scanner.currentError() == ScannerError::IllegalEscapeSequence);
+	if (scanner.currentToken() == Token::StringLiteral || illegalLiteral)
+		tail = _arguments.substr(static_cast<size_t>(scanner.currentLocation().end));
+	else
+		tail = _arguments.substr(static_cast<size_t>(scanner.currentLocation().start));
 
-	if (match[4].matched && (
-		!boost::algorithm::ends_with(match[4].str(), "\"") ||
-		boost::algorithm::ends_with(match[4].str(), "\\\"")
-	))
+	// Other scanner errors may occur if there is no string literal which follows
+	// (f.ex. IllegalHexDigit, IllegalCommentTerminator), but these are ignored
+	if (illegalLiteral)
 	{
 		m_errorReporter.syntaxError(
 			1544_error,
@@ -225,11 +255,15 @@ std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComme
 		return {{tail, SourceLocation{}}};
 	}
 
-	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());
+	std::optional<int> const sourceIndex = toInt(*rawSourceIndex);
+	std::optional<int> const start = toInt(*rawStart);
+	std::optional<int> const end = toInt(*rawEnd);
 
-	if (!sourceIndex.has_value() || !start.has_value() || !end.has_value())
+	if (
+		!sourceIndex.has_value() || *sourceIndex < -1 ||
+		!start.has_value() || *start < -1 ||
+		!end.has_value() || *end < -1
+	)
 		m_errorReporter.syntaxError(
 			6367_error,
 			_commentLocation,
@@ -237,8 +271,8 @@ std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComme
 			"Expected non-negative integer values or -1 for source index and location."
 		);
 	else if (sourceIndex == -1)
-		return {{tail, SourceLocation{start.value(), end.value(), nullptr}}};
-	else if (!(sourceIndex >= 0 && m_sourceNames->count(static_cast<unsigned>(sourceIndex.value()))))
+		return {{tail, SourceLocation{*start, *end, nullptr}}};
+	else if (!(sourceIndex >= 0 && m_sourceNames->count(static_cast<unsigned>(*sourceIndex))))
 		m_errorReporter.syntaxError(
 			2674_error,
 			_commentLocation,
@@ -246,9 +280,9 @@ std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComme
 		);
 	else
 	{
-		std::shared_ptr<std::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));
 		solAssert(sourceName, "");
-		return {{tail, SourceLocation{start.value(), end.value(), std::move(sourceName)}}};
+		return {{tail, SourceLocation{*start, *end, std::move(sourceName)}}};
 	}
 	return {{tail, SourceLocation{}}};
 }
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 46c4f11a8c..ca8784ddb6 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -33,6 +33,8 @@
 #include <liblangutil/ErrorReporter.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/test/data/monomorphic.hpp>
+#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <memory>
@@ -767,6 +769,102 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
 }
 
+BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = R"(
+		/// @src 0:111:222 "
+		///
+		{}
+	)";
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	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);
+	BOOST_TEST(errorList[0]->errorId() == 1544_error);
+	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+}
+
+BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = R"(
+		/// @src 0:111:222 hex"abc"@src 1:333:444 "abc"
+		{}
+	)";
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	BOOST_REQUIRE(!!result && errorList.size() == 0);
+	// the second source location is not parsed as such, as the hex string isn't interpreted as snippet but
+	// as the beginning of the tail in AsmParser
+	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+}
+
+BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = R"(
+		/// @src 0:111:222 "\n\\x\x\w\uö\xy\z\y\fq"
+		{}
+	)";
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	BOOST_REQUIRE(!!result && errorList.size() == 0);
+	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+}
+
+BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces_and_escapes)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = R"(
+		/// @src 0:111:222 '\n\\x\x\w\uö\xy\z\y\fq'
+		/// @src 1 :		222 : 333 '\x33\u1234\t\n'
+		{}
+	)";
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	BOOST_REQUIRE(!!result && errorList.size() == 0);
+	CHECK_LOCATION(result->debugData->originLocation, "source1", 222, 333);
+}
+
+BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_are_ignored, boost::unit_test::data::make({"0x ", "/** unterminated comment", "1_23_4"}), invalid)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = fmt::format(R"(
+		/// @src 0:111:222 {}
+		/// @src 1:222:333
+		{{}}
+	)", invalid);
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	BOOST_REQUIRE(!!result && errorList.empty());
+	CHECK_LOCATION(result->debugData->originLocation, "source1", 222, 333);
+}
+
+BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
+{
+	ErrorList errorList;
+	ErrorReporter reporter(errorList);
+	auto const sourceText = R"(
+		/// @src 1	: 111:
+		/// 222 "
+		/// abc\"def
+		///
+		/// " @src 0:333:444
+		{}
+	)";
+	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	BOOST_REQUIRE(!!result && errorList.empty());
+	CHECK_LOCATION(result->debugData->originLocation, "source0", 333, 444);
+}
+
 BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locations)
 {
 	ErrorList errorList;

From 8b0bb61a7a9392d07b965e88c267123743869426 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Mon, 1 Jul 2024 18:30:03 +0200
Subject: [PATCH 0931/1140] CI: Re-enable *_bytecode_too_large_* and
 *_combined_too_large* tests

---
 .circleci/parallel_bytecode_report.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
index 7fe22c3432..ee9dfde9f3 100755
--- a/.circleci/parallel_bytecode_report.sh
+++ b/.circleci/parallel_bytecode_report.sh
@@ -44,9 +44,6 @@ 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 || $binary_type == "osx_intel" ]]; then
     interface=$(echo -e "standard-json\ncli" | circleci tests split)
     echo "Selected interface: ${interface}"

From ce02133054e276106a0cfa3784521cb6bed5fda8 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Mon, 1 Jul 2024 09:53:22 +0200
Subject: [PATCH 0932/1140] BlockHasher: Do not hash literal kind

---
 Changelog.md                                                    | 1 +
 libyul/optimiser/BlockHasher.cpp                                | 1 -
 .../array/copying/function_type_array_to_storage.sol            | 2 +-
 .../equivalentFunctionCombiner/constant_representation.yul      | 2 +-
 test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul      | 2 +-
 .../yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul     | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 442c4e34f3..16920b50b5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
  * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
+ * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
 
 
 Bugfixes:
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index d5febca932..9d6db20667 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -49,7 +49,6 @@ void ASTHasherBase::hashLiteral(solidity::yul::Literal const& _literal)
 	else
 		hash64(std::hash<std::string>{}(_literal.value.builtinStringLiteralValue()));
 	hash64(_literal.type.hash());
-	hash8(static_cast<uint8_t>(_literal.kind));
 	hash8(_literal.value.unlimited());
 }
 
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 097c7b4d10..e3490e2db0 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: 116530
+// gas irOptimized: 116531
 // gas legacy: 118845
 // gas legacyOptimized: 116844
 // test2() -> 0x20, 0x14, "[b called][a called]"
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
index 77df0ae20a..9d70f75d2a 100644
--- a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
+++ b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
@@ -12,7 +12,7 @@
 // {
 //     f()
 //     f()
-//     h()
+//     f()
 //     function f()
 //     {
 //         mstore(29400335157912315244266070412362164103369332044010299463143527189509193072640, mload(0x00))
diff --git a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
index fca4a6366b..5efebed099 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
@@ -25,7 +25,7 @@
 //         let sum := 0
 //         let length := calldataload(_1)
 //         let i := 0
-//         for { } true { i := add(i, 1) }
+//         for { } 1 { i := add(i, 1) }
 //         {
 //             let _2 := iszero(lt(i, length))
 //             if _2 { break }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
index 76d671bfc3..a0be61939b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
@@ -29,7 +29,7 @@
 //         let length := calldataload(_1)
 //         let i := 0
 //         let _2 := calldataload(7)
-//         for { } true { i := add(i, 1) }
+//         for { } 1 { i := add(i, 1) }
 //         {
 //             let _3 := iszero(lt(i, length))
 //             if _3 { break }

From 2696cff8da228924b7ece37986b124b67c52acb1 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 2 Jul 2024 18:28:09 +0200
Subject: [PATCH 0933/1140] Relax memory safety.

Co-authored-by: Moritz Hoffmann <clonker@gmail.com>
---
 docs/assembly.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index cf2ce1bf94..04742c504c 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -377,3 +377,18 @@ 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
 backward-compatibility with older compiler versions, prefer using the dialect string.
+
+Advanced Safe Use of Memory
+---------------------------
+
+Beyond the strict definition of memory-safety given above, there are cases in which you may want to use more than 64 bytes
+of scratch space starting at memory offset ``0``. If you are careful, it can be admissible to use memory up to (and not
+including) offset ``0x80`` and still safely declare the assembly block as ``memory-safe``.
+This is admissible under either of the following conditions:
+
+- By the end of the assembly block, the free memory pointer at offset ``0x40`` is restored to a sane value (i.e. it is either
+  restored to its original value or an increment of it due to a manual memory allocation), and the memory word at offset ``0x60``
+  is restored to a value of zero.
+
+- The assembly block terminates, i.e. execution can never return to high-level Solidity code. This is the case, for example,
+  if your assembly block unconditionally ends in a ``revert`` statement.

From 22471ea5ae41a674cd8a8e420780b7841dfda283 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Jul 2024 13:27:12 +0200
Subject: [PATCH 0934/1140] More details about the zero pointer.

---
 docs/assembly.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 04742c504c..f57b1f0d92 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -392,3 +392,9 @@ This is admissible under either of the following conditions:
 
 - The assembly block terminates, i.e. execution can never return to high-level Solidity code. This is the case, for example,
   if your assembly block unconditionally ends in a ``revert`` statement.
+
+Furthermore, you need to be aware that the default-value of dynamic arrays in Solidity point to memory offset ``0x60``, so
+for the duration of temporarily changing the value at memory offset ``0x60``, you can no longer rely on getting accurate
+length values when reading dynamic arrays, until you restore the zero value at ``0x60``. To be more precise, we only guarantee
+safety when overwriting the zero pointer, if the remainder of the assembly snippet does not interact with the memory of
+high-level Solidity objects (including by reading from offsets previously stored in variables).

From 318259c5f883cba10dca3ef2ebd039c93c732e63 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Jul 2024 13:40:03 +0200
Subject: [PATCH 0935/1140] Phrasing.

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

diff --git a/docs/assembly.rst b/docs/assembly.rst
index f57b1f0d92..34085bccb7 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -391,7 +391,7 @@ This is admissible under either of the following conditions:
   is restored to a value of zero.
 
 - The assembly block terminates, i.e. execution can never return to high-level Solidity code. This is the case, for example,
-  if your assembly block unconditionally ends in a ``revert`` statement.
+  if your assembly block unconditionally ends in calling the ``revert`` opcode.
 
 Furthermore, you need to be aware that the default-value of dynamic arrays in Solidity point to memory offset ``0x60``, so
 for the duration of temporarily changing the value at memory offset ``0x60``, you can no longer rely on getting accurate

From 60eb07376f30cee8dc533b67eedacd3b533c6ac7 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Fri, 5 Jul 2024 10:59:55 +0200
Subject: [PATCH 0936/1140] SMTChecker: Move formatting methods out of
 Predicate

Some of the methods related to formatting SMT expressions do not depend
on anything from the predicate, so we can make them free and move to
more appropriate place.
---
 libsolidity/formal/ExpressionFormatter.cpp | 176 ++++++++++++++++++++-
 libsolidity/formal/ExpressionFormatter.h   |  11 +-
 libsolidity/formal/Predicate.cpp           | 166 +------------------
 libsolidity/formal/Predicate.h             |   6 -
 4 files changed, 184 insertions(+), 175 deletions(-)

diff --git a/libsolidity/formal/ExpressionFormatter.cpp b/libsolidity/formal/ExpressionFormatter.cpp
index 5a3d11dbef..6571cf6dd7 100644
--- a/libsolidity/formal/ExpressionFormatter.cpp
+++ b/libsolidity/formal/ExpressionFormatter.cpp
@@ -18,13 +18,13 @@
 
 #include <libsolidity/formal/ExpressionFormatter.h>
 
+#include <libsolidity/formal/SymbolicTypes.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>
@@ -182,4 +182,176 @@ std::string toSolidityStr(smtutil::Expression const& _expr)
 	return op + "(" + boost::algorithm::join(strArgs, ", ") + ")";
 }
 
+namespace
+{
+bool fillArray(smtutil::Expression const& _expr, std::vector<std::string>& _array, ArrayType const& _type)
+{
+	// Base case
+	if (_expr.name == "const_array")
+	{
+		auto length = _array.size();
+		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(1), _type.baseType());
+		if (!elemStr)
+			return false;
+		_array.clear();
+		_array.resize(length, *elemStr);
+		return true;
+	}
+
+	// Recursive case.
+	if (_expr.name == "store")
+	{
+		if (!fillArray(_expr.arguments.at(0), _array, _type))
+			return false;
+		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,
+		// we should catch and ignore those.
+		unsigned long index;
+		try
+		{
+			index = stoul(*indexStr);
+		}
+		catch (std::out_of_range const&)
+		{
+			return true;
+		}
+		catch (std::invalid_argument const&)
+		{
+			return true;
+		}
+		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(2), _type.baseType());
+		if (!elemStr)
+			return false;
+		if (index < _array.size())
+			_array.at(index) = *elemStr;
+		return true;
+	}
+
+	// Special base case, not supported yet.
+	if (_expr.name.rfind("(_ as-array") == 0)
+	{
+		// Z3 expression representing reinterpretation of a different term as an array
+		return false;
+	}
+
+	solAssert(false);
+}
+}
+
+std::optional<std::string> expressionToString(smtutil::Expression const& _expr, frontend::Type const* _type)
+{
+	if (smt::isNumber(*_type))
+	{
+		solAssert(_expr.sort->kind == Kind::Int);
+		solAssert(_expr.arguments.empty());
+
+		if (
+			_type->category() == frontend::Type::Category::Address ||
+			_type->category() == frontend::Type::Category::FixedBytes
+		)
+		{
+			try
+			{
+				if (_expr.name == "0")
+					return "0x0";
+				// For some reason the code below returns "0x" for "0".
+				return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower);
+			}
+			catch (std::out_of_range const&)
+			{
+			}
+			catch (std::invalid_argument const&)
+			{
+			}
+		}
+
+		return _expr.name;
+	}
+	if (smt::isBool(*_type))
+	{
+		solAssert(_expr.sort->kind == Kind::Bool);
+		solAssert(_expr.arguments.empty());
+		solAssert(_expr.name == "true" || _expr.name == "false");
+		return _expr.name;
+	}
+	if (smt::isFunction(*_type))
+	{
+		solAssert(_expr.arguments.empty());
+		return _expr.name;
+	}
+	if (smt::isArray(*_type))
+	{
+		auto const& arrayType = dynamic_cast<ArrayType const&>(*_type);
+		if (_expr.name != "tuple_constructor")
+			return {};
+
+		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
+		solAssert(tupleSort.components.size() == 2);
+
+		unsigned long length;
+		try
+		{
+			length = stoul(_expr.arguments.at(1).name);
+		}
+		catch(std::out_of_range const&)
+		{
+			return {};
+		}
+		catch(std::invalid_argument const&)
+		{
+			return {};
+		}
+
+		// Limit this counterexample size to 1k.
+		// Some OSs give you "unlimited" memory through swap and other virtual memory,
+		// so purely relying on bad_alloc being thrown is not a good idea.
+		// In that case, the array allocation might cause OOM and the program is killed.
+		if (length >= 1024)
+			return {};
+		try
+		{
+			std::vector<std::string> array(length);
+			if (!fillArray(_expr.arguments.at(0), array, arrayType))
+				return {};
+			return "[" + boost::algorithm::join(array, ", ") + "]";
+		}
+		catch (std::bad_alloc const&)
+		{
+			// Solver gave a concrete array but length is too large.
+		}
+	}
+	if (smt::isNonRecursiveStruct(*_type))
+	{
+		auto const& structType = dynamic_cast<StructType const&>(*_type);
+		solAssert(_expr.name == "tuple_constructor");
+		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
+		auto members = structType.structDefinition().members();
+		solAssert(tupleSort.components.size() == members.size());
+		solAssert(_expr.arguments.size() == members.size());
+		std::vector<std::string> elements;
+		for (unsigned i = 0; i < members.size(); ++i)
+		{
+			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, ", ") + "}";
+	}
+
+	return {};
+}
+
+std::vector<std::optional<std::string>> formatExpressions(
+	std::vector<smtutil::Expression> const& _exprs,
+	std::vector<frontend::Type const*> const& _types
+)
+{
+	solAssert(_exprs.size() == _types.size());
+	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;
+}
+
 }
diff --git a/libsolidity/formal/ExpressionFormatter.h b/libsolidity/formal/ExpressionFormatter.h
index 3efbeb781f..e42fab26e3 100644
--- a/libsolidity/formal/ExpressionFormatter.h
+++ b/libsolidity/formal/ExpressionFormatter.h
@@ -19,10 +19,12 @@
 #pragma once
 
 /**
- * Formats SMT expressions into Solidity-like strings.
+ * Helper methods for formatting SMT expressions
  */
 
-#include <libsolidity/formal/Predicate.h>
+#include <libsmtutil/SolverInterface.h>
+
+#include <libsolidity/ast/Types.h>
 
 #include <map>
 #include <string>
@@ -38,4 +40,9 @@ smtutil::Expression substitute(smtutil::Expression _from, std::map<std::string,
 /// 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);
 
+/// @returns a string representation of the SMT expression based on a Solidity type.
+std::optional<std::string> expressionToString(smtutil::Expression const& _expr, Type const* _type);
+
+/// @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);
 }
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 75314d7e94..5cac3a6a92 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -18,6 +18,7 @@
 
 #include <libsolidity/formal/Predicate.h>
 
+#include <libsolidity/formal/ExpressionFormatter.h>
 #include <libsolidity/formal/SMTEncoder.h>
 
 #include <liblangutil/CharStreamProvider.h>
@@ -485,171 +486,6 @@ std::map<std::string, std::string> Predicate::expressionSubstitution(smtutil::Ex
 	return subst;
 }
 
-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(), "");
-	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;
-}
-
-std::optional<std::string> Predicate::expressionToString(smtutil::Expression const& _expr, Type const* _type) const
-{
-	if (smt::isNumber(*_type))
-	{
-		solAssert(_expr.sort->kind == Kind::Int, "");
-		solAssert(_expr.arguments.empty(), "");
-
-		if (
-			_type->category() == Type::Category::Address ||
-			_type->category() == Type::Category::FixedBytes
-		)
-		{
-			try
-			{
-				if (_expr.name == "0")
-					return "0x0";
-				// For some reason the code below returns "0x" for "0".
-				return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower);
-			}
-			catch (std::out_of_range const&)
-			{
-			}
-			catch (std::invalid_argument const&)
-			{
-			}
-		}
-
-		return _expr.name;
-	}
-	if (smt::isBool(*_type))
-	{
-		solAssert(_expr.sort->kind == Kind::Bool, "");
-		solAssert(_expr.arguments.empty(), "");
-		solAssert(_expr.name == "true" || _expr.name == "false", "");
-		return _expr.name;
-	}
-	if (smt::isFunction(*_type))
-	{
-		solAssert(_expr.arguments.empty(), "");
-		return _expr.name;
-	}
-	if (smt::isArray(*_type))
-	{
-		auto const& arrayType = dynamic_cast<ArrayType const&>(*_type);
-		if (_expr.name != "tuple_constructor")
-			return {};
-
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
-		solAssert(tupleSort.components.size() == 2, "");
-
-		unsigned long length;
-		try
-		{
-			length = stoul(_expr.arguments.at(1).name);
-		}
-		catch(std::out_of_range const&)
-		{
-			return {};
-		}
-		catch(std::invalid_argument const&)
-		{
-			return {};
-		}
-
-		// Limit this counterexample size to 1k.
-		// Some OSs give you "unlimited" memory through swap and other virtual memory,
-		// so purely relying on bad_alloc being thrown is not a good idea.
-		// In that case, the array allocation might cause OOM and the program is killed.
-		if (length >= 1024)
-			return {};
-		try
-		{
-			std::vector<std::string> array(length);
-			if (!fillArray(_expr.arguments.at(0), array, arrayType))
-				return {};
-			return "[" + boost::algorithm::join(array, ", ") + "]";
-		}
-		catch (std::bad_alloc const&)
-		{
-			// Solver gave a concrete array but length is too large.
-		}
-	}
-	if (smt::isNonRecursiveStruct(*_type))
-	{
-		auto const& structType = dynamic_cast<StructType const&>(*_type);
-		solAssert(_expr.name == "tuple_constructor", "");
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_expr.sort);
-		auto members = structType.structDefinition().members();
-		solAssert(tupleSort.components.size() == members.size(), "");
-		solAssert(_expr.arguments.size() == members.size(), "");
-		std::vector<std::string> elements;
-		for (unsigned i = 0; i < members.size(); ++i)
-		{
-			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, ", ") + "}";
-	}
-
-	return {};
-}
-
-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();
-		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(1), _type.baseType());
-		if (!elemStr)
-			return false;
-		_array.clear();
-		_array.resize(length, *elemStr);
-		return true;
-	}
-
-	// Recursive case.
-	if (_expr.name == "store")
-	{
-		if (!fillArray(_expr.arguments.at(0), _array, _type))
-			return false;
-		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,
-		// we should catch and ignore those.
-		unsigned long index;
-		try
-		{
-			index = stoul(*indexStr);
-		}
-		catch (std::out_of_range const&)
-		{
-			return true;
-		}
-		catch (std::invalid_argument const&)
-		{
-			return true;
-		}
-		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(2), _type.baseType());
-		if (!elemStr)
-			return false;
-		if (index < _array.size())
-			_array.at(index) = *elemStr;
-		return true;
-	}
-
-	// Special base case, not supported yet.
-	if (_expr.name.rfind("(_ as-array") == 0)
-	{
-		// Z3 expression representing reinterpretation of a different term as an array
-		return false;
-	}
-
-	solAssert(false, "");
-}
 
 std::map<std::string, std::optional<std::string>> Predicate::readTxVars(smtutil::Expression const& _tx) const
 {
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
index a7df446218..f389ab8221 100644
--- a/libsolidity/formal/Predicate.h
+++ b/libsolidity/formal/Predicate.h
@@ -184,12 +184,6 @@ class Predicate
 	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.
-	std::vector<std::optional<std::string>> formatExpressions(std::vector<smtutil::Expression> const& _exprs, std::vector<Type const*> const& _types) const;
-
-	/// @returns a string representation of the SMT expression based on a Solidity type.
-	std::optional<std::string> expressionToString(smtutil::Expression const& _expr, Type const* _type) const;
-
 	/// Recursively fills _array from _expr.
 	/// _expr should have the form `store(store(...(const_array(x_0), i_0, e_0), i_m, e_m), i_k, e_k)`.
 	/// @returns true if the construction worked,

From 08a98d1914d127dbc755cb20c789ab3a90f9066e Mon Sep 17 00:00:00 2001
From: Meet Mangukiya <meet@flamy.dev>
Date: Sun, 7 Jul 2024 15:19:57 +0530
Subject: [PATCH 0937/1140] OptimizedEVMCodeTransform: tag source location in
 stack too deep errors in yul

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

diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 047014e3dc..8731f2cc5d 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -275,7 +275,7 @@ void OptimizedEVMCodeTransform::createStackLayout(langutil::DebugData::ConstPtr
 					varNameDeep.empty() ? varNameTop : varNameDeep,
 					deficit,
 					msg
-				));
+				) << langutil::errinfo_sourceLocation(sourceLocation));
 				m_assembly.markAsInvalid();
 			}
 		},

From 4c857f50ccd73c86b0d1f0b17cc4be298bd99058 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Tue, 9 Jul 2024 16:45:27 +0200
Subject: [PATCH 0938/1140] SMTChecker: Increase Z3 resource limit

Increasing resource limit of z3 results in more SMTChecker tests
correctly solved, without increasing the running time significantly.

This is in preparation for switching z3 to SMT-LIB interface, so as to
not have significant changes in tests for that switch.
---
 libsmtutil/Z3Interface.h                      |  2 +-
 .../abi_encode_with_selector_array_slice.sol  |  4 +--
 ...abi_encode_with_selector_array_slice_2.sol |  4 +--
 .../deployment/deploy_trusted_flow.sol        | 10 ++-----
 .../external_call_indirect_1.sol              |  2 +-
 .../external_call_indirect_3.sol              |  3 +-
 .../external_call_indirect_4.sol              |  3 +-
 .../external_call_indirect_5.sol              |  2 +-
 ..._loop_array_assignment_storage_storage.sol | 10 +++----
 .../operators/index_access_side_effect.sol    |  4 +--
 .../operators/slice_default_start.sol         |  7 ++---
 ...rator_matches_equivalent_function_call.sol | 28 ++-----------------
 .../smtCheckerTests/out_of_bounds/array_1.sol |  7 ++---
 13 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/libsmtutil/Z3Interface.h b/libsmtutil/Z3Interface.h
index ee268ac41d..d5dc5792e0 100644
--- a/libsmtutil/Z3Interface.h
+++ b/libsmtutil/Z3Interface.h
@@ -55,7 +55,7 @@ class Z3Interface: public SolverInterface
 
 	// Z3 "basic resources" limit.
 	// This is used to make the runs more deterministic and platform/machine independent.
-	static int const resourceLimit = 1000000;
+	static int const resourceLimit = 2000000;
 
 private:
 	void declareFunction(std::string const& _name, Sort const& _sort);
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 67c8b92e62..ed6f627b5a 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
@@ -28,6 +28,4 @@ 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.
+// 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/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
index 69a3482b19..c13e9ce07f 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
@@ -28,6 +28,4 @@ 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.
+// 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_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index 2148324ad9..60f3c9415a 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -18,13 +18,9 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTExtCalls: trusted
-// SMTIgnoreOS: macos
 // ----
 // Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) 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: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 6328: (304-322): 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 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) 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_call_indirect_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
index c6b46b2f87..dd8a529a2f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
@@ -38,5 +38,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (256-277): CHC: Assertion violation happens here.
-// Warning 6328: (533-554): CHC: Assertion violation might happen here.
+// Warning 6328: (533-554): 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_call_indirect_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
index ff17649dd9..d7721037fb 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
@@ -40,7 +40,6 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (561-582): CHC: Assertion violation might happen here.
+// Warning 6328: (561-582): 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_call_indirect_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
index 766f6e1334..96adba8843 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
@@ -43,7 +43,6 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (641-662): CHC: Assertion violation might happen here.
+// Warning 6328: (641-662): 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_call_indirect_5.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
index 9313858ce2..26d39838ef 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
@@ -47,5 +47,5 @@ contract C {
 // SMTEngine: chc
 // SMTExtCalls: trusted
 // ----
-// Warning 6328: (601-622): CHC: Assertion violation might happen here.
+// Warning 6328: (601-622): 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_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
index ed7ebdfba5..4bfd175002 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
@@ -23,10 +23,8 @@ contract LoopFor2 {
 	}
 }
 // ====
-// SMTEngine: all
+// SMTEngine: chc
+// SMTTargets: assert
 // ----
-// Warning 6368: (288-292): CHC: Out of bounds access might happen here.
-// 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.
+// 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)
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index d3b6f5895b..644ecdb122 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -22,6 +22,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// 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/slice_default_start.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
index ef422245d3..c4da3b4b69 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
@@ -10,8 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// 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.
+// Warning 6328: (186-218): 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 206c630424..76ad6db553 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
@@ -53,32 +53,10 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTTargets: assert
 // ----
-// 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) might happen here.
-// Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) might happen here.
-// Warning 3944: (870-884): CHC: Underflow (resulting value less than -32768) might happen here.
-// Warning 4984: (870-884): 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 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: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (679-708): BMC: Overflow (resulting value larger than 32767) happens here.
-// Warning 4144: (679-708): BMC: Underflow (resulting value less than -32768) happens here.
-// Warning 2661: (777-806): BMC: Overflow (resulting value larger than 32767) happens here.
-// Warning 4144: (777-806): BMC: Underflow (resulting value less than -32768) happens here.
-// Warning 2661: (953-982): BMC: Overflow (resulting value larger than 32767) happens here.
-// Warning 4144: (953-982): BMC: Underflow (resulting value less than -32768) happens here.
-// Warning 3046: (1051-1080): BMC: Division by zero happens here.
-// Warning 3046: (1149-1178): BMC: Division by zero happens here.
+// Info 1391: CHC: 14 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 7812: (2245-2271): BMC: Assertion violation might happen here.
-// Info 6002: BMC: 14 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/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index 65a1dfd390..c52599b03c 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -18,9 +18,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
+// SMTTargets: outOfBounds
 // ----
-// Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (259-263): 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.
-// Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens 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()

From e0c58e539cebdc9a1de8ae1d27bdb69311b5418c Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 10 Jul 2024 16:37:04 +0200
Subject: [PATCH 0939/1140] SMTChecker: Simplify some of the long running tests

---
 .../smtCheckerTests/abi/abi_decode_array.sol  | 20 +++++++------------
 .../smtCheckerTests/types/array_branch_3d.sol |  4 ++--
 .../array_struct_array_struct_memory_safe.sol |  3 ++-
 ...array_struct_array_struct_storage_safe.sol |  3 ++-
 .../smtCheckerTests/types/type_minmax.sol     | 11 +---------
 .../types/type_simple_range.sol               | 14 +++++++++++++
 6 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/types/type_simple_range.sol

diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
index da30d302fe..c7db3645ac 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
@@ -7,9 +7,7 @@ contract C {
 
 		(uint[] memory c, uint[] memory d) = abi.decode(b1, (uint[], uint[]));
 		assert(a.length == c.length);
-		assert(a.length == d.length); // should fail
 		assert(b.length == d.length);
-		assert(b.length == c.length); // should fail
 
 		(uint[] memory e, uint[] memory f, uint[] memory g) = abi.decode(b1, (uint[], uint[], uint[]));
 		assert(e.length == a.length); // should fail
@@ -24,7 +22,6 @@ contract C {
 
 		(uint[] memory k, uint[] memory l) = abi.decode(b2, (uint[], uint[]));
 		assert(k.length == a.length); // should fail
-		assert(k.length == l.length); // should fail
 		assert(l.length == b.length); // should fail
 	}
 }
@@ -32,14 +29,11 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// 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.
-// Warning 6328: (560-588): CHC: Assertion violation happens here.
-// 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 happens here.
-// Warning 6328: (1056-1084): CHC: Assertion violation happens here.
-// Warning 6328: (1103-1131): CHC: Assertion violation happens here.
+// Warning 6328: (182-210): CHC: Assertion violation happens here.\nCounterexample:\n\nc = []\nd = []\ne = []\nf = []\ng = []\nh = []\ni = []\nj = 0\nk = []\nl = []\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (466-494): CHC: Assertion violation happens here.\nCounterexample:\n\nf = [83, 83, 83, 83, 83, 83, 67, 83, 83, 83, 83, 83, 70, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 72, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 71, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83]\ng = [65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 55, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 60, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65]\nh = []\ni = []\nj = 0\nk = []\nl = []\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (513-541): CHC: Assertion violation happens here.\nCounterexample:\n\ng = [65, 65, 65, 65, 65, 65, 65, 64, 65, 47, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 48, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65]\nh = []\ni = []\nj = 0\nk = []\nl = []\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (560-588): CHC: Assertion violation happens here.\nCounterexample:\n\nb = []\nd = []\nh = []\ni = []\nj = 0\nk = []\nl = []\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (785-822): CHC: Assertion violation happens here.\nCounterexample:\n\nf = [144]\nj = 8365\nk = []\nl = []\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (915-943): CHC: Assertion violation happens here.\nCounterexample:\n\nj = 8365\nl = [35, 35, 35, 35, 35]\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
+// Warning 6328: (962-990): CHC: Assertion violation happens here.\nCounterexample:\n\nj = 32285\n\nTransaction trace:\nC.constructor()\nC.abiDecodeArray(b1, b2) -- counterexample incomplete; parameter name used instead of value
 // 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_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
index 3aced164c8..6c6404c117 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
@@ -15,6 +15,6 @@ contract C
 // ====
 // SMTEngine: chc
 // SMTSolvers: eld
+// SMTTargets: assert
 // ----
-// Warning 6328: (152-174): 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.
+// Warning 6328: (152-174): CHC: Assertion violation happens here.\nCounterexample:\nc = [[[0]]]\nb = false\n\nTransaction trace:\nC.constructor()\nState: c = [[[0]]]\nC.f(false)
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 bc5ddf49ed..972c779707 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
@@ -32,5 +32,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTTargets: assert
 // ----
-// Info 1391: CHC: 29 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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/array_struct_array_struct_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
index b2f7b9825c..ce5f375c46 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
@@ -52,5 +52,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTTargets: assert
 // ----
-// Info 1391: CHC: 51 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// 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 da9bb1b6d1..eb739c5e9e 100644
--- a/test/libsolidity/smtCheckerTests/types/type_minmax.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
@@ -1,12 +1,4 @@
 contract C {
-	function f(uint a) public pure {
-		assert(a <= type(uint).max);
-		assert(a >= type(uint).min);
-		require(a <= type(uint64).max);
-		assert(a <= type(uint64).max);
-		assert(a <= type(uint32).max);
-	}
-
 	function int_min() public pure {
 		int8 int8_min = type(int8).min;
 		assert(int8_min == -2**7);
@@ -81,5 +73,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// 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.
+// 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/types/type_simple_range.sol b/test/libsolidity/smtCheckerTests/types/type_simple_range.sol
new file mode 100644
index 0000000000..579b232d73
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/type_simple_range.sol
@@ -0,0 +1,14 @@
+contract C {
+	function f(uint a) public pure {
+		assert(a <= type(uint).max);
+		assert(a >= type(uint).min);
+		require(a <= type(uint64).max);
+		assert(a <= type(uint64).max);
+		assert(a <= type(uint32).max); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (178-207): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4294967296\n\nTransaction trace:\nC.constructor()\nC.f(4294967296)
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 54686862ece4f0e3430600849a7a69df57cf68ac Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Wed, 10 Jul 2024 14:55:07 +0200
Subject: [PATCH 0940/1140] Yul: Add const version of FunctionCallFinder

---
 libyul/backends/evm/EVMObjectCompiler.cpp |  4 +--
 libyul/optimiser/FullInliner.cpp          |  2 +-
 libyul/optimiser/FunctionCallFinder.cpp   | 41 ++++++++++++++++++-----
 libyul/optimiser/FunctionCallFinder.h     | 24 ++++++-------
 libyul/optimiser/StackLimitEvader.cpp     |  4 +--
 test/libsolidity/MemoryGuardTest.cpp      |  2 +-
 6 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index 28b72c0871..0bd064940e 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -90,8 +90,8 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		);
 		if (!stackErrors.empty())
 		{
-			std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
-				*_object.code,
+			std::vector<FunctionCall const*> memoryGuardCalls = findFunctionCalls(
+				std::as_const(*_object.code),
 				"memoryguard"_yulstring
 			);
 			auto stackError = stackErrors.front();
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 6e4d849719..3bf00282c0 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -83,7 +83,7 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 	}
 
 	// Check for memory guard.
-	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(
 		_ast,
 		"memoryguard"_yulstring
 	);
diff --git a/libyul/optimiser/FunctionCallFinder.cpp b/libyul/optimiser/FunctionCallFinder.cpp
index 9d94dc5f9c..99f171026e 100644
--- a/libyul/optimiser/FunctionCallFinder.cpp
+++ b/libyul/optimiser/FunctionCallFinder.cpp
@@ -16,23 +16,46 @@
 */
 
 #include <libyul/optimiser/FunctionCallFinder.h>
+
+#include <libyul/optimiser/ASTWalker.h>
 #include <libyul/AST.h>
 
 using namespace solidity;
 using namespace solidity::yul;
 
-std::vector<FunctionCall*> FunctionCallFinder::run(Block& _block, YulString _functionName)
+namespace
+{
+template<typename Base, typename ResultType>
+class MaybeConstFunctionCallFinder: Base
 {
-	FunctionCallFinder functionCallFinder(_functionName);
-	functionCallFinder(_block);
-	return functionCallFinder.m_calls;
+public:
+	using MaybeConstBlock = std::conditional_t<std::is_const_v<ResultType>, Block const, Block>;
+	static std::vector<ResultType*> run(MaybeConstBlock& _block, YulString const _functionName)
+	{
+		MaybeConstFunctionCallFinder functionCallFinder(_functionName);
+		functionCallFinder(_block);
+		return functionCallFinder.m_calls;
+	}
+private:
+	explicit MaybeConstFunctionCallFinder(YulString const _functionName): m_functionName(_functionName), m_calls() {}
+	using Base::operator();
+	void operator()(ResultType& _functionCall) override
+	{
+		Base::operator()(_functionCall);
+		if (_functionCall.functionName.name == m_functionName)
+			m_calls.emplace_back(&_functionCall);
+	}
+	YulString m_functionName;
+	std::vector<ResultType*> m_calls;
+};
 }
 
-FunctionCallFinder::FunctionCallFinder(YulString _functionName): m_functionName(_functionName) {}
+std::vector<FunctionCall*> solidity::yul::findFunctionCalls(Block& _block, YulString _functionName)
+{
+	return MaybeConstFunctionCallFinder<ASTModifier, FunctionCall>::run(_block, _functionName);
+}
 
-void FunctionCallFinder::operator()(FunctionCall& _functionCall)
+std::vector<FunctionCall const*> solidity::yul::findFunctionCalls(Block const& _block, YulString _functionName)
 {
-	ASTModifier::operator()(_functionCall);
-	if (_functionCall.functionName.name == m_functionName)
-		m_calls.emplace_back(&_functionCall);
+	return MaybeConstFunctionCallFinder<ASTWalker, FunctionCall const>::run(_block, _functionName);
 }
diff --git a/libyul/optimiser/FunctionCallFinder.h b/libyul/optimiser/FunctionCallFinder.h
index 365f86688b..a5d4da56e9 100644
--- a/libyul/optimiser/FunctionCallFinder.h
+++ b/libyul/optimiser/FunctionCallFinder.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/ASTForward.h>
+#include <libyul/YulString.h>
 
 #include <vector>
 
@@ -28,20 +29,17 @@ namespace solidity::yul
 {
 
 /**
- * AST walker that finds all calls to a function of a given name.
+ * Finds all calls to a function of a given name using an ASTModifier.
  *
  * Prerequisite: Disambiguator
  */
-class FunctionCallFinder: ASTModifier
-{
-public:
-	static std::vector<FunctionCall*> run(Block& _block, YulString _functionName);
-private:
-	FunctionCallFinder(YulString _functionName);
-	using ASTModifier::operator();
-	void operator()(FunctionCall& _functionCall) override;
-	YulString m_functionName;
-	std::vector<FunctionCall*> m_calls;
-};
+std::vector<FunctionCall*> findFunctionCalls(Block& _block, YulString _functionName);
+
+/**
+ * Finds all calls to a function of a given name using an ASTWalker.
+ *
+ * Prerequisite: Disambiguator
+ */
+std::vector<FunctionCall const*> findFunctionCalls(Block const& _block, YulString _functionName);
 
 }
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 904ee77e00..0310858a18 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -174,7 +174,7 @@ void StackLimitEvader::run(
 		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
 	);
 
-	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(
 		*_object.code,
 		"memoryguard"_yulstring
 	);
@@ -206,7 +206,7 @@ void StackLimitEvader::run(
 	StackToMemoryMover::run(_context, reservedMemory, memoryOffsetAllocator.slotAllocations, requiredSlots, *_object.code);
 
 	reservedMemory += 32 * requiredSlots;
-	for (FunctionCall* memoryGuardCall: FunctionCallFinder::run(*_object.code, "memoryguard"_yulstring))
+	for (FunctionCall* memoryGuardCall: findFunctionCalls(*_object.code, "memoryguard"_yulstring))
 	{
 		Literal* literal = std::get_if<Literal>(&memoryGuardCall->arguments.front());
 		yulAssert(literal && literal->kind == LiteralKind::Number, "");
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 7f0914cc4e..caa85c6fde 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -73,7 +73,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 		}
 
 		auto handleObject = [&](std::string const& _kind, Object const& _object) {
-			m_obtainedResult += contractName + "(" + _kind + ") " + (FunctionCallFinder::run(
+			m_obtainedResult += contractName + "(" + _kind + ") " + (findFunctionCalls(
 				*_object.code,
 				"memoryguard"_yulstring
 			).empty() ? "false" : "true") + "\n";

From f53bb02c52f7c63e59da8299ab9dc72872c2795f Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 10 Jul 2024 21:46:10 +0200
Subject: [PATCH 0941/1140] SMTChecker: Further test simplifications

---
 .../deployment/deploy_trusted_flow.sol        |  8 +++---
 ...code_state_reentrancy_indirect_trusted.sol | 24 +++++++----------
 .../external_calls/external_inc.sol           |  8 +++---
 .../external_calls/external_safe.sol          |  5 ++--
 .../types/array_branches_3d.sol               | 10 ++-----
 .../types/array_branches_3d_show_unproved.sol | 27 -------------------
 .../types/array_static_mapping_aliasing_1.sol | 10 +++----
 .../types/array_static_mapping_aliasing_2.sol | 12 +++------
 8 files changed, 29 insertions(+), 75 deletions(-)
 delete mode 100644 test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol

diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index 60f3c9415a..4a447d6316 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -1,6 +1,6 @@
 contract D {
 	uint x;
-	function inc() public { ++x; }
+	function inc() public { require(x < 5); ++x; }
 	function f() public view returns (uint) { return x; }
 }
 
@@ -18,9 +18,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTExtCalls: trusted
+// SMTTargets: assert
 // ----
-// Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (304-322): CHC: Assertion violation might happen here.
+// Warning 6328: (320-338): 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 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (304-322): BMC: Assertion violation happens here.
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
index 8000b3267d..e689c21b4b 100644
--- 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
@@ -1,9 +1,5 @@
 contract Other {
-	C c;
-	constructor(C _c) {
-		c = _c;
-	}
-	function h() public {
+	function h(C c) public {
 		c.setOwner(address(0));
 	}
 }
@@ -11,13 +7,11 @@ contract Other {
 contract State {
 	uint x;
 	Other o;
-	C c;
-	constructor(C _c) {
-		c = _c;
-		o = new Other(_c);
+	constructor() {
+		o = new Other();
 	}
-	function f() public returns (uint) {
-		o.h();
+	function f(C c) public returns (uint) {
+		o.h(c);
 		return c.g();
 	}
 }
@@ -29,7 +23,7 @@ contract C {
 
 	constructor() {
 		owner = msg.sender;
-		s = new State(this);
+		s = new State();
 	}
 
 	function setOwner(address _owner) public {
@@ -38,7 +32,7 @@ contract C {
 
 	function f() public {
 		address prevOwner = owner;
-		uint z = s.f();
+		uint z = s.f(this);
 		assert(z == y); // should hold
 		assert(prevOwner == owner); // should not hold because of reentrancy
 	}
@@ -52,5 +46,5 @@ contract C {
 // SMTEngine: chc
 // SMTExtCalls: trusted
 // ----
-// Warning 6328: (531-545): CHC: Assertion violation might happen here.
-// Warning 6328: (564-590): CHC: Assertion violation happens here.
+// Warning 6328: (509-535): 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_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
index 22a4551c85..117d3fa721 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
@@ -7,18 +7,18 @@ contract C {
 	D d;
 
 	function inc() public {
+		require(x < 10);
 		++x;
 	}
 
 	function f() public {
 		d.d();
-		assert(x < 10);
+		assert(x < 5);
 	}
 }
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (113-116): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.
-// Warning 2661: (113-116): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (175-188): CHC: Assertion violation happens here.\nCounterexample:\nx = 5, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.inc()\nState: x = 1, d = 0\nC.inc()\nState: x = 2, d = 0\nC.inc()\nState: x = 3, d = 0\nC.inc()\nState: x = 4, d = 0\nC.f()\n    d.d() -- untrusted external call, synthesized as:\n        C.inc() -- reentrant 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/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index 593aba289c..bfc95b35a2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -6,16 +6,15 @@ contract C {
 	uint x;
 	D d;
 	function f() public {
-		if (x < 10)
+		if (x < 5)
 			++x;
 	}
 	function g() public {
 		d.d();
-		assert(x < 11);
+		assert(x < 6);
 	}
 }
 // ====
 // SMTEngine: all
-// 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/types/array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
index 8e9499183a..9dbdde90fb 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
@@ -15,12 +15,6 @@ contract C
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
+// SMTTargets: assert
 // ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// 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 1391: CHC: 7 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.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
deleted file mode 100644
index 7e9aad5b01..0000000000
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-contract C
-{
-	uint[][][] c;
-	constructor() {
-		c.push();
-		c[0].push();
-		c[0][0].push();
-	}
-	function f(bool b) public {
-		c[0][0][0] = 0;
-		if (b)
-			c[0][0][0] = 1;
-		assert(c[0][0][0] < 2);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTShowUnproved: yes
-// SMTIgnoreOS: macos
-// ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// 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 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 7ee1acf47b..8d727f018a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
@@ -5,7 +5,6 @@ contract C
 	mapping (uint => uint8)[2] severalMaps8;
 	mapping (uint => uint)[2][2] severalMaps3d;
 	function f(mapping (uint => uint) storage map) internal {
-		// Accesses are safe but oob is reported because of aliasing.
 		severalMaps[0][0] = 42;
 		severalMaps8[0][0] = 42;
 		severalMaps3d[0][0][0] = 42;
@@ -15,8 +14,7 @@ contract C
 		// Should not fail since knowledge is erased only for mapping (uint => uint).
 		assert(severalMaps8[0][0] == 42);
 		// Should fail since map == severalMaps3d[0][0] is possible.
-		// Removed because current Spacer seg faults in cex generation.
-		//assert(severalMaps3d[0][0][0] == 42);
+		assert(severalMaps3d[0][0][0] == 42);
 	}
 	function g(uint x) public {
 		require(x < severalMaps.length);
@@ -26,6 +24,8 @@ contract C
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
-// Warning 6328: (456-487): 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.
+// Warning 6328: (392-423): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(map) -- counterexample incomplete; parameter name used instead of value -- internal call
+// Warning 6328: (606-642): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(map) -- counterexample incomplete; parameter name used instead of value -- 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/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index 1f167b8586..f05487dcb9 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -5,7 +5,6 @@ contract C
 	mapping (uint => uint8)[2] severalMaps8;
 	mapping (uint => uint)[2][2] severalMaps3d;
 	function f(mapping (uint => uint) storage map) internal {
-		// Accesses are safe but reported as unsafe due to aliasing.
 		map[0] = 42;
 		severalMaps[0][0] = 42;
 		severalMaps8[0][0] = 42;
@@ -16,8 +15,7 @@ contract C
 		// Should not fail since knowledge is erased only for mapping (uint => uint).
 		assert(severalMaps8[0][0] == 42);
 		// Should not fail since singleMap == severalMaps3d[0][0] is not possible.
-		// Removed because of Spacer nondeterminism.
-		//assert(severalMaps3d[0][0][0] == 42);
+		assert(severalMaps3d[0][0][0] == 42);
 		// Should fail since singleMap == map is possible.
 		assert(map[0] == 42);
 	}
@@ -29,9 +27,7 @@ contract C
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
-// 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.
-// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 6328: (748-768): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(map) -- counterexample incomplete; parameter name used instead of value -- internal call
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 678e352f2093184b5cd1faee54783cfab74978ed Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Mon, 15 Jul 2024 10:55:03 +0200
Subject: [PATCH 0942/1140] Yul: Object node names are std::string instead of
 YulString

---
 libsolidity/interface/StandardCompiler.cpp |  2 +-
 libyul/AsmAnalysis.cpp                     |  2 +-
 libyul/AsmAnalysis.h                       |  4 +--
 libyul/Object.cpp                          | 41 +++++++++++-----------
 libyul/Object.h                            | 10 +++---
 libyul/ObjectParser.cpp                    | 18 ++++++----
 libyul/ObjectParser.h                      |  4 +--
 libyul/YulStack.cpp                        |  2 +-
 libyul/backends/evm/EVMDialect.cpp         | 16 ++++-----
 libyul/backends/evm/EVMDialect.h           |  2 +-
 libyul/backends/evm/EVMObjectCompiler.cpp  |  6 ++--
 test/libsolidity/MemoryGuardTest.cpp       |  2 +-
 tools/yulPhaser/Program.cpp                |  2 +-
 13 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 5510b54307..b908ab0cc6 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1638,7 +1638,7 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		return output;
 	}
 
-	std::string contractName = stack.parserResult()->name.str();
+	std::string contractName = stack.parserResult()->name;
 
 	bool const wildcardMatchesExperimental = true;
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ir", wildcardMatchesExperimental))
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index ac97f988d4..38b9c782e0 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -428,7 +428,7 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				if (functionName == "datasize" || functionName == "dataoffset")
 				{
 					auto const& argumentAsLiteral = std::get<Literal>(arg);
-					if (!m_dataNames.count(YulString(formatLiteral(argumentAsLiteral))))
+					if (!m_dataNames.count(formatLiteral(argumentAsLiteral)))
 						m_errorReporter.typeError(
 							3517_error,
 							nativeLocationOf(arg),
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index c49e685591..9dd4b22923 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -61,7 +61,7 @@ class AsmAnalyzer
 		langutil::ErrorReporter& _errorReporter,
 		Dialect const& _dialect,
 		ExternalIdentifierAccess::Resolver _resolver = ExternalIdentifierAccess::Resolver(),
-		std::set<YulString> _dataNames = {}
+		std::set<std::string> _dataNames = {}
 	):
 		m_resolver(std::move(_resolver)),
 		m_info(_analysisInfo),
@@ -128,7 +128,7 @@ class AsmAnalyzer
 	langutil::EVMVersion m_evmVersion;
 	Dialect const& m_dialect;
 	/// Names of data objects to be referenced by builtin functions with literal arguments.
-	std::set<YulString> m_dataNames;
+	std::set<std::string> m_dataNames;
 	ForLoop const* m_currentForLoop = nullptr;
 	/// Worst side effects encountered during analysis (including within defined functions).
 	SideEffects m_sideEffects;
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 260cb73301..76d8bdc667 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -40,7 +40,7 @@ using namespace solidity::yul;
 
 std::string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
 {
-	return "data \"" + name.str() + "\" hex\"" + util::toHex(data) + "\"";
+	return "data \"" + name + "\" hex\"" + util::toHex(data) + "\"";
 }
 
 std::string Object::toString(
@@ -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) + "\n}";
+	return useSrcComment + "object \"" + name + "\" {\n" + indent(inner) + "\n}";
 }
 
 Json Data::toJson() const
@@ -97,62 +97,61 @@ Json Object::toJson() const
 
 	Json ret;
 	ret["nodeType"] = "YulObject";
-	ret["name"] = name.str();
+	ret["name"] = name;
 	ret["code"] = codeJson;
 	ret["subObjects"] = subObjectsJson;
 	return ret;
 }
 
-std::set<YulString> Object::qualifiedDataNames() const
+std::set<std::string> Object::qualifiedDataNames() const
 {
-	std::set<YulString> qualifiedNames =
-		name.empty() || util::contains(name.str(), '.') ?
-		std::set<YulString>{} :
-		std::set<YulString>{name};
+	std::set<std::string> qualifiedNames =
+		name.empty() || util::contains(name, '.') ?
+		std::set<std::string>{} :
+		std::set<std::string>{name};
 	for (std::shared_ptr<ObjectNode> const& subObjectNode: subObjects)
 	{
 		yulAssert(qualifiedNames.count(subObjectNode->name) == 0, "");
-		if (util::contains(subObjectNode->name.str(), '.'))
+		if (util::contains(subObjectNode->name, '.'))
 			continue;
 		qualifiedNames.insert(subObjectNode->name);
 		if (auto const* subObject = dynamic_cast<Object const*>(subObjectNode.get()))
-			for (YulString const& subSubObj: subObject->qualifiedDataNames())
+			for (auto const& subSubObj: subObject->qualifiedDataNames())
 				if (subObject->name != subSubObj)
 				{
-					yulAssert(qualifiedNames.count(YulString{subObject->name.str() + "." + subSubObj.str()}) == 0, "");
-					qualifiedNames.insert(YulString{subObject->name.str() + "." + subSubObj.str()});
+					yulAssert(qualifiedNames.count(subObject->name + "." + subSubObj) == 0, "");
+					qualifiedNames.insert(subObject->name + "." + subSubObj);
 				}
 	}
 
-	yulAssert(qualifiedNames.count(YulString{}) == 0, "");
-	qualifiedNames.erase(YulString{});
+	yulAssert(qualifiedNames.count("") == 0, "");
 	return qualifiedNames;
 }
 
-std::vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
+std::vector<size_t> Object::pathToSubObject(std::string_view _qualifiedName) const
 {
 	yulAssert(_qualifiedName != name, "");
 	yulAssert(subIndexByName.count(name) == 0, "");
 
-	if (boost::algorithm::starts_with(_qualifiedName.str(), name.str() + "."))
-		_qualifiedName = YulString{_qualifiedName.str().substr(name.str().length() + 1)};
+	if (boost::algorithm::starts_with(_qualifiedName, name + "."))
+		_qualifiedName = _qualifiedName.substr(name.length() + 1);
 	yulAssert(!_qualifiedName.empty(), "");
 
 	std::vector<std::string> subObjectPathComponents;
-	boost::algorithm::split(subObjectPathComponents, _qualifiedName.str(), boost::is_any_of("."));
+	boost::algorithm::split(subObjectPathComponents, _qualifiedName, boost::is_any_of("."));
 
 	std::vector<size_t> path;
 	Object const* object = this;
 	for (std::string const& currentSubObjectName: subObjectPathComponents)
 	{
 		yulAssert(!currentSubObjectName.empty(), "");
-		auto subIndexIt = object->subIndexByName.find(YulString{currentSubObjectName});
+		auto subIndexIt = object->subIndexByName.find(currentSubObjectName);
 		yulAssert(
 			subIndexIt != object->subIndexByName.end(),
-			"Assembly object <" + _qualifiedName.str() + "> not found or does not contain code."
+			"Assembly object <" + std::string(_qualifiedName) + "> not found or does not contain code."
 		);
 		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, "Assembly object <" + std::string(_qualifiedName) + "> not found or does not contain code.");
 		yulAssert(object->subId != std::numeric_limits<size_t>::max(), "");
 		path.push_back({object->subId});
 	}
diff --git a/libyul/Object.h b/libyul/Object.h
index 54a8080d08..c1ca9244d9 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -52,7 +52,7 @@ struct ObjectNode
 
 	/// Name of the object.
 	/// Can be empty since .yul files can also just contain code, without explicitly placing it in an object.
-	YulString name;
+	std::string name;
 	virtual std::string toString(
 		Dialect const* _dialect,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
@@ -66,7 +66,7 @@ struct ObjectNode
  */
 struct Data: public ObjectNode
 {
-	Data(YulString _name, bytes _data): data(std::move(_data)) { name = _name; }
+	Data(std::string _name, bytes _data): data(std::move(_data)) { name = _name; }
 
 	bytes data;
 
@@ -102,7 +102,7 @@ struct Object: public ObjectNode
 	/// @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.
-	std::set<YulString> qualifiedDataNames() const;
+	std::set<std::string> qualifiedDataNames() const;
 
 	/// @returns vector of subIDs if possible to reach subobject with @a _qualifiedName, throws otherwise
 	/// For "B.C" should return vector of two values if success (subId of B and subId of C in B).
@@ -114,14 +114,14 @@ struct Object: public ObjectNode
 	/// pathToSubObject("E2.F3.H4") == {1, 0, 2}
 	/// pathToSubObject("A1.E2") == {1}
 	/// The path must not lead to a @a Data object (will throw in that case).
-	std::vector<size_t> pathToSubObject(YulString _qualifiedName) const;
+	std::vector<size_t> pathToSubObject(std::string_view _qualifiedName) const;
 
 	/// sub id for object if it is subobject of another object, max value if it is not subobject
 	size_t subId = std::numeric_limits<size_t>::max();
 
 	std::shared_ptr<Block> code;
 	std::vector<std::shared_ptr<ObjectNode>> subObjects;
-	std::map<YulString, size_t> subIndexByName;
+	std::map<std::string, size_t, std::less<>> subIndexByName;
 	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
 
 	std::shared_ptr<ObjectDebugData const> debugData;
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index a02b9660b9..1f5363fd8d 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -50,7 +50,7 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 		{
 			// Special case: Code-only form.
 			object = std::make_shared<Object>();
-			object->name = "object"_yulstring;
+			object->name = "object";
 			auto sourceNameMapping = tryParseSourceNameMapping();
 			object->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
 			object->code = parseBlock(sourceNameMapping);
@@ -185,7 +185,7 @@ void ObjectParser::parseData(Object& _containingObject)
 	);
 	advance();
 
-	YulString name = parseUniqueName(&_containingObject);
+	auto const name = parseUniqueName(&_containingObject);
 
 	if (currentToken() == Token::HexStringLiteral)
 		expectToken(Token::HexStringLiteral, false);
@@ -195,22 +195,26 @@ void ObjectParser::parseData(Object& _containingObject)
 	advance();
 }
 
-YulString ObjectParser::parseUniqueName(Object const* _containingObject)
+std::string ObjectParser::parseUniqueName(Object const* _containingObject)
 {
 	expectToken(Token::StringLiteral, false);
-	YulString name{currentLiteral()};
+	auto const name = currentLiteral();
 	if (name.empty())
 		parserError(3287_error, "Object name cannot be empty.");
 	else if (_containingObject && _containingObject->name == name)
 		parserError(8311_error, "Object name cannot be the same as the name of the containing object.");
 	else if (_containingObject && _containingObject->subIndexByName.count(name))
-		parserError(8794_error, "Object name \"" + name.str() + "\" already exists inside the containing object.");
+		parserError(8794_error, "Object name \"" + name + "\" already exists inside the containing object.");
 	advance();
 	return name;
 }
 
-void ObjectParser::addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject)
+void ObjectParser::addNamedSubObject(Object& _container, std::string_view const _name, std::shared_ptr<ObjectNode> _subObject)
 {
-	_container.subIndexByName[_name] = _container.subObjects.size();
+	_container.subIndexByName.emplace(
+		std::piecewise_construct,
+		std::forward_as_tuple(_name),
+		std::forward_as_tuple(_container.subObjects.size())
+	);
 	_container.subObjects.emplace_back(std::move(_subObject));
 }
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h
index 716a191ea8..08a8529912 100644
--- a/libyul/ObjectParser.h
+++ b/libyul/ObjectParser.h
@@ -63,8 +63,8 @@ class ObjectParser: public langutil::ParserBase
 	void parseData(Object& _containingObject);
 
 	/// Tries to parse a name that is non-empty and unique inside the containing object.
-	YulString parseUniqueName(Object const* _containingObject);
-	void addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject);
+	std::string parseUniqueName(Object const* _containingObject);
+	void addNamedSubObject(Object& _container, std::string_view _name, std::shared_ptr<ObjectNode> _subObject);
 
 	Dialect const& m_dialect;
 };
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 94e9ad7a8d..27b4b5526b 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -198,7 +198,7 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 	for (auto& subNode: _object.subObjects)
 		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
 		{
-			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
+			bool isCreation = !boost::ends_with(subObject->name, "_deployed");
 			optimize(*subObject, isCreation);
 		}
 
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 856689c91a..d3b9c34bcb 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -249,14 +249,14 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
 			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
-			if (_context.currentObject->name == dataName)
+			if (_context.currentObject->name == dataName.str())
 				_assembly.appendAssemblySize();
 			else
 			{
 			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName) == 0 ?
-						_context.currentObject->pathToSubObject(dataName) :
-						std::vector<size_t>{_context.subIDs.at(dataName)};
+					_context.subIDs.count(dataName.str()) == 0 ?
+						_context.currentObject->pathToSubObject(dataName.str()) :
+						std::vector<size_t>{_context.subIDs.at(dataName.str())};
 				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
 				_assembly.appendDataSize(subIdPath);
 			}
@@ -270,14 +270,14 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
 			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
-			if (_context.currentObject->name == dataName)
+			if (_context.currentObject->name == dataName.str())
 				_assembly.appendConstant(0);
 			else
 			{
 			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName) == 0 ?
-						_context.currentObject->pathToSubObject(dataName) :
-						std::vector<size_t>{_context.subIDs.at(dataName)};
+					_context.subIDs.count(dataName.str()) == 0 ?
+						_context.currentObject->pathToSubObject(dataName.str()) :
+						std::vector<size_t>{_context.subIDs.at(dataName.str())};
 				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
 				_assembly.appendDataOffset(subIdPath);
 			}
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 28649f3e5e..f0455a8e42 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -45,7 +45,7 @@ struct BuiltinContext
 {
 	Object const* currentObject = nullptr;
 	/// Mapping from named objects to abstract assembly sub IDs.
-	std::map<YulString, AbstractAssembly::SubID> subIDs;
+	std::map<std::string, AbstractAssembly::SubID> subIDs;
 };
 
 struct BuiltinFunctionForEVM: public BuiltinFunction
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index 0bd064940e..81a345f908 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -55,8 +55,8 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 	for (auto const& subNode: _object.subObjects)
 		if (auto* subObject = dynamic_cast<Object*>(subNode.get()))
 		{
-			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
-			auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name.str());
+			bool isCreation = !boost::ends_with(subObject->name, "_deployed");
+			auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name);
 			context.subIDs[subObject->name] = subAssemblyAndID.second;
 			subObject->subId = subAssemblyAndID.second;
 			compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize, m_eofVersion);
@@ -65,7 +65,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		{
 			Data const& data = dynamic_cast<Data const&>(*subNode);
 			// Special handling of metadata.
-			if (data.name.str() == Object::metadataName())
+			if (data.name == Object::metadataName())
 				m_assembly.appendToAuxiliaryData(data.data);
 			else
 				context.subIDs[data.name] = m_assembly.appendData(data.data);
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index caa85c6fde..6e44afccf4 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -80,7 +80,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 		};
 		handleObject("creation", *object);
 		size_t deployedIndex = object->subIndexByName.at(
-			YulString(IRNames::deployedObject(compiler().contractDefinition(contractName)))
+			IRNames::deployedObject(compiler().contractDefinition(contractName))
 		);
 		handleObject("runtime", dynamic_cast<Object const&>(*object->subObjects[deployedIndex]));
 	}
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 00abcc8e5c..1586f60206 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -135,7 +135,7 @@ std::variant<std::unique_ptr<Block>, ErrorList> Program::parseObject(Dialect con
 			// The other object references the nested one which makes analysis fail. Below we try to
 			// extract just the nested one for that reason. This is just a heuristic. If there's no
 			// subobject with such a suffix we fall back to accepting the whole object as is.
-			if (subObject != nullptr && subObject->name.str() == object->name.str() + "_deployed")
+			if (subObject != nullptr && subObject->name == object->name + "_deployed")
 			{
 				deployedObject = dynamic_cast<Object*>(subObject.get());
 				if (deployedObject != nullptr)

From d6bf14ae3035df916b1b67667467a08b96cd61f1 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 7 Jun 2023 12:17:10 +0200
Subject: [PATCH 0943/1140] Implementation of Lengauer-Tarjan algorithm to find
 dominators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 libsolutil/CMakeLists.txt               |   1 +
 libsolutil/DominatorFinder.h            | 412 +++++++++++
 test/CMakeLists.txt                     |   1 +
 test/libsolutil/DominatorFinderTest.cpp | 920 ++++++++++++++++++++++++
 4 files changed, 1334 insertions(+)
 create mode 100644 libsolutil/DominatorFinder.h
 create mode 100644 test/libsolutil/DominatorFinderTest.cpp

diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 0fdb23b044..291c95c0d1 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -8,6 +8,7 @@ set(sources
 	CommonIO.cpp
 	CommonIO.h
 	cxx20.h
+	DominatorFinder.h
 	Exceptions.cpp
 	Exceptions.h
 	ErrorCodes.h
diff --git a/libsolutil/DominatorFinder.h b/libsolutil/DominatorFinder.h
new file mode 100644
index 0000000000..ba86f6f022
--- /dev/null
+++ b/libsolutil/DominatorFinder.h
@@ -0,0 +1,412 @@
+/*
+	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
+/**
+ * Dominator analysis of a control flow graph.
+ * The implementation is based on the following paper:
+ * https://www.cs.princeton.edu/courses/archive/spr03/cs423/download/dominators.pdf
+ * See appendix B pg. 139.
+ */
+#pragma once
+
+#include <liblangutil/Exceptions.h>
+#include <libsolutil/Visitor.h>
+
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/drop.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <range/v3/view/transform.hpp>
+
+#include <deque>
+#include <vector>
+#include <set>
+
+namespace
+{
+	template <typename, typename = void>
+	struct has_id : std::false_type {};
+
+	template <typename T>
+	struct has_id<T, std::void_t<decltype(std::declval<T>().id)>> : std::true_type {};
+}
+
+namespace solidity::util
+{
+
+/// DominatorFinder computes the dominator tree of a directed graph.
+/// V is the type of the vertex and it is assumed to have a unique identifier.
+/// ForEachSuccessor is a visitor that visits the successors of a vertex.
+///
+/// The graph must contain at least one vertex (the entry point) and is assumed to not be disconnected.
+/// Only vertices reachable from the entry vertex are visited.
+template<typename V, typename ForEachSuccessor>
+class DominatorFinder
+{
+public:
+	static_assert(has_id<V>::value, "vertex must define id member");
+	using VId = typename V::Id;
+	using DfsIndex = size_t;
+
+	DominatorFinder(V const& _entry):
+		m_immediateDominators(findDominators(_entry))
+	{
+		buildDominatorTree();
+	}
+
+	std::vector<VId> const& verticesIdsInDFSOrder() const
+	{
+		return m_verticesInDFSOrder;
+	}
+
+	std::map<VId, DfsIndex> const& dfsIndexById() const
+	{
+		return m_dfsIndexByVertexId;
+	}
+
+	std::map<VId, std::optional<VId>> const immediateDominators() const
+	{
+		return m_immediateDominators
+			| ranges::views::enumerate
+			| ranges::views::transform([&](auto const& _v) {
+				std::optional<VId> idomId = (_v.second.has_value()) ? std::optional<VId>(m_verticesInDFSOrder[_v.second.value()]) : std::nullopt;
+				return std::make_pair(m_verticesInDFSOrder[_v.first], idomId);
+			})
+			| ranges::to<std::map<VId, std::optional<VId>>>;
+	}
+
+	std::vector<std::optional<DfsIndex>> const& immediateDominatorsByDfsIndex() const
+	{
+		return m_immediateDominators;
+	}
+
+	std::map<VId, std::vector<VId>> const& dominatorTree() const
+	{
+		return m_dominatorTree;
+	}
+
+	bool dominates(VId const& _dominatorId, VId const& _dominatedId) const
+	{
+		solAssert(!m_dfsIndexByVertexId.empty());
+		solAssert(!m_immediateDominators.empty());
+
+		solAssert(m_dfsIndexByVertexId.count(_dominatorId) && m_dfsIndexByVertexId.count(_dominatedId));
+		DfsIndex dominatorIdx = m_dfsIndexByVertexId.at(_dominatorId);
+		DfsIndex dominatedIdx = m_dfsIndexByVertexId.at(_dominatedId);
+
+		if (dominatorIdx == dominatedIdx)
+			return true;
+
+		DfsIndex idomIdx = m_immediateDominators.at(dominatedIdx).value_or(0);
+		while (idomIdx != 0)
+		{
+			solAssert(idomIdx < m_immediateDominators.size());
+			if (idomIdx == dominatorIdx)
+				return true;
+			// The index of the immediate dominator of a vertex is always less than the index of the vertex itself.
+			solAssert(m_immediateDominators.at(idomIdx).has_value() && m_immediateDominators.at(idomIdx).value() < idomIdx);
+			idomIdx = m_immediateDominators[idomIdx].value();
+		}
+		// Now that we reached the entry node (i.e. idomIdx = 0),
+		// either ``dominatorIdx == 0`` or it does not dominate the other node.
+		solAssert(idomIdx == 0);
+		return dominatorIdx == 0;
+	}
+
+	/// Checks whether vertex ``_dominator`` dominates ``_dominated`` by going
+	/// through the path from ``_dominated`` to the entry node.
+	/// If ``_dominator`` is found, then it dominates ``_dominated``
+	/// otherwise it doesn't.
+	bool dominates(V const& _dominator, V const& _dominated) const
+	{
+		return dominates(_dominator.id, _dominated.id);
+	}
+
+	std::vector<VId> dominatorsOf(VId const& _vId) const
+	{
+		solAssert(!m_verticesInDFSOrder.empty());
+		solAssert(!m_dfsIndexByVertexId.empty());
+		solAssert(!m_immediateDominators.empty());
+
+		solAssert(m_dfsIndexByVertexId.count(_vId));
+
+		// No one dominates the entry vertex and we consider self-dominance implicit
+		// i.e. every node already dominates itself.
+		if (m_dfsIndexByVertexId.at(_vId) == 0)
+			return {};
+
+		solAssert(m_dfsIndexByVertexId.at(_vId) < m_immediateDominators.size());
+		DfsIndex idomIdx = m_immediateDominators.at(m_dfsIndexByVertexId.at(_vId)).value_or(0);
+		solAssert(idomIdx < m_immediateDominators.size());
+
+		std::vector<VId> dominators;
+		while (idomIdx != 0)
+		{
+			solAssert(m_immediateDominators.at(idomIdx).has_value() && m_immediateDominators.at(idomIdx).value() < idomIdx);
+			dominators.emplace_back(m_verticesInDFSOrder.at(idomIdx));
+			idomIdx = m_immediateDominators[idomIdx].value();
+		}
+
+		// The loop above discovers the dominators in the reverse order
+		// i.e. from the given vertex upwards to the entry node (the root of the dominator tree).
+		// And the entry vertex always dominates all other vertices.
+		dominators.emplace_back(m_verticesInDFSOrder[0]);
+
+		return dominators;
+	}
+
+	/// Find all dominators of a node _v
+	/// @note for a vertex ``_v``, the _v’s inclusion in the set of dominators of ``_v`` is implicit.
+	std::vector<VId> dominatorsOf(V const& _v) const
+	{
+		return dominatorsOf(_v.id);
+	}
+
+private:
+	std::vector<std::optional<DfsIndex>> findDominators(V const& _entry)
+	{
+		solAssert(m_verticesInDFSOrder.empty());
+		solAssert(m_dfsIndexByVertexId.empty());
+
+		// parent(w): The index of the vertex which is the parent of ``w`` in the spanning
+		// tree generated by the DFS.
+		std::vector<DfsIndex> parent;
+
+		// step 1
+		// The vertices are assigned indices in DFS order.
+		std::set<VId> visited;
+		DfsIndex nextUnusedDFSIndex = 0;
+
+		auto dfs = [&](V const& _v, auto _dfs) -> void {
+			auto [_, inserted] = visited.insert(_v.id);
+			if (!inserted)
+				return;
+
+			m_verticesInDFSOrder.emplace_back(_v.id);
+			m_dfsIndexByVertexId[_v.id] = nextUnusedDFSIndex;
+			nextUnusedDFSIndex++;
+
+			ForEachSuccessor{}(_v, [&](V const& _successor) {
+				if (visited.count(_successor.id) == 0)
+				{
+					parent.push_back(m_dfsIndexByVertexId[_v.id]);
+					m_predecessors.push_back({m_dfsIndexByVertexId[_v.id]});
+					_dfs(_successor, _dfs);
+				}
+				else
+				{
+					solAssert(m_dfsIndexByVertexId[_successor.id] < m_predecessors.size());
+					m_predecessors[m_dfsIndexByVertexId[_successor.id]].insert(m_dfsIndexByVertexId[_v.id]);
+				}
+			});
+		};
+
+		parent.emplace_back(std::numeric_limits<DfsIndex>::max());
+		m_predecessors.emplace_back();
+		dfs(_entry, dfs);
+
+		size_t numVertices = visited.size();
+		solAssert(nextUnusedDFSIndex == numVertices);
+		solAssert(m_verticesInDFSOrder.size() == numVertices);
+		solAssert(visited.size() == numVertices);
+		solAssert(m_predecessors.size() == numVertices);
+		solAssert(parent.size() == numVertices);
+
+		// ancestor(w): Parent of vertex ``w`` in the virtual forest traversed by eval().
+		// The forest consists of disjoint subtrees of the spanning tree and the parent of ``w`` is
+		// always one of its ancestors in that spanning tree.
+		// Initially each subtree consists of a single vertex. As the algorithm iterates over the
+		// graph, each processed vertex gets connected to its parent from the spanning tree using
+		// link(). Later on, the path compression performed by eval() may move it up in the subtree.
+		std::vector<DfsIndex> ancestor(numVertices, std::numeric_limits<DfsIndex>::max());
+		// label(w): The index of a vertex with the smallest semidominator, on the path between ``w``
+		// and the root of its subtree. The value is not updated immediately by link(), but
+		// only during path compression performed by eval().
+		std::vector<DfsIndex> label;
+		// bucket(w): The set of all vertices having ``w`` as their semidominator.
+		// The index of the array represents the vertex' DFS index.
+		std::vector<std::deque<DfsIndex>> bucket(numVertices);
+
+		// semi(w): The DFS index of the semidominator of ``w``.
+		std::vector<DfsIndex> semi;
+		// idom(w): The DFS index of the immediate dominator of ``w``.
+		std::vector<std::optional<DfsIndex>> idom(numVertices, std::nullopt);
+
+		// ``link(v, w)`` adds an edge from ``w`` to ``v`` in the virtual forest.
+		// It is meant to initially attach vertex ``w`` to its parent from the spanning tree,
+		// but path compression can later limit the search path upwards.
+		// TODO: implement sophisticated link-eval algorithm as shown in pg 132
+		// See: https://www.cs.princeton.edu/courses/archive/spr03/cs423/download/dominators.pdf
+		auto link = [&](DfsIndex _parentIdx, DfsIndex _wIdx)
+		{
+			solAssert(ancestor[_wIdx] == std::numeric_limits<DfsIndex>::max());
+			ancestor[_wIdx] = _parentIdx;
+		};
+
+		// ``eval(v)`` returns a vertex with the smallest semidominator index on the path between
+		// vertex ``v`` and the root of its subtree in the virtual forest, i.e. the label of ``v``.
+		// Performs path compression in the process, updating labels and ancestors on the path to
+		// the subtree root.
+		auto eval = [&](DfsIndex _vIdx) -> DfsIndex
+		{
+			if (ancestor[_vIdx] == std::numeric_limits<DfsIndex>::max())
+				return _vIdx;
+
+			compressPath(ancestor, label, semi, _vIdx);
+			return label[_vIdx];
+		};
+
+		auto toDfsIndex = [&](VId const& _vId) { return m_dfsIndexByVertexId[_vId]; };
+
+		for (DfsIndex wIdx = 0; wIdx < m_verticesInDFSOrder.size(); ++wIdx)
+		{
+			semi.push_back(wIdx);
+			label.push_back(wIdx);
+		}
+
+		// Process the vertices in decreasing order of the DFS number
+		for (DfsIndex wIdx: m_verticesInDFSOrder | ranges::views::reverse | ranges::views::transform(toDfsIndex))
+		{
+			// step 3
+			// NOTE: this is an optimization, i.e. performing the step 3 before step 2.
+			// The goal is to process the bucket at the beginning of the loop for the vertex ``w``
+			// instead of ``parent[w]`` at the end of the loop as described in the original paper.
+			// Inverting those steps ensures that a bucket is only processed once and
+			// it does not need to be erased.
+			// The optimization proposal is available here: https://jgaa.info/index.php/jgaa/article/view/paper119/2847 pg.77
+			for (DfsIndex vIdx: bucket[wIdx])
+			{
+				DfsIndex uIdx = eval(vIdx);
+				solAssert(uIdx <= vIdx);
+				idom[vIdx] = (semi[uIdx] < semi[vIdx]) ? uIdx : wIdx;
+			}
+
+			// step 2
+			for (DfsIndex vIdx: m_predecessors[wIdx])
+			{
+				DfsIndex uIdx = eval(vIdx);
+				solAssert(uIdx <= vIdx);
+				if (semi[uIdx] < semi[wIdx])
+					semi[wIdx] = semi[uIdx];
+			}
+			solAssert(semi[wIdx] < wIdx || wIdx == 0);
+			bucket[semi[wIdx]].emplace_back(wIdx);
+			link(parent[wIdx], wIdx);
+			solAssert(ancestor[wIdx] == parent[wIdx]);
+		}
+
+		// step 4
+		// Compute idom in DFS order
+		// The entry vertex does not have an immediate dominator.
+		solAssert(idom[0] == std::nullopt);
+		for (DfsIndex wIdx: m_verticesInDFSOrder | ranges::views::drop(1) | ranges::views::transform(toDfsIndex))
+		{
+			// All the other vertices must have an immediate dominator.
+			solAssert(idom[wIdx].has_value());
+			if (idom[wIdx].value() != semi[wIdx])
+				idom[wIdx] = idom[idom[wIdx].value()];
+		}
+
+		return idom;
+	}
+
+	/// Path compression updates the ancestors of vertices along
+	/// the path to the ancestor with the minimum label value.
+	static void compressPath(
+		std::vector<DfsIndex>& _ancestor,
+		std::vector<DfsIndex>& _label,
+		std::vector<DfsIndex> const& _semi,
+		DfsIndex _vIdx
+	)
+	{
+		solAssert(_vIdx < _ancestor.size() && _vIdx < _semi.size() && _vIdx < _label.size());
+		solAssert(_ancestor[_vIdx] != std::numeric_limits<size_t>::max());
+		solAssert(_ancestor[_vIdx] < _vIdx);
+		if (_ancestor[_ancestor[_vIdx]] != std::numeric_limits<DfsIndex>::max())
+		{
+			solAssert(_ancestor[_ancestor[_vIdx]] < _ancestor[_vIdx]);
+			compressPath(_ancestor, _label, _semi, _ancestor[_vIdx]);
+			if (_semi[_label[_ancestor[_vIdx]]] < _semi[_label[_vIdx]])
+				_label[_vIdx] = _label[_ancestor[_vIdx]];
+			_ancestor[_vIdx] = _ancestor[_ancestor[_vIdx]];
+		}
+		solAssert(_label[_ancestor[_vIdx]] <= _label[_vIdx]);
+	}
+
+	/// Build dominator tree from the immediate dominators set.
+	/// The function groups all the vertex IDs that are immediately dominated by a vertex.
+	void buildDominatorTree()
+	{
+		// m_immediateDominators is guaranteed to have at least one element after findingDominators() is executed.
+		solAssert(m_immediateDominators.size() > 0);
+		solAssert(m_immediateDominators.size() == m_verticesInDFSOrder.size());
+		solAssert(m_immediateDominators[0] == std::nullopt);
+
+		// Ignoring the entry node since no one dominates it.
+		for (DfsIndex dominatedIdx = 1; dominatedIdx < m_verticesInDFSOrder.size(); ++dominatedIdx)
+		{
+			VId dominatedId = m_verticesInDFSOrder[dominatedIdx];
+			solAssert(m_dfsIndexByVertexId.count(dominatedId));
+			solAssert(dominatedIdx == m_dfsIndexByVertexId.at(dominatedId));
+
+			// If the vertex does not have an immediate dominator, it is the entry vertex (i.e. index 0).
+			// NOTE: `dominatedIdx` will never be 0 since the loop starts from 1.
+			solAssert(m_immediateDominators[dominatedIdx].has_value());
+			DfsIndex dominatorIdx = m_immediateDominators[dominatedIdx].value();
+
+			solAssert(dominatorIdx < dominatedIdx);
+			VId dominatorId = m_verticesInDFSOrder[dominatorIdx];
+			m_dominatorTree[dominatorId].emplace_back(dominatedId);
+		}
+	}
+
+	// predecessors(w): The set of vertices ``v`` such that (``v``, ``w``) is an edge of the graph.
+	std::vector<std::set<DfsIndex>> m_predecessors;
+
+	/// Keeps the list of vertex IDs in the DFS order.
+	/// The entry vertex is the first element of the vector.
+	/// The indices of the other vertices are assigned in the order they are visited during the DFS.
+	/// I.e. m_verticesInDFSOrder[i] is the ID of the vertex whose DFS index is i.
+	///
+	/// DFS index -> vertex ID
+	std::vector<VId> m_verticesInDFSOrder;
+
+	/// Maps a vertex ID to its DFS order index.
+	///
+	/// Vertex ID -> DFS index
+	std::map<VId, DfsIndex> m_dfsIndexByVertexId;
+
+	/// Maps a vertex to all vertices that it dominates.
+	/// If the vertex does not dominate any other vertex it has no entry in the map.
+	/// The value is a set of IDs of vertices dominated by the vertex whose ID is the map key.
+	///
+	/// Vertex id -> dominates set {vertex ID}
+	std::map<VId, std::vector<VId>> m_dominatorTree;
+
+	/// Immediate dominators by DFS index.
+	/// Maps a vertex' DFS index (i.e. array index) to its immediate dominator DFS index.
+	/// As the entry vertex does not have immediate dominator, its idom is always set to `std::nullopt`.
+	/// However note that the DFS index of the entry vertex is 0, since it is the first element of the vector.
+	///
+	/// E.g. to get the immediate dominator of a Vertex w:
+	/// idomIdx = m_immediateDominators[m_dfsIndexByVertexId[w.id]]
+	/// idomVertexId = m_verticesInDFSOrder[domIdx]
+	///
+	/// DFS index -> dominates DFS index
+	std::vector<std::optional<DfsIndex>> m_immediateDominators;
+};
+}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d5435237ec..0d19d77960 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,6 +31,7 @@ set(libsolutil_sources
     libsolutil/Checksum.cpp
     libsolutil/CommonData.cpp
     libsolutil/CommonIO.cpp
+    libsolutil/DominatorFinderTest.cpp
     libsolutil/FixedHash.cpp
     libsolutil/FunctionSelector.cpp
     libsolutil/IpfsHash.cpp
diff --git a/test/libsolutil/DominatorFinderTest.cpp b/test/libsolutil/DominatorFinderTest.cpp
new file mode 100644
index 0000000000..22e8010ca4
--- /dev/null
+++ b/test/libsolutil/DominatorFinderTest.cpp
@@ -0,0 +1,920 @@
+/*
+	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 algorithm to find dominators from a graph.
+ */
+#include <libsolutil/DominatorFinder.h>
+
+#include <test/libsolidity/util/SoltestErrors.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <fmt/format.h>
+
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/filter.hpp>
+#include <range/v3/view/join.hpp>
+#include <range/v3/view/map.hpp>
+#include <range/v3/view/transform.hpp>
+
+using namespace solidity::util;
+
+namespace solidity::util::test
+{
+
+typedef size_t TestVertexId;
+typedef std::string TestVertexLabel;
+typedef std::pair<TestVertexLabel, TestVertexLabel> Edge;
+
+struct TestVertex {
+	using Id = TestVertexId;
+
+	TestVertexId id;
+	TestVertexLabel label;
+	std::vector<TestVertex const*> successors;
+};
+
+struct ForEachVertexSuccessorMock {
+	template<typename Callable>
+	void operator()(TestVertex const& _v, Callable&& _callable) const
+	{
+		for (auto const& w: _v.successors)
+			_callable(*w);
+	}
+};
+
+typedef DominatorFinder<TestVertex, ForEachVertexSuccessorMock> TestDominatorFinder;
+
+class DominatorFinderTest
+{
+public:
+	DominatorFinderTest(
+		std::vector<TestVertexLabel> const& _vertices,
+		std::vector<Edge> const& _edges,
+		std::map<TestVertexLabel, TestVertexLabel> const& _expectedImmediateDominators,
+		std::map<TestVertexLabel, TestDominatorFinder::DfsIndex> const& _expectedDFSIndices,
+		std::map<TestVertexLabel, std::vector<TestVertexLabel>> const& _expectedDominatorTree
+	)
+	{
+		soltestAssert(!_vertices.empty());
+
+		// NOTE: We use the indices of the vertices in the ``_vertices`` vector as vertex IDs.
+		TestVertexId id = 0;
+		vertices = _vertices | ranges::views::transform([&](TestVertexLabel const& label) -> TestVertex {
+			vertexIdMap[label] = id;
+			return {id++, label, {}};
+		}) | ranges::to<std::vector<TestVertex>>;
+		soltestAssert(vertices.size() == _vertices.size());
+		soltestAssert(vertexIdMap.size() == _vertices.size());
+		soltestAssert(id == _vertices.size());
+
+		// Populate the successors of the vertices.
+		for (auto const& [from, to]: _edges)
+			vertices[vertexIdMap[from]].successors.emplace_back(&vertices[vertexIdMap[to]]);
+
+		// Validate that all vertices used in the expected results are part of the graph.
+		std::set<TestVertexLabel> verticesSet = _vertices | ranges::to<std::set<TestVertexLabel>>;
+		auto validateVertices = [&](std::set<TestVertexLabel> const& labels) {
+			if (verticesSet.size() != labels.size())
+				soltestAssert(std::includes(verticesSet.begin(), verticesSet.end(), labels.begin(), labels.end()));
+			else
+				soltestAssert(std::equal(verticesSet.begin(), verticesSet.end(), labels.begin(), labels.end()));
+		};
+
+		validateVertices(_edges
+			| ranges::views::transform([](Edge const& e) { return e.first; })
+			| ranges::to<std::set<TestVertexLabel>>
+		);
+		validateVertices(_edges
+			| ranges::views::transform([](Edge const& e) { return e.second; })
+			| ranges::to<std::set<TestVertexLabel>>
+		);
+		validateVertices(_expectedImmediateDominators | ranges::views::keys | ranges::to<std::set<TestVertexLabel>>);
+		// The entry vertex does not have an immediate dominator.
+		validateVertices(_expectedImmediateDominators
+			| ranges::views::values
+			| ranges::views::filter([](TestVertexLabel const& label) { return !label.empty(); })
+			| ranges::to<std::set<TestVertexLabel>>
+		);
+		validateVertices(_expectedDFSIndices | ranges::views::keys | ranges::to<std::set<TestVertexLabel>>);
+		bool allDFSIndexInRange = std::all_of(
+			_expectedDFSIndices.begin(),
+			_expectedDFSIndices.end(),
+			[&](auto const& pair) {
+				return pair.second < verticesSet.size();
+			}
+		);
+		solAssert(allDFSIndexInRange);
+		validateVertices(_expectedDominatorTree | ranges::views::keys | ranges::to<std::set<TestVertexLabel>>);
+		validateVertices(_expectedDominatorTree | ranges::views::values | ranges::views::join | ranges::to<std::set<TestVertexLabel>>);
+
+		entry = &vertices[0];
+		expectedImmediateDominators = labelMapToIdMap(_expectedImmediateDominators);
+		expectedDFSIndices = toVertexMapById(_expectedDFSIndices);
+		expectedDominatorTree = vertexMapToVertexId(_expectedDominatorTree);
+	}
+
+	// Converts a map of vertex labels to map of vertex IDs
+	std::map<TestVertexId, std::optional<TestVertexId>> labelMapToIdMap(std::map<TestVertexLabel, TestVertexLabel> const& _vertexLabelMap) const
+	{
+		return _vertexLabelMap
+			| ranges::views::transform([&](auto const& pair) -> std::pair<TestVertexId, std::optional<TestVertexId>> {
+				return {vertexIdMap.at(pair.first), (pair.second != "") ? std::optional<TestVertexId>(vertexIdMap.at(pair.second)) : std::nullopt};
+			})
+			| ranges::to<std::map<TestVertexId, std::optional<TestVertexId>>>;
+	}
+
+	// Converts a map with vertex labels as keys to a map with vertex IDs as keys.
+	template <typename T>
+	std::map<TestVertexId, T> toVertexMapById(std::map<TestVertexLabel, T> const& _verticesByLabel) const
+	{
+		return _verticesByLabel
+			| ranges::views::transform([&](auto const& pair) -> std::pair<TestVertexId, T> {
+				return {vertexIdMap.at(pair.first), pair.second};
+			})
+			| ranges::to<std::map<TestVertexId, T>>;
+	}
+
+	// Converts a map with vertex labels as keys to a map with vertex IDs as keys.
+	std::map<TestVertexId, std::vector<TestVertexId>> vertexMapToVertexId(std::map<TestVertexLabel, std::vector<TestVertexLabel>> const& _vertexMapByLabel) const
+	{
+		auto labelVectorToIdVector = [&](std::vector<TestVertexLabel> const& labels) -> std::vector<TestVertexId> {
+			return labels
+				| ranges::views::transform([&](TestVertexLabel const& label) {
+					soltestAssert(vertexIdMap.count(label));
+					return vertexIdMap.at(label);
+				})
+				| ranges::to<std::vector<TestVertexId>>;
+		};
+
+		return toVertexMapById(_vertexMapByLabel | ranges::views::transform([&](auto const& pair) -> std::pair<TestVertexLabel, std::vector<TestVertexId>> {
+			return {pair.first, labelVectorToIdVector(pair.second)};
+		}) | ranges::to<std::map<TestVertexLabel, std::vector<TestVertexId>>>);
+	}
+
+	TestVertex const* entry = nullptr;
+	std::vector<TestVertex> vertices;
+	// Reverse map from vertices labels to IDs
+	std::map<TestVertexLabel, TestVertexId> vertexIdMap;
+	std::map<TestVertexId, std::optional<TestVertexId>> expectedImmediateDominators;
+	std::map<TestVertexId, TestDominatorFinder::DfsIndex> expectedDFSIndices;
+	std::map<TestVertexId, std::vector<TestVertexId>> expectedDominatorTree;
+};
+
+BOOST_AUTO_TEST_SUITE(Dominators)
+
+BOOST_AUTO_TEST_CASE(immediate_dominator_1)
+{
+	//            A
+	//            │
+	//            ▼
+	//        ┌───B
+	//        │   │
+	//        ▼   │
+	//        C ──┼───┐
+	//        │   │   │
+	//        ▼   │   ▼
+	//        D◄──┘   G
+	//        │       │
+	//        ▼       ▼
+	//        E       H
+	//        │       │
+	//        └──►F◄──┘
+	DominatorFinderTest test(
+		{"A", "B", "C", "D", "E", "F", "G", "H"}, // Vertices
+		{ // Edges
+			Edge("A", "B"),
+			Edge("B", "C"),
+			Edge("B", "D"),
+			Edge("C", "D"),
+			Edge("C", "G"),
+			Edge("D", "E"),
+			Edge("E", "F"),
+			Edge("G", "H"),
+			Edge("H", "F")
+		},
+		{ // Immediate dominators
+			{"A", ""},
+			{"B", "A"},
+			{"C", "B"},
+			{"D", "B"},
+			{"E", "D"},
+			{"F", "B"},
+			{"G", "C"},
+			{"H", "G"}
+		},
+		{ // DFS indices
+			{"A", 0},
+			{"B", 1},
+			{"C", 2},
+			{"D", 3},
+			{"E", 4},
+			{"F", 5},
+			{"G", 6},
+			{"H", 7}
+		},
+		{ // Dominator tree
+			{"A", {"B"}},
+			{"B", {"C", "D", "F"}},
+			{"C", {"G"}},
+			{"D", {"E"}},
+			{"G", {"H"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(immediate_dominator_2)
+{
+	//    ┌────►A──────┐
+	//    │     │      ▼
+	//    │ B◄──┘   ┌──D──┐
+	//    │ │       │     │
+	//    │ ▼       ▼     ▼
+	//    └─C◄───┐  E     F
+	//      │    │  │     │
+	//      └───►G◄─┴─────┘
+	DominatorFinderTest test(
+		{"A", "B", "C", "D", "E", "F", "G"},
+		{
+			Edge("A", "B"),
+			Edge("B", "C"),
+			Edge("C", "G"),
+			Edge("C", "A"),
+			Edge("A", "D"),
+			Edge("D", "E"),
+			Edge("D", "F"),
+			Edge("E", "G"),
+			Edge("F", "G"),
+			Edge("G", "C")
+		},
+		{
+			{"A", ""},
+			{"B", "A"},
+			{"C", "A"},
+			{"D", "A"},
+			{"E", "D"},
+			{"F", "D"},
+			{"G", "A"}
+		},
+		{
+			{"A", 0},
+			{"B", 1},
+			{"C", 2},
+			{"G", 3},
+			{"D", 4},
+			{"E", 5},
+			{"F", 6}
+		},
+		{
+			{"A", {"B", "C", "G", "D"}},
+			{"D", {"E", "F"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(immediate_dominator_3)
+{
+	//    ┌─────────┐
+	//    │         ▼
+	//    │     ┌───A───┐
+	//    │     │       │
+	//    │     ▼       ▼
+	//    │ ┌──►C◄───── B──┬──────┐
+	//    │ │   │       ▲  │      │
+	//    │ │   │  ┌────┘  │      │
+	//    │ │   ▼  │       ▼      ▼
+	//    │ │   D──┘  ┌───►E◄─────I
+	//    │ │   ▲     │    │      │
+	//    │ │   │     │    ├───┐  │
+	//    │ │   │     │    │   │  │
+	//    │ │   │     │    ▼   │  ▼
+	//    │ └───┼─────┼────F   └─►H
+	//    │     │     │    │      │
+	//    │     │     │    │      │
+	//    │     │     │    │      │
+	//    │     └─────┴─G◄─┴──────┘
+	//    │             │
+	//    └─────────────┘
+	DominatorFinderTest test(
+		{"A", "B", "C", "D", "E", "F", "G", "H", "I"},
+		{
+			Edge("A", "B"),
+			Edge("A", "C"),
+			Edge("B", "C"),
+			Edge("B", "I"),
+			Edge("B", "E"),
+			Edge("C", "D"),
+			Edge("D", "B"),
+			Edge("E", "H"),
+			Edge("E", "F"),
+			Edge("F", "G"),
+			Edge("F", "C"),
+			Edge("G", "E"),
+			Edge("G", "A"),
+			Edge("G", "D"),
+			Edge("H", "G"),
+			Edge("I", "E"),
+			Edge("I", "H")
+		},
+		{
+			{"A", ""},
+			{"B", "A"},
+			{"C", "A"},
+			{"D", "A"},
+			{"E", "B"},
+			{"F", "E"},
+			{"G", "B"},
+			{"H", "B"},
+			{"I", "B"}
+		},
+		{
+			{"A", 0},
+			{"B", 1},
+			{"C", 2},
+			{"D", 3},
+			{"I", 4},
+			{"E", 5},
+			{"H", 6},
+			{"G", 7},
+			{"F", 8}
+		},
+		{
+			{"A", {"B", "C", "D"}},
+			{"B", {"I", "E", "H", "G"}},
+			{"E", {"F"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(langauer_tarjan_p122_fig1)
+{
+	// T. Lengauer and R. E. Tarjan pg. 122 fig. 1
+	// ref: https://www.cs.princeton.edu/courses/archive/spr03/cs423/download/dominators.pdf
+	DominatorFinderTest test(
+		{"R", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "L", "K"},
+		{
+			Edge("R", "B"),
+			Edge("R", "A"),
+			Edge("R", "C"),
+			Edge("B", "A"),
+			Edge("B", "D"),
+			Edge("B", "E"),
+			Edge("A", "D"),
+			Edge("D", "L"),
+			Edge("L", "H"),
+			Edge("E", "H"),
+			Edge("H", "E"),
+			Edge("H", "K"),
+			Edge("K", "I"),
+			Edge("K", "R"),
+			Edge("C", "F"),
+			Edge("C", "G"),
+			Edge("F", "I"),
+			Edge("G", "I"),
+			Edge("G", "J"),
+			Edge("J", "I"),
+			Edge("I", "K")
+		},
+		{
+			{"R", ""},
+			{"A", "R"},
+			{"B", "R"},
+			{"C", "R"},
+			{"D", "R"},
+			{"E", "R"},
+			{"F", "C"},
+			{"G", "C"},
+			{"H", "R"},
+			{"I", "R"},
+			{"J", "G"},
+			{"L", "D"},
+			{"K", "R"}
+		},
+		{
+			{"R", 0},
+			{"B", 1},
+			{"A", 2},
+			{"D", 3},
+			{"L", 4},
+			{"H", 5},
+			{"E", 6},
+			{"K", 7},
+			{"I", 8},
+			{"C", 9},
+			{"F", 10},
+			{"G", 11},
+			{"J", 12}
+		},
+		{
+			{"R", {"B", "A", "D", "H", "E", "K", "I", "C"}},
+			{"D", {"L"}},
+			{"C", {"F", "G"}},
+			{"G", {"J"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(loukas_georgiadis)
+{
+	// Extracted from Loukas Georgiadis Dissertation - Linear-Time Algorithms for Dominators and Related Problems
+	// pg. 12 Fig. 2.2
+	// ref: https://www.cs.princeton.edu/techreports/2005/737.pdf
+	DominatorFinderTest test(
+		{"R", "W", "X1", "X2", "X3", "X4", "X5", "X6", "X7", "Y"},
+		{
+			Edge("R", "W"),
+			Edge("R", "Y"),
+			Edge("W", "X1"),
+			Edge("Y", "X7"),
+			Edge("X1", "X2"),
+			Edge("X2", "X1"),
+			Edge("X2", "X3"),
+			Edge("X3", "X2"),
+			Edge("X3", "X4"),
+			Edge("X4", "X3"),
+			Edge("X4", "X5"),
+			Edge("X5", "X4"),
+			Edge("X5", "X6"),
+			Edge("X6", "X5"),
+			Edge("X6", "X7"),
+			Edge("X7", "X6")
+		},
+		{
+			{"R", ""},
+			{"W", "R"},
+			{"X1", "R"},
+			{"X2", "R"},
+			{"X3", "R"},
+			{"X4", "R"},
+			{"X5", "R"},
+			{"X6", "R"},
+			{"X7", "R"},
+			{"Y", "R"}
+		},
+		{
+			{"R", 0},
+			{"W", 1},
+			{"X1", 2},
+			{"X2", 3},
+			{"X3", 4},
+			{"X4", 5},
+			{"X5", 6},
+			{"X6", 7},
+			{"X7", 8},
+			{"Y", 9}
+		},
+		{
+			{"R", {"W", "X1", "X2", "X3", "X4", "X5", "X6", "X7", "Y"}},
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(itworst)
+{
+	// Worst-case families for k = 3
+	// Example itworst(3) pg. 26 fig. 2.9
+	// ref: https://www.cs.princeton.edu/techreports/2005/737.pdf
+	DominatorFinderTest test(
+		{"R", "W1", "W2", "W3", "X1", "X2", "X3", "Y1", "Y2", "Y3", "Z1", "Z2", "Z3"},
+		{
+			Edge("R", "W1"),
+			Edge("R", "X1"),
+			Edge("R", "Z3"),
+			Edge("W1", "W2"),
+			Edge("W2", "W3"),
+			Edge("X1", "X2"),
+			Edge("X2", "X3"),
+			Edge("X3", "Y1"),
+			Edge("Y1", "W1"),
+			Edge("Y1", "W2"),
+			Edge("Y1", "W3"),
+			Edge("Y1", "Y2"),
+			Edge("Y2", "W1"),
+			Edge("Y2", "W2"),
+			Edge("Y2", "W3"),
+			Edge("Y2", "Y3"),
+			Edge("Y3", "W1"),
+			Edge("Y3", "W2"),
+			Edge("Y3", "W3"),
+			Edge("Y3", "Z1"),
+			Edge("Z1", "Z2"),
+			Edge("Z2", "Z1"),
+			Edge("Z2", "Z3"),
+			Edge("Z3", "Z2")
+		},
+		{
+			{"R", ""},
+			{"W1", "R"},
+			{"W2", "R"},
+			{"W3", "R"},
+			{"X1", "R"},
+			{"X2", "X1"},
+			{"X3", "X2"},
+			{"Y1", "X3"},
+			{"Y2", "Y1"},
+			{"Y3", "Y2"},
+			{"Z1", "R"},
+			{"Z2", "R"},
+			{"Z3", "R"}
+		},
+		{
+			{"R", 0},
+			{"W1", 1},
+			{"W2", 2},
+			{"W3", 3},
+			{"X1", 4},
+			{"X2", 5},
+			{"X3", 6},
+			{"Y1", 7},
+			{"Y2", 8},
+			{"Y3", 9},
+			{"Z1", 10},
+			{"Z2", 11},
+			{"Z3", 12}
+		},
+		{
+			{"R", {"W1", "W2", "W3", "X1", "Z1", "Z2", "Z3"}},
+			{"X1", {"X2"}},
+			{"X2", {"X3"}},
+			{"X3", {"Y1"}},
+			{"Y1", {"Y2"}},
+			{"Y2", {"Y3"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(idfsquad)
+{
+	// Worst-case families for k = 3
+	// Example idfsquad(3) pg. 26 fig. 2.9
+	// ref: https://www.cs.princeton.edu/techreports/2005/737.pdf
+	DominatorFinderTest test(
+		{"R", "X1", "X2", "X3", "Y1", "Y2", "Y3", "Z1", "Z2", "Z3"},
+		{
+			Edge("R", "X1"),
+			Edge("R", "Z1"),
+			Edge("X1", "Y1"),
+			Edge("X1", "X2"),
+			Edge("X2", "X3"),
+			Edge("X2", "Y2"),
+			Edge("X3", "Y3"),
+			Edge("Y1", "Z1"),
+			Edge("Y1", "Z2"),
+			Edge("Z1", "Y1"),
+			Edge("Y2", "Z2"),
+			Edge("Y2", "Z3"),
+			Edge("Z2", "Y2"),
+			Edge("Y3", "Z3"),
+			Edge("Z3", "Y3")
+		},
+		{
+			{"R", ""},
+			{"X1", "R"},
+			{"X2", "X1"},
+			{"X3", "X2"},
+			{"Y1", "R"},
+			{"Y2", "R"},
+			{"Y3", "R"},
+			{"Z1", "R"},
+			{"Z2", "R"},
+			{"Z3", "R"}
+		},
+		{
+			{"R", 0},
+			{"X1", 1},
+			{"Y1", 2},
+			{"Z1", 3},
+			{"Z2", 4},
+			{"Y2", 5},
+			{"Z3", 6},
+			{"Y3", 7},
+			{"X2", 8},
+			{"X3", 9}
+		},
+		{
+			{"R", {"X1", "Y1", "Z1", "Z2", "Y2", "Z3", "Y3"}},
+			{"X1", {"X2"}},
+			{"X2", {"X3"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(ibsfquad)
+{
+	// Worst-case families for k = 3
+	// Example ibfsquad(3) pg. 26 fig. 2.9
+	// ref: https://www.cs.princeton.edu/techreports/2005/737.pdf
+	DominatorFinderTest test(
+		{"R", "W", "X1", "X2", "X3", "Y", "Z"},
+		{
+			Edge("R", "W"),
+			Edge("R", "Y"),
+			Edge("W", "X1"),
+			Edge("W", "X2"),
+			Edge("W", "X3"),
+			Edge("Y", "Z"),
+			Edge("Z", "X3"),
+			Edge("X3", "X2"),
+			Edge("X2", "X1")
+		},
+		{
+			{"R", ""},
+			{"W", "R"},
+			{"X1", "R"},
+			{"X2", "R"},
+			{"X3", "R"},
+			{"Y", "R"},
+			{"Z", "Y"}
+		},
+		{
+			{"R", 0},
+			{"W", 1},
+			{"X1", 2},
+			{"X2", 3},
+			{"X3", 4},
+			{"Y", 5},
+			{"Z", 6}
+		},
+		{
+			{"R", {"W", "X1", "X2", "X3", "Y"}},
+			{"Y", {"Z"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(sncaworst)
+{
+	// Worst-case families for k = 3
+	// Example sncaworst(3) pg. 26 fig. 2.9
+	// ref: https://www.cs.princeton.edu/techreports/2005/737.pdf
+	DominatorFinderTest test(
+		{"R", "X1", "X2", "X3", "Y1", "Y2", "Y3"},
+		{
+			Edge("R", "X1"),
+			Edge("R", "Y1"),
+			Edge("R", "Y2"),
+			Edge("R", "Y3"),
+			Edge("X1", "X2"),
+			Edge("X2", "X3"),
+			Edge("X3", "Y1"),
+			Edge("X3", "Y2"),
+			Edge("X3", "Y3")
+		},
+		{
+			{"R", ""},
+			{"X1", "R"},
+			{"X2", "X1"},
+			{"X3", "X2"},
+			{"Y1", "R"},
+			{"Y2", "R"},
+			{"Y3", "R"}
+		},
+		{
+			{"R", 0},
+			{"X1", 1},
+			{"X2", 2},
+			{"X3", 3},
+			{"Y1", 4},
+			{"Y2", 5},
+			{"Y3", 6}
+		},
+		{
+			{"R", {"X1", "Y1", "Y2", "Y3"}},
+			{"X1", {"X2"}},
+			{"X2", {"X3"}}
+		}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_CASE(collect_all_dominators_of_a_vertex)
+{
+	//            A
+	//            │
+	//            ▼
+	//        ┌───B
+	//        │   │
+	//        ▼   │
+	//        C ──┼───┐
+	//        │   │   │
+	//        ▼   │   ▼
+	//        D◄──┘   G
+	//        │       │
+	//        ▼       ▼
+	//        E       H
+	//        │       │
+	//        └──►F◄──┘
+	DominatorFinderTest test(
+		{"A", "B", "C", "D", "E", "F", "G", "H"},
+		{
+			Edge("A", "B"),
+			Edge("B", "C"),
+			Edge("B", "D"),
+			Edge("C", "D"),
+			Edge("C", "G"),
+			Edge("D", "E"),
+			Edge("E", "F"),
+			Edge("G", "H"),
+			Edge("H", "F")
+		},
+		{},
+		{},
+		{}
+	);
+
+	// Converts a vector of vertex IDs to a vector of vertex labels.
+	auto toVertexLabel = [&](std::vector<TestVertexId> const& _vertices)
+	{
+		return _vertices | ranges::views::transform([&](TestVertexId id){
+			return test.vertices[id].label;
+		}) | ranges::to<std::vector<TestVertexLabel>>;
+	};
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["A"])) == std::vector<TestVertexLabel>());
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["B"])) == std::vector<TestVertexLabel>({"A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["C"])) == std::vector<TestVertexLabel>({"B", "A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["D"])) == std::vector<TestVertexLabel>({"B", "A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["E"])) == std::vector<TestVertexLabel>({"D", "B", "A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["F"])) == std::vector<TestVertexLabel>({"B", "A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["G"])) == std::vector<TestVertexLabel>({"C", "B", "A"}));
+	BOOST_TEST(toVertexLabel(dominatorFinder.dominatorsOf(test.vertexIdMap["H"])) == std::vector<TestVertexLabel>({"G", "C", "B", "A"}));
+}
+
+BOOST_AUTO_TEST_CASE(check_dominance)
+{
+	//            A
+	//            │
+	//            ▼
+	//        ┌───B
+	//        │   │
+	//        ▼   │
+	//        C ──┼───┐
+	//        │   │   │
+	//        ▼   │   ▼
+	//        D◄──┘   G
+	//        │       │
+	//        ▼       ▼
+	//        E       H
+	//        │       │
+	//        └──►F◄──┘
+	DominatorFinderTest test(
+		{"A", "B", "C", "D", "E", "F", "G", "H"},
+		{
+			Edge("A", "B"),
+			Edge("B", "C"),
+			Edge("B", "D"),
+			Edge("C", "D"),
+			Edge("C", "G"),
+			Edge("D", "E"),
+			Edge("E", "F"),
+			Edge("G", "H"),
+			Edge("H", "F")
+		},
+		{},
+		{
+			{"A", 0},
+			{"B", 1},
+			{"C", 2},
+			{"D", 3},
+			{"E", 4},
+			{"F", 5},
+			{"G", 6},
+			{"H", 7}
+		},
+		{}
+	);
+
+	// Helper function to create a dominance relation for a vertex with all other vertices.
+	//
+	// @param _indices: The indices of the vertices that the vertex dominates.
+	// @return: A vector of booleans where the index represents the vertex and the value
+	// represents if the vertex dominates the other vertex at that index.
+	auto makeDominanceVertexRelation = [&](std::vector<TestDominatorFinder::DfsIndex> const& _indices = {}){
+		std::vector<bool> dominance(test.vertices.size(), false);
+		for (TestDominatorFinder::DfsIndex i: _indices)
+		{
+			soltestAssert(i < test.vertices.size());
+			dominance[i] = true;
+		}
+		return dominance;
+	};
+
+	// Dominance truth table for all vertices.
+	// Note that it includes self-dominance relation.
+	std::vector<std::vector<bool>> expectedDominanceTable = {
+		std::vector<bool>(test.vertices.size(), true),    // A dominates all vertices, including itself
+		makeDominanceVertexRelation({1,2,3,4,5,6,7}), // B, C, D, E, F, G, H
+		makeDominanceVertexRelation({2, 6, 7}), // C, G, H
+		makeDominanceVertexRelation({3, 4}),    // D, E
+		makeDominanceVertexRelation({4}),       // E
+		makeDominanceVertexRelation({5}),       // F
+		makeDominanceVertexRelation({6, 7}),    // G, H
+		makeDominanceVertexRelation({7})        // H
+	};
+	soltestAssert(expectedDominanceTable.size() == test.vertices.size());
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	// Check if the dominance table is as expected.
+	for (TestDominatorFinder::DfsIndex i = 0; i < expectedDominanceTable.size(); ++i)
+	{
+		soltestAssert(expectedDominanceTable[i].size() == test.vertices.size());
+		for (TestDominatorFinder::DfsIndex j = 0; j < expectedDominanceTable[i].size(); ++j)
+		{
+			bool iDominatesJ = dominatorFinder.dominates(i, j);
+			BOOST_CHECK_MESSAGE(
+				iDominatesJ == expectedDominanceTable[i][j],
+				fmt::format(
+					"Vertex: {} expected to {} dominate vertex {} but returned: {}\n",
+					i,
+					(iDominatesJ ? "" : "not"),
+					j,
+					iDominatesJ
+				)
+			);
+		}
+	}
+}
+
+BOOST_AUTO_TEST_CASE(no_edges)
+{
+	DominatorFinderTest test(
+		{"A"},
+		{},
+		{
+			{"A", ""},
+		},
+		{
+			{"A", 0},
+		},
+		{}
+	);
+
+	TestDominatorFinder dominatorFinder(*test.entry);
+	BOOST_TEST(dominatorFinder.immediateDominators() == test.expectedImmediateDominators);
+	BOOST_TEST(dominatorFinder.dfsIndexById() == test.expectedDFSIndices);
+	BOOST_TEST(dominatorFinder.dominatorTree() == test.expectedDominatorTree);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+} // namespace solidity::util::test

From 6ad92526990091acce9a242749db795c2282d4c5 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Tue, 16 Jul 2024 09:14:26 +0200
Subject: [PATCH 0944/1140] Add fstream std header to not break build after
 compiler upgrade.

---
 test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
index e10979ee13..aaa8e79c4e 100644
--- a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
+++ b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
@@ -22,6 +22,7 @@
 
 #include <src/libfuzzer/libfuzzer_macro.h>
 #include <abicoder.hpp>
+#include <fstream>
 
 using namespace solidity::frontend;
 using namespace solidity::test::fuzzer;

From 630f736cfdbabbfd9015e9180580c32270b7d061 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 16 Jul 2024 17:54:26 +0200
Subject: [PATCH 0945/1140] Add test.

---
 test/cmdlineTests/ir_subobject_order/args     |  1 +
 .../cmdlineTests/ir_subobject_order/input.sol | 14 +++
 test/cmdlineTests/ir_subobject_order/output   | 95 +++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 test/cmdlineTests/ir_subobject_order/args
 create mode 100644 test/cmdlineTests/ir_subobject_order/input.sol
 create mode 100644 test/cmdlineTests/ir_subobject_order/output

diff --git a/test/cmdlineTests/ir_subobject_order/args b/test/cmdlineTests/ir_subobject_order/args
new file mode 100644
index 0000000000..a536442c5c
--- /dev/null
+++ b/test/cmdlineTests/ir_subobject_order/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --debug-info none
diff --git a/test/cmdlineTests/ir_subobject_order/input.sol b/test/cmdlineTests/ir_subobject_order/input.sol
new file mode 100644
index 0000000000..70326ac06e
--- /dev/null
+++ b/test/cmdlineTests/ir_subobject_order/input.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >0.0.0;
+
+contract B { constructor() payable { assembly { revert(0,0) } } }
+contract A { constructor() payable { assembly { revert(0,0) } } }
+contract C {
+    // The subobject order should be determined by reference, not AST ID,
+    // So the subobject for A should precede the subobject for B.
+	A a = new A();
+	B b = new B();
+	fallback() external payable {
+		assembly { revert(0,0) }
+	}
+}
diff --git a/test/cmdlineTests/ir_subobject_order/output b/test/cmdlineTests/ir_subobject_order/output
new file mode 100644
index 0000000000..a364e623d7
--- /dev/null
+++ b/test/cmdlineTests/ir_subobject_order/output
@@ -0,0 +1,95 @@
+Optimized IR:
+/// @use-src 0:"ir_subobject_order/input.sol"
+object "A_13" {
+    code { { revert(0, 0) } }
+    /// @use-src 0:"ir_subobject_order/input.sol"
+    object "A_13_deployed" {
+        code { { revert(0, 0) } }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
+
+Optimized IR:
+/// @use-src 0:"ir_subobject_order/input.sol"
+object "B_7" {
+    code { { revert(0, 0) } }
+    /// @use-src 0:"ir_subobject_order/input.sol"
+    object "B_7_deployed" {
+        code { { revert(0, 0) } }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
+
+Optimized IR:
+/// @use-src 0:"ir_subobject_order/input.sol"
+object "C_33" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize("A_13")
+            let _3 := add(_1, _2)
+            if or(gt(_3, sub(shl(64, 1), 1)), lt(_3, _1))
+            {
+                mstore(0, shl(224, 0x4e487b71))
+                mstore(4, 0x41)
+                revert(0, 0x24)
+            }
+            datacopy(_1, dataoffset("A_13"), _2)
+            let expr_address := create(0, _1, sub(_3, _1))
+            if iszero(expr_address)
+            {
+                let pos := mload(64)
+                returndatacopy(pos, 0, returndatasize())
+                revert(pos, returndatasize())
+            }
+            sstore(0, or(and(sload(0), not(sub(shl(160, 1), 1))), and(expr_address, sub(shl(160, 1), 1))))
+            let _4 := mload(64)
+            let _5 := datasize("B_7")
+            let _6 := add(_4, _5)
+            if or(gt(_6, sub(shl(64, 1), 1)), lt(_6, _4))
+            {
+                mstore(0, shl(224, 0x4e487b71))
+                mstore(4, 0x41)
+                revert(0, 0x24)
+            }
+            datacopy(_4, dataoffset("B_7"), _5)
+            let expr_address_1 := create(0, _4, sub(_6, _4))
+            if iszero(expr_address_1)
+            {
+                let pos_1 := mload(64)
+                returndatacopy(pos_1, 0, returndatasize())
+                revert(pos_1, returndatasize())
+            }
+            sstore(0x01, or(and(sload(0x01), not(sub(shl(160, 1), 1))), and(expr_address_1, sub(shl(160, 1), 1))))
+            let _7 := mload(64)
+            let _8 := datasize("C_33_deployed")
+            codecopy(_7, dataoffset("C_33_deployed"), _8)
+            return(_7, _8)
+        }
+    }
+    /// @use-src 0:"ir_subobject_order/input.sol"
+    object "C_33_deployed" {
+        code { { revert(0, 0) } }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+    /// @use-src 0:"ir_subobject_order/input.sol"
+    object "B_7" {
+        code { { revert(0, 0) } }
+        /// @use-src 0:"ir_subobject_order/input.sol"
+        object "B_7_deployed" {
+            code { { revert(0, 0) } }
+            data ".metadata" hex"<BYTECODE REMOVED>"
+        }
+    }
+    /// @use-src 0:"ir_subobject_order/input.sol"
+    object "A_13" {
+        code { { revert(0, 0) } }
+        /// @use-src 0:"ir_subobject_order/input.sol"
+        object "A_13_deployed" {
+            code { { revert(0, 0) } }
+            data ".metadata" hex"<BYTECODE REMOVED>"
+        }
+    }
+}

From 8840e33746c26cc6398b0498b5a3ba0abc992eef Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 15 Jul 2024 17:15:11 +0200
Subject: [PATCH 0946/1140] Order yul subobjects by order of reference.
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/codegen/ir/IRGenerationContext.h        | 5 +++--
 libsolidity/codegen/ir/IRGenerator.cpp              | 4 ++--
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7bffd07e1e..bfdd45575f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
+ * Yul IR Code Generation: Deterministic order of Yul subobjects.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
  * Yul Parser: Fix segfault when parsing very long location comments.
 
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index 8e03a378b3..2bf837697b 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -143,7 +143,8 @@ class IRGenerationContext
 
 	RevertStrings revertStrings() const { return m_revertStrings; }
 
-	std::set<ContractDefinition const*, ASTNode::CompareByID>& subObjectsCreated() { return m_subObjects; }
+	util::UniqueVector<ContractDefinition const*> const& subObjectsCreated() const { return m_subObjects; }
+	void addSubObject(ContractDefinition const* _contractDefinition) { m_subObjects.pushBack(_contractDefinition); }
 
 	bool memoryUnsafeInlineAssemblySeen() const { return m_memoryUnsafeInlineAssemblySeen; }
 	void setMemoryUnsafeInlineAssemblySeen() { m_memoryUnsafeInlineAssemblySeen = true; }
@@ -195,7 +196,7 @@ class IRGenerationContext
 	/// It will fail at runtime but the code must still compile.
 	InternalDispatchMap m_internalDispatchMap;
 
-	std::set<ContractDefinition const*, ASTNode::CompareByID> m_subObjects;
+	util::UniqueVector<ContractDefinition const*> m_subObjects;
 
 	langutil::DebugInfoSelection m_debugInfoSelection = {};
 	langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 93136a1a26..bf0f6d5c0f 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -101,10 +101,10 @@ std::string IRGenerator::generate(
 	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
 )
 {
-	auto subObjectSources = [&_otherYulSources](std::set<ContractDefinition const*, ASTNode::CompareByID> const& subObjects) -> std::string
+	auto subObjectSources = [&_otherYulSources](UniqueVector<ContractDefinition const*> const& _subObjects) -> std::string
 	{
 		std::string subObjectsSources;
-		for (ContractDefinition const* subObject: subObjects)
+		for (ContractDefinition const* subObject: _subObjects)
 			subObjectsSources += _otherYulSources.at(subObject);
 		return subObjectsSources;
 	};
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 1c212cd828..0579f50c2d 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1559,7 +1559,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 		ContractDefinition const* contract =
 			&dynamic_cast<ContractType const&>(*functionType->returnParameterTypes().front()).contractDefinition();
-		m_context.subObjectsCreated().insert(contract);
+		m_context.addSubObject(contract);
 
 		Whiskers t(R"(let <memPos> := <allocateUnbounded>()
 			let <memEnd> := add(<memPos>, datasize("<object>"))
@@ -1947,7 +1947,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
 			solAssert(!contractType.isSuper());
 			ContractDefinition const& contract = contractType.contractDefinition();
-			m_context.subObjectsCreated().insert(&contract);
+			m_context.addSubObject(&contract);
 			appendCode() << Whiskers(R"(
 				let <size> := datasize("<objectName>")
 				let <result> := <allocationFunction>(add(<size>, 32))

From c78b7e25c6ccd5344b6d2319a4a992fe2095ee1b Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 16 Jul 2024 17:59:02 +0200
Subject: [PATCH 0947/1140] Update test.

---
 test/cmdlineTests/ir_subobject_order/output | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cmdlineTests/ir_subobject_order/output b/test/cmdlineTests/ir_subobject_order/output
index a364e623d7..da4390fff0 100644
--- a/test/cmdlineTests/ir_subobject_order/output
+++ b/test/cmdlineTests/ir_subobject_order/output
@@ -75,19 +75,19 @@ object "C_33" {
         data ".metadata" hex"<BYTECODE REMOVED>"
     }
     /// @use-src 0:"ir_subobject_order/input.sol"
-    object "B_7" {
+    object "A_13" {
         code { { revert(0, 0) } }
         /// @use-src 0:"ir_subobject_order/input.sol"
-        object "B_7_deployed" {
+        object "A_13_deployed" {
             code { { revert(0, 0) } }
             data ".metadata" hex"<BYTECODE REMOVED>"
         }
     }
     /// @use-src 0:"ir_subobject_order/input.sol"
-    object "A_13" {
+    object "B_7" {
         code { { revert(0, 0) } }
         /// @use-src 0:"ir_subobject_order/input.sol"
-        object "A_13_deployed" {
+        object "B_7_deployed" {
             code { { revert(0, 0) } }
             data ".metadata" hex"<BYTECODE REMOVED>"
         }

From 3b85fb9ac75f853602779f0541c9f5909640058e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 17 Jul 2024 11:35:34 +0200
Subject: [PATCH 0948/1140] Remove swap from UniqueVector

---
 libsolutil/CommonData.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index c64b3913fc..1a5451ef51 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -380,12 +380,6 @@ class UniqueVector
 	std::vector<T> m_contents;
 };
 
-template<typename T>
-void swap(UniqueVector<T>& _lhs, UniqueVector<T>& _rhs)
-{
-	std::swap(_lhs.contents(), _rhs.contents());
-}
-
 namespace detail
 {
 

From 94be070ba099d26587af809a7cc54d5348f2fca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 30 Jun 2024 17:27:36 +0200
Subject: [PATCH 0949/1140] YulStack: Remove unused m_sourceMappings member

---
 libyul/YulStack.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index d75ff200f5..c6d78a115c 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -163,8 +163,6 @@ class YulStack: public langutil::CharStreamProvider
 	std::shared_ptr<yul::Object> m_parserResult;
 	langutil::ErrorList m_errors;
 	langutil::ErrorReporter m_errorReporter;
-
-	std::unique_ptr<std::string> m_sourceMappings;
 };
 
 }

From ee839e9a0eee251f6cba9e440397e5f961635f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 30 Jun 2024 18:43:12 +0200
Subject: [PATCH 0950/1140] YulStack: Use util::unreachable() instead of
 returning unnecessary values.

---
 libyul/YulStack.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 27b4b5526b..9aaaab2eb2 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -44,6 +44,7 @@ using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::yul;
 using namespace solidity::langutil;
+using namespace solidity::util;
 
 namespace
 {
@@ -257,8 +258,7 @@ MachineAssemblyObject YulStack::assemble(Machine _machine)
 	case Machine::EVM:
 		return assembleWithDeployed().first;
 	}
-	// unreachable
-	return MachineAssemblyObject();
+	unreachable();
 }
 
 std::pair<MachineAssemblyObject, MachineAssemblyObject>

From 84b89a5cf358f6c103c79d7ff2732180338745f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 18 Jul 2024 14:10:25 +0200
Subject: [PATCH 0951/1140] Fix native source locations in optimized IR AST

---
 Changelog.md                                  |   1 +
 libsolidity/interface/CompilerStack.cpp       |  47 +++---
 test/cmdlineTests/ast_ir/output               |  92 ++++++------
 .../output.json                               | 142 +++++++++---------
 4 files changed, 147 insertions(+), 135 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bfdd45575f..7a5adcc4b0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
+ * Yul AST: Fix ``nativeSrc`` attributes in optimized IR AST referring to locations in unoptimized IR.
  * Yul IR Code Generation: Deterministic order of Yul subobjects.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
  * Yul Parser: Fix segfault when parsing very long location comments.
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 8ee55d87f5..adef81793a 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1464,25 +1464,36 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 		);
 	}
 
-	yul::YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection
-	);
-	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
-	solAssert(
-		yulAnalysisSuccessful,
-		compiledContract.yulIR + "\n\n"
-		"Invalid IR generated:\n" +
-		langutil::SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
-	);
+	auto const parseYul = [&](std::string const& _irSource) {
+		YulStack stack(
+			m_evmVersion,
+			m_eofVersion,
+			YulStack::Language::StrictAssembly,
+			m_optimiserSettings,
+			m_debugInfoSelection
+		);
+		bool yulAnalysisSuccessful = stack.parseAndAnalyze("", _irSource);
+		solAssert(
+			yulAnalysisSuccessful,
+			_irSource + "\n\n"
+			"Invalid IR generated:\n" +
+			langutil::SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
+		);
+		return stack;
+	};
 
-	compiledContract.yulIRAst = stack.astJson();
-	stack.optimize();
-	compiledContract.yulIROptimized = stack.print(this);
-	compiledContract.yulIROptimizedAst = stack.astJson();
+	{
+		YulStack stack = parseYul(compiledContract.yulIR);
+		compiledContract.yulIRAst = stack.astJson();
+		stack.optimize();
+		compiledContract.yulIROptimized = stack.print(this);
+	}
+	{
+		// Optimizer does not maintain correct native source locations in the AST.
+		// We can work around it by regenerating the AST from scratch from optimized IR.
+		YulStack stack = parseYul(compiledContract.yulIROptimized);
+		compiledContract.yulIROptimizedAst = stack.astJson();
+	}
 }
 
 void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
index c68c778729..76f1119908 100644
--- a/test/cmdlineTests/ast_ir/output
+++ b/test/cmdlineTests/ast_ir/output
@@ -637,24 +637,24 @@ Optimized IR AST:
 {
     "code": {
         "block": {
-            "nativeSrc": "59:790:0",
+            "nativeSrc": "58:315:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
             "statements": [
                 {
-                    "nativeSrc": "59:790:0",
+                    "nativeSrc": "68:299:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "122:16:0",
+                            "nativeSrc": "128:27:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "134:3:0",
+                                        "nativeSrc": "150:4:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -663,18 +663,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "memoryguard",
-                                    "nativeSrc": "122:11:0",
+                                    "nativeSrc": "138:11:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "122:16:0",
+                                "nativeSrc": "138:17:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_1",
-                                    "nativeSrc": "122:16:0",
+                                    "nativeSrc": "132:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -686,7 +686,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "118:2:0",
+                                        "nativeSrc": "175:2:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -694,28 +694,28 @@ Optimized IR AST:
                                     },
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "122:16:0",
+                                        "nativeSrc": "179:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "mstore",
-                                    "nativeSrc": "111:6:0",
+                                    "nativeSrc": "168:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "111:28:0",
+                                "nativeSrc": "168:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "111:28:0",
+                            "nativeSrc": "168:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
                         {
                             "body": {
-                                "nativeSrc": "163:83:0",
+                                "nativeSrc": "210:16:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
                                 "statements": [
@@ -724,7 +724,7 @@ Optimized IR AST:
                                             "arguments": [
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "650:1:0",
+                                                    "nativeSrc": "219:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -732,7 +732,7 @@ Optimized IR AST:
                                                 },
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "650:1:0",
+                                                    "nativeSrc": "222:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -741,15 +741,15 @@ Optimized IR AST:
                                             ],
                                             "functionName": {
                                                 "name": "revert",
-                                                "nativeSrc": "640:6:0",
+                                                "nativeSrc": "212:6:0",
                                                 "nodeType": "YulIdentifier",
                                                 "src": "60:13:0"
                                             },
-                                            "nativeSrc": "640:12:0",
+                                            "nativeSrc": "212:12:0",
                                             "nodeType": "YulFunctionCall",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "640:12:0",
+                                        "nativeSrc": "212:12:0",
                                         "nodeType": "YulExpressionStatement",
                                         "src": "60:13:0"
                                     }
@@ -759,20 +759,20 @@ Optimized IR AST:
                                 "arguments": [],
                                 "functionName": {
                                     "name": "callvalue",
-                                    "nativeSrc": "151:9:0",
+                                    "nativeSrc": "198:9:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "151:11:0",
+                                "nativeSrc": "198:11:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "148:98:0",
+                            "nativeSrc": "195:31:0",
                             "nodeType": "YulIf",
                             "src": "60:13:0"
                         },
                         {
-                            "nativeSrc": "363:24:0",
+                            "nativeSrc": "239:34:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
@@ -780,7 +780,7 @@ Optimized IR AST:
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
-                                        "nativeSrc": "372:14:0",
+                                        "nativeSrc": "258:14:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -789,18 +789,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "datasize",
-                                    "nativeSrc": "363:8:0",
+                                    "nativeSrc": "249:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "363:24:0",
+                                "nativeSrc": "249:24:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_2",
-                                    "nativeSrc": "363:24:0",
+                                    "nativeSrc": "243:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -812,7 +812,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "331:2:0",
+                                        "nativeSrc": "295:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
@@ -821,7 +821,7 @@ Optimized IR AST:
                                             {
                                                 "hexValue": "435f325f6465706c6f796564",
                                                 "kind": "string",
-                                                "nativeSrc": "346:14:0",
+                                                "nativeSrc": "310:14:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -830,32 +830,32 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "dataoffset",
-                                            "nativeSrc": "335:10:0",
+                                            "nativeSrc": "299:10:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "335:26:0",
+                                        "nativeSrc": "299:26:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "363:24:0",
+                                        "nativeSrc": "327:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "codecopy",
-                                    "nativeSrc": "322:8:0",
+                                    "nativeSrc": "286:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "322:66:0",
+                                "nativeSrc": "286:44:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "322:66:0",
+                            "nativeSrc": "286:44:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
@@ -864,28 +864,28 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "405:2:0",
+                                        "nativeSrc": "350:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "409:24:0",
+                                        "nativeSrc": "354:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "return",
-                                    "nativeSrc": "398:6:0",
+                                    "nativeSrc": "343:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "398:36:0",
+                                "nativeSrc": "343:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "398:36:0",
+                            "nativeSrc": "343:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         }
@@ -901,12 +901,12 @@ Optimized IR AST:
         {
             "code": {
                 "block": {
-                    "nativeSrc": "929:588:0",
+                    "nativeSrc": "453:118:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "929:588:0",
+                            "nativeSrc": "467:94:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
@@ -915,7 +915,7 @@ Optimized IR AST:
                                         "arguments": [
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "1490:1:0",
+                                                "nativeSrc": "542:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -923,7 +923,7 @@ Optimized IR AST:
                                             },
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "1490:1:0",
+                                                "nativeSrc": "545:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -932,15 +932,15 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "revert",
-                                            "nativeSrc": "1480:6:0",
+                                            "nativeSrc": "535:6:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "1480:12:0",
+                                        "nativeSrc": "535:12:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
-                                    "nativeSrc": "1480:12:0",
+                                    "nativeSrc": "535:12:0",
                                     "nodeType": "YulExpressionStatement",
                                     "src": "60:13:0"
                                 }
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
index 91d0e87f36..5c6762ac99 100644
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -5,12 +5,12 @@
                 "irOptimizedAst": {
                     "code": {
                         "block": {
-                            "nativeSrc": "44:790:0",
+                            "nativeSrc": "43:639:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
                                 {
-                                    "nativeSrc": "44:790:0",
+                                    "nativeSrc": "53:421:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
@@ -19,7 +19,7 @@
                                                 "arguments": [
                                                     {
                                                         "kind": "number",
-                                                        "nativeSrc": "103:2:0",
+                                                        "nativeSrc": "120:2:0",
                                                         "nodeType": "YulLiteral",
                                                         "src": "56:13:0",
                                                         "type": "",
@@ -29,7 +29,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "119:3:0",
+                                                                "nativeSrc": "136:4:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -38,32 +38,32 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "memoryguard",
-                                                            "nativeSrc": "107:11:0",
+                                                            "nativeSrc": "124:11:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "107:16:0",
+                                                        "nativeSrc": "124:17:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "mstore",
-                                                    "nativeSrc": "96:6:0",
+                                                    "nativeSrc": "113:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "96:28:0",
+                                                "nativeSrc": "113:29:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "96:28:0",
+                                            "nativeSrc": "113:29:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "148:83:0",
+                                                "nativeSrc": "182:111:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -72,15 +72,15 @@
                                                             "arguments": [],
                                                             "functionName": {
                                                                 "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                                "nativeSrc": "150:77:0",
+                                                                "nativeSrc": "200:77:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "150:79:0",
+                                                            "nativeSrc": "200:79:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "150:79:0",
+                                                        "nativeSrc": "200:79:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
@@ -90,38 +90,38 @@
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "callvalue",
-                                                    "nativeSrc": "136:9:0",
+                                                    "nativeSrc": "158:9:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "136:11:0",
+                                                "nativeSrc": "158:11:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "133:98:0",
+                                            "nativeSrc": "155:138:0",
                                             "nodeType": "YulIf",
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "nativeSrc": "268:30:0",
+                                            "nativeSrc": "306:30:0",
                                             "nodeType": "YulVariableDeclaration",
                                             "src": "56:13:0",
                                             "value": {
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "allocate_unbounded",
-                                                    "nativeSrc": "278:18:0",
+                                                    "nativeSrc": "316:18:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "278:20:0",
+                                                "nativeSrc": "316:20:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
                                             "variables": [
                                                 {
                                                     "name": "_1",
-                                                    "nativeSrc": "272:2:0",
+                                                    "nativeSrc": "310:2:0",
                                                     "nodeType": "YulTypedName",
                                                     "src": "56:13:0",
                                                     "type": ""
@@ -133,7 +133,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "316:2:0",
+                                                        "nativeSrc": "358:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -142,7 +142,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "331:14:0",
+                                                                "nativeSrc": "373:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -151,11 +151,11 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "dataoffset",
-                                                            "nativeSrc": "320:10:0",
+                                                            "nativeSrc": "362:10:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "320:26:0",
+                                                        "nativeSrc": "362:26:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
@@ -164,7 +164,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "357:14:0",
+                                                                "nativeSrc": "399:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -173,26 +173,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "348:8:0",
+                                                            "nativeSrc": "390:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "348:24:0",
+                                                        "nativeSrc": "390:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "codecopy",
-                                                    "nativeSrc": "307:8:0",
+                                                    "nativeSrc": "349:8:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "307:66:0",
+                                                "nativeSrc": "349:66:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "307:66:0",
+                                            "nativeSrc": "349:66:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
@@ -201,7 +201,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "390:2:0",
+                                                        "nativeSrc": "435:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -210,7 +210,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "403:14:0",
+                                                                "nativeSrc": "448:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -219,26 +219,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "394:8:0",
+                                                            "nativeSrc": "439:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "394:24:0",
+                                                        "nativeSrc": "439:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "return",
-                                                    "nativeSrc": "383:6:0",
+                                                    "nativeSrc": "428:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "383:36:0",
+                                                "nativeSrc": "428:36:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "383:36:0",
+                                            "nativeSrc": "428:36:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         }
@@ -246,19 +246,19 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "469:43:0",
+                                        "nativeSrc": "531:23:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
                                             {
-                                                "nativeSrc": "483:19:0",
+                                                "nativeSrc": "533:19:0",
                                                 "nodeType": "YulAssignment",
                                                 "src": "56:13:0",
                                                 "value": {
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "499:2:0",
+                                                            "nativeSrc": "549:2:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -267,18 +267,18 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "mload",
-                                                        "nativeSrc": "493:5:0",
+                                                        "nativeSrc": "543:5:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "493:9:0",
+                                                    "nativeSrc": "543:9:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
                                                 "variableNames": [
                                                     {
                                                         "name": "memPtr",
-                                                        "nativeSrc": "483:6:0",
+                                                        "nativeSrc": "533:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     }
@@ -287,12 +287,12 @@
                                         ]
                                     },
                                     "name": "allocate_unbounded",
-                                    "nativeSrc": "429:83:0",
+                                    "nativeSrc": "483:71:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "returnVariables": [
                                         {
                                             "name": "memPtr",
-                                            "nativeSrc": "462:6:0",
+                                            "nativeSrc": "516:6:0",
                                             "nodeType": "YulTypedName",
                                             "src": "56:13:0",
                                             "type": ""
@@ -302,7 +302,7 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "611:36:0",
+                                        "nativeSrc": "660:16:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
@@ -311,7 +311,7 @@
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "632:1:0",
+                                                            "nativeSrc": "669:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -319,7 +319,7 @@
                                                         },
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "635:1:0",
+                                                            "nativeSrc": "672:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -328,22 +328,22 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "revert",
-                                                        "nativeSrc": "625:6:0",
+                                                        "nativeSrc": "662:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "625:12:0",
+                                                    "nativeSrc": "662:12:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "625:12:0",
+                                                "nativeSrc": "662:12:0",
                                                 "nodeType": "YulExpressionStatement",
                                                 "src": "56:13:0"
                                             }
                                         ]
                                     },
                                     "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                    "nativeSrc": "522:125:0",
+                                    "nativeSrc": "563:113:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "src": "56:13:0"
                                 }
@@ -357,12 +357,12 @@
                         {
                             "code": {
                                 "block": {
-                                    "nativeSrc": "899:588:0",
+                                    "nativeSrc": "747:361:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
                                         {
-                                            "nativeSrc": "899:588:0",
+                                            "nativeSrc": "761:207:0",
                                             "nodeType": "YulBlock",
                                             "src": "-1:-1:0",
                                             "statements": [
@@ -371,7 +371,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "966:2:0",
+                                                                "nativeSrc": "836:2:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -381,7 +381,7 @@
                                                                 "arguments": [
                                                                     {
                                                                         "kind": "number",
-                                                                        "nativeSrc": "982:3:0",
+                                                                        "nativeSrc": "852:4:0",
                                                                         "nodeType": "YulLiteral",
                                                                         "src": "56:13:0",
                                                                         "type": "",
@@ -390,26 +390,26 @@
                                                                 ],
                                                                 "functionName": {
                                                                     "name": "memoryguard",
-                                                                    "nativeSrc": "970:11:0",
+                                                                    "nativeSrc": "840:11:0",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "56:13:0"
                                                                 },
-                                                                "nativeSrc": "970:16:0",
+                                                                "nativeSrc": "840:17:0",
                                                                 "nodeType": "YulFunctionCall",
                                                                 "src": "56:13:0"
                                                             }
                                                         ],
                                                         "functionName": {
                                                             "name": "mstore",
-                                                            "nativeSrc": "959:6:0",
+                                                            "nativeSrc": "829:6:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "959:28:0",
+                                                        "nativeSrc": "829:29:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "959:28:0",
+                                                    "nativeSrc": "829:29:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 },
@@ -418,15 +418,15 @@
                                                         "arguments": [],
                                                         "functionName": {
                                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                            "nativeSrc": "1001:77:0",
+                                                            "nativeSrc": "875:77:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "1001:79:0",
+                                                        "nativeSrc": "875:79:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "1001:79:0",
+                                                    "nativeSrc": "875:79:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 }
@@ -434,7 +434,7 @@
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "1432:44:0",
+                                                "nativeSrc": "1082:16:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -443,7 +443,7 @@
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1457:1:0",
+                                                                    "nativeSrc": "1091:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -451,7 +451,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1460:1:0",
+                                                                    "nativeSrc": "1094:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -460,22 +460,22 @@
                                                             ],
                                                             "functionName": {
                                                                 "name": "revert",
-                                                                "nativeSrc": "1450:6:0",
+                                                                "nativeSrc": "1084:6:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "1450:12:0",
+                                                            "nativeSrc": "1084:12:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "1450:12:0",
+                                                        "nativeSrc": "1084:12:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                            "nativeSrc": "1343:133:0",
+                                            "nativeSrc": "981:117:0",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "56:13:0"
                                         }

From 198d2393ce504e108ee0bbb531f8ad3f375a87ca Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 19 Jul 2024 09:56:15 +0200
Subject: [PATCH 0952/1140] Downgrade nodejs in base_node_small image to fix CI

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6c3f33da0..20f57b4131 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -487,7 +487,8 @@ defaults:
 
   - base_node_small: &base_node_small
       docker:
-        - image: cimg/node:current
+        # TODO: Revert to cimg/node:current once https://github.com/npm/cli/issues/7657 is resolved.
+        - image: cimg/node:22.4
       resource_class: small
       environment: &base_node_small_env
         TERM: xterm
@@ -761,6 +762,7 @@ defaults:
       # which does not support shanghai EVM.
       compile_only: 1
       resource_class: medium
+      image: cimg/node:18.16
 
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *requires_b_ubu_static

From 1a5335a48688bd19dbb95d9279e7e1af5e4044d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 17 Jul 2024 17:01:16 +0200
Subject: [PATCH 0953/1140] Fix isoltest crash when formatting call arguments
 in a contract whose ABI includes entries without names

- functionSignatureFromABI() would attempt to calculate signature for a function even if it had no name (i.e. was a constructor, fallback or receive). This would lead to a crash.
- The buggy logic is used only for formatting expectations when an test fails in interactive mode.
---
 test/libsolidity/util/ContractABIUtils.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
index fb2f4eb626..dcbdcbc5d1 100644
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ b/test/libsolidity/util/ContractABIUtils.cpp
@@ -142,6 +142,8 @@ std::optional<ABIType> isFixedPoint(std::string const& type)
 
 std::string functionSignatureFromABI(Json const& _functionABI)
 {
+	soltestAssert(_functionABI.contains("name"));
+
 	auto inputs = _functionABI["inputs"];
 	std::string signature = {_functionABI["name"].get<std::string>() + "("};
 	size_t parameterCount = 0;
@@ -169,7 +171,9 @@ std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::paramet
 		return std::nullopt;
 
 	for (auto const& function: _contractABI)
-		if (_functionSignature == functionSignatureFromABI(function))
+		// ABI may contain functions without names (constructor, fallback, receive). Since name is
+		// necessary to calculate the signature, these cannot possibly match and can be safely ignored.
+		if (function.contains("name") && _functionSignature == functionSignatureFromABI(function))
 		{
 			ParameterList inplaceTypeParams;
 			ParameterList dynamicTypeParams;

From 96fdcc3d040d05209f561e78a50dee2ebe4252c3 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Thu, 18 Jul 2024 14:15:22 +0200
Subject: [PATCH 0954/1140] Yul: Prepare removal of YulString by replacing its
 occurrences by YulName typedef

---
 libsolc/libsolc.cpp                           |   2 +-
 libsolidity/analysis/ReferencesResolver.cpp   |   2 +-
 libsolidity/analysis/ReferencesResolver.h     |   2 +-
 libsolidity/codegen/CompilerContext.cpp       |  10 +-
 libsolidity/codegen/CompilerContext.h         |   2 +-
 libsolidity/codegen/ContractCompiler.cpp      |   2 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |   6 +-
 .../codegen/IRGeneratorForStatements.cpp      |   6 +-
 libsolidity/interface/CompilerStack.cpp       |   2 +-
 libyul/AST.h                                  |  10 +-
 libyul/AsmAnalysis.cpp                        |  52 ++++----
 libyul/AsmAnalysis.h                          |  18 +--
 libyul/AsmJsonImporter.cpp                    |  10 +-
 libyul/AsmParser.cpp                          |   6 +-
 libyul/AsmParser.h                            |   2 +-
 libyul/AsmPrinter.cpp                         |   2 +-
 libyul/AsmPrinter.h                           |   4 +-
 libyul/CMakeLists.txt                         |   1 +
 libyul/CompilabilityChecker.h                 |   4 +-
 libyul/ControlFlowSideEffectsCollector.cpp    |   4 +-
 libyul/ControlFlowSideEffectsCollector.h      |   2 +-
 libyul/Dialect.cpp                            |  31 +++--
 libyul/Dialect.h                              |  37 +++---
 libyul/Exceptions.h                           |  10 +-
 libyul/FunctionReferenceResolver.h            |   2 +-
 libyul/Object.h                               |   1 -
 libyul/ObjectParser.h                         |   1 -
 libyul/Scope.cpp                              |   8 +-
 libyul/Scope.h                                |  20 +--
 libyul/YulName.h                              |  26 ++++
 libyul/YulString.h                            |   2 +-
 libyul/backends/evm/ConstantOptimiser.cpp     |  16 +--
 libyul/backends/evm/ConstantOptimiser.h       |   6 +-
 .../backends/evm/ControlFlowGraphBuilder.cpp  |  10 +-
 libyul/backends/evm/ControlFlowGraphBuilder.h |   4 +-
 libyul/backends/evm/EVMCodeTransform.cpp      |  12 +-
 libyul/backends/evm/EVMCodeTransform.h        |   8 +-
 libyul/backends/evm/EVMDialect.cpp            | 122 +++++++++---------
 libyul/backends/evm/EVMDialect.h              |  33 +++--
 libyul/backends/evm/EVMObjectCompiler.cpp     |   2 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |  14 +-
 libyul/backends/evm/StackLayoutGenerator.cpp  |  10 +-
 libyul/backends/evm/StackLayoutGenerator.h    |   6 +-
 .../backends/evm/VariableReferenceCounter.cpp |   2 +-
 .../backends/evm/VariableReferenceCounter.h   |   2 +-
 libyul/optimiser/ASTCopier.cpp                |   4 +-
 libyul/optimiser/ASTCopier.h                  |  10 +-
 libyul/optimiser/ASTWalker.h                  |   2 +-
 libyul/optimiser/BlockHasher.h                |   6 +-
 libyul/optimiser/CallGraphGenerator.cpp       |  14 +-
 libyul/optimiser/CallGraphGenerator.h         |   8 +-
 libyul/optimiser/CircularReferencesPruner.cpp |  12 +-
 libyul/optimiser/CircularReferencesPruner.h   |   7 +-
 .../CommonSubexpressionEliminator.cpp         |   6 +-
 .../optimiser/CommonSubexpressionEliminator.h |   8 +-
 libyul/optimiser/ConditionalSimplifier.cpp    |   4 +-
 libyul/optimiser/ConditionalSimplifier.h      |   4 +-
 libyul/optimiser/ConditionalUnsimplifier.cpp  |   4 +-
 libyul/optimiser/ConditionalUnsimplifier.h    |   4 +-
 libyul/optimiser/ControlFlowSimplifier.cpp    |   2 +-
 libyul/optimiser/DataFlowAnalyzer.cpp         |  64 ++++-----
 libyul/optimiser/DataFlowAnalyzer.h           |  56 ++++----
 libyul/optimiser/DeadCodeEliminator.h         |   6 +-
 libyul/optimiser/Disambiguator.cpp            |   2 +-
 libyul/optimiser/Disambiguator.h              |   8 +-
 libyul/optimiser/EqualStoreEliminator.cpp     |   4 +-
 libyul/optimiser/EqualStoreEliminator.h       |   2 +-
 libyul/optimiser/EquivalentFunctionCombiner.h |   4 +-
 libyul/optimiser/EquivalentFunctionDetector.h |   4 +-
 libyul/optimiser/ExpressionInliner.cpp        |   4 +-
 libyul/optimiser/ExpressionInliner.h          |   9 +-
 libyul/optimiser/ExpressionJoiner.h           |   2 +-
 libyul/optimiser/ExpressionSimplifier.cpp     |   2 +-
 libyul/optimiser/ExpressionSplitter.cpp       |   4 +-
 .../optimiser/ForLoopConditionOutOfBody.cpp   |   2 +-
 libyul/optimiser/FullInliner.cpp              |  35 +++--
 libyul/optimiser/FullInliner.h                |  32 ++---
 libyul/optimiser/FunctionCallFinder.cpp       |  10 +-
 libyul/optimiser/FunctionCallFinder.h         |   6 +-
 libyul/optimiser/FunctionSpecializer.cpp      |  12 +-
 libyul/optimiser/FunctionSpecializer.h        |   8 +-
 .../InlinableExpressionFunctionFinder.cpp     |   4 +-
 .../InlinableExpressionFunctionFinder.h       |   8 +-
 libyul/optimiser/KnowledgeBase.cpp            |  36 +++---
 libyul/optimiser/KnowledgeBase.h              |  38 +++---
 libyul/optimiser/LoadResolver.cpp             |   4 +-
 libyul/optimiser/LoadResolver.h               |   2 +-
 libyul/optimiser/LoopInvariantCodeMotion.cpp  |   8 +-
 libyul/optimiser/LoopInvariantCodeMotion.h    |  10 +-
 libyul/optimiser/Metrics.cpp                  |   2 +-
 libyul/optimiser/Metrics.h                    |   4 +-
 libyul/optimiser/NameCollector.cpp            |  22 ++--
 libyul/optimiser/NameCollector.h              |  31 ++---
 libyul/optimiser/NameDispenser.cpp            |  13 +-
 libyul/optimiser/NameDispenser.h              |  18 +--
 libyul/optimiser/NameDisplacer.cpp            |   4 +-
 libyul/optimiser/NameDisplacer.h              |  14 +-
 libyul/optimiser/NameSimplifier.cpp           |  14 +-
 libyul/optimiser/NameSimplifier.h             |   8 +-
 libyul/optimiser/OptimiserStep.h              |   3 +-
 libyul/optimiser/OptimizerUtilities.cpp       |   4 +-
 libyul/optimiser/OptimizerUtilities.h         |   6 +-
 libyul/optimiser/Rematerialiser.cpp           |   8 +-
 libyul/optimiser/Rematerialiser.h             |   8 +-
 libyul/optimiser/SSATransform.cpp             |  52 ++++----
 libyul/optimiser/SSAValueTracker.cpp          |   6 +-
 libyul/optimiser/SSAValueTracker.h            |  12 +-
 libyul/optimiser/Semantics.cpp                |  18 +--
 libyul/optimiser/Semantics.h                  |  22 ++--
 libyul/optimiser/SimplificationRules.cpp      |   8 +-
 libyul/optimiser/SimplificationRules.h        |   6 +-
 libyul/optimiser/StackCompressor.cpp          |  44 +++----
 libyul/optimiser/StackLimitEvader.cpp         |  33 +++--
 libyul/optimiser/StackLimitEvader.h           |   4 +-
 libyul/optimiser/StackToMemoryMover.cpp       |  16 +--
 libyul/optimiser/StackToMemoryMover.h         |  21 +--
 libyul/optimiser/Substitution.cpp             |   2 +-
 libyul/optimiser/Substitution.h               |   6 +-
 libyul/optimiser/Suite.cpp                    |   4 +-
 libyul/optimiser/Suite.h                      |   4 +-
 libyul/optimiser/SyntacticalEquality.h        |   6 +-
 libyul/optimiser/TypeInfo.cpp                 |  12 +-
 libyul/optimiser/TypeInfo.h                   |  16 +--
 libyul/optimiser/UnusedAssignEliminator.cpp   |   4 +-
 libyul/optimiser/UnusedAssignEliminator.h     |   8 +-
 .../UnusedFunctionParameterPruner.cpp         |  14 +-
 libyul/optimiser/UnusedFunctionsCommon.cpp    |   4 +-
 libyul/optimiser/UnusedFunctionsCommon.h      |   4 +-
 libyul/optimiser/UnusedPruner.cpp             |  20 +--
 libyul/optimiser/UnusedPruner.h               |  26 ++--
 libyul/optimiser/UnusedStoreBase.h            |   2 +-
 libyul/optimiser/UnusedStoreEliminator.cpp    |  24 ++--
 libyul/optimiser/UnusedStoreEliminator.h      |  22 ++--
 libyul/optimiser/VarNameCleaner.cpp           |  16 +--
 libyul/optimiser/VarNameCleaner.h             |  16 +--
 test/libsolidity/MemoryGuardTest.cpp          |   2 +-
 test/libyul/FunctionSideEffects.cpp           |   2 +-
 test/libyul/KnowledgeBaseTest.cpp             |  50 +++----
 test/libyul/Parser.cpp                        |   6 +-
 test/libyul/StackShufflingTest.cpp            |   8 +-
 test/libyul/StackShufflingTest.h              |   4 +-
 test/libyul/YulOptimizerTestCommon.cpp        |  10 +-
 test/libyul/YulOptimizerTestCommon.h          |   4 +-
 test/tools/yulInterpreter/Inspector.h         |  10 +-
 test/tools/yulInterpreter/Interpreter.cpp     |   6 +-
 test/tools/yulInterpreter/Interpreter.h       |  14 +-
 test/tools/yulopti.cpp                        |   2 +-
 tools/yulPhaser/Program.cpp                   |   6 +-
 148 files changed, 879 insertions(+), 871 deletions(-)
 create mode 100644 libyul/YulName.h

diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
index 1059492532..b49905130c 100644
--- a/libsolc/libsolc.cpp
+++ b/libsolc/libsolc.cpp
@@ -24,7 +24,7 @@
 #include <libsolc/libsolc.h>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <cstdlib>
 #include <list>
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index fd7def7145..270e1a55ab 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -488,7 +488,7 @@ void ReferencesResolver::resolveInheritDoc(StructuredDocumentation const& _docum
 	}
 }
 
-void ReferencesResolver::validateYulIdentifierName(yul::YulString _name, SourceLocation const& _location)
+void ReferencesResolver::validateYulIdentifierName(yul::YulName _name, SourceLocation const& _location)
 {
 	if (util::contains(_name.str(), '.'))
 		m_errorReporter.declarationError(
diff --git a/libsolidity/analysis/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
index 13752e9c93..0b7f9d3732 100644
--- a/libsolidity/analysis/ReferencesResolver.h
+++ b/libsolidity/analysis/ReferencesResolver.h
@@ -94,7 +94,7 @@ class ReferencesResolver: private ASTConstVisitor, private yul::ASTWalker
 	void resolveInheritDoc(StructuredDocumentation const& _documentation, StructurallyDocumentedAnnotation& _annotation);
 
 	/// Checks if the name contains a '.'.
-	void validateYulIdentifierName(yul::YulString _name, langutil::SourceLocation const& _location);
+	void validateYulIdentifierName(yul::YulName _name, langutil::SourceLocation const& _location);
 
 	langutil::ErrorReporter& m_errorReporter;
 	NameAndTypeResolver& m_resolver;
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index d9264c6ac5..4d522072af 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -38,7 +38,7 @@
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/optimiser/Suite.h>
 #include <libyul/Object.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/Whiskers.h>
@@ -388,11 +388,11 @@ void CompilerContext::appendInlineAssembly(
 {
 	unsigned startStackHeight = stackHeight();
 
-	std::set<yul::YulString> externallyUsedIdentifiers;
+	std::set<yul::YulName> externallyUsedIdentifiers;
 	for (auto const& fun: _externallyUsedFunctions)
-		externallyUsedIdentifiers.insert(yul::YulString(fun));
+		externallyUsedIdentifiers.insert(yul::YulName(fun));
 	for (auto const& var: _localVariables)
-		externallyUsedIdentifiers.insert(yul::YulString(var));
+		externallyUsedIdentifiers.insert(yul::YulName(var));
 
 	yul::ExternalIdentifierAccess identifierAccess;
 	identifierAccess.resolve = [&](
@@ -532,7 +532,7 @@ void CompilerContext::appendInlineAssembly(
 }
 
 
-void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSettings, std::set<yul::YulString> const& _externalIdentifiers)
+void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSettings, std::set<yul::YulName> const& _externalIdentifiers)
 {
 #ifdef SOL_OUTPUT_ASM
 	cout << yul::AsmPrinter(*dialect)(*_object.code) << endl;
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index 8eba084eba..c6972f92b8 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -277,7 +277,7 @@ class CompilerContext
 	/// Otherwise returns "revert(0, 0)".
 	std::string revertReasonIfDebug(std::string const& _message = "");
 
-	void optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSetting, std::set<yul::YulString> const& _externalIdentifiers = {});
+	void optimizeYul(yul::Object& _object, yul::EVMDialect const& _dialect, OptimiserSettings const& _optimiserSetting, std::set<yul::YulName> const& _externalIdentifiers = {});
 
 	/// Appends arbitrary data to the end of the bytecode.
 	void appendToAuxiliaryData(bytes const& _data) { m_asm->appendToAuxiliaryData(_data); }
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 2326d33363..0ed17f6d02 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -38,7 +38,7 @@
 #include <libyul/optimiser/Suite.h>
 #include <libyul/Object.h>
 #include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Assembly.h>
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 0579f50c2d..5be4d550e7 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -78,7 +78,7 @@ struct CopyTranslate: public yul::ASTCopier
 			return ASTCopier::operator()(_identifier);
 	}
 
-	yul::YulString translateIdentifier(yul::YulString _name) override
+	yul::YulName translateIdentifier(yul::YulName _name) override
 	{
 		// Strictly, the dialect used by inline assembly (m_dialect) could be different
 		// from the Yul dialect we are compiling to. So we are assuming here that the builtin
@@ -87,7 +87,7 @@ struct CopyTranslate: public yul::ASTCopier
 		if (m_dialect.builtin(_name))
 			return _name;
 		else
-			return yul::YulString{"usr$" + _name.str()};
+			return yul::YulName{"usr$" + _name.str()};
 	}
 
 	yul::Identifier translate(yul::Identifier const& _identifier) override
@@ -206,7 +206,7 @@ struct CopyTranslate: public yul::ASTCopier
 		if (isDigit(value.front()))
 			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::valueOfNumberLiteral(value), {}};
 		else
-			return yul::Identifier{_identifier.debugData, yul::YulString{value}};
+			return yul::Identifier{_identifier.debugData, yul::YulName{value}};
 	}
 
 
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
index cb4705f0d1..f9c50cf7a7 100644
--- a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -70,12 +70,12 @@ struct CopyTranslate: public yul::ASTCopier
 			return ASTCopier::operator()(_identifier);
 	}
 
-	yul::YulString translateIdentifier(yul::YulString _name) override
+	yul::YulName translateIdentifier(yul::YulName _name) override
 	{
 		if (m_dialect.builtin(_name))
 			return _name;
 		else
-			return yul::YulString{"usr$" + _name.str()};
+			return yul::YulName{"usr$" + _name.str()};
 	}
 
 	yul::Identifier translate(yul::Identifier const& _identifier) override
@@ -102,7 +102,7 @@ struct CopyTranslate: public yul::ASTCopier
 		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}};
+		return yul::Identifier{_identifier.debugData, yul::YulName{value}};
 	}
 
 	IRGenerationContext const& m_context;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index adef81793a..566feb21b1 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -66,7 +66,7 @@
 
 #include <libstdlib/stdlib.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/YulStack.h>
diff --git a/libyul/AST.h b/libyul/AST.h
index ad60e46859..72be60a468 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <liblangutil/DebugData.h>
 
@@ -36,9 +36,9 @@
 namespace solidity::yul
 {
 
-using Type = YulString;
+using Type = YulName;
 
-struct TypedName { langutil::DebugData::ConstPtr debugData; YulString name; Type type; };
+struct TypedName { langutil::DebugData::ConstPtr debugData; YulName name; Type type; };
 using TypedNameList = std::vector<TypedName>;
 
 /// Literal number or string (up to 32 bytes)
@@ -70,7 +70,7 @@ class LiteralValue {
 };
 struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; LiteralValue value; Type type; };
 /// External / internal identifier or label reference
-struct Identifier { langutil::DebugData::ConstPtr debugData; YulString name; };
+struct Identifier { langutil::DebugData::ConstPtr debugData; YulName name; };
 /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
 /// side and requires x to occupy exactly one stack slot.
 ///
@@ -86,7 +86,7 @@ struct VariableDeclaration { langutil::DebugData::ConstPtr debugData; TypedNameL
 /// Block that creates a scope (frees declared stack variables)
 struct Block { langutil::DebugData::ConstPtr debugData; std::vector<Statement> statements; };
 /// Function definition ("function f(a, b) -> (d, e) { ... }")
-struct FunctionDefinition { langutil::DebugData::ConstPtr debugData; YulString name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
+struct FunctionDefinition { langutil::DebugData::ConstPtr debugData; YulName name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
 /// Conditional execution without "else" part.
 struct If { langutil::DebugData::ConstPtr debugData; std::unique_ptr<Expression> condition; Block body; };
 /// Switch case or default case
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 38b9c782e0..cccb3de421 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -100,7 +100,7 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect,
 	return analysisInfo;
 }
 
-std::vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
+std::vector<YulName> AsmAnalyzer::operator()(Literal const& _literal)
 {
 	expectValidType(_literal.type, nativeLocationOf(_literal));
 	bool erroneousLiteralValue = false;
@@ -132,11 +132,11 @@ std::vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
 	return {_literal.type};
 }
 
-std::vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
+std::vector<YulName> AsmAnalyzer::operator()(Identifier const& _identifier)
 {
 	yulAssert(!_identifier.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	YulString type = m_dialect.defaultType;
+	YulName type = m_dialect.defaultType;
 
 	if (m_currentScope->lookup(_identifier.name, GenericVisitor{
 		[&](Scope::Variable const& _var)
@@ -190,7 +190,7 @@ std::vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
 void AsmAnalyzer::operator()(ExpressionStatement const& _statement)
 {
 	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulString> types = std::visit(*this, _statement.expression);
+	std::vector<YulName> types = std::visit(*this, _statement.expression);
 	if (watcher.ok() && !types.empty())
 		m_errorReporter.typeError(
 			3083_error,
@@ -209,7 +209,7 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 	size_t const numVariables = _assignment.variableNames.size();
 	yulAssert(numVariables >= 1, "");
 
-	std::set<YulString> variables;
+	std::set<YulName> variables;
 	for (auto const& _variableName: _assignment.variableNames)
 		if (!variables.insert(_variableName.name).second)
 			m_errorReporter.declarationError(
@@ -220,7 +220,7 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 				" occurs multiple times on the left-hand side of the assignment."
 			);
 
-	std::vector<YulString> types = std::visit(*this, *_assignment.value);
+	std::vector<YulName> types = std::visit(*this, *_assignment.value);
 
 	if (types.size() != numVariables)
 		m_errorReporter.declarationError(
@@ -259,7 +259,7 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 
 	if (_varDecl.value)
 	{
-		std::vector<YulString> types = std::visit(*this, *_varDecl.value);
+		std::vector<YulName> types = std::visit(*this, *_varDecl.value);
 		if (types.size() != numVariables)
 			m_errorReporter.declarationError(
 				3812_error,
@@ -275,7 +275,7 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 
 		for (size_t i = 0; i < _varDecl.variables.size(); ++i)
 		{
-			YulString givenType = m_dialect.defaultType;
+			YulName givenType = m_dialect.defaultType;
 			if (i < types.size())
 				givenType = types[i];
 			TypedName const& variable = _varDecl.variables[i];
@@ -311,17 +311,17 @@ void AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
 	(*this)(_funDef.body);
 }
 
-std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
+std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 {
 	yulAssert(!_funCall.functionName.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulString> const* parameterTypes = nullptr;
-	std::vector<YulString> const* returnTypes = nullptr;
+	std::vector<YulName> const* parameterTypes = nullptr;
+	std::vector<YulName> const* returnTypes = nullptr;
 	std::vector<std::optional<LiteralKind>> const* literalArguments = nullptr;
 
 	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
 	{
-		if (_funCall.functionName.name == "selfdestruct"_yulstring)
+		if (_funCall.functionName.name == "selfdestruct"_yulname)
 			m_errorReporter.warning(
 				1699_error,
 				nativeLocationOf(_funCall.functionName),
@@ -334,7 +334,7 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			);
 		else if (
 			m_evmVersion.supportsTransientStorage() &&
-			_funCall.functionName.name == "tstore"_yulstring &&
+			_funCall.functionName.name == "tstore"_yulname &&
 			!m_errorReporter.hasError({2394})
 		)
 			m_errorReporter.warning(
@@ -400,7 +400,7 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			std::to_string(_funCall.arguments.size()) + "."
 		);
 
-	std::vector<YulString> argTypes;
+	std::vector<YulName> argTypes;
 	for (size_t i = _funCall.arguments.size(); i > 0; i--)
 	{
 		Expression const& arg = _funCall.arguments[i - 1];
@@ -465,7 +465,7 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 		return *returnTypes;
 	}
 	else if (returnTypes)
-		return std::vector<YulString>(returnTypes->size(), m_dialect.defaultType);
+		return std::vector<YulName>(returnTypes->size(), m_dialect.defaultType);
 	else
 		return {};
 }
@@ -488,7 +488,7 @@ void AsmAnalyzer::operator()(Switch const& _switch)
 			"\"switch\" statement with only a default case."
 		);
 
-	YulString valueType = expectExpression(*_switch.expression);
+	YulName valueType = expectExpression(*_switch.expression);
 
 	std::set<u256> cases;
 	for (auto const& _case: _switch.cases)
@@ -553,9 +553,9 @@ void AsmAnalyzer::operator()(Block const& _block)
 	m_currentScope = previousScope;
 }
 
-YulString AsmAnalyzer::expectExpression(Expression const& _expr)
+YulName AsmAnalyzer::expectExpression(Expression const& _expr)
 {
-	std::vector<YulString> types = std::visit(*this, _expr);
+	std::vector<YulName> types = std::visit(*this, _expr);
 	if (types.size() != 1)
 		m_errorReporter.typeError(
 			3950_error,
@@ -567,7 +567,7 @@ YulString AsmAnalyzer::expectExpression(Expression const& _expr)
 	return types.empty() ? m_dialect.defaultType : types.front();
 }
 
-YulString AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
+YulName AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 {
 	yulAssert(_literal.kind == LiteralKind::String);
 	yulAssert(m_dialect.validTypeForLiteral(LiteralKind::String, _literal.value, _literal.type));
@@ -578,7 +578,7 @@ YulString AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 
 void AsmAnalyzer::expectBoolExpression(Expression const& _expr)
 {
-	YulString type = expectExpression(_expr);
+	YulName type = expectExpression(_expr);
 	if (type != m_dialect.boolType)
 		m_errorReporter.typeError(
 			1733_error,
@@ -591,11 +591,11 @@ void AsmAnalyzer::expectBoolExpression(Expression const& _expr)
 		);
 }
 
-void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulString _valueType)
+void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueType)
 {
 	yulAssert(!_variable.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	YulString const* variableType = nullptr;
+	YulName const* variableType = nullptr;
 	bool found = false;
 	if (Scope::Identifier const* var = m_currentScope->lookup(_variable.name))
 	{
@@ -654,7 +654,7 @@ Scope& AsmAnalyzer::scope(Block const* _block)
 	return *scopePtr;
 }
 
-void AsmAnalyzer::expectValidIdentifier(YulString _identifier, SourceLocation const& _location)
+void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation const& _location)
 {
 	// NOTE: the leading dot case is handled by the parser not allowing it.
 	if (boost::ends_with(_identifier.str(), "."))
@@ -679,7 +679,7 @@ void AsmAnalyzer::expectValidIdentifier(YulString _identifier, SourceLocation co
 		);
 }
 
-void AsmAnalyzer::expectValidType(YulString _type, SourceLocation const& _location)
+void AsmAnalyzer::expectValidType(YulName _type, SourceLocation const& _location)
 {
 	if (!m_dialect.types.count(_type))
 		m_errorReporter.typeError(
@@ -689,7 +689,7 @@ void AsmAnalyzer::expectValidType(YulString _type, SourceLocation const& _locati
 		);
 }
 
-void AsmAnalyzer::expectType(YulString _expectedType, YulString _givenType, SourceLocation const& _location)
+void AsmAnalyzer::expectType(YulName _expectedType, YulName _givenType, SourceLocation const& _location)
 {
 	if (_expectedType != _givenType)
 		m_errorReporter.typeError(
@@ -702,7 +702,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));
+	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}).builtin(YulName(_instructionIdentifier));
 	if (builtin && builtin->instruction.has_value())
 		return validateInstructions(builtin->instruction.value(), _location);
 	else
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index 9dd4b22923..5aa7fe4968 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -79,13 +79,13 @@ class AsmAnalyzer
 	/// Asserts on failure.
 	static AsmAnalysisInfo analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object);
 
-	std::vector<YulString> operator()(Literal const& _literal);
-	std::vector<YulString> operator()(Identifier const&);
+	std::vector<YulName> operator()(Literal const& _literal);
+	std::vector<YulName> operator()(Identifier const&);
 	void operator()(ExpressionStatement const&);
 	void operator()(Assignment const& _assignment);
 	void operator()(VariableDeclaration const& _variableDeclaration);
 	void operator()(FunctionDefinition const& _functionDefinition);
-	std::vector<YulString> operator()(FunctionCall const& _functionCall);
+	std::vector<YulName> operator()(FunctionCall const& _functionCall);
 	void operator()(If const& _if);
 	void operator()(Switch const& _switch);
 	void operator()(ForLoop const& _forLoop);
@@ -99,20 +99,20 @@ class AsmAnalyzer
 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.
-	YulString expectExpression(Expression const& _expr);
-	YulString expectUnlimitedStringLiteral(Literal const& _literal);
+	YulName expectExpression(Expression const& _expr);
+	YulName expectUnlimitedStringLiteral(Literal const& _literal);
 	/// Visits the expression and expects it to return a single boolean value.
 	/// Reports an error otherwise.
 	void expectBoolExpression(Expression const& _expr);
 
 	/// Verifies that a variable to be assigned to exists, can be assigned to
 	/// and has the same type as the value.
-	void checkAssignment(Identifier const& _variable, YulString _valueType);
+	void checkAssignment(Identifier const& _variable, YulName _valueType);
 
 	Scope& scope(Block const* _block);
-	void expectValidIdentifier(YulString _identifier, langutil::SourceLocation const& _location);
-	void expectValidType(YulString _type, langutil::SourceLocation const& _location);
-	void expectType(YulString _expectedType, YulString _givenType, langutil::SourceLocation const& _location);
+	void expectValidIdentifier(YulName _identifier, langutil::SourceLocation const& _location);
+	void expectValidType(YulName _type, langutil::SourceLocation const& _location);
+	void expectType(YulName _expectedType, YulName _givenType, langutil::SourceLocation const& _location);
 
 	bool validateInstructions(evmasm::Instruction _instr, langutil::SourceLocation const& _location);
 	bool validateInstructions(std::string const& _instrIdentifier, langutil::SourceLocation const& _location);
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 63b1d65d26..8f211f31b4 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -72,8 +72,8 @@ Json AsmJsonImporter::member(Json const& _node, std::string const& _name)
 TypedName AsmJsonImporter::createTypedName(Json const& _node)
 {
 	auto typedName = createAsmNode<TypedName>(_node);
-	typedName.type = YulString{member(_node, "type").get<std::string>()};
-	typedName.name = YulString{member(_node, "name").get<std::string>()};
+	typedName.type = YulName{member(_node, "type").get<std::string>()};
+	typedName.name = YulName{member(_node, "name").get<std::string>()};
 	return typedName;
 }
 
@@ -171,7 +171,7 @@ Literal AsmJsonImporter::createLiteral(Json const& _node)
 		value = util::asString(util::fromHex(member(_node, "hexValue").get<std::string>()));
 	else
 		value = member(_node, "value").get<std::string>();
-	lit.type = YulString{member(_node, "type").get<std::string>()};
+	lit.type = YulName{member(_node, "type").get<std::string>()};
 	if (kind == "number")
 	{
 		langutil::CharStream charStream(value, "");
@@ -219,7 +219,7 @@ Leave AsmJsonImporter::createLeave(Json const& _node)
 Identifier AsmJsonImporter::createIdentifier(Json const& _node)
 {
 	auto identifier = createAsmNode<Identifier>(_node);
-	identifier.name = YulString(member(_node, "name").get<std::string>());
+	identifier.name = YulName(member(_node, "name").get<std::string>());
 	return identifier;
 }
 
@@ -269,7 +269,7 @@ VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json const& _node
 FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json const& _node)
 {
 	auto funcDef = createAsmNode<FunctionDefinition>(_node);
-	funcDef.name = YulString{member(_node, "name").get<std::string>()};
+	funcDef.name = YulName{member(_node, "name").get<std::string>()};
 
 	if (_node.contains("parameters"))
 		for (auto const& var: member(_node, "parameters"))
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 2ae4dd805b..41bef57fe0 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -537,7 +537,7 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimit
 	{
 	case Token::Identifier:
 	{
-		Identifier identifier{createDebugData(), YulString{currentLiteral()}};
+		Identifier identifier{createDebugData(), YulName{currentLiteral()}};
 		advance();
 		return identifier;
 	}
@@ -712,9 +712,9 @@ TypedName Parser::parseTypedName()
 	return typedName;
 }
 
-YulString Parser::expectAsmIdentifier()
+YulName Parser::expectAsmIdentifier()
 {
-	YulString name{currentLiteral()};
+	YulName name{currentLiteral()};
 	if (currentToken() == Token::Identifier && m_dialect.builtin(name))
 		fatalParserError(5568_error, "Cannot use builtin function name \"" + name.str() + "\" as identifier name.");
 	// NOTE: We keep the expectation here to ensure the correct source location for the error above.
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index 3348904091..408c8029cf 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -146,7 +146,7 @@ class Parser: public langutil::ParserBase
 	FunctionDefinition parseFunctionDefinition();
 	FunctionCall parseCall(std::variant<Literal, Identifier>&& _initialOp);
 	TypedName parseTypedName();
-	YulString expectAsmIdentifier();
+	YulName expectAsmIdentifier();
 
 	/// Reports an error if we are currently not inside the body part of a for loop.
 	void checkBreakContinuePosition(std::string const& _which);
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 191fc5d2d6..054f83a913 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -243,7 +243,7 @@ std::string AsmPrinter::formatTypedName(TypedName _variable)
 	return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
 }
 
-std::string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
+std::string AsmPrinter::appendTypeName(YulName _type, bool _isBoolLiteral) const
 {
 	if (m_dialect && !_type.empty())
 	{
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index d3f80b9a09..36ea06c767 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <libsolutil/CommonData.h>
 
@@ -92,7 +92,7 @@ class AsmPrinter
 
 private:
 	std::string formatTypedName(TypedName _variable);
-	std::string appendTypeName(YulString _type, bool _isBoolLiteral = false) const;
+	std::string appendTypeName(YulName _type, bool _isBoolLiteral = false) const;
 	std::string formatDebugData(langutil::DebugData::ConstPtr const& _debugData, bool _statement);
 	template <class T>
 	std::string formatDebugData(T const& _node)
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 92b03facfe..ee78d525df 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -37,6 +37,7 @@ add_library(yul
 	ScopeFiller.h
 	Utilities.cpp
 	Utilities.h
+	YulName.h
 	YulString.h
 	backends/evm/AbstractAssembly.h
 	backends/evm/AsmCodeGen.cpp
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
index c046df94ff..89bb7aa7c9 100644
--- a/libyul/CompilabilityChecker.h
+++ b/libyul/CompilabilityChecker.h
@@ -45,8 +45,8 @@ namespace solidity::yul
 struct CompilabilityChecker
 {
 	CompilabilityChecker(Dialect const& _dialect, Object const& _object, bool _optimizeStackAllocation);
-	std::map<YulString, std::vector<YulString>> unreachableVariables;
-	std::map<YulString, int> stackDeficit;
+	std::map<YulName, std::vector<YulName>> unreachableVariables;
+	std::map<YulName, int> stackDeficit;
 };
 
 }
diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index c657fa17cb..471a164e52 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -229,9 +229,9 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 	}
 }
 
-std::map<YulString, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
+std::map<YulName, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
 {
-	std::map<YulString, ControlFlowSideEffects> result;
+	std::map<YulName, ControlFlowSideEffects> result;
 	for (auto&& [function, sideEffects]: m_functionSideEffects)
 		yulAssert(result.insert({function->name, sideEffects}).second);
 	return result;
diff --git a/libyul/ControlFlowSideEffectsCollector.h b/libyul/ControlFlowSideEffectsCollector.h
index a4ab2bfae7..5a1c762970 100644
--- a/libyul/ControlFlowSideEffectsCollector.h
+++ b/libyul/ControlFlowSideEffectsCollector.h
@@ -101,7 +101,7 @@ class ControlFlowSideEffectsCollector
 		return m_functionSideEffects;
 	}
 	/// Returns the side effects by function name, requires unique function names.
-	std::map<YulString, ControlFlowSideEffects> functionSideEffectsNamed() const;
+	std::map<YulName, ControlFlowSideEffects> functionSideEffectsNamed() const;
 private:
 
 	/// @returns false if nothing could be processed.
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index 69ca1e9dc6..f4f59ec26a 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -25,7 +25,7 @@
 using namespace solidity::yul;
 using namespace solidity::langutil;
 
-Literal Dialect::zeroLiteralForType(solidity::yul::YulString _type) const
+Literal Dialect::zeroLiteralForType(solidity::yul::YulName _type) const
 {
 	if (_type == boolType && _type != defaultType)
 		return {DebugData::create(), LiteralKind::Boolean, LiteralValue(false), _type};
@@ -41,7 +41,7 @@ Literal Dialect::trueLiteral() const
 		return {DebugData::create(), LiteralKind::Number, LiteralValue(1), defaultType};
 }
 
-bool Dialect::validTypeForLiteral(LiteralKind _kind, LiteralValue const&, YulString _type) const
+bool Dialect::validTypeForLiteral(LiteralKind _kind, LiteralValue const&, YulName _type) const
 {
 	if (_kind == LiteralKind::Boolean)
 		return _type == boolType;
@@ -58,21 +58,20 @@ Dialect const& Dialect::yulDeprecated()
 	{
 		// TODO will probably change, especially the list of types.
 		dialect = std::make_unique<Dialect>();
-		dialect->defaultType = "u256"_yulstring;
-		dialect->boolType = "bool"_yulstring;
+		dialect->defaultType = "u256"_yulname;
+		dialect->boolType = "bool"_yulname;
 		dialect->types = {
-			"bool"_yulstring,
-			"u8"_yulstring,
-			"s8"_yulstring,
-			"u32"_yulstring,
-			"s32"_yulstring,
-			"u64"_yulstring,
-			"s64"_yulstring,
-			"u128"_yulstring,
-			"s128"_yulstring,
-			"u256"_yulstring,
-			"s256"_yulstring
-		};
+			"bool"_yulname,
+			"u8"_yulname,
+			"s8"_yulname,
+			"u32"_yulname,
+			"s32"_yulname,
+			"u64"_yulname,
+			"s64"_yulname,
+			"u128"_yulname,
+			"s128"_yulname,
+			"u256"_yulname,
+			"s256"_yulname};
 	};
 
 	return *dialect;
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
index e3f270357f..3362246a06 100644
--- a/libyul/Dialect.h
+++ b/libyul/Dialect.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/ControlFlowSideEffects.h>
 #include <libyul/SideEffects.h>
 
@@ -32,15 +32,14 @@
 namespace solidity::yul
 {
 
-class YulString;
-using Type = YulString;
+using Type = YulName;
 enum class LiteralKind;
 class LiteralValue;
 struct Literal;
 
 struct BuiltinFunction
 {
-	YulString name;
+	YulName name;
 	std::vector<Type> parameters;
 	std::vector<Type> returns;
 	SideEffects sideEffects;
@@ -63,35 +62,35 @@ struct Dialect
 	Dialect& operator=(Dialect const&) = delete;
 
 	/// Default type, can be omitted.
-	YulString defaultType;
+	YulName defaultType;
 	/// Type used for the literals "true" and "false".
-	YulString boolType;
-	std::set<YulString> types = {{}};
+	YulName boolType;
+	std::set<YulName> types = {{}};
 
 	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
-	virtual BuiltinFunction const* builtin(YulString /*_name*/) const { return nullptr; }
+	virtual BuiltinFunction const* builtin(YulName /*_name*/) const { return nullptr; }
 
 	/// @returns true if the identifier is reserved. This includes the builtins too.
-	virtual bool reservedIdentifier(YulString _name) const { return builtin(_name) != nullptr; }
+	virtual bool reservedIdentifier(YulName _name) const { return builtin(_name) != nullptr; }
 
-	virtual BuiltinFunction const* discardFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* equalityFunction(YulString /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* discardFunction(YulName /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* equalityFunction(YulName /* _type */) const { return nullptr; }
 	virtual BuiltinFunction const* booleanNegationFunction() const { return nullptr; }
 
-	virtual BuiltinFunction const* memoryStoreFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* memoryLoadFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageStoreFunction(YulString /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageLoadFunction(YulString /* _type */) const { return nullptr; }
-	virtual YulString hashFunction(YulString /* _type */ ) const { return YulString{}; }
+	virtual BuiltinFunction const* memoryStoreFunction(YulName /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* memoryLoadFunction(YulName /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* storageStoreFunction(YulName /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* storageLoadFunction(YulName /* _type */) const { return nullptr; }
+	virtual YulName hashFunction(YulName /* _type */ ) const { return YulName{}; }
 
 	/// Check whether the given type is legal for the given literal value.
 	/// Should only be called if the type exists in the dialect at all.
-	virtual bool validTypeForLiteral(LiteralKind _kind, LiteralValue const& _value, YulString _type) const;
+	virtual bool validTypeForLiteral(LiteralKind _kind, LiteralValue const& _value, YulName _type) const;
 
-	virtual Literal zeroLiteralForType(YulString _type) const;
+	virtual Literal zeroLiteralForType(YulName _type) const;
 	virtual Literal trueLiteral() const;
 
-	virtual std::set<YulString> fixedFunctionNames() const { return {}; }
+	virtual std::set<YulName> fixedFunctionNames() const { return {}; }
 
 	Dialect() = default;
 	virtual ~Dialect() = default;
diff --git a/libyul/Exceptions.h b/libyul/Exceptions.h
index 45c681a5d6..f922681809 100644
--- a/libyul/Exceptions.h
+++ b/libyul/Exceptions.h
@@ -24,7 +24,7 @@
 #include <libsolutil/Exceptions.h>
 #include <libsolutil/Assertions.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/facilities/empty.hpp>
@@ -40,18 +40,18 @@ struct YulAssertion: virtual YulException {};
 
 struct StackTooDeepError: virtual YulException
 {
-	StackTooDeepError(YulString _variable, int _depth, std::string const& _message):
+	StackTooDeepError(YulName _variable, int _depth, std::string const& _message):
 		variable(_variable), depth(_depth)
 	{
 		*this << util::errinfo_comment(_message);
 	}
-	StackTooDeepError(YulString _functionName, YulString _variable, int _depth, std::string const& _message):
+	StackTooDeepError(YulName _functionName, YulName _variable, int _depth, std::string const& _message):
 		functionName(_functionName), variable(_variable), depth(_depth)
 	{
 		*this << util::errinfo_comment(_message);
 	}
-	YulString functionName;
-	YulString variable;
+	YulName functionName;
+	YulName variable;
 	int depth;
 };
 
diff --git a/libyul/FunctionReferenceResolver.h b/libyul/FunctionReferenceResolver.h
index 8c1385adb6..dcc5f50e5b 100644
--- a/libyul/FunctionReferenceResolver.h
+++ b/libyul/FunctionReferenceResolver.h
@@ -41,7 +41,7 @@ class FunctionReferenceResolver: private ASTWalker
 	void operator()(Block const& _block) override;
 
 	std::map<FunctionCall const*, FunctionDefinition const*> m_functionReferences;
-	std::vector<std::map<YulString, FunctionDefinition const*>> m_scopes;
+	std::vector<std::map<YulName, FunctionDefinition const*>> m_scopes;
 };
 
 
diff --git a/libyul/Object.h b/libyul/Object.h
index c1ca9244d9..af354005b6 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
 
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/DebugInfoSelection.h>
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h
index 08a8529912..a8f75d373c 100644
--- a/libyul/ObjectParser.h
+++ b/libyul/ObjectParser.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include <libyul/YulString.h>
 #include <libyul/Object.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
index 4471aa5313..89bdfc674c 100644
--- a/libyul/Scope.cpp
+++ b/libyul/Scope.cpp
@@ -25,7 +25,7 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-bool Scope::registerVariable(YulString _name, YulType const& _type)
+bool Scope::registerVariable(YulName _name, YulType const& _type)
 {
 	if (exists(_name))
 		return false;
@@ -36,7 +36,7 @@ bool Scope::registerVariable(YulString _name, YulType const& _type)
 	return true;
 }
 
-bool Scope::registerFunction(YulString _name, std::vector<YulType> _arguments, std::vector<YulType> _returns)
+bool Scope::registerFunction(YulName _name, std::vector<YulType> _arguments, std::vector<YulType> _returns)
 {
 	if (exists(_name))
 		return false;
@@ -44,7 +44,7 @@ bool Scope::registerFunction(YulString _name, std::vector<YulType> _arguments, s
 	return true;
 }
 
-Scope::Identifier* Scope::lookup(YulString _name)
+Scope::Identifier* Scope::lookup(YulName _name)
 {
 	bool crossedFunctionBoundary = false;
 	for (Scope* s = this; s; s = s->superScope)
@@ -64,7 +64,7 @@ Scope::Identifier* Scope::lookup(YulString _name)
 	return nullptr;
 }
 
-bool Scope::exists(YulString _name) const
+bool Scope::exists(YulName _name) const
 {
 	if (identifiers.count(_name))
 		return true;
diff --git a/libyul/Scope.h b/libyul/Scope.h
index f9ac3830a2..0275972900 100644
--- a/libyul/Scope.h
+++ b/libyul/Scope.h
@@ -23,7 +23,7 @@
 
 #include <liblangutil/Exceptions.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <functional>
 #include <memory>
@@ -35,25 +35,25 @@ namespace solidity::yul
 
 struct Scope
 {
-	using YulType = YulString;
+	using YulType = YulName;
 
 	struct Variable
 	{
 		YulType type;
-		YulString name;
+		YulName name;
 	};
 	struct Function
 	{
 		std::vector<YulType> arguments;
 		std::vector<YulType> returns;
-		YulString name;
+		YulName name;
 	};
 
 	using Identifier = std::variant<Variable, Function>;
 
-	bool registerVariable(YulString _name, YulType const& _type);
+	bool registerVariable(YulName _name, YulType const& _type);
 	bool registerFunction(
-		YulString _name,
+		YulName _name,
 		std::vector<YulType> _arguments,
 		std::vector<YulType> _returns
 	);
@@ -63,12 +63,12 @@ struct Scope
 	/// will any lookups across assembly boundaries.
 	/// The pointer will be invalidated if the scope is modified.
 	/// @param _crossedFunction if true, we already crossed a function boundary during recursive lookup
-	Identifier* lookup(YulString _name);
+	Identifier* lookup(YulName _name);
 	/// Looks up the identifier in this and super scopes (will not find variables across function
 	/// boundaries and generally stops at assembly boundaries) and calls the visitor, returns
 	/// false if not found.
 	template <class V>
-	bool lookup(YulString _name, V const& _visitor)
+	bool lookup(YulName _name, V const& _visitor)
 	{
 		if (Identifier* id = lookup(_name))
 		{
@@ -80,7 +80,7 @@ struct Scope
 	}
 	/// @returns true if the name exists in this scope or in super scopes (also searches
 	/// across function and assembly boundaries).
-	bool exists(YulString _name) const;
+	bool exists(YulName _name) const;
 
 	/// @returns the number of variables directly registered inside the scope.
 	size_t numberOfVariables() const;
@@ -91,7 +91,7 @@ struct Scope
 	/// If true, variables from the super scope are not visible here (other identifiers are),
 	/// but they are still taken into account to prevent shadowing.
 	bool functionScope = false;
-	std::map<YulString, Identifier> identifiers;
+	std::map<YulName, Identifier> identifiers;
 };
 
 }
diff --git a/libyul/YulName.h b/libyul/YulName.h
new file mode 100644
index 0000000000..34fd6a5a26
--- /dev/null
+++ b/libyul/YulName.h
@@ -0,0 +1,26 @@
+/*
+	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/YulString.h>
+
+namespace solidity::yul
+{
+using YulName = YulString;
+}
diff --git a/libyul/YulString.h b/libyul/YulString.h
index 7dbaf1b84a..89d35b123c 100644
--- a/libyul/YulString.h
+++ b/libyul/YulString.h
@@ -162,7 +162,7 @@ class YulString
 	YulStringRepository::Handle m_handle{ 0, YulStringRepository::emptyHash() };
 };
 
-inline YulString operator "" _yulstring(char const* _string, std::size_t _size)
+inline YulString operator "" _yulname(char const* _string, std::size_t _size)
 {
 	return YulString(std::string(_string, _size));
 }
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index 7b17f7d890..2ab77f84e9 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -129,7 +129,7 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 
 	if (numberEncodingSize(~_value) < numberEncodingSize(_value))
 		// Negated is shorter to represent
-		routine = min(std::move(routine), represent("not"_yulstring, findRepresentation(~_value)));
+		routine = min(std::move(routine), represent("not"_yulname, findRepresentation(~_value)));
 
 	// Decompose value into a * 2**k + b where abs(b) << 2**k
 	for (unsigned bits = 255; bits > 8 && m_maxSteps > 0; --bits)
@@ -152,21 +152,21 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 			continue;
 		Representation newRoutine;
 		if (m_dialect.evmVersion().hasBitwiseShifting())
-			newRoutine = represent("shl"_yulstring, represent(bits), findRepresentation(upperPart));
+			newRoutine = represent("shl"_yulname, represent(bits), findRepresentation(upperPart));
 		else
 		{
-			newRoutine = represent("exp"_yulstring, represent(2), represent(bits));
+			newRoutine = represent("exp"_yulname, represent(2), represent(bits));
 			if (upperPart != 1)
-				newRoutine = represent("mul"_yulstring, findRepresentation(upperPart), newRoutine);
+				newRoutine = represent("mul"_yulname, findRepresentation(upperPart), newRoutine);
 		}
 
 		if (newRoutine.cost >= routine.cost)
 			continue;
 
 		if (lowerPart > 0)
-			newRoutine = represent("add"_yulstring, newRoutine, findRepresentation(u256(abs(lowerPart))));
+			newRoutine = represent("add"_yulname, newRoutine, findRepresentation(u256(abs(lowerPart))));
 		else if (lowerPart < 0)
-			newRoutine = represent("sub"_yulstring, newRoutine, findRepresentation(u256(abs(lowerPart))));
+			newRoutine = represent("sub"_yulname, newRoutine, findRepresentation(u256(abs(lowerPart))));
 
 		if (m_maxSteps > 0)
 			m_maxSteps--;
@@ -185,7 +185,7 @@ Representation RepresentationFinder::represent(u256 const& _value) const
 }
 
 Representation RepresentationFinder::represent(
-	YulString _instruction,
+	YulName _instruction,
 	Representation const& _argument
 ) const
 {
@@ -200,7 +200,7 @@ Representation RepresentationFinder::represent(
 }
 
 Representation RepresentationFinder::represent(
-	YulString _instruction,
+	YulName _instruction,
 	Representation const& _arg1,
 	Representation const& _arg2
 ) const
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
index 280f50bf9b..35d7dfa432 100644
--- a/libyul/backends/evm/ConstantOptimiser.h
+++ b/libyul/backends/evm/ConstantOptimiser.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/ASTForward.h>
@@ -93,8 +93,8 @@ class RepresentationFinder
 	Representation const& findRepresentation(u256 const& _value);
 
 	Representation represent(u256 const& _value) const;
-	Representation represent(YulString _instruction, Representation const& _arg) const;
-	Representation represent(YulString _instruction, Representation const& _arg1, Representation const& _arg2) const;
+	Representation represent(YulName _instruction, Representation const& _arg) const;
+	Representation represent(YulName _instruction, Representation const& _arg1, Representation const& _arg2) const;
 
 	Representation min(Representation _a, Representation _b);
 
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index a5e9613b58..b4d1cdf15c 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -336,8 +336,8 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 	langutil::DebugData::ConstPtr preSwitchDebugData = debugDataOf(_switch);
 
 	auto ghostVariableId = m_graph.ghostVariables.size();
-	YulString ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
-	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{""_yulstring, ghostVariableName});
+	YulName ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
+	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{""_yulname, ghostVariableName});
 
 	// Artificially generate:
 	// let <ghostVariable> := <switchExpression>
@@ -357,7 +357,7 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 	auto makeValueCompare = [&](Case const& _case) {
 		yul::FunctionCall const& ghostCall = m_graph.ghostCalls.emplace_back(yul::FunctionCall{
 			debugDataOf(_case),
-			yul::Identifier{{}, "eq"_yulstring},
+			yul::Identifier{{}, "eq"_yulname},
 			{*_case.value, Identifier{{}, ghostVariableName}}
 		});
 		CFG::Operation& operation = m_currentBlock->operations.emplace_back(CFG::Operation{
@@ -578,7 +578,7 @@ Stack ControlFlowGraphBuilder::visitAssignmentRightHandSide(Expression const& _e
 	}, _expression);
 }
 
-Scope::Function const& ControlFlowGraphBuilder::lookupFunction(YulString _name) const
+Scope::Function const& ControlFlowGraphBuilder::lookupFunction(YulName _name) const
 {
 	Scope::Function const* function = nullptr;
 	yulAssert(m_scope->lookup(_name, util::GenericVisitor{
@@ -589,7 +589,7 @@ Scope::Function const& ControlFlowGraphBuilder::lookupFunction(YulString _name)
 	return *function;
 }
 
-Scope::Variable const& ControlFlowGraphBuilder::lookupVariable(YulString _name) const
+Scope::Variable const& ControlFlowGraphBuilder::lookupVariable(YulName _name) const
 {
 	yulAssert(m_scope, "");
 	Scope::Variable const* var = nullptr;
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
index 5007d36108..77feaea7b4 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.h
@@ -63,8 +63,8 @@ class ControlFlowGraphBuilder
 	Stack const& visitFunctionCall(FunctionCall const&);
 	Stack visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount);
 
-	Scope::Function const& lookupFunction(YulString _name) const;
-	Scope::Variable const& lookupVariable(YulString _name) const;
+	Scope::Function const& lookupFunction(YulName _name) const;
+	Scope::Variable const& lookupVariable(YulName _name) const;
 	/// Resets m_currentBlock to enforce a subsequent explicit reassignment.
 	void makeConditionalJump(
 		langutil::DebugData::ConstPtr _debugData,
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index bdce395ef8..2112472300 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -79,7 +79,7 @@ CodeTransform::CodeTransform(
 	}
 }
 
-void CodeTransform::decreaseReference(YulString, Scope::Variable const& _var)
+void CodeTransform::decreaseReference(YulName, Scope::Variable const& _var)
 {
 	if (!m_allowStackOpt)
 		return;
@@ -158,7 +158,7 @@ void CodeTransform::operator()(VariableDeclaration const& _varDecl)
 	for (size_t varIndex = 0; varIndex < numVariables; ++varIndex)
 	{
 		size_t varIndexReverse = numVariables - 1 - varIndex;
-		YulString varName = _varDecl.variables[varIndexReverse].name;
+		YulName varName = _varDecl.variables[varIndexReverse].name;
 		auto& var = std::get<Scope::Variable>(m_scope->identifiers.at(varName));
 		m_context->variableStackHeights[&var] = heightAtStart + varIndexReverse;
 		if (!m_allowStackOpt)
@@ -457,7 +457,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 		{
 			StackTooDeepError error(
 				_function.name,
-				YulString{},
+				YulName{},
 				static_cast<int>(stackLayout.size()) - 17,
 				"The function " +
 				_function.name.str() +
@@ -667,7 +667,7 @@ bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<
 		std::holds_alternative<Assignment>(_statement)
 	)
 	{
-		std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_statement);
+		std::map<YulName, size_t> references = VariableReferencesCounter::countReferences(_statement);
 		auto isReferenced = [&references](TypedName const& _returnVariable) {
 			return references.count(_returnVariable.name);
 		};
@@ -771,7 +771,7 @@ void CodeTransform::generateAssignment(Identifier const& _variableName)
 	}
 }
 
-size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString _varName, bool _forSwap)
+size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulName _varName, bool _forSwap)
 {
 	yulAssert(m_context->variableStackHeights.count(&_var), "");
 	size_t heightDiff = static_cast<size_t>(m_assembly.stackHeight()) - m_context->variableStackHeights[&_var];
@@ -795,7 +795,7 @@ size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString
 	return heightDiff;
 }
 
-int CodeTransform::variableStackHeight(YulString _name) const
+int CodeTransform::variableStackHeight(YulName _name) const
 {
 	Scope::Variable const* var = std::get_if<Scope::Variable>(m_scope->lookup(_name));
 	yulAssert(var, "");
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index bad9a357ff..0e6a9d8be1 100644
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -118,7 +118,7 @@ class CodeTransform
 		std::optional<AbstractAssembly::LabelID> _functionExitLabel
 	);
 
-	void decreaseReference(YulString _name, Scope::Variable const& _var);
+	void decreaseReference(YulName _name, Scope::Variable const& _var);
 	bool unreferenced(Scope::Variable const& _var) const;
 	/// Marks slots of variables that are not used anymore
 	/// and were defined in the current scope for reuse.
@@ -165,10 +165,10 @@ class CodeTransform
 	/// the (positive) stack height difference otherwise.
 	/// @param _forSwap if true, produces stack error if the difference is invalid for a swap
 	///                 opcode, otherwise checks for validity for a dup opcode.
-	size_t variableHeightDiff(Scope::Variable const& _var, YulString _name, bool _forSwap);
+	size_t variableHeightDiff(Scope::Variable const& _var, YulName _name, bool _forSwap);
 
 	/// Determines the stack height of the given variable. Throws if the variable is not in scope.
-	int variableStackHeight(YulString _name) const;
+	int variableStackHeight(YulName _name) const;
 
 	void expectDeposit(int _deposit, int _oldHeight) const;
 
@@ -198,7 +198,7 @@ class CodeTransform
 	BuiltinContext& m_builtinContext;
 	bool const m_allowStackOpt = true;
 	UseNamedLabels const m_useNamedLabelsForFunctions = UseNamedLabels::Never;
-	std::set<YulString> m_assignedNamedLabels;
+	std::set<YulName> m_assignedNamedLabels;
 	ExternalIdentifierAccess::CodeGenerator m_identifierAccessCodeGen;
 	std::shared_ptr<Context> m_context;
 
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index d3b9c34bcb..50ede8c760 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -46,7 +46,7 @@ using namespace solidity::util;
 namespace
 {
 
-std::pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
+std::pair<YulName, BuiltinFunctionForEVM> createEVMFunction(
 	langutil::EVMVersion _evmVersion,
 	std::string const& _name,
 	evmasm::Instruction _instruction
@@ -54,7 +54,7 @@ std::pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 {
 	evmasm::InstructionInfo info = evmasm::instructionInfo(_instruction, _evmVersion);
 	BuiltinFunctionForEVM f;
-	f.name = YulString{_name};
+	f.name = YulName{_name};
 	f.parameters.resize(static_cast<size_t>(info.args));
 	f.returns.resize(static_cast<size_t>(info.ret));
 	f.sideEffects = EVMDialect::sideEffectsOfInstruction(_instruction);
@@ -83,11 +83,11 @@ std::pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 		_assembly.appendInstruction(_instruction);
 	};
 
-	YulString name = f.name;
+	YulName name = f.name;
 	return {name, std::move(f)};
 }
 
-std::pair<YulString, BuiltinFunctionForEVM> createFunction(
+std::pair<YulName, BuiltinFunctionForEVM> createFunction(
 	std::string _name,
 	size_t _params,
 	size_t _returns,
@@ -98,7 +98,7 @@ std::pair<YulString, BuiltinFunctionForEVM> createFunction(
 {
 	yulAssert(_literalArguments.size() == _params || _literalArguments.empty(), "");
 
-	YulString name{std::move(_name)};
+	YulName name{std::move(_name)};
 	BuiltinFunctionForEVM f;
 	f.name = name;
 	f.parameters.resize(_params);
@@ -111,7 +111,7 @@ std::pair<YulString, BuiltinFunctionForEVM> createFunction(
 	return {name, f};
 }
 
-std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
+std::set<YulName> 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.
@@ -157,7 +157,7 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 			(_instr == evmasm::Instruction::TSTORE || _instr == evmasm::Instruction::TLOAD);
 	};
 
-	std::set<YulString> reserved;
+	std::set<YulName> reserved;
 	for (auto const& instr: evmasm::c_instructions)
 	{
 		std::string name = toLower(instr.first);
@@ -171,18 +171,18 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 		)
 			reserved.emplace(name);
 	}
-	reserved += std::vector<YulString>{
-		"linkersymbol"_yulstring,
-		"datasize"_yulstring,
-		"dataoffset"_yulstring,
-		"datacopy"_yulstring,
-		"setimmutable"_yulstring,
-		"loadimmutable"_yulstring,
+	reserved += std::vector<YulName>{
+		"linkersymbol"_yulname,
+		"datasize"_yulname,
+		"dataoffset"_yulname,
+		"datacopy"_yulname,
+		"setimmutable"_yulname,
+		"loadimmutable"_yulname,
 	};
 	return reserved;
 }
 
-std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
+std::map<YulName, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
 {
 
 	// Exclude prevrandao as builtin for VMs before paris and difficulty for VMs after paris.
@@ -191,7 +191,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 		return (_instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris()) || (_instrName == "difficulty" && _evmVersion >= langutil::EVMVersion::paris());
 	};
 
-	std::map<YulString, BuiltinFunctionForEVM> builtins;
+	std::map<YulName, BuiltinFunctionForEVM> builtins;
 	for (auto const& instr: evmasm::c_instructions)
 	{
 		std::string name = toLower(instr.first);
@@ -248,7 +248,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_context.currentObject, "No object available.");
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
-			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
+			YulName const dataName (formatLiteral(std::get<Literal>(arg)));
 			if (_context.currentObject->name == dataName.str())
 				_assembly.appendAssemblySize();
 			else
@@ -269,7 +269,7 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			yulAssert(_context.currentObject, "No object available.");
 			yulAssert(_call.arguments.size() == 1, "");
 			Expression const& arg = _call.arguments.front();
-			YulString const dataName (formatLiteral(std::get<Literal>(arg)));
+			YulName const dataName (formatLiteral(std::get<Literal>(arg)));
 			if (_context.currentObject->name == dataName.str())
 				_assembly.appendConstant(0);
 			else
@@ -368,7 +368,7 @@ EVMDialect::EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess):
 {
 }
 
-BuiltinFunctionForEVM const* EVMDialect::builtin(YulString _name) const
+BuiltinFunctionForEVM const* EVMDialect::builtin(YulName _name) const
 {
 	if (m_objectAccess)
 	{
@@ -383,7 +383,7 @@ BuiltinFunctionForEVM const* EVMDialect::builtin(YulString _name) const
 		return nullptr;
 }
 
-bool EVMDialect::reservedIdentifier(YulString _name) const
+bool EVMDialect::reservedIdentifier(YulName _name) const
 {
 	if (m_objectAccess)
 		if (_name.str().substr(0, "verbatim"s.size()) == "verbatim")
@@ -465,8 +465,8 @@ BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, siz
 EVMDialectTyped::EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess):
 	EVMDialect(_evmVersion, _objectAccess)
 {
-	defaultType = "u256"_yulstring;
-	boolType = "bool"_yulstring;
+	defaultType = "u256"_yulname;
+	boolType = "bool"_yulname;
 	types = {defaultType, boolType};
 
 	// Set all types to ``defaultType``
@@ -478,43 +478,43 @@ EVMDialectTyped::EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectA
 			r = defaultType;
 	}
 
-	m_functions["lt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["gt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["slt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["sgt"_yulstring].returns = {"bool"_yulstring};
-	m_functions["eq"_yulstring].returns = {"bool"_yulstring};
+	m_functions["lt"_yulname].returns = {"bool"_yulname};
+	m_functions["gt"_yulname].returns = {"bool"_yulname};
+	m_functions["slt"_yulname].returns = {"bool"_yulname};
+	m_functions["sgt"_yulname].returns = {"bool"_yulname};
+	m_functions["eq"_yulname].returns = {"bool"_yulname};
 
 	// "not" and "bitnot" replace "iszero" and "not"
-	m_functions["bitnot"_yulstring] = m_functions["not"_yulstring];
-	m_functions["bitnot"_yulstring].name = "bitnot"_yulstring;
-	m_functions["not"_yulstring] = m_functions["iszero"_yulstring];
-	m_functions["not"_yulstring].name = "not"_yulstring;
-	m_functions["not"_yulstring].returns = {"bool"_yulstring};
-	m_functions["not"_yulstring].parameters = {"bool"_yulstring};
-	m_functions.erase("iszero"_yulstring);
-
-	m_functions["bitand"_yulstring] = m_functions["and"_yulstring];
-	m_functions["bitand"_yulstring].name = "bitand"_yulstring;
-	m_functions["bitor"_yulstring] = m_functions["or"_yulstring];
-	m_functions["bitor"_yulstring].name = "bitor"_yulstring;
-	m_functions["bitxor"_yulstring] = m_functions["xor"_yulstring];
-	m_functions["bitxor"_yulstring].name = "bitxor"_yulstring;
-	m_functions["and"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["and"_yulstring].returns = {"bool"_yulstring};
-	m_functions["or"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["or"_yulstring].returns = {"bool"_yulstring};
-	m_functions["xor"_yulstring].parameters = {"bool"_yulstring, "bool"_yulstring};
-	m_functions["xor"_yulstring].returns = {"bool"_yulstring};
-	m_functions["popbool"_yulstring] = m_functions["pop"_yulstring];
-	m_functions["popbool"_yulstring].name = "popbool"_yulstring;
-	m_functions["popbool"_yulstring].parameters = {"bool"_yulstring};
+	m_functions["bitnot"_yulname] = m_functions["not"_yulname];
+	m_functions["bitnot"_yulname].name = "bitnot"_yulname;
+	m_functions["not"_yulname] = m_functions["iszero"_yulname];
+	m_functions["not"_yulname].name = "not"_yulname;
+	m_functions["not"_yulname].returns = {"bool"_yulname};
+	m_functions["not"_yulname].parameters = {"bool"_yulname};
+	m_functions.erase("iszero"_yulname);
+
+	m_functions["bitand"_yulname] = m_functions["and"_yulname];
+	m_functions["bitand"_yulname].name = "bitand"_yulname;
+	m_functions["bitor"_yulname] = m_functions["or"_yulname];
+	m_functions["bitor"_yulname].name = "bitor"_yulname;
+	m_functions["bitxor"_yulname] = m_functions["xor"_yulname];
+	m_functions["bitxor"_yulname].name = "bitxor"_yulname;
+	m_functions["and"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
+	m_functions["and"_yulname].returns = {"bool"_yulname};
+	m_functions["or"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
+	m_functions["or"_yulname].returns = {"bool"_yulname};
+	m_functions["xor"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
+	m_functions["xor"_yulname].returns = {"bool"_yulname};
+	m_functions["popbool"_yulname] = m_functions["pop"_yulname];
+	m_functions["popbool"_yulname].name = "popbool"_yulname;
+	m_functions["popbool"_yulname].parameters = {"bool"_yulname};
 	m_functions.insert(createFunction("bool_to_u256", 1, 1, {}, {}, [](
 		FunctionCall const&,
 		AbstractAssembly&,
 		BuiltinContext&
 	) {}));
-	m_functions["bool_to_u256"_yulstring].parameters = {"bool"_yulstring};
-	m_functions["bool_to_u256"_yulstring].returns = {"u256"_yulstring};
+	m_functions["bool_to_u256"_yulname].parameters = {"bool"_yulname};
+	m_functions["bool_to_u256"_yulname].returns = {"u256"_yulname};
 	m_functions.insert(createFunction("u256_to_bool", 1, 1, {}, {}, [](
 		FunctionCall const&,
 		AbstractAssembly& _assembly,
@@ -530,29 +530,29 @@ EVMDialectTyped::EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectA
 		_assembly.appendInstruction(evmasm::Instruction::INVALID);
 		_assembly.appendLabel(inRange);
 	}));
-	m_functions["u256_to_bool"_yulstring].parameters = {"u256"_yulstring};
-	m_functions["u256_to_bool"_yulstring].returns = {"bool"_yulstring};
+	m_functions["u256_to_bool"_yulname].parameters = {"u256"_yulname};
+	m_functions["u256_to_bool"_yulname].returns = {"bool"_yulname};
 }
 
-BuiltinFunctionForEVM const* EVMDialectTyped::discardFunction(YulString _type) const
+BuiltinFunctionForEVM const* EVMDialectTyped::discardFunction(YulName _type) const
 {
-	if (_type == "bool"_yulstring)
-		return builtin("popbool"_yulstring);
+	if (_type == "bool"_yulname)
+		return builtin("popbool"_yulname);
 	else
 	{
 		yulAssert(_type == defaultType, "");
-		return builtin("pop"_yulstring);
+		return builtin("pop"_yulname);
 	}
 }
 
-BuiltinFunctionForEVM const* EVMDialectTyped::equalityFunction(YulString _type) const
+BuiltinFunctionForEVM const* EVMDialectTyped::equalityFunction(YulName _type) const
 {
-	if (_type == "bool"_yulstring)
+	if (_type == "bool"_yulname)
 		return nullptr;
 	else
 	{
 		yulAssert(_type == defaultType, "");
-		return builtin("eq"_yulstring);
+		return builtin("eq"_yulname);
 	}
 }
 
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index f0455a8e42..7db1ec09d3 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -33,8 +33,7 @@
 namespace solidity::yul
 {
 
-class YulString;
-using Type = YulString;
+using Type = YulName;
 struct FunctionCall;
 struct Object;
 
@@ -70,19 +69,19 @@ struct EVMDialect: public Dialect
 	EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess);
 
 	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
-	BuiltinFunctionForEVM const* builtin(YulString _name) const override;
+	BuiltinFunctionForEVM const* builtin(YulName _name) const override;
 
 	/// @returns true if the identifier is reserved. This includes the builtins too.
-	bool reservedIdentifier(YulString _name) const override;
+	bool reservedIdentifier(YulName _name) const override;
 
-	BuiltinFunctionForEVM const* discardFunction(YulString /*_type*/) const override { return builtin("pop"_yulstring); }
-	BuiltinFunctionForEVM const* equalityFunction(YulString /*_type*/) const override { return builtin("eq"_yulstring); }
-	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("iszero"_yulstring); }
-	BuiltinFunctionForEVM const* memoryStoreFunction(YulString /*_type*/) const override { return builtin("mstore"_yulstring); }
-	BuiltinFunctionForEVM const* memoryLoadFunction(YulString /*_type*/) const override { return builtin("mload"_yulstring); }
-	BuiltinFunctionForEVM const* storageStoreFunction(YulString /*_type*/) const override { return builtin("sstore"_yulstring); }
-	BuiltinFunctionForEVM const* storageLoadFunction(YulString /*_type*/) const override { return builtin("sload"_yulstring); }
-	YulString hashFunction(YulString /*_type*/) const override { return "keccak256"_yulstring; }
+	BuiltinFunctionForEVM const* discardFunction(YulName /*_type*/) const override { return builtin("pop"_yulname); }
+	BuiltinFunctionForEVM const* equalityFunction(YulName /*_type*/) const override { return builtin("eq"_yulname); }
+	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("iszero"_yulname); }
+	BuiltinFunctionForEVM const* memoryStoreFunction(YulName /*_type*/) const override { return builtin("mstore"_yulname); }
+	BuiltinFunctionForEVM const* memoryLoadFunction(YulName /*_type*/) const override { return builtin("mload"_yulname); }
+	BuiltinFunctionForEVM const* storageStoreFunction(YulName /*_type*/) const override { return builtin("sstore"_yulname); }
+	BuiltinFunctionForEVM const* storageLoadFunction(YulName /*_type*/) const override { return builtin("sload"_yulname); }
+	YulName hashFunction(YulName /*_type*/) const override { return "keccak256"_yulname; }
 
 	static EVMDialect const& strictAssemblyForEVM(langutil::EVMVersion _version);
 	static EVMDialect const& strictAssemblyForEVMObjects(langutil::EVMVersion _version);
@@ -98,9 +97,9 @@ struct EVMDialect: public Dialect
 
 	bool const m_objectAccess;
 	langutil::EVMVersion const m_evmVersion;
-	std::map<YulString, BuiltinFunctionForEVM> m_functions;
+	std::map<YulName, BuiltinFunctionForEVM> m_functions;
 	std::map<std::pair<size_t, size_t>, std::shared_ptr<BuiltinFunctionForEVM const>> mutable m_verbatimFunctions;
-	std::set<YulString> m_reserved;
+	std::set<YulName> m_reserved;
 };
 
 /**
@@ -118,9 +117,9 @@ struct EVMDialectTyped: public EVMDialect
 	/// Constructor, should only be used internally. Use the factory function below.
 	EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess);
 
-	BuiltinFunctionForEVM const* discardFunction(YulString _type) const override;
-	BuiltinFunctionForEVM const* equalityFunction(YulString _type) const override;
-	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("not"_yulstring); }
+	BuiltinFunctionForEVM const* discardFunction(YulName _type) const override;
+	BuiltinFunctionForEVM const* equalityFunction(YulName _type) const override;
+	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("not"_yulname); }
 
 	static EVMDialectTyped const& instance(langutil::EVMVersion _version);
 };
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index 81a345f908..422c08bf96 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -92,7 +92,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		{
 			std::vector<FunctionCall const*> memoryGuardCalls = findFunctionCalls(
 				std::as_const(*_object.code),
-				"memoryguard"_yulstring
+				"memoryguard"_yulname
 			);
 			auto stackError = stackErrors.front();
 			std::string msg = stackError.comment() ? *stackError.comment() : "";
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 047014e3dc..a6b867aba1 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -185,7 +185,7 @@ OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
 	m_stackLayout(_stackLayout),
 	m_functionLabels([&](){
 		std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> functionLabels;
-		std::set<YulString> assignedFunctionNames;
+		std::set<YulName> assignedFunctionNames;
 		for (Scope::Function const* function: m_dfg.functions)
 		{
 			CFG::FunctionInfo const& functionInfo = m_dfg.functionInfo.at(function);
@@ -242,7 +242,7 @@ void OptimizedEVMCodeTransform::createStackLayout(langutil::DebugData::ConstPtr
 	static constexpr auto slotVariableName = [](StackSlot const& _slot) {
 		return std::visit(util::GenericVisitor{
 			[](VariableSlot const& _var) { return _var.variable.get().name; },
-			[](auto const&) { return YulString{}; }
+			[](auto const&) { return YulName{}; }
 		}, _slot);
 	};
 
@@ -264,14 +264,14 @@ void OptimizedEVMCodeTransform::createStackLayout(langutil::DebugData::ConstPtr
 			{
 				int deficit = static_cast<int>(_i) - 16;
 				StackSlot const& deepSlot = m_stack.at(m_stack.size() - _i - 1);
-				YulString varNameDeep = slotVariableName(deepSlot);
-				YulString varNameTop = slotVariableName(m_stack.back());
+				YulName varNameDeep = slotVariableName(deepSlot);
+				YulName varNameTop = slotVariableName(m_stack.back());
 				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 " + std::to_string(deficit) + " slots in " + stackToString(m_stack);
 				m_stackErrors.emplace_back(StackTooDeepError(
-					m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulString{},
+					m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulName{},
 					varNameDeep.empty() ? varNameTop : varNameDeep,
 					deficit,
 					msg
@@ -295,12 +295,12 @@ void OptimizedEVMCodeTransform::createStackLayout(langutil::DebugData::ConstPtr
 				else if (!canBeFreelyGenerated(_slot))
 				{
 					int deficit = static_cast<int>(*depth - 15);
-					YulString varName = slotVariableName(_slot);
+					YulName varName = slotVariableName(_slot);
 					std::string msg =
 						(varName.empty() ? "Slot " + stackSlotToString(_slot) : "Variable " + varName.str())
 						+ " 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{},
+						m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulName{},
 						varName,
 						deficit,
 						msg
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 954c9f2af7..c781d7c1b8 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -58,17 +58,17 @@ StackLayout StackLayoutGenerator::run(CFG const& _cfg)
 	return stackLayout;
 }
 
-std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg)
+std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg)
 {
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> stackTooDeepErrors;
-	stackTooDeepErrors[YulString{}] = reportStackTooDeep(_cfg, YulString{});
+	std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> stackTooDeepErrors;
+	stackTooDeepErrors[YulName{}] = reportStackTooDeep(_cfg, YulName{});
 	for (auto const& function: _cfg.functions)
 		if (auto errors = reportStackTooDeep(_cfg, function->name); !errors.empty())
 			stackTooDeepErrors[function->name] = std::move(errors);
 	return stackTooDeepErrors;
 }
 
-std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg, YulString _functionName)
+std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg, YulName _functionName)
 {
 	StackLayout stackLayout;
 	CFG::FunctionInfo const* functionInfo = nullptr;
@@ -102,7 +102,7 @@ std::vector<StackLayoutGenerator::StackTooDeep> findStackTooDeep(Stack const& _s
 	Stack currentStack = _source;
 	std::vector<StackLayoutGenerator::StackTooDeep> stackTooDeepErrors;
 	auto getVariableChoices = [](auto&& _range) {
-		std::vector<YulString> result;
+		std::vector<YulName> result;
 		for (auto const& slot: _range)
 			if (auto const* variableSlot = std::get_if<VariableSlot>(&slot))
 				if (!util::contains(result, variableSlot->variable.get().name))
diff --git a/libyul/backends/evm/StackLayoutGenerator.h b/libyul/backends/evm/StackLayoutGenerator.h
index d04b80bdc0..fc846a9dec 100644
--- a/libyul/backends/evm/StackLayoutGenerator.h
+++ b/libyul/backends/evm/StackLayoutGenerator.h
@@ -52,18 +52,18 @@ class StackLayoutGenerator
 		/// Number of slots that need to be saved.
 		size_t deficit = 0;
 		/// Set of variables, eliminating which would decrease the stack deficit.
-		std::vector<YulString> variableChoices;
+		std::vector<YulName> variableChoices;
 	};
 
 	static StackLayout run(CFG const& _cfg);
 	/// @returns a map from function names to the stack too deep errors occurring in that function.
 	/// Requires @a _cfg to be a control flow graph generated from disambiguated Yul.
 	/// The empty string is mapped to the stack too deep errors of the main entry point.
-	static std::map<YulString, std::vector<StackTooDeep>> reportStackTooDeep(CFG const& _cfg);
+	static std::map<YulName, std::vector<StackTooDeep>> reportStackTooDeep(CFG const& _cfg);
 	/// @returns all stack too deep errors in the function named @a _functionName.
 	/// Requires @a _cfg to be a control flow graph generated from disambiguated Yul.
 	/// If @a _functionName is empty, the stack too deep errors of the main entry point are reported instead.
-	static std::vector<StackTooDeep> reportStackTooDeep(CFG const& _cfg, YulString _functionName);
+	static std::vector<StackTooDeep> reportStackTooDeep(CFG const& _cfg, YulName _functionName);
 
 private:
 	StackLayoutGenerator(StackLayout& _context, CFG::FunctionInfo const* _functionInfo);
diff --git a/libyul/backends/evm/VariableReferenceCounter.cpp b/libyul/backends/evm/VariableReferenceCounter.cpp
index c2afb399d2..9f48578877 100644
--- a/libyul/backends/evm/VariableReferenceCounter.cpp
+++ b/libyul/backends/evm/VariableReferenceCounter.cpp
@@ -71,7 +71,7 @@ void VariableReferenceCounter::operator()(Block const& _block)
 	m_scope = originalScope;
 }
 
-void VariableReferenceCounter::increaseRefIfFound(YulString _variableName)
+void VariableReferenceCounter::increaseRefIfFound(YulName _variableName)
 {
 	m_scope->lookup(_variableName, util::GenericVisitor{
 		[&](Scope::Variable const& _var)
diff --git a/libyul/backends/evm/VariableReferenceCounter.h b/libyul/backends/evm/VariableReferenceCounter.h
index ba6404b171..7555227935 100644
--- a/libyul/backends/evm/VariableReferenceCounter.h
+++ b/libyul/backends/evm/VariableReferenceCounter.h
@@ -58,7 +58,7 @@ struct VariableReferenceCounter: public yul::ASTWalker
 	): m_info(_assemblyInfo)
 	{}
 
-	void increaseRefIfFound(YulString _variableName);
+	void increaseRefIfFound(YulName _variableName);
 
 	AsmAnalysisInfo const& m_info;
 	Scope* m_scope = nullptr;
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index 9f41079418..8efe29613e 100644
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -83,7 +83,7 @@ Statement ASTCopier::operator()(Switch const& _switch)
 
 Statement ASTCopier::operator()(FunctionDefinition const& _function)
 {
-	YulString translatedName = translateIdentifier(_function.name);
+	YulName translatedName = translateIdentifier(_function.name);
 
 	enterFunction(_function);
 	ScopeGuard g([&]() { this->leaveFunction(_function); });
@@ -168,7 +168,7 @@ TypedName ASTCopier::translate(TypedName const& _typedName)
 	return TypedName{_typedName.debugData, translateIdentifier(_typedName.name), _typedName.type};
 }
 
-YulString FunctionCopier::translateIdentifier(YulString _name)
+YulName FunctionCopier::translateIdentifier(YulName _name)
 {
 	if (m_translations.count(_name))
 		return m_translations.at(_name);
diff --git a/libyul/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
index db9d72af35..88d2a34510 100644
--- a/libyul/optimiser/ASTCopier.h
+++ b/libyul/optimiser/ASTCopier.h
@@ -23,7 +23,7 @@
 
 #include <libyul/ASTForward.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <memory>
 #include <optional>
@@ -106,7 +106,7 @@ class ASTCopier: public ExpressionCopier, public StatementCopier
 	virtual void leaveScope(Block const&) { }
 	virtual void enterFunction(FunctionDefinition const&) { }
 	virtual void leaveFunction(FunctionDefinition const&) { }
-	virtual YulString translateIdentifier(YulString _name) { return _name; }
+	virtual YulName translateIdentifier(YulName _name) { return _name; }
 };
 
 template <typename T>
@@ -124,16 +124,16 @@ class FunctionCopier: public ASTCopier
 {
 public:
 	FunctionCopier(
-		std::map<YulString, YulString> const& _translations
+		std::map<YulName, YulName> const& _translations
 	):
 		m_translations(_translations)
 	{}
 	using ASTCopier::operator();
-	YulString translateIdentifier(YulString _name) override;
+	YulName translateIdentifier(YulName _name) override;
 private:
 	/// A mapping between old and new names. We replace the names of variable declarations contained
 	/// in the mapping with their new names.
-	std::map<YulString, YulString> const& m_translations;
+	std::map<YulName, YulName> const& m_translations;
 };
 
 }
diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
index b937f7eae4..0c23a836e6 100644
--- a/libyul/optimiser/ASTWalker.h
+++ b/libyul/optimiser/ASTWalker.h
@@ -24,7 +24,7 @@
 #include <libyul/ASTForward.h>
 
 #include <libyul/Exceptions.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <map>
 #include <optional>
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
index 2b9a71f101..427161b3c7 100644
--- a/libyul/optimiser/BlockHasher.h
+++ b/libyul/optimiser/BlockHasher.h
@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 namespace solidity::yul
 {
@@ -112,8 +112,8 @@ class BlockHasher: public ASTWalker, public ASTHasherBase
 		size_t id = 0;
 		bool isExternal = false;
 	};
-	std::map<YulString, VariableReference> m_variableReferences;
-	std::vector<YulString> m_externalReferences;
+	std::map<YulName, VariableReference> m_variableReferences;
+	std::vector<YulName> m_externalReferences;
 	size_t m_externalIdentifierCount = 0;
 	size_t m_internalIdentifierCount = 0;
 };
diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
index 87035e68a0..f457f55838 100644
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ b/libyul/optimiser/CallGraphGenerator.cpp
@@ -35,11 +35,11 @@ namespace
 struct CallGraphCycleFinder
 {
 	CallGraph const& callGraph;
-	std::set<YulString> containedInCycle{};
-	std::set<YulString> visited{};
-	std::vector<YulString> currentPath{};
+	std::set<YulName> containedInCycle{};
+	std::set<YulName> visited{};
+	std::vector<YulName> currentPath{};
 
-	void visit(YulString _function)
+	void visit(YulName _function)
 	{
 		if (visited.count(_function))
 			return;
@@ -61,7 +61,7 @@ struct CallGraphCycleFinder
 };
 }
 
-std::set<YulString> CallGraph::recursiveFunctions() const
+std::set<YulName> CallGraph::recursiveFunctions() const
 {
 	CallGraphCycleFinder cycleFinder{*this};
 	// Visiting the root only is not enough, since there may be disconnected recursive functions.
@@ -93,7 +93,7 @@ void CallGraphGenerator::operator()(ForLoop const& _forLoop)
 
 void CallGraphGenerator::operator()(FunctionDefinition const& _functionDefinition)
 {
-	YulString previousFunction = m_currentFunction;
+	YulName previousFunction = m_currentFunction;
 	m_currentFunction = _functionDefinition.name;
 	yulAssert(m_callGraph.functionCalls.count(m_currentFunction) == 0, "");
 	m_callGraph.functionCalls[m_currentFunction] = {};
@@ -103,6 +103,6 @@ void CallGraphGenerator::operator()(FunctionDefinition const& _functionDefinitio
 
 CallGraphGenerator::CallGraphGenerator()
 {
-	m_callGraph.functionCalls[YulString{}] = {};
+	m_callGraph.functionCalls[YulName{}] = {};
 }
 
diff --git a/libyul/optimiser/CallGraphGenerator.h b/libyul/optimiser/CallGraphGenerator.h
index ad19878b68..23e9a25115 100644
--- a/libyul/optimiser/CallGraphGenerator.h
+++ b/libyul/optimiser/CallGraphGenerator.h
@@ -32,12 +32,12 @@ namespace solidity::yul
 
 struct CallGraph
 {
-	std::map<YulString, std::vector<YulString>> functionCalls;
-	std::set<YulString> functionsWithLoops;
+	std::map<YulName, std::vector<YulName>> functionCalls;
+	std::set<YulName> functionsWithLoops;
 	/// @returns the set of functions contained in cycles in the call graph, i.e.
 	/// functions that are part of a (mutual) recursion.
 	/// Note that this does not include functions that merely call recursive functions.
-	std::set<YulString> recursiveFunctions() const;
+	std::set<YulName> recursiveFunctions() const;
 };
 
 /**
@@ -62,7 +62,7 @@ class CallGraphGenerator: public ASTWalker
 
 	CallGraph m_callGraph;
 	/// The name of the function we are currently visiting during traversal.
-	YulString m_currentFunction;
+	YulName m_currentFunction;
 };
 
 }
diff --git a/libyul/optimiser/CircularReferencesPruner.cpp b/libyul/optimiser/CircularReferencesPruner.cpp
index 824d2be39f..a34f3f4e2a 100644
--- a/libyul/optimiser/CircularReferencesPruner.cpp
+++ b/libyul/optimiser/CircularReferencesPruner.cpp
@@ -34,7 +34,7 @@ void CircularReferencesPruner::run(OptimiserStepContext& _context, Block& _ast)
 
 void CircularReferencesPruner::operator()(Block& _block)
 {
-	std::set<YulString> functionsToKeep =
+	std::set<YulName> functionsToKeep =
 		functionsCalledFromOutermostContext(CallGraphGenerator::callGraph(_block));
 
 	for (auto&& statement: _block.statements)
@@ -48,13 +48,13 @@ void CircularReferencesPruner::operator()(Block& _block)
 	removeEmptyBlocks(_block);
 }
 
-std::set<YulString> CircularReferencesPruner::functionsCalledFromOutermostContext(CallGraph const& _callGraph)
+std::set<YulName> CircularReferencesPruner::functionsCalledFromOutermostContext(CallGraph const& _callGraph)
 {
-	std::set<YulString> verticesToTraverse = m_reservedIdentifiers;
-	verticesToTraverse.insert(YulString(""));
+	std::set<YulName> verticesToTraverse = m_reservedIdentifiers;
+	verticesToTraverse.insert(YulName(""));
 
-	return util::BreadthFirstSearch<YulString>{{verticesToTraverse.begin(), verticesToTraverse.end()}}.run(
-		[&_callGraph](YulString _function, auto&& _addChild) {
+	return util::BreadthFirstSearch<YulName>{{verticesToTraverse.begin(), verticesToTraverse.end()}}.run(
+		[&_callGraph](YulName _function, auto&& _addChild) {
 			if (_callGraph.functionCalls.count(_function))
 				for (auto const& callee: _callGraph.functionCalls.at(_function))
 					if (_callGraph.functionCalls.count(callee))
diff --git a/libyul/optimiser/CircularReferencesPruner.h b/libyul/optimiser/CircularReferencesPruner.h
index 0602445af4..090b0617fc 100644
--- a/libyul/optimiser/CircularReferencesPruner.h
+++ b/libyul/optimiser/CircularReferencesPruner.h
@@ -27,6 +27,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/YulName.h>
 
 namespace solidity::yul
 {
@@ -44,16 +45,16 @@ class CircularReferencesPruner: public ASTModifier
 	using ASTModifier::operator();
 	void operator()(Block& _block) override;
 private:
-	CircularReferencesPruner(std::set<YulString> const& _reservedIdentifiers):
+	CircularReferencesPruner(std::set<YulName> const& _reservedIdentifiers):
 		m_reservedIdentifiers(_reservedIdentifiers)
 	{}
 
 	/// Run a breadth-first search starting from the outermost context and
 	/// externally referenced functions to find all the functions that are
 	/// called from there either directly or indirectly.
-	std::set<YulString> functionsCalledFromOutermostContext(CallGraph const& _callGraph);
+	std::set<YulName> functionsCalledFromOutermostContext(CallGraph const& _callGraph);
 
-	std::set<YulString> const& m_reservedIdentifiers;
+	std::set<YulName> const& m_reservedIdentifiers;
 };
 
 }
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 1c7879056d..073d621cc2 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -46,7 +46,7 @@ void CommonSubexpressionEliminator::run(OptimiserStepContext& _context, Block& _
 
 CommonSubexpressionEliminator::CommonSubexpressionEliminator(
 	Dialect const& _dialect,
-	std::map<YulString, SideEffects> _functionSideEffects
+	std::map<YulName, SideEffects> _functionSideEffects
 ):
 	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore, std::move(_functionSideEffects))
 {
@@ -95,7 +95,7 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 
 	if (Identifier const* identifier = std::get_if<Identifier>(&_e))
 	{
-		YulString identifierName = identifier->name;
+		YulName identifierName = identifier->name;
 		if (AssignedValue const* assignedValue = variableValue(identifierName))
 		{
 			assertThrow(assignedValue->value, OptimizerException, "");
@@ -126,7 +126,7 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 			}
 }
 
-void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression const* _value)
+void CommonSubexpressionEliminator::assignValue(YulName _variable, Expression const* _value)
 {
 	if (_value)
 		m_replacementCandidates[*_value].insert(_variable);
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.h b/libyul/optimiser/CommonSubexpressionEliminator.h
index 163c9df994..d7dc42596c 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.h
+++ b/libyul/optimiser/CommonSubexpressionEliminator.h
@@ -53,19 +53,19 @@ class CommonSubexpressionEliminator: public DataFlowAnalyzer
 private:
 	CommonSubexpressionEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects
+		std::map<YulName, SideEffects> _functionSideEffects
 	);
 
 protected:
 	using ASTModifier::visit;
 	void visit(Expression& _e) override;
 
-	void assignValue(YulString _variable, Expression const* _value) override;
+	void assignValue(YulName _variable, Expression const* _value) override;
 private:
-	std::set<YulString> m_returnVariables;
+	std::set<YulName> m_returnVariables;
 	std::unordered_map<
 		std::reference_wrapper<Expression const>,
-		std::set<YulString>,
+		std::set<YulName>,
 		ExpressionHash,
 		SyntacticallyEqualExpression
 	> m_replacementCandidates;
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index 7119091257..a2656fed39 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -42,7 +42,7 @@ void ConditionalSimplifier::operator()(Switch& _switch)
 		ASTModifier::operator()(_switch);
 		return;
 	}
-	YulString expr = std::get<Identifier>(*_switch.expression).name;
+	YulName expr = std::get<Identifier>(*_switch.expression).name;
 	for (auto& _case: _switch.cases)
 	{
 		if (_case.value)
@@ -77,7 +77,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 						TerminationFinder::ControlFlow::FlowOut
 				)
 				{
-					YulString condition = std::get<Identifier>(*_if.condition).name;
+					YulName condition = std::get<Identifier>(*_if.condition).name;
 					langutil::DebugData::ConstPtr debugData = _if.debugData;
 					return make_vector<Statement>(
 						std::move(_s),
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index e558a1c6cf..c78052126f 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> _sideEffects
+		std::map<YulName, ControlFlowSideEffects> _sideEffects
 	):
 		m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects))
 	{}
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
+	std::map<YulName, ControlFlowSideEffects> m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index 104ec1e4f0..06348e9977 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -43,7 +43,7 @@ void ConditionalUnsimplifier::operator()(Switch& _switch)
 		ASTModifier::operator()(_switch);
 		return;
 	}
-	YulString expr = std::get<Identifier>(*_switch.expression).name;
+	YulName expr = std::get<Identifier>(*_switch.expression).name;
 	for (auto& _case: _switch.cases)
 	{
 		if (_case.value)
@@ -83,7 +83,7 @@ void ConditionalUnsimplifier::operator()(Block& _block)
 					!_if.body.statements.empty()
 				)
 				{
-					YulString condition = std::get<Identifier>(*_if.condition).name;
+					YulName condition = std::get<Identifier>(*_if.condition).name;
 					if (
 						std::holds_alternative<Assignment>(_stmt2) &&
 						TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
diff --git a/libyul/optimiser/ConditionalUnsimplifier.h b/libyul/optimiser/ConditionalUnsimplifier.h
index 8025b661b9..dc1c6e2454 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.h
+++ b/libyul/optimiser/ConditionalUnsimplifier.h
@@ -42,12 +42,12 @@ class ConditionalUnsimplifier: public ASTModifier
 private:
 	explicit ConditionalUnsimplifier(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
+		std::map<YulName, ControlFlowSideEffects> const& _sideEffects
 	):
 		m_dialect(_dialect), m_functionSideEffects(_sideEffects)
 	{}
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
+	std::map<YulName, ControlFlowSideEffects> const& m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 10f479a421..9d56583a06 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -197,7 +197,7 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 
 	auto& switchCase = _switchStmt.cases.front();
 	langutil::DebugData::ConstPtr debugData = debugDataOf(*_switchStmt.expression);
-	YulString type = m_typeInfo.typeOf(*_switchStmt.expression);
+	YulName type = m_typeInfo.typeOf(*_switchStmt.expression);
 	if (switchCase.value)
 	{
 		if (!m_dialect.equalityFunction(type))
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 5ec3cf248d..a51ca91239 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -45,22 +45,22 @@ using namespace solidity::yul;
 DataFlowAnalyzer::DataFlowAnalyzer(
 	Dialect const& _dialect,
 	MemoryAndStorage _analyzeStores,
-	std::map<YulString, SideEffects> _functionSideEffects
+	std::map<YulName, SideEffects> _functionSideEffects
 ):
 	m_dialect(_dialect),
 	m_functionSideEffects(std::move(_functionSideEffects)),
-	m_knowledgeBase([this](YulString _var) { return variableValue(_var); }),
+	m_knowledgeBase([this](YulName _var) { return variableValue(_var); }),
 	m_analyzeStores(_analyzeStores == MemoryAndStorage::Analyze)
 {
 	if (m_analyzeStores)
 	{
-		if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
+		if (auto const* builtin = _dialect.memoryStoreFunction(YulName{}))
 			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.memoryLoadFunction(YulString{}))
+		if (auto const* builtin = _dialect.memoryLoadFunction(YulName{}))
 			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.storageStoreFunction(YulString{}))
+		if (auto const* builtin = _dialect.storageStoreFunction(YulName{}))
 			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
-		if (auto const* builtin = _dialect.storageLoadFunction(YulString{}))
+		if (auto const* builtin = _dialect.storageLoadFunction(YulName{}))
 			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
 	}
 }
@@ -98,7 +98,7 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 
 void DataFlowAnalyzer::operator()(Assignment& _assignment)
 {
-	std::set<YulString> names;
+	std::set<YulName> names;
 	for (auto const& var: _assignment.variableNames)
 		names.emplace(var.name);
 	assertThrow(_assignment.value, OptimizerException, "");
@@ -109,7 +109,7 @@ void DataFlowAnalyzer::operator()(Assignment& _assignment)
 
 void DataFlowAnalyzer::operator()(VariableDeclaration& _varDecl)
 {
-	std::set<YulString> names;
+	std::set<YulName> names;
 	for (auto const& var: _varDecl.variables)
 		names.emplace(var.name);
 	m_variableScopes.back().variables += names;
@@ -138,14 +138,14 @@ void DataFlowAnalyzer::operator()(Switch& _switch)
 {
 	clearKnowledgeIfInvalidated(*_switch.expression);
 	visit(*_switch.expression);
-	std::set<YulString> assignedVariables;
+	std::set<YulName> assignedVariables;
 	for (auto& _case: _switch.cases)
 	{
 		Environment preEnvironment = m_state.environment;
 		(*this)(_case.body);
 		joinKnowledge(preEnvironment);
 
-		std::set<YulString> variables = assignedVariableNames(_case.body);
+		std::set<YulName> variables = assignedVariableNames(_case.body);
 		assignedVariables += variables;
 		// This is a little too destructive, we could retain the old values.
 		clearValues(variables);
@@ -191,7 +191,7 @@ void DataFlowAnalyzer::operator()(ForLoop& _for)
 	AssignmentsSinceContinue assignmentsSinceCont;
 	assignmentsSinceCont(_for.body);
 
-	std::set<YulString> assignedVariables =
+	std::set<YulName> assignedVariables =
 		assignedVariableNames(_for.body) + assignedVariableNames(_for.post);
 	clearValues(assignedVariables);
 
@@ -222,31 +222,31 @@ void DataFlowAnalyzer::operator()(Block& _block)
 	assertThrow(numScopes == m_variableScopes.size(), OptimizerException, "");
 }
 
-std::optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
+std::optional<YulName> DataFlowAnalyzer::storageValue(YulName _key) const
 {
-	if (YulString const* value = valueOrNullptr(m_state.environment.storage, _key))
+	if (YulName const* value = valueOrNullptr(m_state.environment.storage, _key))
 		return *value;
 	else
 		return std::nullopt;
 }
 
-std::optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
+std::optional<YulName> DataFlowAnalyzer::memoryValue(YulName _key) const
 {
-	if (YulString const* value = valueOrNullptr(m_state.environment.memory, _key))
+	if (YulName const* value = valueOrNullptr(m_state.environment.memory, _key))
 		return *value;
 	else
 		return std::nullopt;
 }
 
-std::optional<YulString> DataFlowAnalyzer::keccakValue(YulString _start, YulString _length) const
+std::optional<YulName> DataFlowAnalyzer::keccakValue(YulName _start, YulName _length) const
 {
-	if (YulString const* value = valueOrNullptr(m_state.environment.keccak, std::make_pair(_start, _length)))
+	if (YulName const* value = valueOrNullptr(m_state.environment.keccak, std::make_pair(_start, _length)))
 		return *value;
 	else
 		return std::nullopt;
 }
 
-void DataFlowAnalyzer::handleAssignment(std::set<YulString> const& _variables, Expression* _value, bool _isDeclaration)
+void DataFlowAnalyzer::handleAssignment(std::set<YulName> const& _variables, Expression* _value, bool _isDeclaration)
 {
 	if (!_isDeclaration)
 		clearValues(_variables);
@@ -260,7 +260,7 @@ void DataFlowAnalyzer::handleAssignment(std::set<YulString> const& _variables, E
 
 	if (_value && _variables.size() == 1)
 	{
-		YulString name = *_variables.begin();
+		YulName name = *_variables.begin();
 		// Expression has to be movable and cannot contain a reference
 		// to the variable that will be assigned to.
 		if (movableChecker.movable() && !movableChecker.referencedVariables().count(name))
@@ -289,7 +289,7 @@ void DataFlowAnalyzer::handleAssignment(std::set<YulString> const& _variables, E
 
 	if (_value && _variables.size() == 1)
 	{
-		YulString variable = *_variables.begin();
+		YulName variable = *_variables.begin();
 		if (!movableChecker.referencedVariables().count(variable))
 		{
 			// This might erase additional knowledge about the slot.
@@ -320,7 +320,7 @@ void DataFlowAnalyzer::popScope()
 	m_variableScopes.pop_back();
 }
 
-void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
+void DataFlowAnalyzer::clearValues(std::set<YulName> _variables)
 {
 	// All variables that reference variables to be cleared also have to be
 	// cleared, but not recursively, since only the value of the original
@@ -351,7 +351,7 @@ void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
 	});
 
 	// Also clear variables that reference variables to be cleared.
-	std::set<YulString> referencingVariables;
+	std::set<YulName> referencingVariables;
 	for (auto const& variableToClear: _variables)
 		for (auto const& [ref, names]: m_state.references)
 			if (names.count(variableToClear))
@@ -365,7 +365,7 @@ void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
 	}
 }
 
-void DataFlowAnalyzer::assignValue(YulString _variable, Expression const* _value)
+void DataFlowAnalyzer::assignValue(YulName _variable, Expression const* _value)
 {
 	m_state.value[_variable] = {_value, m_loopDepth};
 }
@@ -398,7 +398,7 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
 	}
 }
 
-bool DataFlowAnalyzer::inScope(YulString _variableName) const
+bool DataFlowAnalyzer::inScope(YulName _variableName) const
 {
 	for (auto const& scope: m_variableScopes | ranges::views::reverse)
 	{
@@ -410,7 +410,7 @@ bool DataFlowAnalyzer::inScope(YulString _variableName) const
 	return false;
 }
 
-std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name) const
+std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulName const& _name) const
 {
 	if (AssignedValue const* value = variableValue(_name))
 		if (Literal const* literal = std::get_if<Literal>(value->value))
@@ -418,7 +418,7 @@ std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name)
 	return std::nullopt;
 }
 
-std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isSimpleStore(
+std::optional<std::pair<YulName, YulName>> DataFlowAnalyzer::isSimpleStore(
 	StoreLoadLocation _location,
 	ExpressionStatement const& _statement
 ) const
@@ -431,7 +431,7 @@ std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isSimpleStore(
 	return {};
 }
 
-std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
+std::optional<YulName> DataFlowAnalyzer::isSimpleLoad(
 	StoreLoadLocation _location,
 	Expression const& _expression
 ) const
@@ -443,7 +443,7 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 	return {};
 }
 
-std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
+std::optional<std::pair<YulName, YulName>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
 {
 	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
 		if (funCall->functionName.name == m_dialect.hashFunction({}))
@@ -460,14 +460,14 @@ void DataFlowAnalyzer::joinKnowledge(Environment const& _olderEnvironment)
 	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);
+		YulName const* oldValue = valueOrNullptr(_olderEnvironment.keccak, key);
 		return !oldValue || *oldValue != currentValue;
 	}));
 }
 
 void DataFlowAnalyzer::joinKnowledgeHelper(
-	std::unordered_map<YulString, YulString>& _this,
-	std::unordered_map<YulString, YulString> const& _older
+	std::unordered_map<YulName, YulName>& _this,
+	std::unordered_map<YulName, YulName> const& _older
 )
 {
 	// We clear if the key does not exist in the older map or if the value is different.
@@ -475,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 = valueOrNullptr(_older, key);
+		YulName const* oldValue = valueOrNullptr(_older, key);
 		return !oldValue || *oldValue != currentValue;
 	}));
 }
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index e41620b15f..6b23a86b9c 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -25,7 +25,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/AST.h> // Needed for m_zero below.
 #include <libyul/SideEffects.h>
 
@@ -89,7 +89,7 @@ class DataFlowAnalyzer: public ASTModifier
 	explicit DataFlowAnalyzer(
 		Dialect const& _dialect,
 		MemoryAndStorage _analyzeStores,
-		std::map<YulString, SideEffects> _functionSideEffects = {}
+		std::map<YulName, SideEffects> _functionSideEffects = {}
 	);
 
 	using ASTModifier::operator();
@@ -103,16 +103,16 @@ 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_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;
-	std::optional<YulString> keccakValue(YulString _start, YulString _length) const;
+	AssignedValue const* variableValue(YulName _variable) const { return util::valueOrNullptr(m_state.value, _variable); }
+	std::set<YulName> const* references(YulName _variable) const { return util::valueOrNullptr(m_state.references, _variable); }
+	std::map<YulName, AssignedValue> const& allValues() const { return m_state.value; }
+	std::optional<YulName> storageValue(YulName _key) const;
+	std::optional<YulName> memoryValue(YulName _key) const;
+	std::optional<YulName> keccakValue(YulName _start, YulName _length) const;
 
 protected:
 	/// Registers the assignment.
-	void handleAssignment(std::set<YulString> const& _names, Expression* _value, bool _isDeclaration);
+	void handleAssignment(std::set<YulName> const& _names, Expression* _value, bool _isDeclaration);
 
 	/// Creates a new inner scope.
 	void pushScope(bool _functionScope);
@@ -122,9 +122,9 @@ class DataFlowAnalyzer: public ASTModifier
 
 	/// Clears information about the values assigned to the given variables,
 	/// for example at points where control flow is merged.
-	void clearValues(std::set<YulString> _names);
+	void clearValues(std::set<YulName> _names);
 
-	virtual void assignValue(YulString _variable, Expression const* _value);
+	virtual void assignValue(YulName _variable, Expression const* _value);
 
 	/// Clears knowledge about storage or memory if they may be modified inside the block.
 	void clearKnowledgeIfInvalidated(Block const& _block);
@@ -133,10 +133,10 @@ class DataFlowAnalyzer: public ASTModifier
 	void clearKnowledgeIfInvalidated(Expression const& _expression);
 
 	/// Returns true iff the variable is in scope.
-	bool inScope(YulString _variableName) const;
+	bool inScope(YulName _variableName) const;
 
 	/// Returns the literal value of the identifier, if it exists.
-	std::optional<u256> valueOfIdentifier(YulString const& _name) const;
+	std::optional<u256> valueOfIdentifier(YulName const& _name) const;
 
 	enum class StoreLoadLocation {
 		Memory = 0,
@@ -146,41 +146,41 @@ class DataFlowAnalyzer: public ASTModifier
 
 	/// Checks if the statement is sstore(a, b) / mstore(a, b)
 	/// where a and b are variables and returns these variables in that case.
-	std::optional<std::pair<YulString, YulString>> isSimpleStore(
+	std::optional<std::pair<YulName, YulName>> isSimpleStore(
 		StoreLoadLocation _location,
 		ExpressionStatement const& _statement
 	) const;
 
 	/// Checks if the expression is sload(a) / mload(a)
 	/// where a is a variable and returns the variable in that case.
-	std::optional<YulString> isSimpleLoad(
+	std::optional<YulName> isSimpleLoad(
 		StoreLoadLocation _location,
 		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;
+	std::optional<std::pair<YulName, YulName>> 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.
-	std::map<YulString, SideEffects> m_functionSideEffects;
+	std::map<YulName, SideEffects> m_functionSideEffects;
 
 private:
 	struct Environment
 	{
-		std::unordered_map<YulString, YulString> storage;
-		std::unordered_map<YulString, YulString> memory;
+		std::unordered_map<YulName, YulName> storage;
+		std::unordered_map<YulName, YulName> memory;
 		/// If keccak[s, l] = y then y := keccak256(s, l) occurs in the code.
-		std::map<std::pair<YulString, YulString>, YulString> keccak;
+		std::map<std::pair<YulName, YulName>, YulName> keccak;
 	};
 	struct State
 	{
 		/// Current values of variables, always movable.
-		std::map<YulString, AssignedValue> value;
+		std::map<YulName, 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<YulName, std::set<YulName>> references;
 
 		Environment environment;
 	};
@@ -192,8 +192,8 @@ class DataFlowAnalyzer: public ASTModifier
 	void joinKnowledge(Environment const& _olderEnvironment);
 
 	static void joinKnowledgeHelper(
-		std::unordered_map<YulString, YulString>& _thisData,
-		std::unordered_map<YulString, YulString> const& _olderData
+		std::unordered_map<YulName, YulName>& _thisData,
+		std::unordered_map<YulName, YulName> const& _olderData
 	);
 
 	State m_state;
@@ -203,8 +203,8 @@ class DataFlowAnalyzer: public ASTModifier
 
 	/// 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];
+	YulName m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
+	YulName m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
 
 	/// Current nesting depth of loops.
 	size_t m_loopDepth{0};
@@ -212,11 +212,11 @@ class DataFlowAnalyzer: public ASTModifier
 	struct Scope
 	{
 		explicit Scope(bool _isFunction): isFunction(_isFunction) {}
-		std::set<YulString> variables;
+		std::set<YulName> variables;
 		bool isFunction;
 	};
 	/// Special expression whose address will be used in m_value.
-	/// YulString does not need to be reset because DataFlowAnalyzer is short-lived.
+	/// YulName does not need to be reset because DataFlowAnalyzer is short-lived.
 	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue{0, "0"}, {}}};
 	/// List of scopes.
 	std::vector<Scope> m_variableScopes;
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
index ae8c1b2a6a..f252536c59 100644
--- a/libyul/optimiser/DeadCodeEliminator.h
+++ b/libyul/optimiser/DeadCodeEliminator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/ControlFlowSideEffects.h>
 
 #include <map>
@@ -62,11 +62,11 @@ class DeadCodeEliminator: public ASTModifier
 private:
 	DeadCodeEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> _sideEffects
+		std::map<YulName, ControlFlowSideEffects> _sideEffects
 	): m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects)) {}
 
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
+	std::map<YulName, ControlFlowSideEffects> m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index 34e6bc7e6a..11325936c7 100644
--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -30,7 +30,7 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-YulString Disambiguator::translateIdentifier(YulString _originalName)
+YulName Disambiguator::translateIdentifier(YulName _originalName)
 {
 	if (m_dialect.builtin(_originalName) || m_externallyUsedIdentifiers.count(_originalName))
 		return _originalName;
diff --git a/libyul/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h
index 0621738827..08d8d158f6 100644
--- a/libyul/optimiser/Disambiguator.h
+++ b/libyul/optimiser/Disambiguator.h
@@ -42,7 +42,7 @@ class Disambiguator: public ASTCopier
 	explicit Disambiguator(
 		Dialect const& _dialect,
 		AsmAnalysisInfo const& _analysisInfo,
-		std::set<YulString> const& _externallyUsedIdentifiers = {}
+		std::set<YulName> const& _externallyUsedIdentifiers = {}
 	):
 		m_info(_analysisInfo),
 		m_dialect(_dialect),
@@ -56,17 +56,17 @@ class Disambiguator: public ASTCopier
 	void leaveScope(Block const& _block) override;
 	void enterFunction(FunctionDefinition const& _function) override;
 	void leaveFunction(FunctionDefinition const& _function) override;
-	YulString translateIdentifier(YulString _name) override;
+	YulName translateIdentifier(YulName _name) override;
 
 	void enterScopeInternal(Scope& _scope);
 	void leaveScopeInternal(Scope& _scope);
 
 	AsmAnalysisInfo const& m_info;
 	Dialect const& m_dialect;
-	std::set<YulString> const& m_externallyUsedIdentifiers;
+	std::set<YulName> const& m_externallyUsedIdentifiers;
 
 	std::vector<Scope*> m_scopes;
-	std::map<void const*, YulString> m_translations;
+	std::map<void const*, YulName> m_translations;
 	NameDispenser m_nameDispenser;
 };
 
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
index 1e894608e9..0d7ff9e9c5 100644
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -53,13 +53,13 @@ void EqualStoreEliminator::visit(Statement& _statement)
 	{
 		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
 		{
-			if (std::optional<YulString> currentValue = storageValue(vars->first))
+			if (std::optional<YulName> currentValue = storageValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
 		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
 		{
-			if (std::optional<YulString> currentValue = memoryValue(vars->first))
+			if (std::optional<YulName> currentValue = memoryValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
diff --git a/libyul/optimiser/EqualStoreEliminator.h b/libyul/optimiser/EqualStoreEliminator.h
index b8572f4667..a0b54c590f 100644
--- a/libyul/optimiser/EqualStoreEliminator.h
+++ b/libyul/optimiser/EqualStoreEliminator.h
@@ -45,7 +45,7 @@ class EqualStoreEliminator: public DataFlowAnalyzer
 private:
 	EqualStoreEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects
+		std::map<YulName, SideEffects> _functionSideEffects
 	):
 		DataFlowAnalyzer(_dialect, MemoryAndStorage::Analyze, std::move(_functionSideEffects))
 	{}
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.h b/libyul/optimiser/EquivalentFunctionCombiner.h
index 5337f76842..627dcb3ff4 100644
--- a/libyul/optimiser/EquivalentFunctionCombiner.h
+++ b/libyul/optimiser/EquivalentFunctionCombiner.h
@@ -46,8 +46,8 @@ class EquivalentFunctionCombiner: public ASTModifier
 	void operator()(FunctionCall& _funCall) override;
 
 private:
-	EquivalentFunctionCombiner(std::map<YulString, FunctionDefinition const*> _duplicates): m_duplicates(std::move(_duplicates)) {}
-	std::map<YulString, FunctionDefinition const*> m_duplicates;
+	EquivalentFunctionCombiner(std::map<YulName, FunctionDefinition const*> _duplicates): m_duplicates(std::move(_duplicates)) {}
+	std::map<YulName, FunctionDefinition const*> m_duplicates;
 };
 
 
diff --git a/libyul/optimiser/EquivalentFunctionDetector.h b/libyul/optimiser/EquivalentFunctionDetector.h
index d3ddc25f7b..7cd161af1a 100644
--- a/libyul/optimiser/EquivalentFunctionDetector.h
+++ b/libyul/optimiser/EquivalentFunctionDetector.h
@@ -35,7 +35,7 @@ namespace solidity::yul
 class EquivalentFunctionDetector: public ASTWalker
 {
 public:
-	static std::map<YulString, FunctionDefinition const*> run(Block& _block)
+	static std::map<YulName, FunctionDefinition const*> run(Block& _block)
 	{
 		EquivalentFunctionDetector detector{BlockHasher::run(_block)};
 		detector(_block);
@@ -50,7 +50,7 @@ class EquivalentFunctionDetector: public ASTWalker
 
 	std::map<Block const*, uint64_t> m_blockHashes;
 	std::map<uint64_t, std::vector<FunctionDefinition const*>> m_candidates;
-	std::map<YulString, FunctionDefinition const*> m_duplicates;
+	std::map<YulName, FunctionDefinition const*> m_duplicates;
 };
 
 
diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
index cacf5843d6..ab4bbcfa43 100644
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@@ -56,11 +56,11 @@ void ExpressionInliner::visit(Expression& _expression)
 			return;
 		FunctionDefinition const& fun = *m_inlinableFunctions.at(funCall.functionName.name);
 
-		std::map<YulString, Expression const*> substitutions;
+		std::map<YulName, Expression const*> substitutions;
 		for (size_t i = 0; i < funCall.arguments.size(); i++)
 		{
 			Expression const& arg = funCall.arguments[i];
-			YulString paraName = fun.parameters[i].name;
+			YulName paraName = fun.parameters[i].name;
 
 			if (!SideEffectsCollector(m_dialect, arg).movable())
 				return;
diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
index ff7da67b88..08ff086484 100644
--- a/libyul/optimiser/ExpressionInliner.h
+++ b/libyul/optimiser/ExpressionInliner.h
@@ -22,6 +22,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/ASTForward.h>
+#include <libyul/YulName.h>
 
 #include <optional>
 #include <set>
@@ -59,16 +60,16 @@ class ExpressionInliner: public ASTModifier
 private:
 	ExpressionInliner(
 		Dialect const& _dialect,
-		std::map<YulString, FunctionDefinition const*> const& _inlinableFunctions
+		std::map<YulName, FunctionDefinition const*> const& _inlinableFunctions
 	): m_dialect(_dialect), m_inlinableFunctions(_inlinableFunctions)
 	{}
 
 	Dialect const& m_dialect;
-	std::map<YulString, FunctionDefinition const*> const& m_inlinableFunctions;
+	std::map<YulName, FunctionDefinition const*> const& m_inlinableFunctions;
 
-	std::map<YulString, YulString> m_varReplacements;
+	std::map<YulName, YulName> m_varReplacements;
 	/// Set of functions we are currently visiting inside.
-	std::set<YulString> m_currentFunctions;
+	std::set<YulName> m_currentFunctions;
 };
 
 }
diff --git a/libyul/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
index 3a1fdf7435..07f86ddce7 100644
--- a/libyul/optimiser/ExpressionJoiner.h
+++ b/libyul/optimiser/ExpressionJoiner.h
@@ -93,7 +93,7 @@ class ExpressionJoiner: public ASTModifier
 private:
 	Block* m_currentBlock = nullptr;            ///< Pointer to current block holding the statement being visited.
 	size_t m_latestStatementInBlock = 0;        ///< Offset to m_currentBlock's statements of the last visited statement.
-	std::map<YulString, size_t> m_references;   ///< Holds reference counts to all variable declarations in current block.
+	std::map<YulName, size_t> m_references;   ///< Holds reference counts to all variable declarations in current block.
 };
 
 }
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 6d0a8c9d74..482ade8f87 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -44,7 +44,7 @@ void ExpressionSimplifier::visit(Expression& _expression)
 	while (auto const* match = SimplificationRules::findFirstMatch(
 		_expression,
 		m_dialect,
-		[this](YulString _var) { return variableValue(_var); }
+		[this](YulName _var) { return variableValue(_var); }
 	))
 		_expression = match->action().toExpression(debugDataOf(_expression), evmVersionFromDialect(m_dialect));
 
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index 6f0834d776..acaa40dbf0 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -99,8 +99,8 @@ void ExpressionSplitter::outlineExpression(Expression& _expr)
 	visit(_expr);
 
 	langutil::DebugData::ConstPtr debugData = debugDataOf(_expr);
-	YulString var = m_nameDispenser.newName({});
-	YulString type = m_typeInfo.typeOf(_expr);
+	YulName var = m_nameDispenser.newName({});
+	YulName type = m_typeInfo.typeOf(_expr);
 	m_statementsToPrefix.emplace_back(VariableDeclaration{
 		debugData,
 		{{TypedName{debugData, var, type}}},
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index 83b1e20a8e..afd005b719 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -53,7 +53,7 @@ void ForLoopConditionOutOfBody::operator()(ForLoop& _forLoop)
 	if (!SideEffectsCollector(m_dialect, *firstStatement.condition).movable())
 		return;
 
-	YulString iszero = m_dialect.booleanNegationFunction()->name;
+	YulName iszero = m_dialect.booleanNegationFunction()->name;
 	langutil::DebugData::ConstPtr debugData = debugDataOf(*firstStatement.condition);
 
 	if (
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 3bf00282c0..5cdde8f0fd 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -66,8 +66,8 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 			m_constants.emplace(ssaValue.first);
 
 	// Store size of global statements.
-	m_functionSizes[YulString{}] = CodeSize::codeSize(_ast);
-	std::map<YulString, size_t> references = ReferencesCounter::countReferences(m_ast);
+	m_functionSizes[YulName{}] = CodeSize::codeSize(_ast);
+	std::map<YulName, size_t> references = ReferencesCounter::countReferences(m_ast);
 	for (auto& statement: m_ast.statements)
 	{
 		if (!std::holds_alternative<FunctionDefinition>(statement))
@@ -83,10 +83,7 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 	}
 
 	// Check for memory guard.
-	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(
-		_ast,
-		"memoryguard"_yulstring
-	);
+	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(_ast, "memoryguard"_yulname);
 	// We will perform less aggressive inlining, if no ``memoryguard`` call is found.
 	if (!memoryGuardCalls.empty())
 		m_hasMemoryGuard = true;
@@ -104,7 +101,7 @@ 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.
-	std::map<YulString, size_t> depths = callDepths();
+	std::map<YulName, size_t> depths = callDepths();
 	std::vector<FunctionDefinition*> functions;
 	for (auto& statement: m_ast.statements)
 		if (std::holds_alternative<FunctionDefinition>(statement))
@@ -126,10 +123,10 @@ void FullInliner::run(Pass _pass)
 			handleBlock({}, std::get<Block>(statement));
 }
 
-std::map<YulString, size_t> FullInliner::callDepths() const
+std::map<YulName, size_t> FullInliner::callDepths() const
 {
 	CallGraph cg = CallGraphGenerator::callGraph(m_ast);
-	cg.functionCalls.erase(""_yulstring);
+	cg.functionCalls.erase(""_yulname);
 
 	// Remove calls to builtin functions.
 	for (auto& call: cg.functionCalls)
@@ -139,12 +136,12 @@ std::map<YulString, size_t> FullInliner::callDepths() const
 			else
 				++it;
 
-	std::map<YulString, size_t> depths;
+	std::map<YulName, size_t> depths;
 	size_t currentDepth = 0;
 
 	while (true)
 	{
-		std::vector<YulString> removed;
+		std::vector<YulName> removed;
 		for (auto it = cg.functionCalls.begin(); it != cg.functionCalls.end();)
 		{
 			auto const& [fun, callees] = *it;
@@ -159,7 +156,7 @@ std::map<YulString, size_t> FullInliner::callDepths() const
 		}
 
 		for (auto& call: cg.functionCalls)
-			for (YulString toBeRemoved: removed)
+			for (YulName toBeRemoved: removed)
 				ranges::actions::remove(call.second, toBeRemoved);
 
 		currentDepth++;
@@ -175,7 +172,7 @@ std::map<YulString, size_t> FullInliner::callDepths() const
 	return depths;
 }
 
-bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
+bool FullInliner::shallInline(FunctionCall const& _funCall, YulName _callSite)
 {
 	// No recursive inlining
 	if (_funCall.functionName.name == _callSite)
@@ -237,7 +234,7 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 	return (size < (aggressiveInlining ? 8u : 6u) || (constantArg && size < (aggressiveInlining ? 16u : 12u)));
 }
 
-void FullInliner::tentativelyUpdateCodeSize(YulString _function, YulString _callSite)
+void FullInliner::tentativelyUpdateCodeSize(YulName _function, YulName _callSite)
 {
 	m_functionSizes.at(_callSite) += m_functionSizes.at(_function);
 }
@@ -247,14 +244,14 @@ void FullInliner::updateCodeSize(FunctionDefinition const& _fun)
 	m_functionSizes[_fun.name] = CodeSize::codeSize(_fun.body);
 }
 
-void FullInliner::handleBlock(YulString _currentFunctionName, Block& _block)
+void FullInliner::handleBlock(YulName _currentFunctionName, Block& _block)
 {
 	InlineModifier{*this, m_nameDispenser, _currentFunctionName, m_dialect}(_block);
 }
 
 bool FullInliner::recursive(FunctionDefinition const& _fun) const
 {
-	std::map<YulString, size_t> references = ReferencesCounter::countReferences(_fun);
+	std::map<YulName, size_t> references = ReferencesCounter::countReferences(_fun);
 	return references[_fun.name] > 0;
 }
 
@@ -292,7 +289,7 @@ std::optional<std::vector<Statement>> InlineModifier::tryInlineStatement(Stateme
 std::vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionCall& _funCall)
 {
 	std::vector<Statement> newStatements;
-	std::map<YulString, YulString> variableReplacements;
+	std::map<YulName, YulName> variableReplacements;
 
 	FunctionDefinition* function = m_driver.function(_funCall.functionName.name);
 	assertThrow(!!function, OptimizerException, "Attempt to inline invalid function.");
@@ -302,7 +299,7 @@ std::vector<Statement> InlineModifier::performInline(Statement& _statement, Func
 	// helper function to create a new variable that is supposed to model
 	// an existing variable.
 	auto newVariable = [&](TypedName const& _existingVariable, Expression* _value) {
-		YulString newName = m_nameDispenser.newName(_existingVariable.name);
+		YulName newName = m_nameDispenser.newName(_existingVariable.name);
 		variableReplacements[_existingVariable.name] = newName;
 		VariableDeclaration varDecl{_funCall.debugData, {{_funCall.debugData, newName, _existingVariable.type}}, {}};
 		if (_value)
@@ -364,7 +361,7 @@ Statement BodyCopier::operator()(FunctionDefinition const&)
 	return {};
 }
 
-YulString BodyCopier::translateIdentifier(YulString _name)
+YulName BodyCopier::translateIdentifier(YulName _name)
 {
 	if (m_variableReplacements.count(_name))
 		return m_variableReplacements.at(_name);
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index 931315305c..e939070238 100644
--- a/libyul/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -75,9 +75,9 @@ class FullInliner: public ASTModifier
 
 	/// Inlining heuristic.
 	/// @param _callSite the name of the function in which the function call is located.
-	bool shallInline(FunctionCall const& _funCall, YulString _callSite);
+	bool shallInline(FunctionCall const& _funCall, YulName _callSite);
 
-	FunctionDefinition* function(YulString _name)
+	FunctionDefinition* function(YulName _name)
 	{
 		auto it = m_functions.find(_name);
 		if (it != m_functions.end())
@@ -88,7 +88,7 @@ class FullInliner: public ASTModifier
 	/// Adds the size of _funCall to the size of _callSite. This is just
 	/// a rough estimate that is done during inlining. The proper size
 	/// should be determined after inlining is completed.
-	void tentativelyUpdateCodeSize(YulString _function, YulString _callSite);
+	void tentativelyUpdateCodeSize(YulName _function, YulName _callSite);
 
 private:
 	enum Pass { InlineTiny, InlineRest };
@@ -98,28 +98,28 @@ class FullInliner: public ASTModifier
 
 	/// @returns a map containing the maximum depths of a call chain starting at each
 	/// function. For recursive functions, the value is one larger than for all others.
-	std::map<YulString, size_t> callDepths() const;
+	std::map<YulName, size_t> callDepths() const;
 
 	void updateCodeSize(FunctionDefinition const& _fun);
-	void handleBlock(YulString _currentFunctionName, Block& _block);
+	void handleBlock(YulName _currentFunctionName, Block& _block);
 	bool recursive(FunctionDefinition const& _fun) const;
 
 	Pass m_pass;
 	/// The AST to be modified. The root block itself will not be modified, because
 	/// we store pointers to functions.
 	Block& m_ast;
-	std::map<YulString, FunctionDefinition*> m_functions;
+	std::map<YulName, FunctionDefinition*> m_functions;
 	/// Functions not to be inlined (because they contain the ``leave`` statement).
-	std::set<YulString> m_noInlineFunctions;
+	std::set<YulName> 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;
+	std::set<YulName> m_recursiveFunctions;
 	/// Names of functions to always inline.
-	std::set<YulString> m_singleUse;
+	std::set<YulName> m_singleUse;
 	/// Variables that are constants (used for inlining heuristic)
-	std::set<YulString> m_constants;
-	std::map<YulString, size_t> m_functionSizes;
+	std::set<YulName> m_constants;
+	std::map<YulName, size_t> m_functionSizes;
 	NameDispenser& m_nameDispenser;
 	Dialect const& m_dialect;
 };
@@ -131,7 +131,7 @@ class FullInliner: public ASTModifier
 class InlineModifier: public ASTModifier
 {
 public:
-	InlineModifier(FullInliner& _driver, NameDispenser& _nameDispenser, YulString _functionName, Dialect const& _dialect):
+	InlineModifier(FullInliner& _driver, NameDispenser& _nameDispenser, YulName _functionName, Dialect const& _dialect):
 		m_currentFunction(std::move(_functionName)),
 		m_driver(_driver),
 		m_nameDispenser(_nameDispenser),
@@ -144,7 +144,7 @@ class InlineModifier: public ASTModifier
 	std::optional<std::vector<Statement>> tryInlineStatement(Statement& _statement);
 	std::vector<Statement> performInline(Statement& _statement, FunctionCall& _funCall);
 
-	YulString m_currentFunction;
+	YulName m_currentFunction;
 	FullInliner& m_driver;
 	NameDispenser& m_nameDispenser;
 	Dialect const& m_dialect;
@@ -160,7 +160,7 @@ class BodyCopier: public ASTCopier
 public:
 	BodyCopier(
 		NameDispenser& _nameDispenser,
-		std::map<YulString, YulString> _variableReplacements
+		std::map<YulName, YulName> _variableReplacements
 	):
 		m_nameDispenser(_nameDispenser),
 		m_variableReplacements(std::move(_variableReplacements))
@@ -171,10 +171,10 @@ class BodyCopier: public ASTCopier
 	Statement operator()(VariableDeclaration const& _varDecl) override;
 	Statement operator()(FunctionDefinition const& _funDef) override;
 
-	YulString translateIdentifier(YulString _name) override;
+	YulName translateIdentifier(YulName _name) override;
 
 	NameDispenser& m_nameDispenser;
-	std::map<YulString, YulString> m_variableReplacements;
+	std::map<YulName, YulName> m_variableReplacements;
 };
 
 
diff --git a/libyul/optimiser/FunctionCallFinder.cpp b/libyul/optimiser/FunctionCallFinder.cpp
index 99f171026e..aaf8b9f682 100644
--- a/libyul/optimiser/FunctionCallFinder.cpp
+++ b/libyul/optimiser/FunctionCallFinder.cpp
@@ -30,14 +30,14 @@ class MaybeConstFunctionCallFinder: Base
 {
 public:
 	using MaybeConstBlock = std::conditional_t<std::is_const_v<ResultType>, Block const, Block>;
-	static std::vector<ResultType*> run(MaybeConstBlock& _block, YulString const _functionName)
+	static std::vector<ResultType*> run(MaybeConstBlock& _block, YulName const _functionName)
 	{
 		MaybeConstFunctionCallFinder functionCallFinder(_functionName);
 		functionCallFinder(_block);
 		return functionCallFinder.m_calls;
 	}
 private:
-	explicit MaybeConstFunctionCallFinder(YulString const _functionName): m_functionName(_functionName), m_calls() {}
+	explicit MaybeConstFunctionCallFinder(YulName const _functionName): m_functionName(_functionName), m_calls() {}
 	using Base::operator();
 	void operator()(ResultType& _functionCall) override
 	{
@@ -45,17 +45,17 @@ class MaybeConstFunctionCallFinder: Base
 		if (_functionCall.functionName.name == m_functionName)
 			m_calls.emplace_back(&_functionCall);
 	}
-	YulString m_functionName;
+	YulName m_functionName;
 	std::vector<ResultType*> m_calls;
 };
 }
 
-std::vector<FunctionCall*> solidity::yul::findFunctionCalls(Block& _block, YulString _functionName)
+std::vector<FunctionCall*> solidity::yul::findFunctionCalls(Block& _block, YulName _functionName)
 {
 	return MaybeConstFunctionCallFinder<ASTModifier, FunctionCall>::run(_block, _functionName);
 }
 
-std::vector<FunctionCall const*> solidity::yul::findFunctionCalls(Block const& _block, YulString _functionName)
+std::vector<FunctionCall const*> solidity::yul::findFunctionCalls(Block const& _block, YulName _functionName)
 {
 	return MaybeConstFunctionCallFinder<ASTWalker, FunctionCall const>::run(_block, _functionName);
 }
diff --git a/libyul/optimiser/FunctionCallFinder.h b/libyul/optimiser/FunctionCallFinder.h
index a5d4da56e9..41a19fe99f 100644
--- a/libyul/optimiser/FunctionCallFinder.h
+++ b/libyul/optimiser/FunctionCallFinder.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <vector>
 
@@ -33,13 +33,13 @@ namespace solidity::yul
  *
  * Prerequisite: Disambiguator
  */
-std::vector<FunctionCall*> findFunctionCalls(Block& _block, YulString _functionName);
+std::vector<FunctionCall*> findFunctionCalls(Block& _block, YulName _functionName);
 
 /**
  * Finds all calls to a function of a given name using an ASTWalker.
  *
  * Prerequisite: Disambiguator
  */
-std::vector<FunctionCall const*> findFunctionCalls(Block const& _block, YulString _functionName);
+std::vector<FunctionCall const*> findFunctionCalls(Block const& _block, YulName _functionName);
 
 }
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
index 7e6d486327..49da50032d 100644
--- a/libyul/optimiser/FunctionSpecializer.cpp
+++ b/libyul/optimiser/FunctionSpecializer.cpp
@@ -24,7 +24,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 
 #include <libyul/AST.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libsolutil/CommonData.h>
 
 #include <range/v3/algorithm/any_of.hpp>
@@ -64,7 +64,7 @@ void FunctionSpecializer::operator()(FunctionCall& _f)
 
 	if (ranges::any_of(arguments, [](auto& _a) { return _a.has_value(); }))
 	{
-		YulString oldName = std::move(_f.functionName.name);
+		YulName oldName = std::move(_f.functionName.name);
 		auto newName = m_nameDispenser.newName(oldName);
 
 		m_oldToNewMap[oldName].emplace_back(std::make_pair(newName, arguments));
@@ -79,19 +79,19 @@ void FunctionSpecializer::operator()(FunctionCall& _f)
 
 FunctionDefinition FunctionSpecializer::specialize(
 	FunctionDefinition const& _f,
-	YulString _newName,
+	YulName _newName,
 	FunctionSpecializer::LiteralArguments _arguments
 )
 {
 	yulAssert(_arguments.size() == _f.parameters.size(), "");
 
-	std::map<YulString, YulString> translatedNames = applyMap(
+	std::map<YulName, YulName> translatedNames = applyMap(
 		NameCollector{_f, NameCollector::OnlyVariables}.names(),
-		[&](auto& _name) -> std::pair<YulString, YulString>
+		[&](auto& _name) -> std::pair<YulName, YulName>
 		{
 			return std::make_pair(_name, m_nameDispenser.newName(_name));
 		},
-		std::map<YulString, YulString>{}
+		std::map<YulName, YulName>{}
 	);
 
 	FunctionDefinition newFunction = std::get<FunctionDefinition>(FunctionCopier{translatedNames}(_f));
diff --git a/libyul/optimiser/FunctionSpecializer.h b/libyul/optimiser/FunctionSpecializer.h
index b922ece8b0..784ec4311e 100644
--- a/libyul/optimiser/FunctionSpecializer.h
+++ b/libyul/optimiser/FunctionSpecializer.h
@@ -67,7 +67,7 @@ class FunctionSpecializer: public ASTModifier
 
 private:
 	explicit FunctionSpecializer(
-		std::set<YulString> _recursiveFunctions,
+		std::set<YulName> _recursiveFunctions,
 		NameDispenser& _nameDispenser,
 		Dialect const& _dialect
 	):
@@ -96,15 +96,15 @@ class FunctionSpecializer: public ASTModifier
 	///
 	FunctionDefinition specialize(
 		FunctionDefinition const& _f,
-		YulString _newName,
+		YulName _newName,
 		FunctionSpecializer::LiteralArguments _arguments
 	);
 
 	/// A mapping between the old function name and a pair of new function name and its arguments.
 	/// Note that at least one of the argument will have a literal value.
-	std::map<YulString, std::vector<std::pair<YulString, LiteralArguments>>> m_oldToNewMap;
+	std::map<YulName, std::vector<std::pair<YulName, LiteralArguments>>> m_oldToNewMap;
 	/// We skip specializing recursive functions. Need backtracking to properly deal with them.
-	std::set<YulString> const m_recursiveFunctions;
+	std::set<YulName> const m_recursiveFunctions;
 
 	NameDispenser& m_nameDispenser;
 	Dialect const& m_dialect;
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
index 0bb4d368d8..d719302dcb 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@@ -43,7 +43,7 @@ void InlinableExpressionFunctionFinder::operator()(FunctionDefinition const& _fu
 {
 	if (_function.returnVariables.size() == 1 && _function.body.statements.size() == 1)
 	{
-		YulString retVariable = _function.returnVariables.front().name;
+		YulName retVariable = _function.returnVariables.front().name;
 		Statement const& bodyStatement = _function.body.statements.front();
 		if (std::holds_alternative<Assignment>(bodyStatement))
 		{
@@ -56,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 = std::set<YulString>{retVariable, _function.name};
+				m_disallowedIdentifiers = std::set<YulName>{retVariable, _function.name};
 				std::visit(*this, *assignment.value);
 				if (!m_foundDisallowedIdentifier)
 					m_inlinableFunctions[_function.name] = &_function;
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.h b/libyul/optimiser/InlinableExpressionFunctionFinder.h
index 587bdca911..e7210da69a 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.h
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.h
@@ -42,7 +42,7 @@ class InlinableExpressionFunctionFinder: public ASTWalker
 {
 public:
 
-	std::map<YulString, FunctionDefinition const*> const& inlinableFunctions() const
+	std::map<YulName, FunctionDefinition const*> const& inlinableFunctions() const
 	{
 		return m_inlinableFunctions;
 	}
@@ -53,15 +53,15 @@ class InlinableExpressionFunctionFinder: public ASTWalker
 	void operator()(FunctionDefinition const& _function) override;
 
 private:
-	void checkAllowed(YulString _name)
+	void checkAllowed(YulName _name)
 	{
 		if (m_disallowedIdentifiers.count(_name))
 			m_foundDisallowedIdentifier = true;
 	}
 
 	bool m_foundDisallowedIdentifier = false;
-	std::set<YulString> m_disallowedIdentifiers;
-	std::map<YulString, FunctionDefinition const*> m_inlinableFunctions;
+	std::set<YulName> m_disallowedIdentifiers;
+	std::map<YulName, FunctionDefinition const*> m_inlinableFunctions;
 };
 
 }
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 79eb2b3179..731f4b3b81 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -32,19 +32,19 @@
 using namespace solidity;
 using namespace solidity::yul;
 
-KnowledgeBase::KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues):
+KnowledgeBase::KnowledgeBase(std::map<YulName, AssignedValue> const& _ssaValues):
 	m_valuesAreSSA(true),
-	m_variableValues([_ssaValues](YulString _var) { return util::valueOrNullptr(_ssaValues, _var); })
+	m_variableValues([_ssaValues](YulName _var) { return util::valueOrNullptr(_ssaValues, _var); })
 {}
 
-bool KnowledgeBase::knownToBeDifferent(YulString _a, YulString _b)
+bool KnowledgeBase::knownToBeDifferent(YulName _a, YulName _b)
 {
 	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference != 0;
 	return false;
 }
 
-std::optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString _b)
+std::optional<u256> KnowledgeBase::differenceIfKnownConstant(YulName _a, YulName _b)
 {
 	VariableOffset offA = explore(_a);
 	VariableOffset offB = explore(_b);
@@ -55,7 +55,7 @@ std::optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulSt
 }
 
 
-bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
+bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulName _a, YulName _b)
 {
 	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference >= 32 && difference <= u256(0) - 32;
@@ -63,12 +63,12 @@ bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
 	return false;
 }
 
-bool KnowledgeBase::knownToBeZero(YulString _a)
+bool KnowledgeBase::knownToBeZero(YulName _a)
 {
 	return valueIfKnownConstant(_a) == 0;
 }
 
-std::optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
+std::optional<u256> KnowledgeBase::valueIfKnownConstant(YulName _a)
 {
 	return explore(_a).absoluteValue();
 }
@@ -83,7 +83,7 @@ std::optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expre
 		return std::nullopt;
 }
 
-KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
+KnowledgeBase::VariableOffset KnowledgeBase::explore(YulName _var)
 {
 	Expression const* value = nullptr;
 	if (m_valuesAreSSA)
@@ -113,12 +113,12 @@ KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
 {
 	if (Literal const* literal = std::get_if<Literal>(&_value))
-		return VariableOffset{YulString{}, literal->value.value()};
+		return VariableOffset{YulName{}, literal->value.value()};
 	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
 		return explore(identifier->name);
 	else if (FunctionCall const* f = std::get_if<FunctionCall>(&_value))
 	{
-		if (f->functionName.name == "add"_yulstring)
+		if (f->functionName.name == "add"_yulname)
 		{
 			if (std::optional<VariableOffset> a = explore(f->arguments[0]))
 				if (std::optional<VariableOffset> b = explore(f->arguments[1]))
@@ -132,13 +132,13 @@ std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression c
 						return VariableOffset{a->reference, offset};
 				}
 		}
-		else if (f->functionName.name == "sub"_yulstring)
+		else if (f->functionName.name == "sub"_yulname)
 			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)
-						return VariableOffset{YulString{}, offset};
+						return VariableOffset{YulName{}, offset};
 					else if (b->isAbsolute())
 						// b is constant
 						return VariableOffset{a->reference, offset};
@@ -148,7 +148,7 @@ std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression c
 	return std::nullopt;
 }
 
-Expression const* KnowledgeBase::valueOf(YulString _var)
+Expression const* KnowledgeBase::valueOf(YulName _var)
 {
 	AssignedValue const* assignedValue = m_variableValues(_var);
 	Expression const* currentValue = assignedValue ? assignedValue->value : nullptr;
@@ -162,7 +162,7 @@ Expression const* KnowledgeBase::valueOf(YulString _var)
 	return currentValue;
 }
 
-void KnowledgeBase::reset(YulString _var)
+void KnowledgeBase::reset(YulName _var)
 {
 	yulAssert(!m_valuesAreSSA);
 
@@ -174,16 +174,16 @@ void KnowledgeBase::reset(YulString _var)
 			m_groupMembers[offset->reference].erase(_var);
 		m_offsets.erase(_var);
 	}
-	if (std::set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
+	if (std::set<YulName>* group = util::valueOrNullptr(m_groupMembers, _var))
 	{
 		// _var was a representative, we might have to find a new one.
 		if (!group->empty())
 		{
-			YulString newRepresentative = *group->begin();
+			YulName newRepresentative = *group->begin();
 			yulAssert(newRepresentative != _var);
 			u256 newOffset = m_offsets[newRepresentative].offset;
 			// newOffset = newRepresentative - _var
-			for (YulString groupMember: *group)
+			for (YulName groupMember: *group)
 			{
 				yulAssert(m_offsets[groupMember].reference == _var);
 				m_offsets[groupMember].reference = newRepresentative;
@@ -200,7 +200,7 @@ void KnowledgeBase::reset(YulString _var)
 	}
 }
 
-KnowledgeBase::VariableOffset KnowledgeBase::setOffset(YulString _variable, VariableOffset _value)
+KnowledgeBase::VariableOffset KnowledgeBase::setOffset(YulName _variable, VariableOffset _value)
 {
 	m_offsets[_variable] = _value;
 	// Constants are not tracked in m_groupMembers because
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index f83c5ac661..46ea7b96af 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <libsolutil/Common.h>
 #include <libsolutil/Numeric.h>
@@ -55,34 +55,34 @@ struct AssignedValue;
  * representative variable of the group.
  *
  * There is a special group which is the constant values. Those use the
- * empty YulString as representative "variable".
+ * empty YulName as representative "variable".
  */
 class KnowledgeBase
 {
 public:
 	/// Constructor for arbitrary value callback that allows for variable values
 	/// to change in between calls to functions of this class.
-	explicit KnowledgeBase(std::function<AssignedValue const*(YulString)> _variableValues):
+	explicit KnowledgeBase(std::function<AssignedValue const*(YulName)> _variableValues):
 		m_variableValues(std::move(_variableValues))
 	{}
 	/// Constructor to use if source code is in SSA form and values are constant.
-	explicit KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues);
+	explicit KnowledgeBase(std::map<YulName, AssignedValue> const& _ssaValues);
 
-	bool knownToBeDifferent(YulString _a, YulString _b);
-	std::optional<u256> differenceIfKnownConstant(YulString _a, YulString _b);
-	bool knownToBeDifferentByAtLeast32(YulString _a, YulString _b);
-	bool knownToBeZero(YulString _a);
-	std::optional<u256> valueIfKnownConstant(YulString _a);
+	bool knownToBeDifferent(YulName _a, YulName _b);
+	std::optional<u256> differenceIfKnownConstant(YulName _a, YulName _b);
+	bool knownToBeDifferentByAtLeast32(YulName _a, YulName _b);
+	bool knownToBeZero(YulName _a);
+	std::optional<u256> valueIfKnownConstant(YulName _a);
 	std::optional<u256> valueIfKnownConstant(Expression const& _expression);
 
 private:
 	/**
 	 * Constant offset relative to a reference variable, or absolute constant if the
-	 * reference variable is the empty YulString.
+	 * reference variable is the empty YulName.
 	 */
 	struct VariableOffset
 	{
-		YulString reference;
+		YulName reference;
 		u256 offset;
 
 		bool isAbsolute() const
@@ -99,30 +99,30 @@ class KnowledgeBase
 		}
 	};
 
-	VariableOffset explore(YulString _var);
+	VariableOffset explore(YulName _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);
+	Expression const* valueOf(YulName _var);
 
 	/// Resets all information about the variable and removes it from its group,
 	/// potentially finding a new representative.
-	void reset(YulString _var);
+	void reset(YulName _var);
 
-	VariableOffset setOffset(YulString _variable, VariableOffset _value);
+	VariableOffset setOffset(YulName _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;
+	std::function<AssignedValue const*(YulName)> m_variableValues;
 
 	/// 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;
+	std::map<YulName, VariableOffset> m_offsets;
 	/// Last known value of each variable we queried.
-	std::map<YulString, Expression const*> m_lastKnownValue;
+	std::map<YulName, Expression const*> m_lastKnownValue;
 	/// For each representative, variables that use it to offset from.
-	std::map<YulString, std::set<YulString>> m_groupMembers;
+	std::map<YulName, std::set<YulName>> m_groupMembers;
 };
 
 }
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index 170eefc902..a7ee5dd0b9 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -87,7 +87,7 @@ void LoadResolver::tryResolve(
 	if (_arguments.empty() || !std::holds_alternative<Identifier>(_arguments.at(0)))
 		return;
 
-	YulString key = std::get<Identifier>(_arguments.at(0)).name;
+	YulName key = std::get<Identifier>(_arguments.at(0)).name;
 	if (_location == StoreLoadLocation::Storage)
 	{
 		if (auto value = storageValue(key))
@@ -137,7 +137,7 @@ void LoadResolver::tryEvaluateKeccak(
 	if (costOfLiteral > costOfKeccak)
 		return;
 
-	std::optional<YulString> value = memoryValue(memoryKey->name);
+	std::optional<YulName> value = memoryValue(memoryKey->name);
 	if (value && inScope(*value))
 	{
 		std::optional<u256> memoryContent = valueOfIdentifier(*value);
diff --git a/libyul/optimiser/LoadResolver.h b/libyul/optimiser/LoadResolver.h
index e56bc6c4a2..b4a4963033 100644
--- a/libyul/optimiser/LoadResolver.h
+++ b/libyul/optimiser/LoadResolver.h
@@ -49,7 +49,7 @@ class LoadResolver: public DataFlowAnalyzer
 private:
 	LoadResolver(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> _functionSideEffects,
+		std::map<YulName, SideEffects> _functionSideEffects,
 		bool _containsMSize,
 		std::optional<size_t> _expectedExecutionsPerDeployment
 	):
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
index da3c5e3e0a..2a196a68f9 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ b/libyul/optimiser/LoopInvariantCodeMotion.cpp
@@ -32,10 +32,10 @@ using namespace solidity::yul;
 
 void LoopInvariantCodeMotion::run(OptimiserStepContext& _context, Block& _ast)
 {
-	std::map<YulString, SideEffects> functionSideEffects =
+	std::map<YulName, SideEffects> functionSideEffects =
 		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast));
 	bool containsMSize = MSizeFinder::containsMSize(_context.dialect, _ast);
-	std::set<YulString> ssaVars = SSAValueTracker::ssaVariables(_ast);
+	std::set<YulName> ssaVars = SSAValueTracker::ssaVariables(_ast);
 	LoopInvariantCodeMotion{_context.dialect, ssaVars, functionSideEffects, containsMSize}(_ast);
 }
 
@@ -56,7 +56,7 @@ void LoopInvariantCodeMotion::operator()(Block& _block)
 
 bool LoopInvariantCodeMotion::canBePromoted(
 	VariableDeclaration const& _varDecl,
-	std::set<YulString> const& _varsDefinedInCurrentScope,
+	std::set<YulName> const& _varsDefinedInCurrentScope,
 	SideEffects const& _forLoopSideEffects
 ) const
 {
@@ -90,7 +90,7 @@ std::optional<std::vector<Statement>> LoopInvariantCodeMotion::rewriteLoop(ForLo
 	std::vector<Statement> replacement;
 	for (Block* block: {&_for.post, &_for.body})
 	{
-		std::set<YulString> varsDefinedInScope;
+		std::set<YulName> varsDefinedInScope;
 		util::iterateReplacing(
 			block->statements,
 			[&](Statement& _s) -> std::optional<std::vector<Statement>>
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.h b/libyul/optimiser/LoopInvariantCodeMotion.h
index 1b26479247..c85b87a01c 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.h
+++ b/libyul/optimiser/LoopInvariantCodeMotion.h
@@ -48,8 +48,8 @@ class LoopInvariantCodeMotion: public ASTModifier
 private:
 	explicit LoopInvariantCodeMotion(
 		Dialect const& _dialect,
-		std::set<YulString> const& _ssaVariables,
-		std::map<YulString, SideEffects> const& _functionSideEffects,
+		std::set<YulName> const& _ssaVariables,
+		std::map<YulName, SideEffects> const& _functionSideEffects,
 		bool _containsMSize
 	):
 		m_containsMSize(_containsMSize),
@@ -61,15 +61,15 @@ class LoopInvariantCodeMotion: public ASTModifier
 	/// @returns true if the given variable declaration can be moved to in front of the loop.
 	bool canBePromoted(
 		VariableDeclaration const& _varDecl,
-		std::set<YulString> const& _varsDefinedInCurrentScope,
+		std::set<YulName> const& _varsDefinedInCurrentScope,
 		SideEffects const& _forLoopSideEffects
 	) const;
 	std::optional<std::vector<Statement>> rewriteLoop(ForLoop& _for);
 
 	bool m_containsMSize = true;
 	Dialect const& m_dialect;
-	std::set<YulString> const& m_ssaVariables;
-	std::map<YulString, SideEffects> const& m_functionSideEffects;
+	std::set<YulName> const& m_ssaVariables;
+	std::map<YulName, SideEffects> const& m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index 2f1dee93ea..546c465b5c 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -199,7 +199,7 @@ void AssignmentCounter::operator()(Assignment const& _assignment)
 		++m_assignmentCounters[variable.name];
 }
 
-size_t AssignmentCounter::assignmentCount(YulString _name) const
+size_t AssignmentCounter::assignmentCount(YulName _name) const
 {
 	auto it = m_assignmentCounters.find(_name);
 	return (it == m_assignmentCounters.end()) ? 0 : it->second;
diff --git a/libyul/optimiser/Metrics.h b/libyul/optimiser/Metrics.h
index f86e3b28df..01ab1adbd7 100644
--- a/libyul/optimiser/Metrics.h
+++ b/libyul/optimiser/Metrics.h
@@ -139,9 +139,9 @@ class AssignmentCounter: public ASTWalker
 public:
 	using ASTWalker::operator();
 	void operator()(Assignment const& _assignment) override;
-	std::size_t assignmentCount(YulString _name) const;
+	std::size_t assignmentCount(YulName _name) const;
 private:
-	std::map<YulString, size_t> m_assignmentCounters;
+	std::map<YulName, size_t> m_assignmentCounters;
 };
 
 }
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index 7fb0c7ed28..d6db837f84 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -59,21 +59,21 @@ void ReferencesCounter::operator()(FunctionCall const& _funCall)
 	ASTWalker::operator()(_funCall);
 }
 
-std::map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block)
+std::map<YulName, size_t> ReferencesCounter::countReferences(Block const& _block)
 {
 	ReferencesCounter counter;
 	counter(_block);
 	return std::move(counter.m_references);
 }
 
-std::map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
+std::map<YulName, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
 {
 	ReferencesCounter counter;
 	counter(_function);
 	return std::move(counter.m_references);
 }
 
-std::map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression)
+std::map<YulName, size_t> ReferencesCounter::countReferences(Expression const& _expression)
 {
 	ReferencesCounter counter;
 	counter.visit(_expression);
@@ -85,28 +85,28 @@ void VariableReferencesCounter::operator()(Identifier const& _identifier)
 	++m_references[_identifier.name];
 }
 
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Block const& _block)
+std::map<YulName, size_t> VariableReferencesCounter::countReferences(Block const& _block)
 {
 	VariableReferencesCounter counter;
 	counter(_block);
 	return std::move(counter.m_references);
 }
 
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
+std::map<YulName, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
 {
 	VariableReferencesCounter counter;
 	counter(_function);
 	return std::move(counter.m_references);
 }
 
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
+std::map<YulName, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
 {
 	VariableReferencesCounter counter;
 	counter.visit(_expression);
 	return std::move(counter.m_references);
 }
 
-std::map<YulString, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
+std::map<YulName, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
 {
 	VariableReferencesCounter counter;
 	counter.visit(_statement);
@@ -138,9 +138,9 @@ void AssignmentsSinceContinue::operator()(FunctionDefinition const&)
 	yulAssert(false, "");
 }
 
-std::set<YulString> solidity::yul::assignedVariableNames(Block const& _code)
+std::set<YulName> solidity::yul::assignedVariableNames(Block const& _code)
 {
-	std::set<YulString> names;
+	std::set<YulName> names;
 	forEach<Assignment const>(_code, [&](Assignment const& _assignment) {
 		for (auto const& var: _assignment.variableNames)
 			names.emplace(var.name);
@@ -148,9 +148,9 @@ std::set<YulString> solidity::yul::assignedVariableNames(Block const& _code)
 	return names;
 }
 
-std::map<YulString, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
+std::map<YulName, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
 {
-	std::map<YulString, FunctionDefinition const*> result;
+	std::map<YulName, FunctionDefinition const*> result;
 	forEach<FunctionDefinition const>(_block, [&](FunctionDefinition const& _function) {
 		result[_function.name] = &_function;
 	});
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
index ad18e1e26b..0fc2e311ca 100644
--- a/libyul/optimiser/NameCollector.h
+++ b/libyul/optimiser/NameCollector.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
+#include <libyul/YulName.h>
 
 #include <map>
 #include <set>
@@ -59,9 +60,9 @@ class NameCollector: public ASTWalker
 	void operator()(VariableDeclaration const& _varDecl) override;
 	void operator()(FunctionDefinition const& _funDef) override;
 
-	std::set<YulString> names() const { return m_names; }
+	std::set<YulName> names() const { return m_names; }
 private:
-	std::set<YulString> m_names;
+	std::set<YulName> m_names;
 	CollectWhat m_collectWhat = VariablesAndFunctions;
 };
 
@@ -75,12 +76,12 @@ class ReferencesCounter: public ASTWalker
 	void operator()(Identifier const& _identifier) override;
 	void operator()(FunctionCall const& _funCall) override;
 
-	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<YulName, size_t> countReferences(Block const& _block);
+	static std::map<YulName, size_t> countReferences(FunctionDefinition const& _function);
+	static std::map<YulName, size_t> countReferences(Expression const& _expression);
 
 private:
-	std::map<YulString, size_t> m_references;
+	std::map<YulName, size_t> m_references;
 };
 
 /**
@@ -92,13 +93,13 @@ class VariableReferencesCounter: public ASTWalker
 	using ASTWalker::operator ();
 	void operator()(Identifier const& _identifier) override;
 
-	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);
+	static std::map<YulName, size_t> countReferences(Block const& _block);
+	static std::map<YulName, size_t> countReferences(FunctionDefinition const& _function);
+	static std::map<YulName, size_t> countReferences(Expression const& _expression);
+	static std::map<YulName, size_t> countReferences(Statement const& _statement);
 
 private:
-	std::map<YulString, size_t> m_references;
+	std::map<YulName, size_t> m_references;
 };
 
 /**
@@ -117,21 +118,21 @@ class AssignmentsSinceContinue: public ASTWalker
 	void operator()(Assignment const& _assignment) override;
 	void operator()(FunctionDefinition const& _funDef) override;
 
-	std::set<YulString> const& names() const { return m_names; }
+	std::set<YulName> const& names() const { return m_names; }
 	bool empty() const noexcept { return m_names.empty(); }
 
 private:
 	size_t m_forLoopDepth = 0;
 	bool m_continueFound = false;
-	std::set<YulString> m_names;
+	std::set<YulName> 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);
+std::set<YulName> assignedVariableNames(Block const& _code);
 
 /// @returns all function definitions anywhere in the AST.
 /// Requires disambiguated source.
-std::map<YulString, FunctionDefinition const*> allFunctionDefinitions(Block const& _block);
+std::map<YulName, FunctionDefinition const*> allFunctionDefinitions(Block const& _block);
 
 }
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index 3a8db5ee44..c2b6b9847f 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -25,7 +25,6 @@
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
-#include <libyul/YulString.h>
 
 #include <libsolutil/CommonData.h>
 
@@ -33,31 +32,31 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulString> _reservedNames):
+NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulName> _reservedNames):
 	NameDispenser(_dialect, NameCollector(_ast).names() + _reservedNames)
 {
 	m_reservedNames = std::move(_reservedNames);
 }
 
-NameDispenser::NameDispenser(Dialect const& _dialect, std::set<YulString> _usedNames):
+NameDispenser::NameDispenser(Dialect const& _dialect, std::set<YulName> _usedNames):
 	m_dialect(_dialect),
 	m_usedNames(std::move(_usedNames))
 {
 }
 
-YulString NameDispenser::newName(YulString _nameHint)
+YulName NameDispenser::newName(YulName _nameHint)
 {
-	YulString name = _nameHint;
+	YulName name = _nameHint;
 	while (illegalName(name))
 	{
 		m_counter++;
-		name = YulString(_nameHint.str() + "_" + std::to_string(m_counter));
+		name = YulName(_nameHint.str() + "_" + std::to_string(m_counter));
 	}
 	m_usedNames.emplace(name);
 	return name;
 }
 
-bool NameDispenser::illegalName(YulString _name)
+bool NameDispenser::illegalName(YulName _name)
 {
 	return isRestrictedIdentifier(m_dialect, _name) || m_usedNames.count(_name);
 }
diff --git a/libyul/optimiser/NameDispenser.h b/libyul/optimiser/NameDispenser.h
index 6e655e416b..3da50359a7 100644
--- a/libyul/optimiser/NameDispenser.h
+++ b/libyul/optimiser/NameDispenser.h
@@ -22,7 +22,7 @@
 
 #include <libyul/ASTForward.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <set>
 
@@ -40,21 +40,21 @@ class NameDispenser
 {
 public:
 	/// Initialize the name dispenser with all the names used in the given AST.
-	explicit NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulString> _reservedNames = {});
+	explicit NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulName> _reservedNames = {});
 	/// Initialize the name dispenser with the given used names.
-	explicit NameDispenser(Dialect const& _dialect, std::set<YulString> _usedNames);
+	explicit NameDispenser(Dialect const& _dialect, std::set<YulName> _usedNames);
 
 	/// @returns a currently unused name that should be similar to _nameHint.
-	YulString newName(YulString _nameHint);
+	YulName newName(YulName _nameHint);
 
 	/// Mark @a _name as used, i.e. the dispenser's newName function will not
 	/// return it.
-	void markUsed(YulString _name) { m_usedNames.insert(_name); }
+	void markUsed(YulName _name) { m_usedNames.insert(_name); }
 
-	std::set<YulString> const& usedNames() { return m_usedNames; }
+	std::set<YulName> const& usedNames() { return m_usedNames; }
 
 	/// Returns true if `_name` is either used or is a restricted identifier.
-	bool illegalName(YulString _name);
+	bool illegalName(YulName _name);
 
 	/// Resets `m_usedNames` with *only* the names that are used in the AST. Also resets value of
 	/// `m_counter` to zero.
@@ -62,8 +62,8 @@ class NameDispenser
 
 private:
 	Dialect const& m_dialect;
-	std::set<YulString> m_usedNames;
-	std::set<YulString> m_reservedNames;
+	std::set<YulName> m_usedNames;
+	std::set<YulName> m_reservedNames;
 	size_t m_counter = 0;
 };
 
diff --git a/libyul/optimiser/NameDisplacer.cpp b/libyul/optimiser/NameDisplacer.cpp
index 4d0d217d86..fd813fbfc2 100644
--- a/libyul/optimiser/NameDisplacer.cpp
+++ b/libyul/optimiser/NameDisplacer.cpp
@@ -69,14 +69,14 @@ void NameDisplacer::operator()(Block& _block)
 	ASTModifier::operator()(_block);
 }
 
-void NameDisplacer::checkAndReplaceNew(YulString& _name)
+void NameDisplacer::checkAndReplaceNew(YulName& _name)
 {
 	yulAssert(!m_translations.count(_name), "");
 	if (m_namesToFree.count(_name))
 		_name = (m_translations[_name] = m_nameDispenser.newName(_name));
 }
 
-void NameDisplacer::checkAndReplace(YulString& _name) const
+void NameDisplacer::checkAndReplace(YulName& _name) const
 {
 	if (m_translations.count(_name))
 		_name = m_translations.at(_name);
diff --git a/libyul/optimiser/NameDisplacer.h b/libyul/optimiser/NameDisplacer.h
index 336dd04e42..3312e203d7 100644
--- a/libyul/optimiser/NameDisplacer.h
+++ b/libyul/optimiser/NameDisplacer.h
@@ -44,12 +44,12 @@ class NameDisplacer: public ASTModifier
 public:
 	explicit NameDisplacer(
 		NameDispenser& _dispenser,
-		std::set<YulString> const& _namesToFree
+		std::set<YulName> const& _namesToFree
 	):
 		m_nameDispenser(_dispenser),
 		m_namesToFree(_namesToFree)
 	{
-		for (YulString n: _namesToFree)
+		for (YulName n: _namesToFree)
 			m_nameDispenser.markUsed(n);
 	}
 
@@ -60,17 +60,17 @@ class NameDisplacer: public ASTModifier
 	void operator()(FunctionCall& _funCall) override;
 	void operator()(Block& _block) override;
 
-	std::map<YulString, YulString> const& translations() const { return m_translations; }
+	std::map<YulName, YulName> const& translations() const { return m_translations; }
 
 protected:
 	/// Check if the newly introduced identifier @a _name has to be replaced.
-	void checkAndReplaceNew(YulString& _name);
+	void checkAndReplaceNew(YulName& _name);
 	/// Replace the identifier @a _name if it is in the translation map.
-	void checkAndReplace(YulString& _name) const;
+	void checkAndReplace(YulName& _name) const;
 
 	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_namesToFree;
-	std::map<YulString, YulString> m_translations;
+	std::set<YulName> const& m_namesToFree;
+	std::map<YulName, YulName> m_translations;
 };
 
 }
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
index f7d7325477..f03a448f0d 100644
--- a/libyul/optimiser/NameSimplifier.cpp
+++ b/libyul/optimiser/NameSimplifier.cpp
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 
@@ -32,10 +32,10 @@ using namespace solidity::yul;
 NameSimplifier::NameSimplifier(OptimiserStepContext& _context, Block const& _ast):
 	m_context(_context)
 {
-	for (YulString name: _context.reservedIdentifiers)
+	for (YulName name: _context.reservedIdentifiers)
 		m_translations[name] = name;
 
-	for (YulString const& name: NameCollector(_ast).names())
+	for (YulName const& name: NameCollector(_ast).names())
 		findSimplification(name);
 }
 
@@ -72,7 +72,7 @@ void NameSimplifier::operator()(FunctionCall& _funCall)
 	ASTModifier::operator()(_funCall);
 }
 
-void NameSimplifier::findSimplification(YulString const& _name)
+void NameSimplifier::findSimplification(YulName const& _name)
 {
 	if (m_translations.count(_name))
 		return;
@@ -102,19 +102,19 @@ void NameSimplifier::findSimplification(YulString const& _name)
 	for (auto const& [pattern, substitute]: replacements)
 	{
 		std::string candidate = regex_replace(name, pattern, substitute);
-		if (!candidate.empty() && !m_context.dispenser.illegalName(YulString(candidate)))
+		if (!candidate.empty() && !m_context.dispenser.illegalName(YulName(candidate)))
 			name = candidate;
 	}
 
 	if (name != _name.str())
 	{
-		YulString newName{name};
+		YulName newName{name};
 		m_context.dispenser.markUsed(newName);
 		m_translations[_name] = std::move(newName);
 	}
 }
 
-void NameSimplifier::translate(YulString& _name)
+void NameSimplifier::translate(YulName& _name)
 {
 	auto it = m_translations.find(_name);
 	if (it != m_translations.end())
diff --git a/libyul/optimiser/NameSimplifier.h b/libyul/optimiser/NameSimplifier.h
index 34cf694511..848e61f567 100644
--- a/libyul/optimiser/NameSimplifier.h
+++ b/libyul/optimiser/NameSimplifier.h
@@ -20,7 +20,7 @@
 
 #include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
 #include <map>
@@ -62,11 +62,11 @@ class NameSimplifier: public ASTModifier
 	/// Tries to rename a list of variables.
 	void renameVariables(std::vector<TypedName>& _variables);
 
-	void findSimplification(YulString const& _name);
-	void translate(YulString& _name);
+	void findSimplification(YulName const& _name);
+	void translate(YulName& _name);
 
 	OptimiserStepContext& m_context;
-	std::map<YulString, YulString> m_translations;
+	std::map<YulName, YulName> m_translations;
 };
 
 }
diff --git a/libyul/optimiser/OptimiserStep.h b/libyul/optimiser/OptimiserStep.h
index e3e5fe4c60..89bfcef814 100644
--- a/libyul/optimiser/OptimiserStep.h
+++ b/libyul/optimiser/OptimiserStep.h
@@ -29,14 +29,13 @@ namespace solidity::yul
 
 struct Dialect;
 struct Block;
-class YulString;
 class NameDispenser;
 
 struct OptimiserStepContext
 {
 	Dialect const& dialect;
 	NameDispenser& dispenser;
-	std::set<YulString> const& reservedIdentifiers;
+	std::set<YulName> const& reservedIdentifiers;
 	/// The value nullopt represents creation code
 	std::optional<size_t> expectedExecutionsPerDeployment;
 };
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index bfa3d888f1..19f262060f 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -55,12 +55,12 @@ void yul::removeEmptyBlocks(Block& _block)
 	ranges::actions::remove_if(_block.statements, isEmptyBlock);
 }
 
-bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier)
+bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulName const& _identifier)
 {
 	return _identifier.empty() || hasLeadingOrTrailingDot(_identifier.str()) || TokenTraits::isYulKeyword(_identifier.str()) || _dialect.reservedIdentifier(_identifier);
 }
 
-std::optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulString const& _name)
+std::optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulName const& _name)
 {
 	if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
 		if (BuiltinFunctionForEVM const* builtin = dialect->builtin(_name))
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index cb07f7a530..911a1be0a8 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -24,7 +24,7 @@
 #include <libsolutil/Common.h>
 #include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <liblangutil/EVMVersion.h>
 
@@ -45,10 +45,10 @@ void removeEmptyBlocks(Block& _block);
 
 /// Returns true if a given literal can not be used as an identifier.
 /// This includes Yul keywords and builtins of the given dialect.
-bool isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier);
+bool isRestrictedIdentifier(Dialect const& _dialect, YulName const& _identifier);
 
 /// Helper function that returns the instruction, if the `_name` is a BuiltinFunction
-std::optional<evmasm::Instruction> toEVMInstruction(Dialect const& _dialect, YulString const& _name);
+std::optional<evmasm::Instruction> toEVMInstruction(Dialect const& _dialect, YulName const& _name);
 
 /// Helper function that returns the EVM version from a dialect.
 /// It returns the default EVM version if dialect is not an EVMDialect.
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index db6920f243..fe33b10a22 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -31,7 +31,7 @@
 using namespace solidity;
 using namespace solidity::yul;
 
-void Rematerialiser::run(Dialect const& _dialect, Block& _ast, std::set<YulString> _varsToAlwaysRematerialize, bool _onlySelectedVariables)
+void Rematerialiser::run(Dialect const& _dialect, Block& _ast, std::set<YulName> _varsToAlwaysRematerialize, bool _onlySelectedVariables)
 {
 	Rematerialiser{_dialect, _ast, std::move(_varsToAlwaysRematerialize), _onlySelectedVariables}(_ast);
 }
@@ -39,7 +39,7 @@ void Rematerialiser::run(Dialect const& _dialect, Block& _ast, std::set<YulStrin
 Rematerialiser::Rematerialiser(
 	Dialect const& _dialect,
 	Block& _ast,
-	std::set<YulString> _varsToAlwaysRematerialize,
+	std::set<YulName> _varsToAlwaysRematerialize,
 	bool _onlySelectedVariables
 ):
 	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore),
@@ -54,7 +54,7 @@ void Rematerialiser::visit(Expression& _e)
 	if (std::holds_alternative<Identifier>(_e))
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
-		YulString name = identifier.name;
+		YulName name = identifier.name;
 		if (AssignedValue const* value = variableValue(name))
 		{
 			assertThrow(value->value, OptimizerException, "");
@@ -93,7 +93,7 @@ void LiteralRematerialiser::visit(Expression& _e)
 	if (std::holds_alternative<Identifier>(_e))
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
-		YulString name = identifier.name;
+		YulName name = identifier.name;
 		if (AssignedValue const* value = variableValue(name))
 		{
 			assertThrow(value->value, OptimizerException, "");
diff --git a/libyul/optimiser/Rematerialiser.h b/libyul/optimiser/Rematerialiser.h
index 9ee5209fdf..a482ef53e0 100644
--- a/libyul/optimiser/Rematerialiser.h
+++ b/libyul/optimiser/Rematerialiser.h
@@ -50,7 +50,7 @@ class Rematerialiser: public DataFlowAnalyzer
 	static void run(
 		Dialect const& _dialect,
 		Block& _ast,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
+		std::set<YulName> _varsToAlwaysRematerialize = {},
 		bool _onlySelectedVariables = false
 	);
 
@@ -58,7 +58,7 @@ class Rematerialiser: public DataFlowAnalyzer
 	Rematerialiser(
 		Dialect const& _dialect,
 		Block& _ast,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
+		std::set<YulName> _varsToAlwaysRematerialize = {},
 		bool _onlySelectedVariables = false
 	);
 
@@ -67,8 +67,8 @@ class Rematerialiser: public DataFlowAnalyzer
 	using ASTModifier::visit;
 	void visit(Expression& _e) override;
 
-	std::map<YulString, size_t> m_referenceCounts;
-	std::set<YulString> m_varsToAlwaysRematerialize;
+	std::map<YulName, size_t> m_referenceCounts;
+	std::set<YulName> m_varsToAlwaysRematerialize;
 	bool m_onlySelectedVariables = false;
 };
 
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index dba2f6f046..80abdf7e65 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -46,7 +46,7 @@ class IntroduceSSA: public ASTModifier
 public:
 	explicit IntroduceSSA(
 		NameDispenser& _nameDispenser,
-		std::set<YulString> const& _variablesToReplace,
+		std::set<YulName> const& _variablesToReplace,
 		TypeInfo& _typeInfo
 	):
 		m_nameDispenser(_nameDispenser),
@@ -58,7 +58,7 @@ class IntroduceSSA: public ASTModifier
 
 private:
 	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_variablesToReplace;
+	std::set<YulName> const& m_variablesToReplace;
 	TypeInfo const& m_typeInfo;
 };
 
@@ -90,8 +90,8 @@ void IntroduceSSA::operator()(Block& _block)
 				TypedNameList newVariables;
 				for (auto const& var: varDecl.variables)
 				{
-					YulString oldName = var.name;
-					YulString newName = m_nameDispenser.newName(oldName);
+					YulName oldName = var.name;
+					YulName newName = m_nameDispenser.newName(oldName);
 					newVariables.emplace_back(TypedName{debugData, newName, var.type});
 					statements.emplace_back(VariableDeclaration{
 						debugData,
@@ -117,8 +117,8 @@ void IntroduceSSA::operator()(Block& _block)
 				TypedNameList newVariables;
 				for (auto const& var: assignment.variableNames)
 				{
-					YulString oldName = var.name;
-					YulString newName = m_nameDispenser.newName(oldName);
+					YulName oldName = var.name;
+					YulName newName = m_nameDispenser.newName(oldName);
 					newVariables.emplace_back(TypedName{debugData,
 						newName,
 						m_typeInfo.typeOfVariable(oldName)
@@ -148,7 +148,7 @@ class IntroduceControlFlowSSA: public ASTModifier
 public:
 	explicit IntroduceControlFlowSSA(
 		NameDispenser& _nameDispenser,
-		std::set<YulString> const& _variablesToReplace,
+		std::set<YulName> const& _variablesToReplace,
 		TypeInfo const& _typeInfo
 	):
 		m_nameDispenser(_nameDispenser),
@@ -163,19 +163,19 @@ class IntroduceControlFlowSSA: public ASTModifier
 
 private:
 	NameDispenser& m_nameDispenser;
-	std::set<YulString> const& m_variablesToReplace;
+	std::set<YulName> const& m_variablesToReplace;
 	/// Variables (that are to be replaced) currently in scope.
-	std::set<YulString> m_variablesInScope;
+	std::set<YulName> m_variablesInScope;
 	/// Variables that do not have a specific value.
-	util::UniqueVector<YulString> m_variablesToReassign;
+	util::UniqueVector<YulName> m_variablesToReassign;
 	TypeInfo const& m_typeInfo;
 };
 
 void IntroduceControlFlowSSA::operator()(FunctionDefinition& _function)
 {
-	std::set<YulString> varsInScope;
+	std::set<YulName> varsInScope;
 	std::swap(varsInScope, m_variablesInScope);
-	util::UniqueVector<YulString> toReassign;
+	util::UniqueVector<YulName> toReassign;
 	std::swap(toReassign, m_variablesToReassign);
 
 	for (auto const& param: _function.parameters)
@@ -207,7 +207,7 @@ void IntroduceControlFlowSSA::operator()(Switch& _switch)
 {
 	yulAssert(m_variablesToReassign.empty(), "");
 
-	util::UniqueVector<YulString> toReassign;
+	util::UniqueVector<YulName> toReassign;
 	for (auto& c: _switch.cases)
 	{
 		(*this)(c.body);
@@ -219,17 +219,17 @@ void IntroduceControlFlowSSA::operator()(Switch& _switch)
 
 void IntroduceControlFlowSSA::operator()(Block& _block)
 {
-	util::UniqueVector<YulString> variablesDeclaredHere;
-	util::UniqueVector<YulString> assignedVariables;
+	util::UniqueVector<YulName> variablesDeclaredHere;
+	util::UniqueVector<YulName> assignedVariables;
 
 	util::iterateReplacing(
 		_block.statements,
 		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
 			std::vector<Statement> toPrepend;
-			for (YulString toReassign: m_variablesToReassign)
+			for (YulName toReassign: m_variablesToReassign)
 			{
-				YulString newName = m_nameDispenser.newName(toReassign);
+				YulName newName = m_nameDispenser.newName(toReassign);
 				toPrepend.emplace_back(VariableDeclaration{
 					debugDataOf(_s),
 					{TypedName{debugDataOf(_s), newName, m_typeInfo.typeOfVariable(toReassign)}},
@@ -281,7 +281,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 class PropagateValues: public ASTModifier
 {
 public:
-	explicit PropagateValues(std::set<YulString> const& _variablesToReplace):
+	explicit PropagateValues(std::set<YulName> const& _variablesToReplace):
 		m_variablesToReplace(_variablesToReplace)
 	{ }
 
@@ -294,9 +294,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.
-	std::set<YulString> const& m_variablesToReplace;
-	std::map<YulString, YulString> m_currentVariableValues;
-	std::set<YulString> m_clearAtEndOfBlock;
+	std::set<YulName> const& m_variablesToReplace;
+	std::map<YulName, YulName> m_currentVariableValues;
+	std::set<YulName> m_clearAtEndOfBlock;
 };
 
 void PropagateValues::operator()(Identifier& _identifier)
@@ -312,7 +312,7 @@ void PropagateValues::operator()(VariableDeclaration& _varDecl)
 	if (_varDecl.variables.size() != 1)
 		return;
 
-	YulString variable = _varDecl.variables.front().name;
+	YulName variable = _varDecl.variables.front().name;
 	if (m_variablesToReplace.count(variable))
 	{
 		// `let a := a_1` - regular declaration of non-SSA variable
@@ -323,7 +323,7 @@ void PropagateValues::operator()(VariableDeclaration& _varDecl)
 	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;
+		YulName value = std::get<Identifier>(*_varDecl.value).name;
 		if (m_variablesToReplace.count(value))
 		{
 			// This is safe because `a_1` is not a "variable to replace" and thus
@@ -341,7 +341,7 @@ void PropagateValues::operator()(Assignment& _assignment)
 
 	if (_assignment.variableNames.size() != 1)
 		return;
-	YulString name = _assignment.variableNames.front().name;
+	YulName name = _assignment.variableNames.front().name;
 	if (!m_variablesToReplace.count(name))
 		return;
 
@@ -364,7 +364,7 @@ void PropagateValues::operator()(ForLoop& _for)
 
 void PropagateValues::operator()(Block& _block)
 {
-	std::set<YulString> clearAtParentBlock = std::move(m_clearAtEndOfBlock);
+	std::set<YulName> clearAtParentBlock = std::move(m_clearAtEndOfBlock);
 	m_clearAtEndOfBlock.clear();
 
 	ASTModifier::operator()(_block);
@@ -380,7 +380,7 @@ void PropagateValues::operator()(Block& _block)
 void SSATransform::run(OptimiserStepContext& _context, Block& _ast)
 {
 	TypeInfo typeInfo(_context.dialect, _ast);
-	std::set<YulString> assignedVariables = assignedVariableNames(_ast);
+	std::set<YulName> 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 1d25cb54b5..d39ce4b8d2 100644
--- a/libyul/optimiser/SSAValueTracker.cpp
+++ b/libyul/optimiser/SSAValueTracker.cpp
@@ -49,17 +49,17 @@ void SSAValueTracker::operator()(VariableDeclaration const& _varDecl)
 		setValue(_varDecl.variables.front().name, _varDecl.value.get());
 }
 
-std::set<YulString> SSAValueTracker::ssaVariables(Block const& _ast)
+std::set<YulName> SSAValueTracker::ssaVariables(Block const& _ast)
 {
 	SSAValueTracker t;
 	t(_ast);
-	std::set<YulString> ssaVars;
+	std::set<YulName> ssaVars;
 	for (auto const& value: t.values())
 		ssaVars.insert(value.first);
 	return ssaVars;
 }
 
-void SSAValueTracker::setValue(YulString _name, Expression const* _value)
+void SSAValueTracker::setValue(YulName _name, Expression const* _value)
 {
 	assertThrow(
 		m_values.count(_name) == 0,
diff --git a/libyul/optimiser/SSAValueTracker.h b/libyul/optimiser/SSAValueTracker.h
index 5a7eee5124..0196ecc40e 100644
--- a/libyul/optimiser/SSAValueTracker.h
+++ b/libyul/optimiser/SSAValueTracker.h
@@ -47,18 +47,18 @@ class SSAValueTracker: public ASTWalker
 	void operator()(VariableDeclaration const& _varDecl) override;
 	void operator()(Assignment const& _assignment) override;
 
-	std::map<YulString, Expression const*> const& values() const { return m_values; }
-	Expression const* value(YulString _name) const { return m_values.at(_name); }
+	std::map<YulName, Expression const*> const& values() const { return m_values; }
+	Expression const* value(YulName _name) const { return m_values.at(_name); }
 
-	static std::set<YulString> ssaVariables(Block const& _ast);
+	static std::set<YulName> ssaVariables(Block const& _ast);
 
 private:
-	void setValue(YulString _name, Expression const* _value);
+	void setValue(YulName _name, Expression const* _value);
 
 	/// Special expression whose address will be used in m_values.
-	/// YulString does not need to be reset because SSAValueTracker is short-lived.
+	/// YulName does not need to be reset because SSAValueTracker is short-lived.
 	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
-	std::map<YulString, Expression const*> m_values;
+	std::map<YulName, Expression const*> m_values;
 };
 
 }
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 5d375b1454..7dbbb676b4 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -40,7 +40,7 @@ using namespace solidity::yul;
 SideEffectsCollector::SideEffectsCollector(
 		Dialect const& _dialect,
 		Expression const& _expression,
-		std::map<YulString, SideEffects> const* _functionSideEffects
+		std::map<YulName, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -56,7 +56,7 @@ SideEffectsCollector::SideEffectsCollector(Dialect const& _dialect, Statement co
 SideEffectsCollector::SideEffectsCollector(
 	Dialect const& _dialect,
 	Block const& _ast,
-	std::map<YulString, SideEffects> const* _functionSideEffects
+	std::map<YulName, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -66,7 +66,7 @@ SideEffectsCollector::SideEffectsCollector(
 SideEffectsCollector::SideEffectsCollector(
 	Dialect const& _dialect,
 	ForLoop const& _ast,
-	std::map<YulString, SideEffects> const* _functionSideEffects
+	std::map<YulName, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -77,7 +77,7 @@ void SideEffectsCollector::operator()(FunctionCall const& _functionCall)
 {
 	ASTWalker::operator()(_functionCall);
 
-	YulString functionName = _functionCall.functionName.name;
+	YulName functionName = _functionCall.functionName.name;
 	if (BuiltinFunction const* f = m_dialect.builtin(functionName))
 		m_sideEffects += f->sideEffects;
 	else if (m_functionSideEffects && m_functionSideEffects->count(functionName))
@@ -115,7 +115,7 @@ void MSizeFinder::operator()(FunctionCall const& _functionCall)
 			m_msizeFound = true;
 }
 
-std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
+std::map<YulName, SideEffects> SideEffectsPropagator::sideEffects(
 	Dialect const& _dialect,
 	CallGraph const& _directCallGraph
 )
@@ -126,7 +126,7 @@ std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
 	// In the future, we should refine that, because the property
 	// is actually a bit different from "not movable".
 
-	std::map<YulString, SideEffects> ret;
+	std::map<YulName, SideEffects> ret;
 	for (auto const& function: _directCallGraph.functionsWithLoops + _directCallGraph.recursiveFunctions())
 	{
 		ret[function].movable = false;
@@ -137,9 +137,9 @@ std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
 
 	for (auto const& call: _directCallGraph.functionCalls)
 	{
-		YulString funName = call.first;
+		YulName funName = call.first;
 		SideEffects sideEffects;
-		auto _visit = [&, visited = std::set<YulString>{}](YulString _function, auto&& _recurse) mutable {
+		auto _visit = [&, visited = std::set<YulName>{}](YulName _function, auto&& _recurse) mutable {
 			if (!visited.insert(_function).second)
 				return;
 			if (sideEffects == SideEffects::worst())
@@ -150,7 +150,7 @@ std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
 			{
 				if (ret.count(_function))
 					sideEffects += ret[_function];
-				for (YulString callee: _directCallGraph.functionCalls.at(_function))
+				for (YulName callee: _directCallGraph.functionCalls.at(_function))
 					_recurse(callee, _recurse);
 			}
 		};
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index df8ae17a58..1d0018897c 100644
--- a/libyul/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -42,23 +42,23 @@ class SideEffectsCollector: public ASTWalker
 public:
 	explicit SideEffectsCollector(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr
 	): m_dialect(_dialect), m_functionSideEffects(_functionSideEffects) {}
 	SideEffectsCollector(
 		Dialect const& _dialect,
 		Expression const& _expression,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr
 	);
 	SideEffectsCollector(Dialect const& _dialect, Statement const& _statement);
 	SideEffectsCollector(
 		Dialect const& _dialect,
 		Block const& _ast,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr
 	);
 	SideEffectsCollector(
 		Dialect const& _dialect,
 		ForLoop const& _ast,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr
 	);
 
 	using ASTWalker::operator();
@@ -117,7 +117,7 @@ class SideEffectsCollector: public ASTWalker
 
 private:
 	Dialect const& m_dialect;
-	std::map<YulString, SideEffects> const* m_functionSideEffects = nullptr;
+	std::map<YulName, SideEffects> const* m_functionSideEffects = nullptr;
 	SideEffects m_sideEffects;
 };
 
@@ -130,7 +130,7 @@ class SideEffectsCollector: public ASTWalker
 class SideEffectsPropagator
 {
 public:
-	static std::map<YulString, SideEffects> sideEffects(
+	static std::map<YulName, SideEffects> sideEffects(
 		Dialect const& _dialect,
 		CallGraph const& _directCallGraph
 	);
@@ -195,7 +195,7 @@ class MovableChecker: public SideEffectsCollector
 public:
 	explicit MovableChecker(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr
 	): SideEffectsCollector(_dialect, _functionSideEffects) {}
 	MovableChecker(Dialect const& _dialect, Expression const& _expression);
 
@@ -205,11 +205,11 @@ class MovableChecker: public SideEffectsCollector
 	void visit(Statement const&) override;
 	using ASTWalker::visit;
 
-	std::set<YulString> const& referencedVariables() const { return m_variableReferences; }
+	std::set<YulName> const& referencedVariables() const { return m_variableReferences; }
 
 private:
 	/// Which variables the current expression references.
-	std::set<YulString> m_variableReferences;
+	std::set<YulName> m_variableReferences;
 };
 
 struct ControlFlowSideEffects;
@@ -231,7 +231,7 @@ class TerminationFinder
 
 	TerminationFinder(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const* _functionSideEffects = nullptr
+		std::map<YulName, ControlFlowSideEffects> const* _functionSideEffects = nullptr
 	): m_dialect(_dialect), m_functionSideEffects(_functionSideEffects) {}
 
 	/// @returns the index of the first statement in the provided sequence
@@ -256,7 +256,7 @@ class TerminationFinder
 
 private:
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const* m_functionSideEffects;
+	std::map<YulName, ControlFlowSideEffects> const* m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index e2d4683290..03e4ccdd0e 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -40,7 +40,7 @@ using namespace solidity::yul;
 SimplificationRules::Rule const* SimplificationRules::findFirstMatch(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	std::function<AssignedValue const*(YulString)> const& _ssaValues
+	std::function<AssignedValue const*(YulName)> const& _ssaValues
 )
 {
 	auto instruction = instructionAndArguments(_dialect, _expr);
@@ -137,7 +137,7 @@ void Pattern::setMatchGroup(unsigned _group, std::map<unsigned, Expression const
 bool Pattern::matches(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	std::function<AssignedValue const*(YulString)> const& _ssaValues
+	std::function<AssignedValue const*(YulName)> const& _ssaValues
 ) const
 {
 	Expression const* expr = &_expr;
@@ -146,7 +146,7 @@ bool Pattern::matches(
 	// Do not do it for "Any" because we can check identity better for variables.
 	if (m_kind != PatternKind::Any && std::holds_alternative<Identifier>(_expr))
 	{
-		YulString varName = std::get<Identifier>(_expr).name;
+		YulName varName = std::get<Identifier>(_expr).name;
 		if (AssignedValue const* value = _ssaValues(varName))
 			if (Expression const* new_expr = value->value)
 				expr = new_expr;
@@ -252,7 +252,7 @@ Expression Pattern::toExpression(langutil::DebugData::ConstPtr const& _debugData
 		std::string name = util::toLower(instructionInfo(m_instruction, _evmVersion).name);
 
 		return FunctionCall{_debugData,
-			Identifier{_debugData, YulString{name}},
+			Identifier{_debugData, YulName{name}},
 			std::move(arguments)
 		};
 	}
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index 5e498bd5c9..9362ee8557 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -24,7 +24,7 @@
 #include <libevmasm/SimplificationRule.h>
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
@@ -64,7 +64,7 @@ class SimplificationRules
 	static Rule const* findFirstMatch(
 		Expression const& _expr,
 		Dialect const& _dialect,
-		std::function<AssignedValue const*(YulString)> const& _ssaValues
+		std::function<AssignedValue const*(YulName)> const& _ssaValues
 	);
 
 	/// Checks whether the rulelist is non-empty. This is usually enforced
@@ -121,7 +121,7 @@ class Pattern
 	bool matches(
 		Expression const& _expr,
 		Dialect const& _dialect,
-		std::function<AssignedValue const*(YulString)> const& _ssaValues
+		std::function<AssignedValue const*(YulName)> const& _ssaValues
 	) const;
 
 	std::vector<Pattern> arguments() const { return m_arguments; }
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 58552147a6..23d47b6ee5 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -60,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.
-	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates()
+	std::map<YulName, std::map<size_t, std::vector<YulName>>> candidates()
 	{
-		std::map<YulString, std::map<size_t, std::vector<YulString>>> cand;
+		std::map<YulName, std::map<size_t, std::vector<YulName>>> cand;
 		for (auto const& [functionName, candidate]: m_candidates)
 		{
 			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
@@ -88,7 +88,7 @@ class RematCandidateSelector: public DataFlowAnalyzer
 		DataFlowAnalyzer::operator()(_varDecl);
 		if (_varDecl.variables.size() == 1)
 		{
-			YulString varName = _varDecl.variables.front().name;
+			YulName varName = _varDecl.variables.front().name;
 			if (AssignedValue const* value = variableValue(varName))
 			{
 				yulAssert(!m_expressionCodeCost.count(varName), "");
@@ -111,7 +111,7 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	{
 		if (std::holds_alternative<Identifier>(_e))
 		{
-			YulString name = std::get<Identifier>(_e).name;
+			YulName name = std::get<Identifier>(_e).name;
 			if (m_expressionCodeCost.count(name))
 			{
 				if (!variableValue(name))
@@ -124,29 +124,29 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	}
 
 	/// Remove the variable from the candidate set.
-	void rematImpossible(YulString _variable)
+	void rematImpossible(YulName _variable)
 	{
 		m_numReferences.erase(_variable);
 		m_expressionCodeCost.erase(_variable);
 	}
 
-	YulString m_currentFunctionName = {};
+	YulName m_currentFunctionName = {};
 
 	/// All candidate variables by function name, in order of occurrence.
-	std::vector<std::pair<YulString, YulString>> m_candidates;
+	std::vector<std::pair<YulName, YulName>> m_candidates;
 	/// Candidate variables and the code cost of their value.
-	std::map<YulString, size_t> m_expressionCodeCost;
+	std::map<YulName, size_t> m_expressionCodeCost;
 	/// Number of references to each candidate variable.
-	std::map<YulString, size_t> m_numReferences;
+	std::map<YulName, size_t> m_numReferences;
 };
 
 /// Selects at most @a _numVariables among @a _candidates.
-std::set<YulString> chooseVarsToEliminate(
-	std::map<size_t, std::vector<YulString>> const& _candidates,
+std::set<YulName> chooseVarsToEliminate(
+	std::map<size_t, std::vector<YulName>> const& _candidates,
 	size_t _numVariables
 )
 {
-	std::set<YulString> varsToEliminate;
+	std::set<YulName> varsToEliminate;
 	for (auto&& [cost, candidates]: _candidates)
 		for (auto&& candidate: candidates)
 		{
@@ -160,15 +160,15 @@ std::set<YulString> chooseVarsToEliminate(
 void eliminateVariables(
 	Dialect const& _dialect,
 	Block& _ast,
-	std::map<YulString, int> const& _numVariables,
+	std::map<YulName, int> const& _numVariables,
 	bool _allowMSizeOptimization
 )
 {
 	RematCandidateSelector selector{_dialect};
 	selector(_ast);
-	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates = selector.candidates();
+	std::map<YulName, std::map<size_t, std::vector<YulName>>> candidates = selector.candidates();
 
-	std::set<YulString> varsToEliminate;
+	std::set<YulName> varsToEliminate;
 	for (auto const& [functionName, numVariables]: _numVariables)
 	{
 		yulAssert(numVariables > 0);
@@ -177,14 +177,14 @@ void eliminateVariables(
 
 	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate));
 	// Do not remove functions.
-	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	std::set<YulName> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
 	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
 void eliminateVariablesOptimizedCodegen(
 	Dialect const& _dialect,
 	Block& _ast,
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
+	std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
 	bool _allowMSizeOptimization
 )
 {
@@ -194,19 +194,19 @@ void eliminateVariablesOptimizedCodegen(
 	RematCandidateSelector selector{_dialect};
 	selector(_ast);
 
-	std::map<YulString, size_t> candidates;
+	std::map<YulName, size_t> candidates;
 	for (auto const& [functionName, candidatesInFunction]: selector.candidates())
 		for (auto [cost, candidatesWithCost]: candidatesInFunction)
 			for (auto candidate: candidatesWithCost)
 				candidates[candidate] = cost;
 
-	std::set<YulString> varsToEliminate;
+	std::set<YulName> 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)
 		{
-			std::map<size_t, std::vector<YulString>> suitableCandidates;
+			std::map<size_t, std::vector<YulName>> suitableCandidates;
 			size_t neededSlots = unreachable.deficit;
 			for (auto varName: unreachable.variableChoices)
 			{
@@ -229,7 +229,7 @@ void eliminateVariablesOptimizedCodegen(
 		}
 	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate), true);
 	// Do not remove functions.
-	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	std::set<YulName> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
 	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
@@ -268,7 +268,7 @@ bool StackCompressor::run(
 	else
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
 		{
-			std::map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
+			std::map<YulName, 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 0310858a18..24712938f0 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -56,7 +56,7 @@ namespace
  */
 struct MemoryOffsetAllocator
 {
-	uint64_t run(YulString _function = YulString{})
+	uint64_t run(YulName _function = YulName{})
 	{
 		if (slotsRequiredForFunction.count(_function))
 			return slotsRequiredForFunction[_function];
@@ -66,7 +66,7 @@ struct MemoryOffsetAllocator
 
 		uint64_t requiredSlots = 0;
 		if (callGraph.count(_function))
-			for (YulString child: callGraph.at(_function))
+			for (YulName child: callGraph.at(_function))
 				requiredSlots = std::max(run(child), requiredSlots);
 
 		if (auto const* unreachables = util::valueOrNullptr(unreachableVariables, _function))
@@ -84,7 +84,7 @@ struct MemoryOffsetAllocator
 
 			// Assign slots for all variables that become unreachable in the function body, if the above did not
 			// assign a slot for them already.
-			for (YulString variable: *unreachables)
+			for (YulName variable: *unreachables)
 				// The empty case is a function with too many arguments or return values,
 				// which was already handled above.
 				if (!variable.empty() && !slotAllocations.count(variable))
@@ -96,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.
-	std::map<YulString, std::vector<YulString>> const& unreachableVariables;
+	std::map<YulName, std::vector<YulName>> const& unreachableVariables;
 	/// The graph of immediate function calls of all functions.
-	std::map<YulString, std::vector<YulString>> const& callGraph;
+	std::map<YulName, std::vector<YulName>> const& callGraph;
 	/// Maps the name of each user-defined function to its definition.
-	std::map<YulString, FunctionDefinition const*> const& functionDefinitions;
+	std::map<YulName, FunctionDefinition const*> const& functionDefinitions;
 
 	/// Maps variable names to the memory slot the respective variable is assigned.
-	std::map<YulString, uint64_t> slotAllocations{};
+	std::map<YulName, uint64_t> slotAllocations{};
 	/// Maps function names to the number of memory slots the respective function requires.
-	std::map<YulString, uint64_t> slotsRequiredForFunction{};
+	std::map<YulName, uint64_t> slotsRequiredForFunction{};
 };
 
 u256 literalArgumentValue(FunctionCall const& _call)
@@ -145,10 +145,10 @@ void StackLimitEvader::run(
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
-	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
+	std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
 )
 {
-	std::map<YulString, std::vector<YulString>> unreachableVariables;
+	std::map<YulName, std::vector<YulName>> unreachableVariables;
 	for (auto&& [function, stackTooDeepErrors]: _stackTooDeepErrors)
 	{
 		auto& unreachables = unreachableVariables[function];
@@ -164,7 +164,7 @@ void StackLimitEvader::run(
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
-	std::map<YulString, std::vector<YulString>> const& _unreachableVariables
+	std::map<YulName, std::vector<YulName>> const& _unreachableVariables
 )
 {
 	yulAssert(_object.code, "");
@@ -174,10 +174,7 @@ void StackLimitEvader::run(
 		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
 	);
 
-	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(
-		*_object.code,
-		"memoryguard"_yulstring
-	);
+	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(*_object.code, "memoryguard"_yulname);
 	// Do not optimise, if no ``memoryguard`` call is found.
 	if (memoryGuardCalls.empty())
 		return;
@@ -193,11 +190,11 @@ void StackLimitEvader::run(
 	CallGraph callGraph = CallGraphGenerator::callGraph(*_object.code);
 
 	// We cannot move variables in recursive functions to fixed memory offsets.
-	for (YulString function: callGraph.recursiveFunctions())
+	for (YulName function: callGraph.recursiveFunctions())
 		if (_unreachableVariables.count(function))
 			return;
 
-	std::map<YulString, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
+	std::map<YulName, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
 
 	MemoryOffsetAllocator memoryOffsetAllocator{_unreachableVariables, callGraph.functionCalls, functionDefinitions};
 	uint64_t requiredSlots = memoryOffsetAllocator.run();
@@ -206,7 +203,7 @@ void StackLimitEvader::run(
 	StackToMemoryMover::run(_context, reservedMemory, memoryOffsetAllocator.slotAllocations, requiredSlots, *_object.code);
 
 	reservedMemory += 32 * requiredSlots;
-	for (FunctionCall* memoryGuardCall: findFunctionCalls(*_object.code, "memoryguard"_yulstring))
+	for (FunctionCall* memoryGuardCall: findFunctionCalls(*_object.code, "memoryguard"_yulname))
 	{
 		Literal* literal = std::get_if<Literal>(&memoryGuardCall->arguments.front());
 		yulAssert(literal && literal->kind == LiteralKind::Number, "");
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
index 025553200f..0411f05735 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::vector<YulString>> const& _unreachableVariables
+		std::map<YulName, std::vector<YulName>> const& _unreachableVariables
 	);
 	/// @a _stackTooDeepErrors can be determined by the StackLayoutGenerator.
 	/// Can only be run on the EVM dialect with objects.
@@ -70,7 +70,7 @@ class StackLimitEvader
 	static void run(
 		OptimiserStepContext& _context,
 		Object& _object,
-		std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
+		std::map<YulName, 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.
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index dbf3183fb4..7ec5790348 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -77,7 +77,7 @@ FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::Co
 void StackToMemoryMover::run(
 	OptimiserStepContext& _context,
 	u256 _reservedMemory,
-	std::map<YulString, uint64_t> const& _memorySlots,
+	std::map<YulName, uint64_t> const& _memorySlots,
 	uint64_t _numRequiredSlots,
 	Block& _block
 )
@@ -88,10 +88,10 @@ void StackToMemoryMover::run(
 		memoryOffsetTracker,
 		util::applyMap(
 			allFunctionDefinitions(_block),
-			util::mapTuple([](YulString _name, FunctionDefinition const* _funDef) {
+			util::mapTuple([](YulName _name, FunctionDefinition const* _funDef) {
 				return make_pair(_name, _funDef->returnVariables);
 			}),
-			std::map<YulString, TypedNameList>{}
+			std::map<YulName, TypedNameList>{}
 		)
 	);
 	stackToMemoryMover(_block);
@@ -101,7 +101,7 @@ void StackToMemoryMover::run(
 StackToMemoryMover::StackToMemoryMover(
 	OptimiserStepContext& _context,
 	VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-	std::map<YulString, TypedNameList> _functionReturnVariables
+	std::map<YulName, TypedNameList> _functionReturnVariables
 ):
 m_context(_context),
 m_memoryOffsetTracker(_memoryOffsetTracker),
@@ -150,7 +150,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 			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);
+		YulName newFunctionName = m_context.dispenser.newName(_functionDefinition.name);
 		m_newFunctionDefinitions.emplace_back(FunctionDefinition{
 			_functionDefinition.debugData,
 			newFunctionName,
@@ -159,7 +159,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 			std::move(_functionDefinition.body)
 		});
 		// Generate new names for the arguments to maintain disambiguation.
-		std::map<YulString, YulString> newArgumentNames;
+		std::map<YulName, YulName> newArgumentNames;
 		for (TypedName const& _var: stackParameters)
 			newArgumentNames[_var.name] = m_context.dispenser.newName(_var.name);
 		for (auto& parameter: _functionDefinition.parameters)
@@ -255,7 +255,7 @@ void StackToMemoryMover::operator()(Block& _block)
 				rhs = std::make_unique<Expression>(generateMemoryLoad(m_context.dialect, debugData, *rhsSlot));
 			else
 			{
-				YulString tempVarName = m_nameDispenser.newName(lhsVar.name);
+				YulName tempVarName = m_nameDispenser.newName(lhsVar.name);
 				tempDecl.variables.emplace_back(TypedName{lhsVar.debugData, tempVarName, {}});
 				rhs = std::make_unique<Expression>(Identifier{debugData, tempVarName});
 			}
@@ -309,7 +309,7 @@ void StackToMemoryMover::visit(Expression& _expression)
 			_expression = generateMemoryLoad(m_context.dialect, identifier->debugData, *offset);
 }
 
-std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString const& _variable) const
+std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulName const& _variable) const
 {
 	if (m_memorySlots.count(_variable))
 	{
diff --git a/libyul/optimiser/StackToMemoryMover.h b/libyul/optimiser/StackToMemoryMover.h
index 79c7276ede..7392660311 100644
--- a/libyul/optimiser/StackToMemoryMover.h
+++ b/libyul/optimiser/StackToMemoryMover.h
@@ -23,6 +23,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/ASTForward.h>
+#include <libyul/YulName.h>
 
 #include <liblangutil/SourceLocation.h>
 #include <libsolutil/Common.h>
@@ -142,7 +143,7 @@ class StackToMemoryMover: ASTModifier
 	static void run(
 		OptimiserStepContext& _context,
 		u256 _reservedMemory,
-		std::map<YulString, uint64_t> const& _memorySlots,
+		std::map<YulName, uint64_t> const& _memorySlots,
 		uint64_t _numRequiredSlots,
 		Block& _block
 	);
@@ -158,42 +159,42 @@ class StackToMemoryMover: ASTModifier
 	public:
 		VariableMemoryOffsetTracker(
 			u256 _reservedMemory,
-			std::map<YulString, uint64_t> const& _memorySlots,
+			std::map<YulName, uint64_t> const& _memorySlots,
 			uint64_t _numRequiredSlots
 		): m_reservedMemory(_reservedMemory), m_memorySlots(_memorySlots), m_numRequiredSlots(_numRequiredSlots)
 		{}
 
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
+		/// @returns a YulName containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
-		std::optional<LiteralValue> operator()(YulString const& _variable) const;
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
+		std::optional<LiteralValue> operator()(YulName const& _variable) const;
+		/// @returns a YulName containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
 		std::optional<LiteralValue> operator()(TypedName const& _variable) const;
-		/// @returns a YulString containing the memory offset to be assigned to @a _variable as number literal
+		/// @returns a YulName containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
 		std::optional<LiteralValue> operator()(Identifier const& _variable) const;
 
 	private:
 		u256 m_reservedMemory;
-		std::map<YulString, uint64_t> const& m_memorySlots;
+		std::map<YulName, uint64_t> const& m_memorySlots;
 		uint64_t m_numRequiredSlots = 0;
 	};
 	struct FunctionMoveInfo
 	{
-		std::vector<std::optional<YulString>> returnVariableSlots;
+		std::vector<std::optional<YulName>> returnVariableSlots;
 	};
 
 	StackToMemoryMover(
 		OptimiserStepContext& _context,
 		VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-		std::map<YulString, std::vector<TypedName>> _functionReturnVariables
+		std::map<YulName, std::vector<TypedName>> _functionReturnVariables
 	);
 
 	OptimiserStepContext& m_context;
 	VariableMemoryOffsetTracker const& m_memoryOffsetTracker;
 	NameDispenser& m_nameDispenser;
 	/// Map from function names to the return variables of the function with that name.
-	std::map<YulString, std::vector<TypedName>> m_functionReturnVariables;
+	std::map<YulName, std::vector<TypedName>> m_functionReturnVariables;
 	/// List of functions generated while running this step that are to be appended to the code in the end.
 	std::list<Statement> m_newFunctionDefinitions;
 };
diff --git a/libyul/optimiser/Substitution.cpp b/libyul/optimiser/Substitution.cpp
index b2d4d469e1..5baec51e34 100644
--- a/libyul/optimiser/Substitution.cpp
+++ b/libyul/optimiser/Substitution.cpp
@@ -30,7 +30,7 @@ Expression Substitution::translate(Expression const& _expression)
 {
 	if (std::holds_alternative<Identifier>(_expression))
 	{
-		YulString name = std::get<Identifier>(_expression).name;
+		YulName name = std::get<Identifier>(_expression).name;
 		if (m_substitutions.count(name))
 			// No recursive substitution
 			return ASTCopier().translate(*m_substitutions.at(name));
diff --git a/libyul/optimiser/Substitution.h b/libyul/optimiser/Substitution.h
index f76dcc72ea..2d4ccffc01 100644
--- a/libyul/optimiser/Substitution.h
+++ b/libyul/optimiser/Substitution.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <map>
 
@@ -35,13 +35,13 @@ namespace solidity::yul
 class Substitution: public ASTCopier
 {
 public:
-	Substitution(std::map<YulString, Expression const*> const& _substitutions):
+	Substitution(std::map<YulName, Expression const*> const& _substitutions):
 		m_substitutions(_substitutions)
 	{}
 	Expression translate(Expression const& _expression) override;
 
 private:
-	std::map<YulString, Expression const*> const& m_substitutions;
+	std::map<YulName, Expression const*> const& m_substitutions;
 };
 
 }
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 83bc037009..c4004948c8 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -141,7 +141,7 @@ void OptimiserSuite::run(
 	std::string_view _optimisationSequence,
 	std::string_view _optimisationCleanupSequence,
 	std::optional<size_t> _expectedExecutionsPerDeployment,
-	std::set<YulString> const& _externallyUsedIdentifiers
+	std::set<YulName> const& _externallyUsedIdentifiers
 )
 {
 	EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect);
@@ -150,7 +150,7 @@ void OptimiserSuite::run(
 		evmDialect &&
 		evmDialect->evmVersion().canOverchargeGasForCall() &&
 		evmDialect->providesObjectAccess();
-	std::set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
+	std::set<YulName> reservedIdentifiers = _externallyUsedIdentifiers;
 	reservedIdentifiers += _dialect.fixedFunctionNames();
 
 	*_object.code = std::get<Block>(Disambiguator(
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index 6e3886da3b..15a41cb9f3 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <liblangutil/EVMVersion.h>
@@ -70,7 +70,7 @@ class OptimiserSuite
 		std::string_view _optimisationSequence,
 		std::string_view _optimisationCleanupSequence,
 		std::optional<size_t> _expectedExecutionsPerDeployment,
-		std::set<YulString> const& _externallyUsedIdentifiers = {}
+		std::set<YulName> const& _externallyUsedIdentifiers = {}
 	);
 
 	/// Ensures that specified sequence of step abbreviations is well-formed and can be executed.
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index 5a8d2b49b2..0665a5efbe 100644
--- a/libyul/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <map>
 #include <type_traits>
@@ -84,8 +84,8 @@ class SyntacticallyEqual
 	}
 
 	std::size_t m_idsUsed = 0;
-	std::map<YulString, std::size_t> m_identifiersLHS;
-	std::map<YulString, std::size_t> m_identifiersRHS;
+	std::map<YulName, std::size_t> m_identifiersLHS;
+	std::map<YulName, std::size_t> m_identifiersRHS;
 };
 
 /**
diff --git a/libyul/optimiser/TypeInfo.cpp b/libyul/optimiser/TypeInfo.cpp
index 16ce654968..754c0bad08 100644
--- a/libyul/optimiser/TypeInfo.cpp
+++ b/libyul/optimiser/TypeInfo.cpp
@@ -62,8 +62,8 @@ class TypeInfo::TypeCollector: public ASTWalker
 		}
 	}
 
-	std::map<YulString, YulString> variableTypes;
-	std::map<YulString, FunctionType> functionTypes;
+	std::map<YulName, YulName> variableTypes;
+	std::map<YulName, FunctionType> functionTypes;
 };
 
 
@@ -75,12 +75,12 @@ TypeInfo::TypeInfo(Dialect const& _dialect, Block const& _ast):
 	m_variableTypes = std::move(types.variableTypes);
 }
 
-YulString TypeInfo::typeOf(Expression const& _expression) const
+YulName TypeInfo::typeOf(Expression const& _expression) const
 {
 	return std::visit(GenericVisitor{
 		[&](FunctionCall const& _funCall) {
-			YulString name = _funCall.functionName.name;
-			std::vector<YulString> const* retTypes = nullptr;
+			YulName name = _funCall.functionName.name;
+			std::vector<YulName> const* retTypes = nullptr;
 			if (BuiltinFunction const* fun = m_dialect.builtin(name))
 				retTypes = &fun->returns;
 			else
@@ -97,7 +97,7 @@ YulString TypeInfo::typeOf(Expression const& _expression) const
 	}, _expression);
 }
 
-YulString TypeInfo::typeOfVariable(YulString _name) const
+YulName TypeInfo::typeOfVariable(YulName _name) const
 {
 	return m_variableTypes.at(_name);
 }
diff --git a/libyul/optimiser/TypeInfo.h b/libyul/optimiser/TypeInfo.h
index 5ed0a0d55c..96c43875a6 100644
--- a/libyul/optimiser/TypeInfo.h
+++ b/libyul/optimiser/TypeInfo.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <vector>
 #include <map>
@@ -40,26 +40,26 @@ class TypeInfo
 public:
 	TypeInfo(Dialect const& _dialect, Block const& _ast);
 
-	void setVariableType(YulString _name, YulString _type) { m_variableTypes[_name] = _type; }
+	void setVariableType(YulName _name, YulName _type) { m_variableTypes[_name] = _type; }
 
 	/// @returns the type of an expression that is assumed to return exactly one value.
-	YulString typeOf(Expression const& _expression) const;
+	YulName typeOf(Expression const& _expression) const;
 
 	/// \returns the type of variable
-	YulString typeOfVariable(YulString _name) const;
+	YulName typeOfVariable(YulName _name) const;
 
 private:
 	class TypeCollector;
 
 	struct FunctionType
 	{
-		std::vector<YulString> parameters;
-		std::vector<YulString> returns;
+		std::vector<YulName> parameters;
+		std::vector<YulName> returns;
 	};
 
 	Dialect const& m_dialect;
-	std::map<YulString, YulString> m_variableTypes;
-	std::map<YulString, FunctionType> m_functionTypes;
+	std::map<YulName, YulName> m_variableTypes;
+	std::map<YulName, FunctionType> m_functionTypes;
 };
 
 }
diff --git a/libyul/optimiser/UnusedAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
index f3d78288f3..13a6ba9ee5 100644
--- a/libyul/optimiser/UnusedAssignEliminator.cpp
+++ b/libyul/optimiser/UnusedAssignEliminator.cpp
@@ -92,7 +92,7 @@ void UnusedAssignEliminator::operator()(FunctionCall const& _functionCall)
 
 void UnusedAssignEliminator::operator()(Leave const&)
 {
-	for (YulString name: m_returnVariables)
+	for (YulName name: m_returnVariables)
 		markUsed(name);
 	m_activeStores.clear();
 }
@@ -152,7 +152,7 @@ void UnusedAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const
 		markUsed(retParam.name);
 }
 
-void UnusedAssignEliminator::markUsed(YulString _variable)
+void UnusedAssignEliminator::markUsed(YulName _variable)
 {
 	for (auto& assignment: m_activeStores[_variable])
 		m_usedStores.insert(assignment);
diff --git a/libyul/optimiser/UnusedAssignEliminator.h b/libyul/optimiser/UnusedAssignEliminator.h
index 800d626eb8..9c3b1e4bca 100644
--- a/libyul/optimiser/UnusedAssignEliminator.h
+++ b/libyul/optimiser/UnusedAssignEliminator.h
@@ -121,7 +121,7 @@ class UnusedAssignEliminator: public UnusedStoreBase
 
 	explicit UnusedAssignEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects
+		std::map<YulName, ControlFlowSideEffects> _controlFlowSideEffects
 	):
 		UnusedStoreBase(_dialect),
 		m_controlFlowSideEffects(_controlFlowSideEffects)
@@ -141,10 +141,10 @@ class UnusedAssignEliminator: public UnusedStoreBase
 	void shortcutNestedLoop(ActiveStores const& _beforeLoop) override;
 	void finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition) override;
 
-	void markUsed(YulString _variable);
+	void markUsed(YulName _variable);
 
-	std::set<YulString> m_returnVariables;
-	std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
+	std::set<YulName> m_returnVariables;
+	std::map<YulName, ControlFlowSideEffects> m_controlFlowSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index 40c2fe80c6..49c0a9c4d4 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDisplacer.h>
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
@@ -42,7 +42,7 @@ using namespace solidity::yul::unusedFunctionsCommon;
 
 void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _ast)
 {
-	std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_ast);
+	std::map<YulName, 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
@@ -54,7 +54,7 @@ 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.
-	std::map<YulString, std::pair<std::vector<bool>, std::vector<bool>>> usedParametersAndReturnVariables;
+	std::map<YulName, 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.
@@ -72,7 +72,7 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 			};
 		}
 
-	std::set<YulString> functionNamesToFree = util::keys(usedParametersAndReturnVariables);
+	std::set<YulName> 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`.
@@ -81,7 +81,7 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 
 	// Inverse-Map of the above translations. In the above example, this will store an element with
 	// key `f_1` and value `f`.
-	std::map<YulString, YulString> newToOriginalNames = invertMap(replace.translations());
+	std::map<YulName, YulName> newToOriginalNames = invertMap(replace.translations());
 
 	// Step 3 of UnusedFunctionParameterPruner: introduce a new function in the block with body of
 	// the old one. Replace the body of the old one with a function call to the new one with reduced
@@ -98,8 +98,8 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 			if (newToOriginalNames.count(originalFunction.name))
 			{
 
-				YulString linkingFunctionName = originalFunction.name;
-				YulString originalFunctionName = newToOriginalNames.at(linkingFunctionName);
+				YulName linkingFunctionName = originalFunction.name;
+				YulName originalFunctionName = newToOriginalNames.at(linkingFunctionName);
 				std::pair<std::vector<bool>, std::vector<bool>> used =
 					usedParametersAndReturnVariables.at(originalFunctionName);
 
diff --git a/libyul/optimiser/UnusedFunctionsCommon.cpp b/libyul/optimiser/UnusedFunctionsCommon.cpp
index ed9d0ba4c3..bd38b33caf 100644
--- a/libyul/optimiser/UnusedFunctionsCommon.cpp
+++ b/libyul/optimiser/UnusedFunctionsCommon.cpp
@@ -30,8 +30,8 @@ using namespace solidity::yul::unusedFunctionsCommon;
 FunctionDefinition unusedFunctionsCommon::createLinkingFunction(
 	FunctionDefinition const& _original,
 	std::pair<std::vector<bool>, std::vector<bool>> const& _usedParametersAndReturns,
-	YulString const& _originalFunctionName,
-	YulString const& _linkingFunctionName,
+	YulName const& _originalFunctionName,
+	YulName const& _linkingFunctionName,
 	NameDispenser& _nameDispenser
 )
 {
diff --git a/libyul/optimiser/UnusedFunctionsCommon.h b/libyul/optimiser/UnusedFunctionsCommon.h
index 2b0f3000df..5aa231b1e4 100644
--- a/libyul/optimiser/UnusedFunctionsCommon.h
+++ b/libyul/optimiser/UnusedFunctionsCommon.h
@@ -52,8 +52,8 @@ inline bool tooSimpleToBePruned(FunctionDefinition const& _f)
 FunctionDefinition createLinkingFunction(
 	FunctionDefinition const& _original,
 	std::pair<std::vector<bool>, std::vector<bool>> const& _usedParametersAndReturns,
-	YulString const& _originalFunctionName,
-	YulString const& _linkingFunctionName,
+	YulName const& _originalFunctionName,
+	YulName const& _linkingFunctionName,
 	NameDispenser& _nameDispenser
 );
 
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index a64f37ebed..9df51cf7f0 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -43,8 +43,8 @@ UnusedPruner::UnusedPruner(
 	Dialect const& _dialect,
 	Block& _ast,
 	bool _allowMSizeOptimization,
-	std::map<YulString, SideEffects> const* _functionSideEffects,
-	std::set<YulString> const& _externallyUsedFunctions
+	std::map<YulName, SideEffects> const* _functionSideEffects,
+	std::set<YulName> const& _externallyUsedFunctions
 ):
 	m_dialect(_dialect),
 	m_allowMSizeOptimization(_allowMSizeOptimization),
@@ -59,7 +59,7 @@ UnusedPruner::UnusedPruner(
 	Dialect const& _dialect,
 	FunctionDefinition& _function,
 	bool _allowMSizeOptimization,
-	std::set<YulString> const& _externallyUsedFunctions
+	std::set<YulName> const& _externallyUsedFunctions
 ):
 	m_dialect(_dialect),
 	m_allowMSizeOptimization(_allowMSizeOptimization)
@@ -135,8 +135,8 @@ void UnusedPruner::runUntilStabilised(
 	Dialect const& _dialect,
 	Block& _ast,
 	bool _allowMSizeOptimization,
-	std::map<YulString, SideEffects> const* _functionSideEffects,
-	std::set<YulString> const& _externallyUsedFunctions
+	std::map<YulName, SideEffects> const* _functionSideEffects,
+	std::set<YulName> const& _externallyUsedFunctions
 )
 {
 	while (true)
@@ -153,10 +153,10 @@ void UnusedPruner::runUntilStabilised(
 void UnusedPruner::runUntilStabilisedOnFullAST(
 	Dialect const& _dialect,
 	Block& _ast,
-	std::set<YulString> const& _externallyUsedFunctions
+	std::set<YulName> const& _externallyUsedFunctions
 )
 {
-	std::map<YulString, SideEffects> functionSideEffects =
+	std::map<YulName, SideEffects> functionSideEffects =
 		SideEffectsPropagator::sideEffects(_dialect, CallGraphGenerator::callGraph(_ast));
 	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _ast);
 	runUntilStabilised(_dialect, _ast, allowMSizeOptimization, &functionSideEffects, _externallyUsedFunctions);
@@ -166,7 +166,7 @@ void UnusedPruner::runUntilStabilised(
 	Dialect const& _dialect,
 	FunctionDefinition& _function,
 	bool _allowMSizeOptimization,
-	std::set<YulString> const& _externallyUsedFunctions
+	std::set<YulName> const& _externallyUsedFunctions
 )
 {
 	while (true)
@@ -178,12 +178,12 @@ void UnusedPruner::runUntilStabilised(
 	}
 }
 
-bool UnusedPruner::used(YulString _name) const
+bool UnusedPruner::used(YulName _name) const
 {
 	return m_references.count(_name) && m_references.at(_name) > 0;
 }
 
-void UnusedPruner::subtractReferences(std::map<YulString, size_t> const& _subtrahend)
+void UnusedPruner::subtractReferences(std::map<YulName, size_t> const& _subtrahend)
 {
 	for (auto const& ref: _subtrahend)
 	{
diff --git a/libyul/optimiser/UnusedPruner.h b/libyul/optimiser/UnusedPruner.h
index e4587d5d72..b0ba53bce9 100644
--- a/libyul/optimiser/UnusedPruner.h
+++ b/libyul/optimiser/UnusedPruner.h
@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <map>
 #include <set>
@@ -64,14 +64,14 @@ class UnusedPruner: public ASTModifier
 		Dialect const& _dialect,
 		Block& _ast,
 		bool _allowMSizeOptimization,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr,
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	);
 
 	static void run(
 		Dialect const& _dialect,
 		Block& _ast,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	)
 	{
 		runUntilStabilisedOnFullAST(_dialect, _ast, _externallyUsedFunctions);
@@ -84,7 +84,7 @@ class UnusedPruner: public ASTModifier
 	static void runUntilStabilisedOnFullAST(
 		Dialect const& _dialect,
 		Block& _ast,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	);
 
 	// Run the pruner until the code does not change anymore.
@@ -96,7 +96,7 @@ class UnusedPruner: public ASTModifier
 		Dialect const& _dialect,
 		FunctionDefinition& _functionDefinition,
 		bool _allowMSizeOptimization,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	);
 
 private:
@@ -104,24 +104,24 @@ class UnusedPruner: public ASTModifier
 		Dialect const& _dialect,
 		Block& _ast,
 		bool _allowMSizeOptimization,
-		std::map<YulString, SideEffects> const* _functionSideEffects = nullptr,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::map<YulName, SideEffects> const* _functionSideEffects = nullptr,
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	);
 	UnusedPruner(
 		Dialect const& _dialect,
 		FunctionDefinition& _function,
 		bool _allowMSizeOptimization,
-		std::set<YulString> const& _externallyUsedFunctions = {}
+		std::set<YulName> const& _externallyUsedFunctions = {}
 	);
 
-	bool used(YulString _name) const;
-	void subtractReferences(std::map<YulString, size_t> const& _subtrahend);
+	bool used(YulName _name) const;
+	void subtractReferences(std::map<YulName, size_t> const& _subtrahend);
 
 	Dialect const& m_dialect;
 	bool m_allowMSizeOptimization = false;
-	std::map<YulString, SideEffects> const* m_functionSideEffects = nullptr;
+	std::map<YulName, SideEffects> const* m_functionSideEffects = nullptr;
 	bool m_shouldRunAgain = false;
-	std::map<YulString, size_t> m_references;
+	std::map<YulName, size_t> m_references;
 };
 
 }
diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
index 0d618d8d25..b6dde8c551 100644
--- a/libyul/optimiser/UnusedStoreBase.h
+++ b/libyul/optimiser/UnusedStoreBase.h
@@ -60,7 +60,7 @@ class UnusedStoreBase: public ASTWalker
 	void operator()(Continue const&) override;
 
 protected:
-	using ActiveStores = std::map<YulString, std::set<Statement const*>>;
+	using ActiveStores = std::map<YulName, 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
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 6a0ab1518d..d049f59a02 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -51,22 +51,22 @@ static std::string const thirtyTwo{"@ 32"};
 
 void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 {
-	std::map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
+	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		_context.dialect,
 		CallGraphGenerator::callGraph(_ast)
 	);
 
 	SSAValueTracker ssaValues;
 	ssaValues(_ast);
-	std::map<YulString, AssignedValue> values;
+	std::map<YulName, AssignedValue> values;
 	for (auto const& [name, expression]: ssaValues.values())
 		values[name] = AssignedValue{expression, {}};
 	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
 	Expression const oneLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{1}), {}}};
 	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{32}), {}}};
-	values[YulString{zero}] = AssignedValue{&zeroLiteral, {}};
-	values[YulString{one}] = AssignedValue{&oneLiteral, {}};
-	values[YulString{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
+	values[YulName{zero}] = AssignedValue{&zeroLiteral, {}};
+	values[YulName{one}] = AssignedValue{&oneLiteral, {}};
+	values[YulName{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
 
 	bool const ignoreMemory = MSizeFinder::containsMSize(_context.dialect, _ast);
 	UnusedStoreEliminator rse{
@@ -93,9 +93,9 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 
 UnusedStoreEliminator::UnusedStoreEliminator(
 	Dialect const& _dialect,
-	std::map<YulString, SideEffects> const& _functionSideEffects,
-	std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
-	std::map<YulString, AssignedValue> const& _ssaValues,
+	std::map<YulName, SideEffects> const& _functionSideEffects,
+	std::map<YulName, ControlFlowSideEffects> _controlFlowSideEffects,
+	std::map<YulName, AssignedValue> const& _ssaValues,
 	bool _ignoreMemory
 ):
 	UnusedStoreBase(_dialect),
@@ -228,7 +228,7 @@ std::vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsF
 {
 	using evmasm::Instruction;
 
-	YulString functionName = _functionCall.functionName.name;
+	YulName functionName = _functionCall.functionName.name;
 	SideEffects sideEffects;
 	if (BuiltinFunction const* f = m_dialect.builtin(functionName))
 		sideEffects = f->sideEffects;
@@ -263,8 +263,8 @@ std::vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsF
 			if (_op.lengthConstant)
 				switch (*_op.lengthConstant)
 				{
-				case 1: ourOp.length = YulString(one); break;
-				case 32: ourOp.length = YulString(thirtyTwo); break;
+				case 1: ourOp.length = YulName(one); break;
+				case 32: ourOp.length = YulName(thirtyTwo); break;
 				default: yulAssert(false);
 				}
 			return ourOp;
@@ -435,7 +435,7 @@ void UnusedStoreEliminator::clearActive(
 		activeStorageStores() = {};
 }
 
-std::optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
+std::optional<YulName> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
 {
 	if (Identifier const* identifier = std::get_if<Identifier>(&_expression))
 		if (m_ssaValues.count(identifier->name))
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
index 89dbabd78d..98023b64cf 100644
--- a/libyul/optimiser/UnusedStoreEliminator.h
+++ b/libyul/optimiser/UnusedStoreEliminator.h
@@ -64,9 +64,9 @@ class UnusedStoreEliminator: public UnusedStoreBase
 
 	explicit UnusedStoreEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, SideEffects> const& _functionSideEffects,
-		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
-		std::map<YulString, AssignedValue> const& _ssaValues,
+		std::map<YulName, SideEffects> const& _functionSideEffects,
+		std::map<YulName, ControlFlowSideEffects> _controlFlowSideEffects,
+		std::map<YulName, AssignedValue> const& _ssaValues,
 		bool _ignoreMemory
 	);
 
@@ -85,15 +85,15 @@ class UnusedStoreEliminator: public UnusedStoreBase
 		Location location;
 		Effect effect;
 		/// Start of affected area. Unknown if not provided.
-		std::optional<YulString> start;
+		std::optional<YulName> start;
 		/// Length of affected area, unknown if not provided.
 		/// Unused for storage.
-		std::optional<YulString> length;
+		std::optional<YulName> length;
 	};
 
 private:
-	std::set<Statement const*>& activeMemoryStores() { return m_activeStores["m"_yulstring]; }
-	std::set<Statement const*>& activeStorageStores() { return m_activeStores["s"_yulstring]; }
+	std::set<Statement const*>& activeMemoryStores() { return m_activeStores["m"_yulname]; }
+	std::set<Statement const*>& activeStorageStores() { return m_activeStores["s"_yulname]; }
 
 	void shortcutNestedLoop(ActiveStores const&) override
 	{
@@ -113,12 +113,12 @@ class UnusedStoreEliminator: public UnusedStoreBase
 	void markActiveAsUsed(std::optional<Location> _onlyLocation = std::nullopt);
 	void clearActive(std::optional<Location> _onlyLocation = std::nullopt);
 
-	std::optional<YulString> identifierNameIfSSA(Expression const& _expression) const;
+	std::optional<YulName> 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<YulName, SideEffects> const& m_functionSideEffects;
+	std::map<YulName, ControlFlowSideEffects> m_controlFlowSideEffects;
+	std::map<YulName, AssignedValue> const& m_ssaValues;
 
 	std::map<Statement const*, Operation> m_storeOperations;
 
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
index b13dc8e6b4..041ebdeaab 100644
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ b/libyul/optimiser/VarNameCleaner.cpp
@@ -34,7 +34,7 @@ using namespace solidity::yul;
 VarNameCleaner::VarNameCleaner(
 	Block const& _ast,
 	Dialect const& _dialect,
-	std::set<YulString> _namesToKeep
+	std::set<YulName> _namesToKeep
 ):
 	m_dialect{_dialect},
 	m_namesToKeep{std::move(_namesToKeep)},
@@ -51,9 +51,9 @@ void VarNameCleaner::operator()(FunctionDefinition& _funDef)
 	yulAssert(!m_insideFunction, "");
 	m_insideFunction = true;
 
-	std::set<YulString> globalUsedNames = std::move(m_usedNames);
+	std::set<YulName> globalUsedNames = std::move(m_usedNames);
 	m_usedNames = m_namesToKeep;
-	std::map<YulString, YulString> globalTranslatedNames;
+	std::map<YulName, YulName> globalTranslatedNames;
 	swap(globalTranslatedNames, m_translatedNames);
 
 	renameVariables(_funDef.parameters);
@@ -93,7 +93,7 @@ void VarNameCleaner::operator()(Identifier& _identifier)
 		_identifier.name = name->second;
 }
 
-YulString VarNameCleaner::findCleanName(YulString const& _name) const
+YulName VarNameCleaner::findCleanName(YulName const& _name) const
 {
 	auto newName = stripSuffix(_name);
 	if (!isUsedName(newName))
@@ -102,24 +102,24 @@ YulString VarNameCleaner::findCleanName(YulString const& _name) const
 	// create new name with suffix (by finding a free identifier)
 	for (size_t i = 1; i < std::numeric_limits<decltype(i)>::max(); ++i)
 	{
-		YulString newNameSuffixed = YulString{newName.str() + "_" + std::to_string(i)};
+		YulName newNameSuffixed = YulName{newName.str() + "_" + std::to_string(i)};
 		if (!isUsedName(newNameSuffixed))
 			return newNameSuffixed;
 	}
 	yulAssert(false, "Exhausted by attempting to find an available suffix.");
 }
 
-bool VarNameCleaner::isUsedName(YulString const& _name) const
+bool VarNameCleaner::isUsedName(YulName const& _name) const
 {
 	return isRestrictedIdentifier(m_dialect, _name) || m_usedNames.count(_name);
 }
 
-YulString VarNameCleaner::stripSuffix(YulString const& _name) const
+YulName VarNameCleaner::stripSuffix(YulName const& _name) const
 {
 	static std::regex const suffixRegex("(_+[0-9]+)+$");
 
 	std::smatch suffixMatch;
 	if (regex_search(_name.str(), suffixMatch, suffixRegex))
-		return {YulString{suffixMatch.prefix().str()}};
+		return {YulName{suffixMatch.prefix().str()}};
 	return _name;
 }
diff --git a/libyul/optimiser/VarNameCleaner.h b/libyul/optimiser/VarNameCleaner.h
index 7823e5716c..bfb6cfb533 100644
--- a/libyul/optimiser/VarNameCleaner.h
+++ b/libyul/optimiser/VarNameCleaner.h
@@ -21,7 +21,7 @@
 
 #include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/optimiser/OptimiserStep.h>
 
 #include <map>
@@ -64,33 +64,33 @@ class VarNameCleaner: public ASTModifier
 	VarNameCleaner(
 		Block const& _ast,
 		Dialect const& _dialect,
-		std::set<YulString> _namesToKeep = {}
+		std::set<YulName> _namesToKeep = {}
 	);
 
 	/// Tries to rename a list of variables.
 	void renameVariables(std::vector<TypedName>& _variables);
 
 	/// @returns suffix-stripped name, if a suffix was detected, none otherwise.
-	YulString stripSuffix(YulString const& _name) const;
+	YulName stripSuffix(YulName const& _name) const;
 
 	/// Looks out for a "clean name" the given @p name could be trimmed down to.
 	/// @returns a trimmed down and "clean name" in case it found one, none otherwise.
-	YulString findCleanName(YulString const& name) const;
+	YulName findCleanName(YulName const& name) const;
 
 	/// Tests whether a given name was already used within this pass
 	/// or was set to be kept.
-	bool isUsedName(YulString const& _name) const;
+	bool isUsedName(YulName const& _name) const;
 
 	Dialect const& m_dialect;
 
 	/// These names will not be modified.
-	std::set<YulString> m_namesToKeep;
+	std::set<YulName> m_namesToKeep;
 
 	/// Set of names that are in use.
-	std::set<YulString> m_usedNames;
+	std::set<YulName> m_usedNames;
 
 	/// Maps old to new names.
-	std::map<YulString, YulString> m_translatedNames;
+	std::map<YulName, YulName> m_translatedNames;
 
 	/// Whether the traverse is inside a function definition.
 	/// Used to assert that a function definition cannot be inside another.
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 6e44afccf4..77274200bb 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -75,7 +75,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 		auto handleObject = [&](std::string const& _kind, Object const& _object) {
 			m_obtainedResult += contractName + "(" + _kind + ") " + (findFunctionCalls(
 				*_object.code,
-				"memoryguard"_yulstring
+				"memoryguard"_yulname
 			).empty() ? "false" : "true") + "\n";
 		};
 		handleObject("creation", *object);
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index a57ec98078..f1bd0ea379 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -87,7 +87,7 @@ TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string
 	if (!obj.code)
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
-	std::map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
+	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		CallGraphGenerator::callGraph(*obj.code)
 	);
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index b1dd0e6d19..6a9d3e6da8 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -49,7 +49,7 @@ class KnowledgeBaseTest
 		BOOST_REQUIRE(m_object && errorList.empty() && m_object->code);
 
 		NameDispenser dispenser(m_dialect, *m_object->code);
-		std::set<YulString> reserved;
+		std::set<YulName> reserved;
 		OptimiserStepContext context{m_dialect, dispenser, reserved, 0};
 		CommonSubexpressionEliminator::run(context, *m_object->code);
 
@@ -57,13 +57,13 @@ class KnowledgeBaseTest
 		for (auto const& [name, expression]: m_ssaValues.values())
 			m_values[name].value = expression;
 
-		return KnowledgeBase([this](YulString _var) { return util::valueOrNullptr(m_values, _var); });
+		return KnowledgeBase([this](YulName _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
 	EVMDialect m_dialect{EVMVersion{}, true};
 	std::shared_ptr<Object> m_object;
 	SSAValueTracker m_ssaValues;
-	std::map<YulString, AssignedValue> m_values;
+	std::map<YulName, AssignedValue> m_values;
 };
 
 BOOST_FIXTURE_TEST_SUITE(KnowledgeBase, KnowledgeBaseTest)
@@ -79,14 +79,14 @@ BOOST_AUTO_TEST_CASE(basic)
 		let e := sub(a, b)
 	})");
 
-	BOOST_CHECK(!kb.knownToBeDifferent("a"_yulstring, "b"_yulstring));
+	BOOST_CHECK(!kb.knownToBeDifferent("a"_yulname, "b"_yulname));
 	// This only works if the variable names are the same.
 	// It assumes that SSA+CSE+Simplifier actually replaces the variables.
-	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_CHECK(!kb.valueIfKnownConstant("a"_yulname));
+	BOOST_CHECK(kb.valueIfKnownConstant("zero"_yulname) == u256(0));
+	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulname, "b"_yulname) == u256(0));
+	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulname, "c"_yulname) == u256(0));
+	BOOST_CHECK(kb.valueIfKnownConstant("e"_yulname) == u256(0));
 }
 
 BOOST_AUTO_TEST_CASE(difference)
@@ -99,31 +99,21 @@ BOOST_AUTO_TEST_CASE(difference)
 		let e := sub(c, 12)
 	})");
 
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("c"_yulstring, "b"_yulstring) ==
+	BOOST_CHECK(kb.differenceIfKnownConstant("c"_yulname, "b"_yulname) ==
 		u256(20)
 	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("b"_yulstring, "c"_yulstring) ==
+	BOOST_CHECK(kb.differenceIfKnownConstant("b"_yulname, "c"_yulname) ==
 		u256(-20)
 	);
-	BOOST_CHECK(!kb.knownToBeDifferentByAtLeast32("b"_yulstring, "c"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulstring, "d"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("a"_yulstring, "b"_yulstring));
-	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulstring, "a"_yulstring));
-
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("e"_yulstring, "a"_yulstring) == u256(208)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("e"_yulstring, "b"_yulstring) == u256(8)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("a"_yulstring, "e"_yulstring) == u256(-208)
-	);
-	BOOST_CHECK(
-		kb.differenceIfKnownConstant("b"_yulstring, "e"_yulstring) == u256(-8)
-	);
+	BOOST_CHECK(!kb.knownToBeDifferentByAtLeast32("b"_yulname, "c"_yulname));
+	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulname, "d"_yulname));
+	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("a"_yulname, "b"_yulname));
+	BOOST_CHECK(kb.knownToBeDifferentByAtLeast32("b"_yulname, "a"_yulname));
+
+	BOOST_CHECK(kb.differenceIfKnownConstant("e"_yulname, "a"_yulname) == u256(208));
+	BOOST_CHECK(kb.differenceIfKnownConstant("e"_yulname, "b"_yulname) == u256(8));
+	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulname, "e"_yulname) == u256(-208));
+	BOOST_CHECK(kb.differenceIfKnownConstant("b"_yulname, "e"_yulname) == u256(-8));
 }
 
 
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index ca8784ddb6..faa6c6105f 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -135,11 +135,11 @@ BOOST_AUTO_TEST_CASE(builtins_analysis)
 {
 	struct SimpleDialect: public Dialect
 	{
-		BuiltinFunction const* builtin(YulString _name) const override
+		BuiltinFunction const* builtin(YulName _name) const override
 		{
-			return _name == "builtin"_yulstring ? &f : nullptr;
+			return _name == "builtin"_yulname ? &f : nullptr;
 		}
-		BuiltinFunction f{"builtin"_yulstring, std::vector<Type>(2), std::vector<Type>(3), {}, {}, false, {}};
+		BuiltinFunction f{"builtin"_yulname, std::vector<Type>(2), std::vector<Type>(3), {}, {}, false, {}};
 	};
 
 	SimpleDialect dialect;
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
index e53eeafbb0..2da445dd45 100644
--- a/test/libyul/StackShufflingTest.cpp
+++ b/test/libyul/StackShufflingTest.cpp
@@ -56,7 +56,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 					scanner.next();
 					std::string functionName = scanner.currentLiteral();
 					auto call = yul::FunctionCall{
-						{}, yul::Identifier{{}, YulString(functionName)}, {}
+						{}, yul::Identifier{{}, YulName(functionName)}, {}
 					};
 					stack.emplace_back(FunctionCallReturnLabelSlot{
 						m_functions.insert(
@@ -78,7 +78,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 				scanner.next();
 				std::string functionName = scanner.currentLiteral();
 				auto call = yul::FunctionCall{
-					{}, yul::Identifier{{}, YulString(functionName)}, {}
+					{}, yul::Identifier{{}, YulName(functionName)}, {}
 				};
 				expectToken(Token::Comma);
 				scanner.next();
@@ -102,7 +102,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 				expectToken(Token::LBrack);
 				scanner.next(); // read number of ghost variables as ghostVariableId
 				std::string ghostVariableId = scanner.currentLiteral();
-				Scope::Variable ghostVar = Scope::Variable{""_yulstring, YulString(literal + "[" + ghostVariableId + "]")};
+				Scope::Variable ghostVar = Scope::Variable{""_yulname, YulName(literal + "[" + ghostVariableId + "]")};
 				stack.emplace_back(VariableSlot{
 					m_variables.insert(std::make_pair(ghostVar.name, ghostVar)).first->second
 				});
@@ -110,7 +110,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 			}
 			else
 			{
-				Scope::Variable var = Scope::Variable{""_yulstring, YulString(literal)};
+				Scope::Variable var = Scope::Variable{""_yulname, YulName(literal)};
 				stack.emplace_back(VariableSlot{
 					m_variables.insert(
 						make_pair(literal, var)
diff --git a/test/libyul/StackShufflingTest.h b/test/libyul/StackShufflingTest.h
index 75715d25b9..2e2dd12ad3 100644
--- a/test/libyul/StackShufflingTest.h
+++ b/test/libyul/StackShufflingTest.h
@@ -41,7 +41,7 @@ class StackShufflingTest: public TestCase
 
 	Stack m_sourceStack;
 	Stack m_targetStack;
-	std::map<YulString, yul::FunctionCall> m_functions;
-	std::map<YulString, Scope::Variable> m_variables;
+	std::map<YulName, yul::FunctionCall> m_functions;
+	std::map<YulName, Scope::Variable> m_variables;
 };
 }
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 091a9a0b6c..80746c93ba 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -89,7 +89,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			disambiguate();
 			NameDisplacer{
 				*m_nameDispenser,
-				{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
+				{"illegal1"_yulname, "illegal2"_yulname, "illegal3"_yulname, "illegal4"_yulname, "illegal5"_yulname}
 			}(*m_ast);
 		}},
 		{"blockFlattener", [&]() {
@@ -348,11 +348,11 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			// Mark all variables with a name starting with "$" for escalation to memory.
 			struct FakeUnreachableGenerator: ASTWalker
 			{
-				std::map<YulString, std::vector<YulString>> fakeUnreachables;
+				std::map<YulName, std::vector<YulName>> fakeUnreachables;
 				using ASTWalker::operator();
 				void operator()(FunctionDefinition const& _function) override
 				{
-					YulString originalFunctionName = m_currentFunction;
+					YulName originalFunctionName = m_currentFunction;
 					m_currentFunction = _function.name;
 					for (TypedName const& _argument: _function.parameters)
 						visitVariableName(_argument.name);
@@ -361,7 +361,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 					ASTWalker::operator()(_function);
 					m_currentFunction = originalFunctionName;
 				}
-				void visitVariableName(YulString _var)
+				void visitVariableName(YulName _var)
 				{
 					if (!_var.empty() && _var.str().front() == '$')
 						if (!util::contains(fakeUnreachables[m_currentFunction], _var))
@@ -378,7 +378,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 					visitVariableName(_identifier.name);
 					ASTWalker::operator()(_identifier);
 				}
-				YulString m_currentFunction = YulString{};
+				YulName m_currentFunction = YulName{};
 			};
 			FakeUnreachableGenerator fakeUnreachableGenerator;
 			fakeUnreachableGenerator(*m_ast);
diff --git a/test/libyul/YulOptimizerTestCommon.h b/test/libyul/YulOptimizerTestCommon.h
index 3dce998c56..0a5d63320d 100644
--- a/test/libyul/YulOptimizerTestCommon.h
+++ b/test/libyul/YulOptimizerTestCommon.h
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/NameDispenser.h>
 
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 
 #include <set>
 #include <memory>
@@ -63,7 +63,7 @@ class YulOptimizerTestCommon
 	std::string m_optimizerStep;
 
 	Dialect const* m_dialect = nullptr;
-	std::set<YulString> m_reservedIdentifiers;
+	std::set<YulName> m_reservedIdentifiers;
 	std::unique_ptr<NameDispenser> m_nameDispenser;
 	std::unique_ptr<OptimiserStepContext> m_context;
 
diff --git a/test/tools/yulInterpreter/Inspector.h b/test/tools/yulInterpreter/Inspector.h
index f4518c7087..903ebc1142 100644
--- a/test/tools/yulInterpreter/Inspector.h
+++ b/test/tools/yulInterpreter/Inspector.h
@@ -53,13 +53,13 @@ class Inspector
 	 * @returns NodeAction::RunNode if the current AST node (and all children nodes!) should be
 	 *          processed without stopping, else NodeAction::StepThroughNode.
 	 */
-	NodeAction queryUser(langutil::DebugData const& _data, std::map<YulString, u256> const& _variables);
+	NodeAction queryUser(langutil::DebugData const& _data, std::map<YulName, u256> const& _variables);
 
 	void stepMode(NodeAction _action) { m_stepMode = _action; }
 
 	std::string const& source() const { return m_source; }
 
-	void interactiveVisit(langutil::DebugData const& _debugData, std::map<YulString, u256> const& _variables, std::function<void()> _visitNode)
+	void interactiveVisit(langutil::DebugData const& _debugData, std::map<YulName, u256> const& _variables, std::function<void()> _visitNode)
 	{
 		Inspector::NodeAction action = queryUser(_debugData, _variables);
 
@@ -116,7 +116,7 @@ class InspectedInterpreter: public Interpreter
 		Scope& _scope,
 		bool _disableExternalCalls,
 		bool _disableMemoryTracing,
-		std::map<YulString, u256> _variables = {}
+		std::map<YulName, u256> _variables = {}
 	):
 		Interpreter(_state, _dialect, _scope, _disableExternalCalls, _disableMemoryTracing, _variables),
 		m_inspector(_inspector)
@@ -160,7 +160,7 @@ class InspectedExpressionEvaluator: public ExpressionEvaluator
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Scope& _scope,
-		std::map<YulString, u256> const& _variables,
+		std::map<YulName, u256> const& _variables,
 		bool _disableExternalCalls,
 		bool _disableMemoryTrace
 	):
@@ -180,7 +180,7 @@ class InspectedExpressionEvaluator: public ExpressionEvaluator
 	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
+	std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulName, u256> _variables = {}) const override
 	{
 		return std::make_unique<InspectedInterpreter>(
 			m_inspector,
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 6a0f3a9997..21e97f0769 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -131,7 +131,7 @@ void Interpreter::operator()(Assignment const& _assignment)
 	solAssert(values.size() == _assignment.variableNames.size(), "");
 	for (size_t i = 0; i < values.size(); ++i)
 	{
-		YulString varName = _assignment.variableNames.at(i).name;
+		YulName varName = _assignment.variableNames.at(i).name;
 		solAssert(m_variables.count(varName), "");
 		m_variables[varName] = values.at(i);
 	}
@@ -146,7 +146,7 @@ void Interpreter::operator()(VariableDeclaration const& _declaration)
 	solAssert(values.size() == _declaration.variables.size(), "");
 	for (size_t i = 0; i < values.size(); ++i)
 	{
-		YulString varName = _declaration.variables.at(i).name;
+		YulName varName = _declaration.variables.at(i).name;
 		solAssert(!m_variables.count(varName), "");
 		m_variables[varName] = values.at(i);
 		m_scope->names.emplace(varName, nullptr);
@@ -343,7 +343,7 @@ 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(), "");
-	std::map<YulString, u256> variables;
+	std::map<YulName, 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)
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 23a98ca5c3..356a190709 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -145,7 +145,7 @@ struct InterpreterState
 struct Scope
 {
 	/// Used for variables and functions. Value is nullptr for variables.
-	std::map<YulString, FunctionDefinition const*> names;
+	std::map<YulName, FunctionDefinition const*> names;
 	std::map<Block const*, std::unique_ptr<Scope>> subScopes;
 	Scope* parent = nullptr;
 };
@@ -174,7 +174,7 @@ class Interpreter: public ASTWalker
 		Scope& _scope,
 		bool _disableExternalCalls,
 		bool _disableMemoryTracing,
-		std::map<YulString, u256> _variables = {}
+		std::map<YulName, u256> _variables = {}
 	):
 		m_dialect(_dialect),
 		m_state(_state),
@@ -200,7 +200,7 @@ class Interpreter: public ASTWalker
 	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); }
+	u256 valueOfVariable(YulName _name) const { return m_variables.at(_name); }
 
 protected:
 	/// Asserts that the expression evaluates to exactly one value and returns it.
@@ -218,7 +218,7 @@ class Interpreter: public ASTWalker
 	Dialect const& m_dialect;
 	InterpreterState& m_state;
 	/// Values of variables.
-	std::map<YulString, u256> m_variables;
+	std::map<YulName, 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.
@@ -236,7 +236,7 @@ class ExpressionEvaluator: public ASTWalker
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Scope& _scope,
-		std::map<YulString, u256> const& _variables,
+		std::map<YulName, u256> const& _variables,
 		bool _disableExternalCalls,
 		bool _disableMemoryTrace
 	):
@@ -259,7 +259,7 @@ class ExpressionEvaluator: public ASTWalker
 
 protected:
 	void runExternalCall(evmasm::Instruction _instruction);
-	virtual std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const
+	virtual std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulName, u256> _variables = {}) const
 	{
 		return std::make_unique<Interpreter>(
 			m_state,
@@ -298,7 +298,7 @@ class ExpressionEvaluator: public ASTWalker
 	InterpreterState& m_state;
 	Dialect const& m_dialect;
 	/// Values of variables.
-	std::map<YulString, u256> const& m_variables;
+	std::map<YulName, u256> const& m_variables;
 	Scope& m_scope;
 	/// Current value of the expression
 	std::vector<u256> m_values;
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index d16b1da196..7e81cbf7e3 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -245,7 +245,7 @@ class YulOpti
 	std::shared_ptr<yul::Block> m_ast;
 	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
 	std::unique_ptr<AsmAnalysisInfo> m_analysisInfo;
-	std::set<YulString> const m_reservedIdentifiers = {};
+	std::set<YulName> const m_reservedIdentifiers = {};
 	NameDispenser m_nameDispenser{m_dialect, m_reservedIdentifiers};
 	OptimiserStepContext m_context{
 		m_dialect,
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 1586f60206..0cb22242d0 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -28,7 +28,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
 #include <libyul/ObjectParser.h>
-#include <libyul/YulString.h>
+#include <libyul/YulName.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/Disambiguator.h>
 #include <libyul/optimiser/ForLoopInitRewriter.h>
@@ -175,7 +175,7 @@ std::unique_ptr<Block> Program::disambiguateAST(
 	AsmAnalysisInfo const& _analysisInfo
 )
 {
-	std::set<YulString> const externallyUsedIdentifiers = {};
+	std::set<YulName> const externallyUsedIdentifiers = {};
 	Disambiguator disambiguator(_dialect, _analysisInfo, externallyUsedIdentifiers);
 
 	return std::make_unique<Block>(std::get<Block>(disambiguator(_ast)));
@@ -190,7 +190,7 @@ std::unique_ptr<Block> Program::applyOptimisationSteps(
 {
 	// An empty set of reserved identifiers. It could be a constructor parameter but I don't
 	// think it would be useful in this tool. Other tools (like yulopti) have it empty too.
-	std::set<YulString> const externallyUsedIdentifiers = {};
+	std::set<YulName> const externallyUsedIdentifiers = {};
 	OptimiserStepContext context{
 		_dialect,
 		_nameDispenser,

From b508a63e4a6f10d3f7bb578e9ab7f0fcbb5dd219 Mon Sep 17 00:00:00 2001
From: Francisco Giordano <fg@frang.io>
Date: Fri, 19 Jul 2024 15:52:20 -0300
Subject: [PATCH 0955/1140] Fix docs on outputSelection

---
 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 1eb6631df4..39da067f39 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -404,7 +404,8 @@ Input Description
         // but to the whole source file like the AST.
         // A star as contract name refers to all contracts in the file.
         // Similarly, a star as a file name matches all files.
-        // To select all outputs the compiler can possibly generate, use
+        // To select all outputs the compiler can possibly generate, with the exclusion of
+        // Yul intermediate representation outputs, use
         // "outputSelection: { "*": { "*": [ "*" ], "": [ "*" ] } }"
         // but note that this might slow down the compilation process needlessly.
         //

From 535203b58f844335378f0b9567f7abedbd72f904 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 19 Jul 2024 17:27:32 +0200
Subject: [PATCH 0956/1140] Use latest node cimg

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20f57b4131..d6c3f33da0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -487,8 +487,7 @@ defaults:
 
   - base_node_small: &base_node_small
       docker:
-        # TODO: Revert to cimg/node:current once https://github.com/npm/cli/issues/7657 is resolved.
-        - image: cimg/node:22.4
+        - image: cimg/node:current
       resource_class: small
       environment: &base_node_small_env
         TERM: xterm
@@ -762,7 +761,6 @@ defaults:
       # which does not support shanghai EVM.
       compile_only: 1
       resource_class: medium
-      image: cimg/node:18.16
 
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *requires_b_ubu_static

From d0cabf490c97906757d8c8263cdd206fdf5f1547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Mon, 22 Jul 2024 11:56:25 +0200
Subject: [PATCH 0957/1140] Docs: Add note about the library placeholder format
 change in v0.5.0

The library placeholder string format has changed on v0.5.0. Someone reading the docs would be unaware of this and can assume the format remained the same.

This can be important e.g. verifying contracts pre 0.5.0 or working on the bytecode
---
 docs/contracts/libraries.rst | 2 +-
 docs/using-the-compiler.rst  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index 7256ebe031..1c6d837c7c 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -196,7 +196,7 @@ It is possible to obtain the address of a library by converting
 the library type to the ``address`` type, i.e. using ``address(LibraryName)``.
 
 As the compiler does not know the address where the library will be deployed, the compiled hex code
-will contain placeholders of the form ``__$30bbc0abd4d6364515865950d3e0d10953$__``. The placeholder
+will contain placeholders of the form ``__$30bbc0abd4d6364515865950d3e0d10953$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/using-the-compiler.html>`_. The placeholder
 is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library
 name, which would be for example ``libraries/bigint.sol:BigInt`` if the library was stored in a file
 called ``bigint.sol`` in a ``libraries/`` directory. Such bytecode is incomplete and should not be
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 39da067f39..c84d6a838c 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -71,7 +71,7 @@ For a detailed explanation with examples and discussion of corner cases please r
 Library Linking
 ---------------
 
-If your contracts use :ref:`libraries <libraries>`, you will notice that the bytecode contains substrings of the form ``__$53aea86b7d70b31448b230b20ae141a537$__``. These are placeholders for the actual library addresses.
+If your contracts use :ref:`libraries <libraries>`, you will notice that the bytecode contains substrings of the form ``__$53aea86b7d70b31448b230b20ae141a537$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/using-the-compiler.html>`_. These are placeholders for the actual library addresses.
 The placeholder is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library name.
 The bytecode file will also contain lines of the form ``// <placeholder> -> <fq library name>`` at the end to help
 identify which libraries the placeholders represent. Note that the fully qualified library name

From 1cbb3220de39f589885faf9e734e743f3b2f8857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Mon, 22 Jul 2024 12:03:48 +0200
Subject: [PATCH 0958/1140] Change link to libraries page

---
 docs/contracts/libraries.rst | 2 +-
 docs/using-the-compiler.rst  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index 1c6d837c7c..a3c04ba064 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -196,7 +196,7 @@ It is possible to obtain the address of a library by converting
 the library type to the ``address`` type, i.e. using ``address(LibraryName)``.
 
 As the compiler does not know the address where the library will be deployed, the compiled hex code
-will contain placeholders of the form ``__$30bbc0abd4d6364515865950d3e0d10953$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/using-the-compiler.html>`_. The placeholder
+will contain placeholders of the form ``__$30bbc0abd4d6364515865950d3e0d10953$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/contracts.html#libraries>`_. The placeholder
 is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library
 name, which would be for example ``libraries/bigint.sol:BigInt`` if the library was stored in a file
 called ``bigint.sol`` in a ``libraries/`` directory. Such bytecode is incomplete and should not be
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index c84d6a838c..a306fa835d 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -71,7 +71,7 @@ For a detailed explanation with examples and discussion of corner cases please r
 Library Linking
 ---------------
 
-If your contracts use :ref:`libraries <libraries>`, you will notice that the bytecode contains substrings of the form ``__$53aea86b7d70b31448b230b20ae141a537$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/using-the-compiler.html>`_. These are placeholders for the actual library addresses.
+If your contracts use :ref:`libraries <libraries>`, you will notice that the bytecode contains substrings of the form ``__$53aea86b7d70b31448b230b20ae141a537$__`` `(format was different <v0.5.0) <https://docs.soliditylang.org/en/v0.4.26/contracts.html#libraries>`_. These are placeholders for the actual library addresses.
 The placeholder is a 34 character prefix of the hex encoding of the keccak256 hash of the fully qualified library name.
 The bytecode file will also contain lines of the form ``// <placeholder> -> <fq library name>`` at the end to help
 identify which libraries the placeholders represent. Note that the fully qualified library name

From 755201202e3dfb4aca57780b55f8e6ce06663e91 Mon Sep 17 00:00:00 2001
From: dxo <hi@d-xo.org>
Date: Mon, 22 Jul 2024 20:50:00 +0200
Subject: [PATCH 0959/1140] docs/yul: pc is dissalowed in solc yul

pc was removed from solc assembly in 0.7.0 (it introduced an unwelcome
semantic dependency on code location).
---
 docs/yul.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 3cf2785fc4..58cfc992fd 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -820,8 +820,6 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | keccak256(p, n)         |     | F | keccak(mem[p...(p+n)))                                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| pc()                    |     | F | current position in code                                        |
-+-------------------------+-----+---+-----------------------------------------------------------------+
 | pop(x)                  | `-` | F | discard value x                                                 |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | mload(p)                |     | F | mem[p...(p+32))                                                 |

From cccbc122204ed230441ad991fcfd5855caec987f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 28 May 2024 15:06:46 +0200
Subject: [PATCH 0960/1140] Updated some outdated docs and TODOs related to the
 optimizer outputs

---
 libsolidity/interface/CompilerStack.h | 9 ++++++---
 solc/CommandLineInterface.cpp         | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 672067d81c..6ad868ad09 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -387,8 +387,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		std::shared_ptr<evmasm::Assembly> evmRuntimeAssembly;
 		evmasm::LinkerObject object; ///< Deployment object (includes the runtime sub-object).
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
-		std::string yulIR; ///< Yul IR code.
-		std::string yulIROptimized; ///< Optimized Yul IR code.
+		std::string yulIR; ///< Yul IR code straight from the code generator.
+		std::string yulIROptimized; ///< Reparsed and possibly optimized Yul IR code.
 		Json yulIRAst; ///< JSON AST of Yul IR code.
 		Json yulIROptimizedAst; ///< JSON AST of optimized Yul IR code.
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
@@ -449,7 +449,10 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	);
 
 	/// Generate Yul IR for a single contract.
-	/// The IR is stored but otherwise unused.
+	/// Unoptimized IR is stored but otherwise unused, while optimized IR may be used for code
+	/// generation if compilation via IR is enabled. Note that whether "optimized IR" is actually
+	/// optimized depends on the optimizer settings.
+	/// @param _contract Contract to generate IR for.
 	void generateIR(ContractDefinition const& _contract);
 
 	/// Generate EVM representation for a single contract.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 367434c93f..e2d1e2701d 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -849,7 +849,6 @@ void CommandLineInterface::compile()
 		m_compiler->setRevertStringBehaviour(m_options.output.revertStrings);
 		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 ||

From 1a60d1860d9f75b5d115887548fdec0dfc23a70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 29 May 2024 21:25:28 +0200
Subject: [PATCH 0961/1140] Do not perform IR optimization if only unoptimized
 IR is requested

---
 Changelog.md                                  |  2 +
 libsolidity/interface/CompilerStack.cpp       | 28 ++++++--
 libsolidity/interface/CompilerStack.h         | 23 ++++--
 libsolidity/interface/StandardCompiler.cpp    | 27 +++----
 solc/CommandLineInterface.cpp                 | 14 ++--
 .../ir_optimized_with_optimize/args           |  1 +
 .../ir_optimized_with_optimize/input.sol      |  4 ++
 .../ir_optimized_with_optimize/output         | 19 +++++
 .../ir_unoptimized_with_optimize/args         |  1 +
 .../ir_unoptimized_with_optimize/input.sol    |  4 ++
 .../ir_unoptimized_with_optimize/output       | 58 +++++++++++++++
 .../ir_unoptimized_with_optimize_via_ir/args  |  1 +
 .../input.sol                                 |  4 ++
 .../output                                    | 58 +++++++++++++++
 .../input.json                                | 11 +++
 .../output.json                               | 72 +++++++++++++++++++
 .../input.json                                | 12 ++++
 .../output.json                               | 72 +++++++++++++++++++
 18 files changed, 381 insertions(+), 30 deletions(-)
 create mode 100644 test/cmdlineTests/ir_optimized_with_optimize/args
 create mode 100644 test/cmdlineTests/ir_optimized_with_optimize/input.sol
 create mode 100644 test/cmdlineTests/ir_optimized_with_optimize/output
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize/args
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize/input.sol
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize/output
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/args
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/input.sol
 create mode 100644 test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/output
 create mode 100644 test/cmdlineTests/standard_ir_unoptimized_with_optimize/input.json
 create mode 100644 test/cmdlineTests/standard_ir_unoptimized_with_optimize/output.json
 create mode 100644 test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/input.json
 create mode 100644 test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/output.json

diff --git a/Changelog.md b/Changelog.md
index 7a5adcc4b0..e67cf0f07d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,10 +7,12 @@ Language Features:
 
 
 Compiler Features:
+ * Command Line Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Error Reporting: Unimplemented features are now properly reported as errors instead of being handled as if they were bugs.
  * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
+ * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
 
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 566feb21b1..f2c37fa685 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -313,7 +313,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_viaIR = false;
 		m_evmVersion = langutil::EVMVersion();
 		m_modelCheckerSettings = ModelCheckerSettings{};
-		m_generateIR = false;
+		m_irOutputSelection = IROutputSelection::None;
 		m_revertStrings = RevertStrings::Default;
 		m_optimiserSettings = OptimiserSettings::minimal();
 		m_metadataLiteralSources = false;
@@ -728,8 +728,17 @@ bool CompilerStack::compile(State _stopAfter)
 				{
 					try
 					{
-						if ((m_generateEvmBytecode && m_viaIR) || m_generateIR)
-							generateIR(*contract);
+						// NOTE: Bytecode generation via IR always uses Contract::yulIROptimized.
+						// When optimization is not enabled, that member simply contains unoptimized code.
+						bool needIROutput =
+							(m_generateEvmBytecode && m_viaIR) ||
+							m_irOutputSelection != IROutputSelection::None;
+						bool needUnoptimizedIROutputOnly =
+							!(m_generateEvmBytecode && m_viaIR) &&
+							m_irOutputSelection != IROutputSelection::UnoptimizedAndOptimized;
+
+						if (needIROutput)
+							generateIR(*contract, needUnoptimizedIROutputOnly);
 						if (m_generateEvmBytecode)
 						{
 							if (m_viaIR)
@@ -1402,7 +1411,7 @@ void CompilerStack::compileContract(
 	assembleYul(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr());
 }
 
-void CompilerStack::generateIR(ContractDefinition const& _contract)
+void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unoptimizedOnly)
 {
 	solAssert(m_stackState >= AnalysisSuccessful, "");
 
@@ -1420,7 +1429,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 
 	std::string dependenciesSource;
 	for (auto const& [dependency, referencee]: _contract.annotation().contractDependencies)
-		generateIR(*dependency);
+		generateIR(*dependency, _unoptimizedOnly);
 
 	if (!_contract.canBeDeployed())
 		return;
@@ -1485,9 +1494,14 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 	{
 		YulStack stack = parseYul(compiledContract.yulIR);
 		compiledContract.yulIRAst = stack.astJson();
-		stack.optimize();
-		compiledContract.yulIROptimized = stack.print(this);
+		if (!_unoptimizedOnly)
+		{
+			stack.optimize();
+			compiledContract.yulIROptimized = stack.print(this);
+		}
 	}
+
+	if (!_unoptimizedOnly)
 	{
 		// Optimizer does not maintain correct native source locations in the AST.
 		// We can work around it by regenerating the AST from scratch from optimized IR.
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 6ad868ad09..2c5ecb132b 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -126,6 +126,12 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		SolidityAST,
 	};
 
+	enum class IROutputSelection {
+		None,
+		UnoptimizedOnly,
+		UnoptimizedAndOptimized,
+	};
+
 	/// Creates a new compiler stack.
 	/// @param _readFile callback used to read files for import statements. Must return
 	/// and must not emit exceptions.
@@ -192,8 +198,14 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// Enable EVM Bytecode generation. This is enabled by default.
 	void enableEvmBytecodeGeneration(bool _enable = true) { m_generateEvmBytecode = _enable; }
 
-	/// Enable generation of Yul IR code.
-	void enableIRGeneration(bool _enable = true) { m_generateIR = _enable; }
+	/// Enable generation of Yul IR code so that IR output can be safely requested for all contracts.
+	/// Note that IR may also be implicitly generated when not requested. In particular
+	/// @a setViaIR(true) requires access to the IR outputs for bytecode generation.
+	void requestIROutputs(IROutputSelection _selection = IROutputSelection::UnoptimizedAndOptimized)
+	{
+		solAssert(m_stackState < ParsedAndImported);
+		m_irOutputSelection = _selection;
+	}
 
 	/// @arg _metadataLiteralSources When true, store sources as literals in the contract metadata.
 	/// Must be set before parsing.
@@ -453,7 +465,10 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// generation if compilation via IR is enabled. Note that whether "optimized IR" is actually
 	/// optimized depends on the optimizer settings.
 	/// @param _contract Contract to generate IR for.
-	void generateIR(ContractDefinition const& _contract);
+	/// @param _unoptimizedOnly If true, only the IR coming directly from the codegen is stored.
+	///     Optimizer is not invoked and optimized IR output is not available, which means that
+	///     optimized IR, its AST or compilation via IR must not be requested.
+	void generateIR(ContractDefinition const& _contract, bool _unoptimizedOnly);
 
 	/// Generate EVM representation for a single contract.
 	/// Depends on output generated by generateIR.
@@ -518,7 +533,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	ModelCheckerSettings m_modelCheckerSettings;
 	std::map<std::string, std::set<std::string>> m_requestedContractNames;
 	bool m_generateEvmBytecode = true;
-	bool m_generateIR = false;
+	IROutputSelection m_irOutputSelection = IROutputSelection::None;
 	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 b908ab0cc6..cb0c812682 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -295,25 +295,26 @@ bool isEvmBytecodeRequested(Json const& _outputSelection)
 	return false;
 }
 
-/// @returns true if any Yul IR was requested. Note that as an exception, '*' does not
-/// yet match "ir", "irAst", "irOptimized" or "irOptimizedAst"
-bool isIRRequested(Json const& _outputSelection)
+/// @returns The IR output selection for CompilerStack, based on outputs requested in the JSON.
+/// Note that as an exception, '*' does not yet match "ir", "irAst", "irOptimized" or "irOptimizedAst".
+CompilerStack::IROutputSelection irOutputSelection(Json const& _outputSelection)
 {
 	if (!_outputSelection.is_object())
-		return false;
+		return CompilerStack::IROutputSelection::None;
 
+	CompilerStack::IROutputSelection selection = CompilerStack::IROutputSelection::None;
 	for (auto const& fileRequests: _outputSelection)
 		for (auto const& requests: fileRequests)
 			for (auto const& request: requests)
-				if (
-					request == "ir" ||
-					request == "irAst" ||
-					request == "irOptimized" ||
-					request == "irOptimizedAst"
-				)
-					return true;
+			{
+				if (request == "irOptimized" || request == "irOptimizedAst")
+					return CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
 
-	return false;
+				if (request == "ir" || request == "irAst")
+					selection = CompilerStack::IROutputSelection::UnoptimizedOnly;
+			}
+
+	return selection;
 }
 
 Json formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
@@ -1320,7 +1321,7 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	compilerStack.setModelCheckerSettings(_inputsAndSettings.modelCheckerSettings);
 
 	compilerStack.enableEvmBytecodeGeneration(isEvmBytecodeRequested(_inputsAndSettings.outputSelection));
-	compilerStack.enableIRGeneration(isIRRequested(_inputsAndSettings.outputSelection));
+	compilerStack.requestIROutputs(irOutputSelection(_inputsAndSettings.outputSelection));
 
 	Json errors = std::move(_inputsAndSettings.errors);
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e2d1e2701d..5d0272dfa9 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -849,12 +849,14 @@ void CommandLineInterface::compile()
 		m_compiler->setRevertStringBehaviour(m_options.output.revertStrings);
 		if (m_options.output.debugInfoSelection.has_value())
 			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
-		m_compiler->enableIRGeneration(
-			m_options.compiler.outputs.ir ||
-			m_options.compiler.outputs.irOptimized ||
-			m_options.compiler.outputs.irAstJson ||
-			m_options.compiler.outputs.irOptimizedAstJson
-		);
+
+		CompilerStack::IROutputSelection irOutputSelection = CompilerStack::IROutputSelection::None;
+		if (m_options.compiler.outputs.irOptimized || m_options.compiler.outputs.irOptimizedAstJson)
+			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
+		else if (m_options.compiler.outputs.ir || m_options.compiler.outputs.irAstJson)
+			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedOnly;
+
+		m_compiler->requestIROutputs(irOutputSelection);
 		m_compiler->enableEvmBytecodeGeneration(
 			m_options.compiler.estimateGas ||
 			m_options.compiler.outputs.asm_ ||
diff --git a/test/cmdlineTests/ir_optimized_with_optimize/args b/test/cmdlineTests/ir_optimized_with_optimize/args
new file mode 100644
index 0000000000..a536442c5c
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_with_optimize/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --debug-info none
diff --git a/test/cmdlineTests/ir_optimized_with_optimize/input.sol b/test/cmdlineTests/ir_optimized_with_optimize/input.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_with_optimize/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/ir_optimized_with_optimize/output b/test/cmdlineTests/ir_optimized_with_optimize/output
new file mode 100644
index 0000000000..8790e45d35
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_with_optimize/output
@@ -0,0 +1,19 @@
+Optimized IR:
+/// @use-src 0:"ir_optimized_with_optimize/input.sol"
+object "C_2" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize("C_2_deployed")
+            codecopy(_1, dataoffset("C_2_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:"ir_optimized_with_optimize/input.sol"
+    object "C_2_deployed" {
+        code { { revert(0, 0) } }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/cmdlineTests/ir_unoptimized_with_optimize/args b/test/cmdlineTests/ir_unoptimized_with_optimize/args
new file mode 100644
index 0000000000..cdfef46500
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize/args
@@ -0,0 +1 @@
+--ir --optimize --debug-info none
diff --git a/test/cmdlineTests/ir_unoptimized_with_optimize/input.sol b/test/cmdlineTests/ir_unoptimized_with_optimize/input.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/ir_unoptimized_with_optimize/output b/test/cmdlineTests/ir_unoptimized_with_optimize/output
new file mode 100644
index 0000000000..c5307123f0
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize/output
@@ -0,0 +1,58 @@
+IR:
+
+/// @use-src 0:"ir_unoptimized_with_optimize/input.sol"
+object "C_2" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_2()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset("C_2_deployed"), datasize("C_2_deployed"))
+
+        return(_1, datasize("C_2_deployed"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_2() {
+
+        }
+
+    }
+    /// @use-src 0:"ir_unoptimized_with_optimize/input.sol"
+    object "C_2_deployed" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+
+            function shift_right_224_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/cmdlineTests/ir_unoptimized_with_optimize_via_ir/args b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/args
new file mode 100644
index 0000000000..c8c9fa85e7
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/args
@@ -0,0 +1 @@
+--ir --optimize --via-ir --debug-info none
diff --git a/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/input.sol b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/input.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/output b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/output
new file mode 100644
index 0000000000..f5ecdd8bf5
--- /dev/null
+++ b/test/cmdlineTests/ir_unoptimized_with_optimize_via_ir/output
@@ -0,0 +1,58 @@
+IR:
+
+/// @use-src 0:"ir_unoptimized_with_optimize_via_ir/input.sol"
+object "C_2" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_2()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset("C_2_deployed"), datasize("C_2_deployed"))
+
+        return(_1, datasize("C_2_deployed"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_2() {
+
+        }
+
+    }
+    /// @use-src 0:"ir_unoptimized_with_optimize_via_ir/input.sol"
+    object "C_2_deployed" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+
+            function shift_right_224_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/cmdlineTests/standard_ir_unoptimized_with_optimize/input.json b/test/cmdlineTests/standard_ir_unoptimized_with_optimize/input.json
new file mode 100644
index 0000000000..d12265a386
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_unoptimized_with_optimize/input.json
@@ -0,0 +1,11 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *; contract C {}"}
+    },
+    "settings": {
+        "outputSelection": {"*": {"*": ["ir"]}},
+        "optimizer": {"enabled": true},
+        "debug": {"debugInfo": []}
+    }
+}
diff --git a/test/cmdlineTests/standard_ir_unoptimized_with_optimize/output.json b/test/cmdlineTests/standard_ir_unoptimized_with_optimize/output.json
new file mode 100644
index 0000000000..d197231268
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_unoptimized_with_optimize/output.json
@@ -0,0 +1,72 @@
+{
+    "contracts": {
+        "C.sol": {
+            "C": {
+                "ir": "
+/// @use-src 0:\"C.sol\"
+object \"C_2\" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_2()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset(\"C_2_deployed\"), datasize(\"C_2_deployed\"))
+
+        return(_1, datasize(\"C_2_deployed\"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_2() {
+
+        }
+
+    }
+    /// @use-src 0:\"C.sol\"
+    object \"C_2_deployed\" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+
+            function shift_right_224_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>\"
+    }
+
+}
+
+"
+            }
+        }
+    },
+    "sources": {
+        "C.sol": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/input.json b/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/input.json
new file mode 100644
index 0000000000..06b89d0e01
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/input.json
@@ -0,0 +1,12 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *; contract C {}"}
+    },
+    "settings": {
+        "outputSelection": {"*": {"*": ["ir"]}},
+        "optimizer": {"enabled": true},
+        "viaIR": true,
+        "debug": {"debugInfo": []}
+    }
+}
diff --git a/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/output.json b/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/output.json
new file mode 100644
index 0000000000..d197231268
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_unoptimized_with_optimize_via_ir/output.json
@@ -0,0 +1,72 @@
+{
+    "contracts": {
+        "C.sol": {
+            "C": {
+                "ir": "
+/// @use-src 0:\"C.sol\"
+object \"C_2\" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_C_2()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset(\"C_2_deployed\"), datasize(\"C_2_deployed\"))
+
+        return(_1, datasize(\"C_2_deployed\"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_C_2() {
+
+        }
+
+    }
+    /// @use-src 0:\"C.sol\"
+    object \"C_2_deployed\" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+
+            function shift_right_224_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>\"
+    }
+
+}
+
+"
+            }
+        }
+    },
+    "sources": {
+        "C.sol": {
+            "id": 0
+        }
+    }
+}

From f89e83bbb091be506105f17eb7caf6ec1f63ec51 Mon Sep 17 00:00:00 2001
From: clonker <clonker+gh@gmail.com>
Date: Fri, 12 Jul 2024 10:13:04 +0200
Subject: [PATCH 0962/1140] yul: AsmPrinter has mode enum to determine printing
 mode instead of dialect pointer

---
 libsolidity/codegen/CompilerContext.cpp       |  4 ++--
 .../codegen/ir/IRGeneratorForStatements.cpp   |  3 +--
 .../codegen/IRGeneratorForStatements.cpp      |  2 +-
 libyul/AsmPrinter.cpp                         | 10 +++++++---
 libyul/AsmPrinter.h                           | 20 ++++++++++---------
 libyul/Object.cpp                             |  8 +++++---
 libyul/Object.h                               | 10 +++++++---
 libyul/YulStack.cpp                           |  7 ++++++-
 libyul/optimiser/Suite.cpp                    |  2 +-
 test/libyul/Common.cpp                        |  4 +++-
 test/libyul/Parser.cpp                        | 10 ++++------
 test/libyul/YulOptimizerTest.cpp              |  2 +-
 test/tools/yulopti.cpp                        |  4 ++--
 tools/yulPhaser/Program.cpp                   |  2 +-
 14 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 4d522072af..962defdbc8 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -491,8 +491,8 @@ 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);
-			std::string code = yul::AsmPrinter{dialect}(*obj.code);
+			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(*obj.code);
+			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(*obj.code);
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
 			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 5be4d550e7..4f4f96329a 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2256,8 +2256,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 
 	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";
+	appendCode() << yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, _inlineAsm.dialect())(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
index f9c50cf7a7..109c3ee6f1 100644
--- a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -132,7 +132,7 @@ 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";
+	m_code << yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, _assembly.dialect())(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 054f83a913..6b840fcfea 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -245,11 +245,15 @@ std::string AsmPrinter::formatTypedName(TypedName _variable)
 
 std::string AsmPrinter::appendTypeName(YulName _type, bool _isBoolLiteral) const
 {
-	if (m_dialect && !_type.empty())
+	yulAssert(
+		m_typePrintingMode == TypePrinting::OmitDefault || m_typePrintingMode == TypePrinting::Full,
+		"unhandled printing mode"
+	);
+	if (m_typePrintingMode == TypePrinting::OmitDefault && !_type.empty())
 	{
-		if (!_isBoolLiteral && _type == m_dialect->defaultType)
+		if (!_isBoolLiteral && _type == m_dialect.defaultType)
 			_type = {};
-		else if (_isBoolLiteral && _type == m_dialect->boolType && !m_dialect->defaultType.empty())
+		else if (_isBoolLiteral && _type == m_dialect.boolType && !m_dialect.defaultType.empty())
 			// Special case: If we have a bool type but empty default type, do not remove the type.
 			_type = {};
 	}
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 36ea06c767..684ddaacf0 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -46,12 +46,20 @@ struct Dialect;
 class AsmPrinter
 {
 public:
+	enum class TypePrinting
+	{
+		OmitDefault,
+		Full
+	};
+
 	explicit AsmPrinter(
-		Dialect const* _dialect = nullptr,
+		TypePrinting const _typePrintingMode,
+		Dialect const& _dialect,
 		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	):
+		m_typePrintingMode(_typePrintingMode),
 		m_dialect(_dialect),
 		m_debugInfoSelection(_debugInfoSelection),
 		m_soliditySourceProvider(_soliditySourceProvider)
@@ -61,13 +69,6 @@ class AsmPrinter
 				m_nameToSourceIndex[*name] = index;
 	}
 
-	explicit AsmPrinter(
-		Dialect const& _dialect,
-		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
-		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	): AsmPrinter(&_dialect, _sourceIndexToName, _debugInfoSelection, _soliditySourceProvider) {}
-
 	std::string operator()(Literal const& _literal);
 	std::string operator()(Identifier const& _identifier);
 	std::string operator()(ExpressionStatement const& _expr);
@@ -101,7 +102,8 @@ class AsmPrinter
 		return formatDebugData(_node.debugData, !isExpression);
 	}
 
-	Dialect const* const m_dialect = nullptr;
+	TypePrinting const m_typePrintingMode{};
+	Dialect const& m_dialect;
 	std::map<std::string, unsigned> m_nameToSourceIndex;
 	langutil::SourceLocation m_lastLocation = {};
 	langutil::DebugInfoSelection m_debugInfoSelection = {};
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 76d8bdc667..736c1bb841 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -38,13 +38,14 @@ using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-std::string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
+std::string Data::toString(Dialect const&, AsmPrinter::TypePrinting, DebugInfoSelection const&, CharStreamProvider const*) const
 {
 	return "data \"" + name + "\" hex\"" + util::toHex(data) + "\"";
 }
 
 std::string Object::toString(
-	Dialect const* _dialect,
+	Dialect const& _dialect,
+	AsmPrinter::TypePrinting const _printingMode,
 	DebugInfoSelection const& _debugInfoSelection,
 	CharStreamProvider const* _soliditySourceProvider
 ) const
@@ -63,6 +64,7 @@ std::string Object::toString(
 			"\n";
 
 	std::string inner = "code " + AsmPrinter(
+		_printingMode,
 		_dialect,
 		debugData->sourceNames,
 		_debugInfoSelection,
@@ -70,7 +72,7 @@ std::string Object::toString(
 	)(*code);
 
 	for (auto const& obj: subObjects)
-		inner += "\n" + obj->toString(_dialect, _debugInfoSelection, _soliditySourceProvider);
+		inner += "\n" + obj->toString(_dialect, _printingMode, _debugInfoSelection, _soliditySourceProvider);
 
 	return useSrcComment + "object \"" + name + "\" {\n" + indent(inner) + "\n}";
 }
diff --git a/libyul/Object.h b/libyul/Object.h
index af354005b6..4e891c2640 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <libyul/AsmPrinter.h>
 #include <libyul/ASTForward.h>
 
 #include <liblangutil/CharStreamProvider.h>
@@ -53,7 +54,8 @@ struct ObjectNode
 	/// Can be empty since .yul files can also just contain code, without explicitly placing it in an object.
 	std::string name;
 	virtual std::string toString(
-		Dialect const* _dialect,
+		Dialect const& _dialect,
+		AsmPrinter::TypePrinting printingMode,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const = 0;
@@ -70,7 +72,8 @@ struct Data: public ObjectNode
 	bytes data;
 
 	std::string toString(
-		Dialect const* _dialect,
+		Dialect const& _dialect,
+		AsmPrinter::TypePrinting printingMode,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const override;
@@ -92,7 +95,8 @@ struct Object: public ObjectNode
 public:
 	/// @returns a (parseable) string representation.
 	std::string toString(
-		Dialect const* _dialect,
+		Dialect const& _dialect,
+		AsmPrinter::TypePrinting printingMode = AsmPrinter::TypePrinting::Full,
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 9aaaab2eb2..223d6c04a1 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -365,7 +365,12 @@ std::string YulStack::print(
 	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->code, "");
-	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
+	return m_parserResult->toString(
+		languageToDialect(m_language, m_evmVersion),
+		AsmPrinter::TypePrinting::OmitDefault,
+		m_debugInfoSelection,
+		_soliditySourceProvider
+	) + "\n";
 }
 
 Json YulStack::astJson() const
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index c4004948c8..c022fb0d74 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -510,7 +510,7 @@ void OptimiserSuite::runSequence(std::vector<std::string> const& _steps, Block&
 			else
 			{
 				std::cout << "== Running " << step << " changed the AST." << std::endl;
-				std::cout << AsmPrinter{}(_ast) << std::endl;
+				std::cout << AsmPrinter{AsmPrinter::TypePrinting::Full, m_context.dialect}(_ast) << std::endl;
 				copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
 			}
 		}
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 10d7d12add..dece0d82b1 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -96,7 +96,9 @@ yul::Block yul::test::disambiguate(std::string const& _source, bool _yul)
 
 std::string yul::test::format(std::string const& _source, bool _yul)
 {
-	return yul::AsmPrinter()(*parse(_source, _yul).first);
+	auto const version = solidity::test::CommonOptions::get().evmVersion();
+	Dialect const& dialect = _yul ? EVMDialectTyped::instance(version) : EVMDialect::strictAssemblyForEVMObjects(version);
+	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(*parse(_source, _yul).first);
 }
 
 namespace
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index faa6c6105f..7b3cdac8b2 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -164,9 +164,8 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 	);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
-	// Use no dialect so that all types are printed.
-	// This tests that the default types are properly assigned.
-	BOOST_CHECK_EQUAL(AsmPrinter{}(*result),
+	// All types are printed.
+	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::Full, EVMDialectTyped::instance(EVMVersion()))(*result),
 		"{\n"
 		"    let x:bool := true:bool\n"
 		"    let z:bool := true:bool\n"
@@ -177,9 +176,8 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 		"}"
 	);
 
-	// Now test again with type dialect. Now the default types
-	// should be omitted.
-	BOOST_CHECK_EQUAL(AsmPrinter{EVMDialectTyped::instance(EVMVersion{})}(*result),
+	// Now the default types should be omitted.
+	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::OmitDefault, EVMDialectTyped::instance(EVMVersion()))(*result),
 		"{\n"
 		"    let x:bool := true\n"
 		"    let z:bool := true\n"
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 82e2549809..b30fa82511 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -78,7 +78,7 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 		return TestResult::FatalError;
 	}
 
-	auto const printed = (m_object->subObjects.empty() ? AsmPrinter{ *m_dialect }(*m_object->code) : m_object->toString(m_dialect));
+	auto const printed = (m_object->subObjects.empty() ? AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(*m_object->code) : m_object->toString(*m_dialect));
 
 	// Re-parse new code for compilability
 	if (!std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 7e81cbf7e3..2b9e530e02 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -181,7 +181,7 @@ class YulOpti
 		parse(_source);
 		disambiguate();
 		OptimiserSuite{m_context}.runSequence(_steps, *m_ast);
-		std::cout << AsmPrinter{m_dialect}(*m_ast) << std::endl;
+		std::cout << AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_ast) << std::endl;
 	}
 
 	void runInteractive(std::string _source, bool _disambiguated = false)
@@ -229,7 +229,7 @@ class YulOpti
 							*m_ast
 						);
 				}
-				_source = AsmPrinter{m_dialect}(*m_ast);
+				_source = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_ast);
 			}
 			catch (...)
 			{
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 0cb22242d0..e0c8ec4fbe 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -105,7 +105,7 @@ void Program::optimise(std::vector<std::string> const& _optimisationSteps)
 
 std::ostream& phaser::operator<<(std::ostream& _stream, Program const& _program)
 {
-	return _stream << AsmPrinter()(*_program.m_ast);
+	return _stream << AsmPrinter(AsmPrinter::TypePrinting::Full, _program.m_dialect)(*_program.m_ast);
 }
 
 std::string Program::toJson() const

From 5af111584df90e8ff33c62636b419afa4957e50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Thu, 25 Jul 2024 17:41:26 +0200
Subject: [PATCH 0963/1140] Add library abi notes in ABI page

---
 docs/abi-spec.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 0d48b51dd7..91da5127c5 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -16,7 +16,7 @@ as described in this specification. The encoding is not self describing and thus
 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.
+This specification does not address contracts whose interface is dynamic or otherwise known only at run-time. Also, the ABI specification for libraries is :ref:`slightly different <library-selectors>`.
 
 .. _abi_function_selector:
 .. index:: ! selector; of a function
@@ -47,6 +47,8 @@ without the four bytes specifying the function.
 Types
 =====
 
+Note that the library ABIs can take types different than below e.g. for non-storage structs. See :ref:`library selectors <library-selectors>` for details.
+
 The following elementary types exist:
 
 - ``uint<M>``: unsigned integer type of ``M`` bits, ``0 < M <= 256``, ``M % 8 == 0``. e.g. ``uint32``, ``uint8``, ``uint256``.

From 911ab3c1b65ae65bbb49a07dffce3520fe700028 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Thu, 20 Jun 2024 14:24:11 +0200
Subject: [PATCH 0964/1140] SMTChecker: Introduce SMT-LIB context

Maintaining SMT-LIB context has two advantages.
First, it simplifies parsing back solvers' answer as we keep around all
the declarations of datatypes and variables.

Second, it clears SMTLibInterface (CHCSmtLibInterface) as we factor out
the members and functinality related to SMT-LIB context.
---
 libsmtutil/BMCSolverInterface.h               |  51 ++
 libsmtutil/CHCSmtLib2Interface.cpp            | 481 ++++++--------
 libsmtutil/CHCSmtLib2Interface.h              |  52 +-
 libsmtutil/CHCSolverInterface.h               |   6 +-
 libsmtutil/CMakeLists.txt                     |   2 +
 libsmtutil/SMTLib2Context.cpp                 | 314 ++++++++++
 libsmtutil/SMTLib2Context.h                   | 109 ++++
 libsmtutil/SMTLib2Interface.cpp               | 268 +++-----
 libsmtutil/SMTLib2Interface.h                 |  60 +-
 libsmtutil/SMTPortfolio.cpp                   |   4 +-
 libsmtutil/SMTPortfolio.h                     |   8 +-
 libsmtutil/SolverInterface.h                  |  19 +-
 libsmtutil/Z3Interface.cpp                    |   2 +-
 libsmtutil/Z3Interface.h                      |   4 +-
 libsolidity/formal/BMC.cpp                    |   2 +-
 libsolidity/formal/BMC.h                      |   4 +-
 libsolidity/formal/CHC.cpp                    |   3 +-
 .../formal/EldaricaCHCSmtLib2Interface.cpp    |   4 +-
 .../formal/EldaricaCHCSmtLib2Interface.h      |   2 +-
 .../model_checker_print_query_all/err         | 191 +++---
 .../model_checker_print_query_bmc/err         |   1 -
 .../model_checker_print_query_chc/err         | 190 +++---
 .../output.json                               | 593 +++++++-----------
 .../output.json                               |   5 +-
 .../output.json                               | 572 +++++++----------
 .../output.json                               | 195 +++---
 .../invariants/array_access.sol               |  20 +
 .../invariants/struct_access.sol              |  15 +
 28 files changed, 1599 insertions(+), 1578 deletions(-)
 create mode 100644 libsmtutil/BMCSolverInterface.h
 create mode 100644 libsmtutil/SMTLib2Context.cpp
 create mode 100644 libsmtutil/SMTLib2Context.h
 create mode 100644 test/libsolidity/smtCheckerTests/invariants/array_access.sol
 create mode 100644 test/libsolidity/smtCheckerTests/invariants/struct_access.sol

diff --git a/libsmtutil/BMCSolverInterface.h b/libsmtutil/BMCSolverInterface.h
new file mode 100644
index 0000000000..3681b21e43
--- /dev/null
+++ b/libsmtutil/BMCSolverInterface.h
@@ -0,0 +1,51 @@
+/*
+	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 <libsmtutil/SolverInterface.h>
+
+namespace solidity::smtutil
+{
+
+class BMCSolverInterface : public SolverInterface
+{
+public:
+	explicit BMCSolverInterface(std::optional<unsigned> _queryTimeout = {}): m_queryTimeout(_queryTimeout) {}
+
+	~BMCSolverInterface() override = default;
+	virtual void reset() = 0;
+
+	virtual void push() = 0;
+	virtual void pop() = 0;
+
+	virtual void addAssertion(Expression const& _expr) = 0;
+
+	/// Checks for satisfiability, evaluates the expressions if a model
+	/// is available. Throws SMTSolverError on error.
+	virtual std::pair<CheckResult, std::vector<std::string>>
+	check(std::vector<Expression> const& _expressionsToEvaluate) = 0;
+
+	/// @returns a list of queries that the system was not able to respond to.
+	virtual std::vector<std::string> unhandledQueries() { return {}; }
+
+protected:
+	std::optional<unsigned> m_queryTimeout;
+};
+
+}
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index a267a843bb..8b795b9d5f 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -48,48 +48,46 @@ CHCSmtLib2Interface::CHCSmtLib2Interface(
 	std::optional<unsigned> _queryTimeout
 ):
 	CHCSolverInterface(_queryTimeout),
-	m_smtlib2(std::make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
 	m_queryResponses(std::move(_queryResponses)),
-	m_smtCallback(_smtCallback)
+	m_smtCallback(std::move(_smtCallback))
 {
 	reset();
 }
 
 void CHCSmtLib2Interface::reset()
 {
-	m_accumulatedOutput.clear();
-	m_variables.clear();
 	m_unhandledQueries.clear();
-	m_smtlib2->reset();
+	m_commands.clear();
+	m_context.clear();
+	createHeader();
+	m_context.setTupleDeclarationCallback([&](TupleSort const& _tupleSort){
+		m_commands.declareTuple(
+			_tupleSort.name,
+			_tupleSort.members,
+			_tupleSort.components
+				| ranges::views::transform([&](SortPointer const& _sort){ return m_context.toSmtLibSort(_sort); })
+				| ranges::to<std::vector>()
+		);
+	});
 }
 
 void CHCSmtLib2Interface::registerRelation(Expression const& _expr)
 {
 	smtAssert(_expr.sort);
 	smtAssert(_expr.sort->kind == Kind::Function);
-	if (!m_variables.count(_expr.name))
-	{
-		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(
-			"(declare-fun |" +
-			_expr.name +
-			"| " +
-			domain +
-			" Bool)"
-		);
-	}
+	if (m_context.isDeclared(_expr.name))
+		return;
+	auto const& fSort = std::dynamic_pointer_cast<FunctionSort>(_expr.sort);
+	smtAssert(fSort->codomain);
+	auto domain = toSmtLibSort(fSort->domain);
+	std::string codomain = toSmtLibSort(fSort->codomain);
+	m_commands.declareFunction(_expr.name, domain, codomain);
+	m_context.declare(_expr.name, _expr.sort);
 }
 
 void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*_name*/)
 {
-	write(
-		"(assert\n(forall " + forall() + "\n" +
-		m_smtlib2->toSExpr(_expr) +
-		"))\n\n"
-	);
+	m_commands.assertion("(forall" + forall(_expr) + '\n' + m_context.toSExpr(_expr) + ")\n");
 }
 
 std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
@@ -117,31 +115,45 @@ std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Inte
 void CHCSmtLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort);
-	if (_sort->kind == Kind::Function)
-		declareFunction(_name, _sort);
-	else if (!m_variables.count(_name))
-	{
-		m_variables.insert(_name);
-		write("(declare-var |" + _name + "| " + toSmtLibSort(_sort) + ')');
-	}
+	if (!m_context.isDeclared(_name))
+		m_context.declare(_name, _sort);
 }
 
-std::string CHCSmtLib2Interface::toSmtLibSort(SortPointer _sort)
+std::string CHCSmtLib2Interface::toSmtLibSort(SortPointer const& _sort)
 {
-	return m_smtlib2->toSmtLibSort(_sort);
+	return m_context.toSmtLibSort(_sort);
 }
 
-std::string CHCSmtLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
+std::vector<std::string> CHCSmtLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
 {
-	return m_smtlib2->toSmtLibSort(_sorts);
+	return applyMap(_sorts, [this](auto const& sort) { return toSmtLibSort(sort); });
 }
 
-std::string CHCSmtLib2Interface::forall()
+std::set<std::string> CHCSmtLib2Interface::collectVariableNames(Expression const& _expr) const
 {
+	std::set<std::string> names;
+	auto dfs = [&](Expression const& _current, auto _recurse) -> void
+	{
+		if (_current.arguments.empty())
+		{
+			if (m_context.isDeclared(_current.name))
+				names.insert(_current.name);
+		}
+		else
+			for (auto const& arg: _current.arguments)
+				_recurse(arg, _recurse);
+	};
+	dfs(_expr, dfs);
+	return names;
+}
+
+std::string CHCSmtLib2Interface::forall(Expression const& _expr)
+{
+	auto varNames = collectVariableNames(_expr);
 	std::string vars("(");
-	for (auto const& [name, sort]: m_smtlib2->variables())
+	for (auto const& name: varNames)
 	{
-		solAssert(sort, "");
+		auto sort = m_context.getDeclaredSort(name);
 		if (sort->kind != Kind::Function)
 			vars += " (" + name + " " + toSmtLibSort(sort) + ")";
 	}
@@ -149,35 +161,6 @@ std::string CHCSmtLib2Interface::forall()
 	return vars;
 }
 
-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 = std::dynamic_pointer_cast<FunctionSort>(_sort);
-		smtAssert(fSort->codomain);
-		std::string domain = toSmtLibSort(fSort->domain);
-		std::string codomain = toSmtLibSort(fSort->codomain);
-		m_variables.insert(_name);
-		write(
-			"(declare-fun |" +
-			_name +
-			"| " +
-			domain +
-			" " +
-			codomain +
-			")"
-		);
-	}
-}
-
-void CHCSmtLib2Interface::write(std::string _data)
-{
-	m_accumulatedOutput += std::move(_data) + "\n";
-}
-
 std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
 {
 	util::h256 inputHash = util::keccak256(_input);
@@ -186,7 +169,6 @@ std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
 
 	if (m_smtCallback)
 	{
-		setupSmtCallback();
 		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
 		if (result.success)
 			return result.responseOrErrorMessage;
@@ -198,242 +180,194 @@ std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
 
 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();
+	return m_commands.toString() + createQueryAssertion(_expr.name) + '\n' + "(check-sat)" + '\n';
 }
 
-std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
-	std::stringstream s;
+void CHCSmtLib2Interface::createHeader()
+{
 	if (m_queryTimeout)
-		s << "(set-option :timeout " + std::to_string(*m_queryTimeout) + ")\n";
-	s << "(set-logic HORN)" << std::endl;
+		m_commands.setOption("timeout", std::to_string(*m_queryTimeout));
+	m_commands.setLogic("HORN");
+}
 
-	for (auto const& decl: m_smtlib2->userSorts() | ranges::views::values)
-		s << decl << std::endl;
+std::string CHCSmtLib2Interface::createQueryAssertion(std::string _name) {
+	return "(assert\n(forall ((UNUSED Bool))\n(=> " + std::move(_name) + " false)))";
+}
 
-	return s.str();
+namespace
+{
+bool isNumber(std::string const& _expr)
+{
+	return ranges::all_of(_expr, [](char c) { return isDigit(c) || c == '.'; });
+}
 }
 
-std::string CHCSmtLib2Interface::createQueryAssertion(std::string name) {
-	return "(assert\n(forall " + forall() + "\n" + "(=> " + name + " false)))";
+void CHCSmtLib2Interface::ScopedParser::addVariableDeclaration(std::string _name, solidity::smtutil::SortPointer _sort)
+{
+	m_localVariables.emplace(std::move(_name), std::move(_sort));
 }
 
-class SMTLibTranslationContext
+std::optional<SortPointer> CHCSmtLib2Interface::ScopedParser::lookupKnownTupleSort(std::string const& _name) const
 {
-	CHCSmtLib2Interface const& m_chcInterface;
-	std::map<std::string, SortPointer> m_knownVariables;
+	return m_context.getTupleType(_name);
+}
 
-	static bool isNumber(std::string const& _expr)
+SortPointer CHCSmtLib2Interface::ScopedParser::toSort(SMTLib2Expression const& _expr)
+{
+	if (isAtom(_expr))
 	{
-		return ranges::all_of(_expr, [](char c) { return isDigit(c) || c == '.'; });
+		auto const& name = asAtom(_expr);
+		if (name == "Int")
+			return SortProvider::sintSort;
+		if (name == "Bool")
+			return SortProvider::boolSort;
+		auto tupleSort = lookupKnownTupleSort(name);
+		if (tupleSort)
+			return tupleSort.value();
 	}
-
-
-public:
-	explicit SMTLibTranslationContext(CHCSmtLib2Interface const& _chcInterface) : m_chcInterface(_chcInterface)
+	else
 	{
-		// fill user defined sorts and constructors
-		auto const& userSorts = m_chcInterface.smtlib2Interface()->userSorts();
-		for (auto const& declaration: userSorts | ranges::views::values)
+		auto const& args = asSubExpressions(_expr);
+		if (asAtom(args[0]) == "Array")
 		{
-			std::stringstream ss(declaration);
-			SMTLib2Parser parser(ss);
-			auto expr = parser.parseExpression();
-			smtAssert(parser.isEOF());
-			smtAssert(!isAtom(expr));
-			auto const& args = asSubExpressions(expr);
 			smtAssert(args.size() == 3);
-			smtAssert(isAtom(args[0]) && asAtom(args[0]) == "declare-datatypes");
-			// args[1] is the name of the type
-			// args[2] is the constructor with the members
-			smtAssert(!isAtom(args[2]) && asSubExpressions(args[2]).size() == 1 && !isAtom(asSubExpressions(args[2])[0]));
-			auto const& constructors = asSubExpressions(asSubExpressions(args[2])[0]);
-			smtAssert(constructors.size() == 1);
-			auto const& constructor = constructors[0];
-			// constructor is a list: name + members
-			smtAssert(!isAtom(constructor));
-			auto const& constructorArgs = asSubExpressions(constructor);
-			for (unsigned i = 1u; i < constructorArgs.size(); ++i)
-			{
-				auto const& carg = constructorArgs[i];
-				smtAssert(!isAtom(carg) && asSubExpressions(carg).size() == 2);
-				auto const& nameSortPair = asSubExpressions(carg);
-				m_knownVariables.emplace(asAtom(nameSortPair[0]), toSort(nameSortPair[1]));
-			}
+			auto domainSort = toSort(args[1]);
+			auto codomainSort = toSort(args[2]);
+			return std::make_shared<ArraySort>(std::move(domainSort), std::move(codomainSort));
 		}
+		if (args.size() == 3 && isAtom(args[0]) && asAtom(args[0]) == "_" && isAtom(args[1])
+			&& asAtom(args[1]) == "int2bv")
+			return std::make_shared<BitVectorSort>(std::stoul(asAtom(args[2])));
 	}
+	smtAssert(false, "Unknown sort encountered");
+}
 
-	void addVariableDeclaration(std::string name, SortPointer sort)
+smtutil::Expression CHCSmtLib2Interface::ScopedParser::parseQuantifier(
+	std::string const& _quantifierName,
+	std::vector<SMTLib2Expression> const& _varList,
+	SMTLib2Expression const& _coreExpression)
+{
+	std::vector<std::pair<std::string, SortPointer>> boundVariables;
+	for (auto const& sortedVar: _varList)
 	{
-		smtAssert(m_knownVariables.find(name) == m_knownVariables.end());
-		m_knownVariables.emplace(std::move(name), std::move(sort));
-	}
-
-	std::optional<SortPointer> lookupKnownTupleSort(std::string const& name) {
-		auto const& userSorts = m_chcInterface.sortNames();
-		std::string quotedName = "|" + name + "|";
-		auto it = ranges::find_if(userSorts, [&](auto const& entry) { return entry.second == quotedName; });
-		if (it != userSorts.end() && it->first->kind == Kind::Tuple)
-		{
-			auto tupleSort = std::dynamic_pointer_cast<TupleSort>(it->first);
-			smtAssert(tupleSort);
-			return tupleSort;
-		}
-		return {};
+		smtAssert(!isAtom(sortedVar));
+		auto varSortPair = asSubExpressions(sortedVar);
+		smtAssert(varSortPair.size() == 2);
+		boundVariables.emplace_back(asAtom(varSortPair[0]), toSort(varSortPair[1]));
 	}
-
-	SortPointer toSort(SMTLib2Expression const& expr)
+	for (auto const& [var, sort]: boundVariables)
 	{
-		if (isAtom(expr))
-		{
-			auto const& name = asAtom(expr);
-			if (name == "Int")
-				return SortProvider::sintSort;
-			if (name == "Bool")
-				return SortProvider::boolSort;
-			auto tupleSort = lookupKnownTupleSort(name);
-			if (tupleSort)
-				return tupleSort.value();
-		} else {
-			auto const& args = asSubExpressions(expr);
-			if (asAtom(args[0]) == "Array")
-			{
-				smtAssert(args.size() == 3);
-				auto domainSort = toSort(args[1]);
-				auto codomainSort = toSort(args[2]);
-				return std::make_shared<ArraySort>(std::move(domainSort), std::move(codomainSort));
-			}
-			if (args.size() == 3 && isAtom(args[0]) && asAtom(args[0]) == "_" && isAtom(args[1]) && asAtom(args[1]) == "int2bv")
-				return std::make_shared<BitVectorSort>(std::stoul(asAtom(args[2])));
-		}
-		smtAssert(false, "Unknown sort encountered");
+		smtAssert(m_localVariables.count(var) == 0); // TODO: deal with shadowing?
+		m_localVariables.emplace(var, sort);
 	}
-
-	smtutil::Expression parseQuantifier(
-		std::string const& quantifierName,
-		std::vector<SMTLib2Expression> const& varList,
-		SMTLib2Expression const& coreExpression
-	)
+	auto core = toSMTUtilExpression(_coreExpression);
+	for (auto const& [var, sort]: boundVariables)
 	{
-		std::vector<std::pair<std::string, SortPointer>> boundVariables;
-		for (auto const& sortedVar: varList)
-		{
-			smtAssert(!isAtom(sortedVar));
-			auto varSortPair = asSubExpressions(sortedVar);
-			smtAssert(varSortPair.size() == 2);
-			boundVariables.emplace_back(asAtom(varSortPair[0]), toSort(varSortPair[1]));
-		}
-		for (auto const& [var, sort] : boundVariables)
-		{
-			smtAssert(m_knownVariables.find(var) == m_knownVariables.end()); // TODO: deal with shadowing?
-			m_knownVariables.emplace(var, sort);
-		}
-		auto core = toSMTUtilExpression(coreExpression);
-		for (auto const& [var, sort] : boundVariables)
-		{
-			smtAssert(m_knownVariables.find(var) != m_knownVariables.end());
-			m_knownVariables.erase(var);
-		}
-		return Expression(quantifierName, {core}, SortProvider::boolSort); // TODO: what about the bound variables?
-
+		smtAssert(m_localVariables.count(var) != 0);
+		m_localVariables.erase(var);
 	}
+	return Expression(_quantifierName, {core}, SortProvider::boolSort); // TODO: what about the bound variables?
+}
 
-	smtutil::Expression toSMTUtilExpression(SMTLib2Expression const& _expr)
-	{
-		return std::visit(
-			GenericVisitor{
-				[&](std::string const& _atom)
+smtutil::Expression CHCSmtLib2Interface::ScopedParser::toSMTUtilExpression(SMTLib2Expression const& _expr)
+{
+	return std::visit(
+		GenericVisitor{
+			[&](std::string const& _atom)
+			{
+				if (_atom == "true" || _atom == "false")
+					return smtutil::Expression(_atom == "true");
+				else if (isNumber(_atom))
+					return smtutil::Expression(_atom, {}, SortProvider::sintSort);
+				else if (auto it = m_localVariables.find(_atom); it != m_localVariables.end())
+					return smtutil::Expression(_atom, {}, it->second);
+				else if (m_context.isDeclared(_atom))
+					return smtutil::Expression(_atom, {}, m_context.getDeclaredSort(_atom));
+				else if (auto maybeTupleType = m_context.getTupleType(_atom); maybeTupleType.has_value())
 				{
-					if (_atom == "true" || _atom == "false")
-						return smtutil::Expression(_atom == "true");
-					else if (isNumber(_atom))
-						return smtutil::Expression(_atom, {}, SortProvider::sintSort);
-					else if (auto it = m_knownVariables.find(_atom); it != m_knownVariables.end())
-						return smtutil::Expression(_atom, {}, it->second);
-					else // assume this is a predicate with sort bool; TODO: Context should be aware of predicates!
-						return smtutil::Expression(_atom, {}, SortProvider::boolSort);
-				},
-				[&](std::vector<SMTLib2Expression> const& _subExpr)
+					// 0-ary tuple type, can happen
+					return smtutil::Expression(_atom, {}, std::make_shared<TupleSort>(_atom, std::vector<std::string>{}, std::vector<SortPointer>{}));
+				}
+				else
+					smtAssert(false, "Unhandled atomic SMT expression");
+			},
+			[&](std::vector<SMTLib2Expression> const& _subExpr)
+			{
+				SortPointer sort;
+				std::vector<smtutil::Expression> arguments;
+				if (isAtom(_subExpr.front()))
 				{
-					SortPointer sort;
-					std::vector<smtutil::Expression> arguments;
-					if (isAtom(_subExpr.front()))
+					std::string const& op = asAtom(_subExpr.front());
+					if (op == "!")
 					{
-						std::string const& op = asAtom(_subExpr.front());
-						if (op == "!")
-						{
-							// named term, we ignore the name
-							smtAssert(_subExpr.size() > 2);
-							return toSMTUtilExpression(_subExpr[1]);
-						}
-						if (op == "exists" || op == "forall")
-						{
-							smtAssert(_subExpr.size() == 3);
-							smtAssert(!isAtom(_subExpr[1]));
-							return parseQuantifier(op, asSubExpressions(_subExpr[1]), _subExpr[2]);
-						}
-						for (size_t i = 1; i < _subExpr.size(); i++)
-							arguments.emplace_back(toSMTUtilExpression(_subExpr[i]));
-						if (auto tupleSort = lookupKnownTupleSort(op); tupleSort)
-						{
-							auto sortSort = std::make_shared<SortSort>(tupleSort.value());
-							return Expression::tuple_constructor(Expression(sortSort), arguments);
-						}
-						if (auto it = m_knownVariables.find(op); it != m_knownVariables.end())
-							return smtutil::Expression(op, std::move(arguments), it->second);
-						else
-						{
-							std::set<std::string>
-								boolOperators{"and", "or", "not", "=", "<", ">", "<=", ">=", "=>"};
-							sort = contains(boolOperators, op) ? SortProvider::boolSort : arguments.back().sort;
-							return smtutil::Expression(op, std::move(arguments), std::move(sort));
-						}
-						smtAssert(false, "Unhandled case in expression conversion");
+						// named term, we ignore the name
+						smtAssert(_subExpr.size() > 2);
+						return toSMTUtilExpression(_subExpr[1]);
+					}
+					if (op == "exists" || op == "forall")
+					{
+						smtAssert(_subExpr.size() == 3);
+						smtAssert(!isAtom(_subExpr[1]));
+						return parseQuantifier(op, asSubExpressions(_subExpr[1]), _subExpr[2]);
+					}
+					for (size_t i = 1; i < _subExpr.size(); i++)
+						arguments.emplace_back(toSMTUtilExpression(_subExpr[i]));
+					if (auto tupleSort = lookupKnownTupleSort(op); tupleSort)
+					{
+						auto sortSort = std::make_shared<SortSort>(tupleSort.value());
+						return Expression::tuple_constructor(Expression(sortSort), arguments);
+					}
+					if (m_context.isDeclared(op))
+						return smtutil::Expression(op, std::move(arguments), m_context.getDeclaredSort(op));
+					if (auto maybeTupleAccessor = m_context.getTupleAccessor(op); maybeTupleAccessor.has_value())
+					{
+						auto accessor = maybeTupleAccessor.value();
+						return smtutil::Expression("dt_accessor_" + accessor.first, std::move(arguments), accessor.second);
 					}
 					else
 					{
-						// check for const array
-						if (_subExpr.size() == 2 and !isAtom(_subExpr[0]))
+						std::set<std::string> boolOperators{"and", "or", "not", "=", "<", ">", "<=", ">=", "=>"};
+						sort = contains(boolOperators, op) ? SortProvider::boolSort : arguments.back().sort;
+						return smtutil::Expression(op, std::move(arguments), std::move(sort));
+					}
+					smtAssert(false, "Unhandled case in expression conversion");
+				}
+				else
+				{
+					// check for const array
+					if (_subExpr.size() == 2 and !isAtom(_subExpr[0]))
+					{
+						auto const& typeArgs = asSubExpressions(_subExpr.front());
+						if (typeArgs.size() == 3 && typeArgs[0].toString() == "as"
+							&& typeArgs[1].toString() == "const")
 						{
-							auto const& typeArgs = asSubExpressions(_subExpr.front());
-							if (typeArgs.size() == 3 && typeArgs[0].toString() == "as"
-								&& typeArgs[1].toString() == "const")
-							{
-								auto arraySort = toSort(typeArgs[2]);
-								auto sortSort = std::make_shared<SortSort>(arraySort);
-								return smtutil::Expression::
-									const_array(Expression(sortSort), toSMTUtilExpression(_subExpr[1]));
-							}
-							if (typeArgs.size() == 3 && typeArgs[0].toString() == "_"
-								&& typeArgs[1].toString() == "int2bv")
-							{
-								auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(toSort(_subExpr[0]));
-								smtAssert(bvSort);
-								return smtutil::Expression::int2bv(toSMTUtilExpression(_subExpr[1]), bvSort->size);
-							}
-							if (typeArgs.size() == 4 && typeArgs[0].toString() == "_"
-								&& typeArgs[1].toString() == "extract")
-								return smtutil::Expression(
-									"extract",
-									{toSMTUtilExpression(typeArgs[2]), toSMTUtilExpression(typeArgs[3])},
-									SortProvider::bitVectorSort // TODO: Compute bit size properly?
-								);
+							auto arraySort = toSort(typeArgs[2]);
+							auto sortSort = std::make_shared<SortSort>(arraySort);
+							return smtutil::Expression::
+								const_array(Expression(sortSort), toSMTUtilExpression(_subExpr[1]));
 						}
-						smtAssert(false, "Unhandled case in expression conversion");
+						if (typeArgs.size() == 3 && typeArgs[0].toString() == "_"
+							&& typeArgs[1].toString() == "int2bv")
+						{
+							auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(toSort(_subExpr[0]));
+							smtAssert(bvSort);
+							return smtutil::Expression::int2bv(toSMTUtilExpression(_subExpr[1]), bvSort->size);
+						}
+						if (typeArgs.size() == 4 && typeArgs[0].toString() == "_"
+							&& typeArgs[1].toString() == "extract")
+							return smtutil::Expression(
+								"extract",
+								{toSMTUtilExpression(typeArgs[2]), toSMTUtilExpression(typeArgs[3])},
+								SortProvider::bitVectorSort // TODO: Compute bit size properly?
+							);
 					}
+					smtAssert(false, "Unhandled case in expression conversion");
 				}
-			},
-			_expr.data
-		);
-	}
-};
+			}
+		},
+		_expr.data
+	);
+}
 
 
 #define precondition(CONDITION) if (!(CONDITION)) return {}
@@ -474,7 +408,7 @@ std::optional<smtutil::Expression> CHCSmtLib2Interface::invariantsFromSolverResp
 		precondition(isAtom(args[3]) && asAtom(args[3]) == "Bool");
 		auto& interpretation = args[4];
 //		inlineLetExpressions(interpretation);
-		SMTLibTranslationContext context(*this);
+		ScopedParser scopedParser(m_context);
 		auto const& formalArguments = asSubExpressions(args[2]);
 		std::vector<Expression> predicateArgs;
 		for (auto const& formalArgument: formalArguments)
@@ -483,13 +417,14 @@ std::optional<smtutil::Expression> CHCSmtLib2Interface::invariantsFromSolverResp
 			auto const& nameSortPair = asSubExpressions(formalArgument);
 			precondition(nameSortPair.size() == 2);
 			precondition(isAtom(nameSortPair[0]));
-			SortPointer varSort = context.toSort(nameSortPair[1]);
-			context.addVariableDeclaration(asAtom(nameSortPair[0]), varSort);
-			Expression arg = context.toSMTUtilExpression(nameSortPair[0]);
+			SortPointer varSort = scopedParser.toSort(nameSortPair[1]);
+			scopedParser.addVariableDeclaration(asAtom(nameSortPair[0]), varSort);
+			// FIXME: Why Expression here?
+			Expression arg = scopedParser.toSMTUtilExpression(nameSortPair[0]);
 			predicateArgs.push_back(arg);
 		}
 
-		auto parsedInterpretation = context.toSMTUtilExpression(interpretation);
+		auto parsedInterpretation = scopedParser.toSMTUtilExpression(interpretation);
 
 		Expression predicate(asAtom(args[1]), predicateArgs, SortProvider::boolSort);
 		definitions.push_back(predicate == parsedInterpretation);
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index 39131973bf..0b81b4541c 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -25,6 +25,7 @@
 #include <libsmtutil/CHCSolverInterface.h>
 
 #include <libsmtutil/SMTLib2Interface.h>
+#include <libsmtutil/SMTLib2Parser.h>
 
 namespace solidity::smtutil
 {
@@ -54,38 +55,49 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	std::vector<std::string> unhandledQueries() const { return m_unhandledQueries; }
 
-	SMTLib2Interface* smtlib2Interface() const { return m_smtlib2.get(); }
+protected:
+	class ScopedParser
+	{
+	public:
+		ScopedParser(SMTLib2Context const& _context): m_context(_context) {}
 
-	auto const& sortNames() const { return m_smtlib2->sortNames(); }
+		smtutil::Expression toSMTUtilExpression(SMTLib2Expression const& _expr);
 
-protected:
-	std::string toSmtLibSort(SortPointer _sort);
-	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
+		SortPointer toSort(SMTLib2Expression const& _expr);
+
+		void addVariableDeclaration(std::string _name, SortPointer _sort);
 
-	void writeHeader();
-	std::string forall();
+	private:
+		std::optional<SortPointer> lookupKnownTupleSort(std::string const& _name) const;
 
-	void declareFunction(std::string const& _name, SortPointer const& _sort);
+		smtutil::Expression parseQuantifier(
+			std::string const& _quantifierName,
+			std::vector<SMTLib2Expression> const& _varList,
+			SMTLib2Expression const& _coreExpression
+			);
 
-	void write(std::string _data);
+		SMTLib2Context const& m_context;
+		std::unordered_map<std::string, SortPointer> m_localVariables;
+	};
 
-	std::string createQueryAssertion(std::string name);
-	std::string createHeaderAndDeclarations();
+	std::string toSmtLibSort(SortPointer const& _sort);
+	std::vector<std::string> toSmtLibSort(std::vector<SortPointer> const& _sort);
+
+	std::string forall(Expression const& _expr);
+
+	static std::string createQueryAssertion(std::string _name);
+	void createHeader();
 
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
-	std::string querySolver(std::string const& _input);
+	virtual std::string querySolver(std::string const& _input);
 
 	/// Translates CHC solver response with a model to our representation of invariants. Returns None on error.
-	std::optional<smtutil::Expression> invariantsFromSolverResponse(std::string const& response) const;
-
-	/// Hook to setup external solver call
-	virtual void setupSmtCallback() {}
+	std::optional<smtutil::Expression> invariantsFromSolverResponse(std::string const& _response) const;
 
-	/// Used to access toSmtLibSort, SExpr, and handle variables.
-	std::unique_ptr<SMTLib2Interface> m_smtlib2;
+	std::set<std::string> collectVariableNames(Expression const& _expr) const;
 
-	std::string m_accumulatedOutput;
-	std::set<std::string> m_variables;
+	SMTLib2Commands m_commands;
+	SMTLib2Context m_context;
 
 	std::map<util::h256, std::string> m_queryResponses;
 	std::vector<std::string> m_unhandledQueries;
diff --git a/libsmtutil/CHCSolverInterface.h b/libsmtutil/CHCSolverInterface.h
index 8385c1c401..a20283b4fe 100644
--- a/libsmtutil/CHCSolverInterface.h
+++ b/libsmtutil/CHCSolverInterface.h
@@ -30,15 +30,11 @@
 namespace solidity::smtutil
 {
 
-class CHCSolverInterface
+class CHCSolverInterface : public SolverInterface
 {
 public:
 	CHCSolverInterface(std::optional<unsigned> _queryTimeout = {}): m_queryTimeout(_queryTimeout) {}
 
-	virtual ~CHCSolverInterface() = default;
-
-	virtual void declareVariable(std::string const& _name, SortPointer const& _sort) = 0;
-
 	/// Takes a function declaration as a relation.
 	virtual void registerRelation(Expression const& _expr) = 0;
 
diff --git a/libsmtutil/CMakeLists.txt b/libsmtutil/CMakeLists.txt
index 005fbeb804..c89c56f4f5 100644
--- a/libsmtutil/CMakeLists.txt
+++ b/libsmtutil/CMakeLists.txt
@@ -2,6 +2,8 @@ set(sources
 	CHCSmtLib2Interface.cpp
 	CHCSmtLib2Interface.h
 	Exceptions.h
+	SMTLib2Context.cpp
+	SMTLib2Context.h
 	SMTLib2Interface.cpp
 	SMTLib2Interface.h
 	SMTLib2Parser.cpp
diff --git a/libsmtutil/SMTLib2Context.cpp b/libsmtutil/SMTLib2Context.cpp
new file mode 100644
index 0000000000..95bc2011b8
--- /dev/null
+++ b/libsmtutil/SMTLib2Context.cpp
@@ -0,0 +1,314 @@
+/*
+	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 <libsmtutil/SMTLib2Context.h>
+
+#include <boost/functional/hash.hpp>
+
+#include <range/v3/algorithm/find_if.hpp>
+
+namespace solidity::smtutil
+{
+
+std::size_t SortPairHash::operator()(std::pair<SortId, SortId> const& _pair) const
+{
+	std::size_t seed = 0;
+	boost::hash_combine(seed, _pair.first);
+	boost::hash_combine(seed, _pair.second);
+	return seed;
+}
+
+SMTLib2Context::SMTLib2Context()
+{
+	clear();
+}
+
+bool SMTLib2Context::isDeclared(std::string const& _name) const
+{
+	return m_functions.count(_name) > 0;
+}
+
+void SMTLib2Context::declare(std::string const& _name, SortPointer const& _sort)
+{
+	auto [_, inserted] = m_functions.insert({_name, _sort});
+	smtAssert(inserted, "Trying to redeclare SMT function!");
+}
+
+SortPointer SMTLib2Context::getDeclaredSort(std::string const& _name) const
+{
+	smtAssert(isDeclared(_name));
+	return m_functions.at(_name);
+}
+
+void SMTLib2Context::clear() {
+	m_functions.clear();
+	m_knownTypes.clear();
+	m_arraySorts.clear();
+	m_tupleSorts.clear();
+	m_bitVectorSorts.clear();
+	m_callback = {};
+	m_knownTypes.emplace_back(std::make_unique<SMTLibSort>(Kind::Bool, std::string("Bool"), std::vector<SortId>{}, SortId{0u}));
+	m_knownTypes.emplace_back(std::make_unique<SMTLibSort>(Kind::Int, std::string("Int"), std::vector<SortId>{}, SortId{1u}));
+	assert(m_boolSort == m_knownTypes[0]->id);
+	assert(m_intSort == m_knownTypes[1]->id);
+}
+
+SortId SMTLib2Context::resolve(SortPointer const& _sort)
+{
+	switch (_sort->kind)
+	{
+	case Kind::Int:
+		return m_intSort;
+	case Kind::Bool:
+		return m_boolSort;
+	case Kind::BitVector:
+		return resolveBitVectorSort(dynamic_cast<BitVectorSort const&>(*_sort));
+	case Kind::Array:
+		return resolveArraySort(dynamic_cast<ArraySort const&>(*_sort));
+	case Kind::Tuple:
+		return resolveTupleSort(dynamic_cast<TupleSort const&>(*_sort));
+	default:
+		smtAssert(false, "Invalid SMT sort");
+	}
+}
+
+SortPointer SMTLib2Context::unresolve(SortId _sortId) const
+{
+	smtAssert(_sortId < m_knownTypes.size());
+	auto const& type = *m_knownTypes[_sortId];
+	switch (type.kind)
+	{
+	case Kind::Int:
+		return SortProvider::sintSort;
+	case Kind::Bool:
+		return SortProvider::boolSort;
+	case Kind::BitVector:
+	{
+		auto it = ranges::find_if(m_bitVectorSorts, [&](auto const& entry) { return entry.second == _sortId; });
+		smtAssert(it != m_bitVectorSorts.end());
+		return std::make_shared<BitVectorSort>(it->first);
+	}
+	case Kind::Array:
+	{
+		auto it = ranges::find_if(m_arraySorts, [&](auto const& entry) { return entry.second == _sortId; });
+		smtAssert(it != m_arraySorts.end());
+		return std::make_shared<ArraySort>(unresolve(it->first.first), unresolve(it->first.second));
+	}
+	case Kind::Tuple:
+	{
+		auto const& tupleType = dynamic_cast<TupleType const&>(type);
+		std::vector<std::string> memberNames;
+		std::vector<SortPointer> memberTypes;
+		for (auto&& [name, sortId] : tupleType.accessors)
+		{
+			memberNames.push_back(name);
+			memberTypes.push_back(unresolve(sortId));
+		}
+		return std::make_shared<TupleSort>(tupleType.name, std::move(memberNames), std::move(memberTypes));
+	}
+	default:
+		smtAssert(false, "Invalid SMT sort");
+	}
+}
+
+SortId SMTLib2Context::resolveBitVectorSort(BitVectorSort const& _sort)
+{
+	auto size = _sort.size;
+	auto it = m_bitVectorSorts.find(size);
+	if (it == m_bitVectorSorts.end())
+	{
+		auto newId = static_cast<uint32_t>(m_knownTypes.size());
+		m_knownTypes.emplace_back(std::make_unique<SMTLibSort>(Kind::BitVector, "(_ BitVec " + std::to_string(size) + ')', std::vector<SortId>{}, SortId{newId}));
+		auto&& [newIt, inserted] = m_bitVectorSorts.emplace(size, SortId{newId});
+		smtAssert(inserted);
+		return newIt->second;
+	}
+	return it->second;
+}
+
+SortId SMTLib2Context::resolveArraySort(ArraySort const& _sort)
+{
+	smtAssert(_sort.domain && _sort.range);
+	auto domainSort = resolve(_sort.domain);
+	auto rangeSort = resolve(_sort.range);
+	auto pair = std::make_pair(domainSort, rangeSort);
+	auto it = m_arraySorts.find(pair);
+	if (it == m_arraySorts.end())
+	{
+		auto newId = static_cast<uint32_t>(m_knownTypes.size());
+		m_knownTypes.emplace_back(std::make_unique<SMTLibSort>(Kind::Array, "Array", std::vector<SortId>{domainSort, rangeSort}, SortId{newId}));
+		auto&& [newIt, inserted] = m_arraySorts.emplace(pair, SortId{newId});
+		smtAssert(inserted);
+		return newIt->second;
+	}
+	return it->second;
+}
+
+SortId SMTLib2Context::resolveTupleSort(TupleSort const& _sort)
+{
+	auto const& tupleName = _sort.name;
+	auto it = m_tupleSorts.find(tupleName);
+	if (it == m_tupleSorts.end())
+	{
+		std::vector<std::pair<std::string, SortId>> accessors;
+		smtAssert(_sort.members.size() == _sort.components.size());
+		for (std::size_t i = 0u; i < _sort.members.size(); ++i)
+			accessors.emplace_back(_sort.members[i], resolve(_sort.components[i]));
+		auto newId = static_cast<uint32_t>(m_knownTypes.size());
+		m_knownTypes.emplace_back(std::make_unique<TupleType>(tupleName, std::move(accessors), SortId{newId}));
+		auto&& [newIt, inserted] = m_tupleSorts.emplace(tupleName, SortId{newId});
+		smtAssert(inserted);
+		if (m_callback)
+			m_callback(_sort);
+		return newIt->second;
+	}
+	return it->second;
+}
+
+std::string SMTLib2Context::toString(SortId _id)
+{
+	auto const& sort = m_knownTypes.at(_id);
+	switch (sort->kind)
+	{
+	case Kind::Int:
+		return "Int";
+	case Kind::Bool:
+		return "Bool";
+	case Kind::BitVector:
+		return dynamic_cast<SMTLibSort const&>(*sort).name;
+	case Kind::Array:
+	{
+		auto const& arraySort = dynamic_cast<SMTLibSort const&>(*sort);
+		smtAssert(arraySort.args.size() == 2);
+		return "(Array " + toString(arraySort.args.at(0)) + ' ' + toString(arraySort.args.at(1)) + ')';
+	}
+	case Kind::Tuple:
+	{
+		auto const& tupleType = dynamic_cast<TupleType const&>(*sort);
+		return '|' + tupleType.name + '|';
+	}
+	default:
+		smtAssert(false, "Invalid SMT sort");
+	}
+}
+
+std::string SMTLib2Context::toSmtLibSort(solidity::smtutil::SortPointer const& _sort)
+{
+	return toString(resolve(_sort));
+}
+
+std::string SMTLib2Context::toSExpr(Expression const& _expr)
+{
+	if (_expr.arguments.empty())
+		return _expr.name;
+
+	std::string sexpr = "(";
+	if (_expr.name == "int2bv")
+	{
+		size_t size = std::stoul(_expr.arguments[1].name);
+		auto arg = toSExpr(_expr.arguments.front());
+		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 += std::string("ite ") +
+			"(>= " + arg + " 0) " +
+			"(" + int2bv + " " + arg + ") " +
+			"(bvneg (" + int2bv + " (- " + arg + ")))";
+	}
+	else if (_expr.name == "bv2int")
+	{
+		auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
+		smtAssert(intSort, "");
+
+		auto arg = toSExpr(_expr.arguments.front());
+		auto nat = "(bv2nat " + arg + ")";
+
+		if (!intSort->isSigned)
+			return nat;
+
+		auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(_expr.arguments.front().sort);
+		smtAssert(bvSort, "");
+		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 += std::string("ite ") +
+			"(= ((_ extract " + pos + " " + pos + ")" + arg + ") #b0) " +
+			nat + " " +
+			"(- (bv2nat (bvneg " + arg + ")))";
+	}
+	else if (_expr.name == "const_array")
+	{
+		smtAssert(_expr.arguments.size() == 2, "");
+		auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments.at(0).sort);
+		smtAssert(sortSort, "");
+		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
+		smtAssert(arraySort, "");
+		sexpr += "(as const " + toSmtLibSort(arraySort) + ") ";
+		sexpr += toSExpr(_expr.arguments.at(1));
+	}
+	else if (_expr.name == "tuple_get")
+	{
+		smtAssert(_expr.arguments.size() == 2, "");
+		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 = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
+		smtAssert(tupleSort, "");
+		sexpr += "|" + tupleSort->name + "|";
+		for (auto const& arg: _expr.arguments)
+			sexpr += " " + toSExpr(arg);
+	}
+	else
+	{
+		sexpr += _expr.name;
+		for (auto const& arg: _expr.arguments)
+			sexpr += " " + toSExpr(arg);
+	}
+	sexpr += ")";
+	return sexpr;
+}
+
+std::optional<SortPointer> SMTLib2Context::getTupleType(std::string const& _name) const
+{
+	auto it = m_tupleSorts.find(_name);
+	return it == m_tupleSorts.end() ? std::nullopt : std::optional<SortPointer>(unresolve(it->second));
+}
+
+std::optional<std::pair<std::string, SortPointer>> SMTLib2Context::getTupleAccessor(std::string const& _name) const
+{
+	for (auto&& [_, sortId] : m_tupleSorts)
+	{
+		auto const& type = m_knownTypes.at(sortId);
+		smtAssert(type->kind == Kind::Tuple);
+		auto const& tupleType = dynamic_cast<TupleType const&>(*type);
+		for (auto&& [memberName, memberSort] : tupleType.accessors)
+			if (memberName == _name)
+				return std::make_pair(memberName, unresolve(memberSort));
+	}
+	return std::nullopt;
+}
+
+void SMTLib2Context::setTupleDeclarationCallback(TupleDeclarationCallback _callback)
+{
+	m_callback = std::move(_callback);
+}
+} // namespace solidity::smtutil
diff --git a/libsmtutil/SMTLib2Context.h b/libsmtutil/SMTLib2Context.h
new file mode 100644
index 0000000000..30a44605c2
--- /dev/null
+++ b/libsmtutil/SMTLib2Context.h
@@ -0,0 +1,109 @@
+/*
+	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 <libsmtutil/SolverInterface.h>
+#include <libsmtutil/Sorts.h>
+
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace solidity::smtutil
+{
+
+using SortId = uint32_t;
+struct SortPairHash
+{
+	std::size_t operator()(std::pair<SortId, SortId> const& _pair) const;
+};
+
+struct SMTLibType {
+	Kind const kind;
+	SortId const id;
+	SMTLibType(Kind _kind, SortId _id): kind(_kind), id(_id) {}
+	virtual ~SMTLibType() = default;
+};
+
+struct SMTLibSort : public SMTLibType
+{
+	std::string const name;
+	std::vector<SortId> const args;
+
+	SMTLibSort(
+		Kind _kind,
+		std::string_view _name,
+		std::vector<SortId> _args,
+		SortId _id
+	): SMTLibType(_kind, _id), name(_name), args(std::move(_args)) {}
+};
+
+struct TupleType : public SMTLibType
+{
+	std::string const name;
+	std::vector<std::pair<std::string,SortId>> accessors;
+
+	TupleType(std::string_view _name, std::vector<std::pair<std::string,SortId>> _accessors, SortId _id)
+	: SMTLibType(Kind::Tuple, _id), name(_name), accessors(std::move(_accessors)) {}
+};
+
+class SMTLib2Context
+{
+public:
+	using TupleDeclarationCallback = std::function<void(TupleSort const&)>;
+
+	SMTLib2Context();
+	void clear();
+
+	bool isDeclared(std::string const& _name) const;
+	void declare(std::string const& _name, SortPointer const& _sort);
+	SortPointer getDeclaredSort(std::string const& _name) const;
+
+	SortId resolve(SortPointer const& _sort);
+	SortPointer unresolve(SortId _sortId) const;
+
+	std::string toString(SortId _id);
+
+	std::string toSExpr(Expression const& _expr);
+	std::string toSmtLibSort(SortPointer const& _sort);
+
+	std::optional<SortPointer> getTupleType(std::string const& _name) const;
+	std::optional<std::pair<std::string, SortPointer>> getTupleAccessor(std::string const& _name) const;
+
+	void setTupleDeclarationCallback(TupleDeclarationCallback _callback);
+private:
+	SortId resolveBitVectorSort(BitVectorSort const& _sort);
+	SortId resolveArraySort(ArraySort const& _sort);
+	SortId resolveTupleSort(TupleSort const& _sort);
+
+	using functions_t = std::map<std::string, SortPointer>;
+	functions_t m_functions; // Variables are uninterpreted constants = nullary functions
+
+	SortId const m_boolSort{0u};
+	SortId const m_intSort{1u};
+	std::vector<std::unique_ptr<SMTLibType>> m_knownTypes;
+	std::unordered_map<std::pair<SortId, SortId>, SortId, SortPairHash> m_arraySorts;
+	std::unordered_map<std::size_t, SortId> m_bitVectorSorts;
+	std::unordered_map<std::string, SortId> m_tupleSorts;
+
+	TupleDeclarationCallback m_callback;
+};
+
+}
+
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index 06ed26f2b2..81ad5ddd4b 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -43,7 +43,7 @@ SMTLib2Interface::SMTLib2Interface(
 	ReadCallback::Callback _smtCallback,
 	std::optional<unsigned> _queryTimeout
 ):
-	SolverInterface(_queryTimeout),
+	BMCSolverInterface(_queryTimeout),
 	m_queryResponses(std::move(_queryResponses)),
 	m_smtCallback(std::move(_smtCallback))
 {
@@ -52,74 +52,67 @@ SMTLib2Interface::SMTLib2Interface(
 
 void SMTLib2Interface::reset()
 {
-	m_accumulatedOutput.clear();
-	m_accumulatedOutput.emplace_back();
-	m_variables.clear();
-	m_userSorts.clear();
-	m_sortNames.clear();
-	write("(set-option :produce-models true)");
+	m_commands.clear();
+	m_context.clear();
+	m_commands.setOption("produce-models", "true");
 	if (m_queryTimeout)
-		write("(set-option :timeout " + std::to_string(*m_queryTimeout) + ")");
-	write("(set-logic ALL)");
+		m_commands.setOption("timeout", std::to_string(*m_queryTimeout));
+	m_commands.setLogic("ALL");
+	m_context.setTupleDeclarationCallback([&](TupleSort const& tupleSort){
+		m_commands.declareTuple(
+			tupleSort.name,
+			tupleSort.members,
+			tupleSort.components
+				| ranges::views::transform([&](SortPointer const& sort){ return m_context.toSmtLibSort(sort); })
+				| ranges::to<std::vector>()
+		);
+	});
 }
 
 void SMTLib2Interface::push()
 {
-	m_accumulatedOutput.emplace_back();
+	m_commands.push();
 }
 
 void SMTLib2Interface::pop()
 {
-	smtAssert(!m_accumulatedOutput.empty(), "");
-	m_accumulatedOutput.pop_back();
+	m_commands.pop();
 }
 
 void SMTLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
-	smtAssert(_sort, "");
+	smtAssert(_sort);
 	if (_sort->kind == Kind::Function)
 		declareFunction(_name, _sort);
-	else if (!m_variables.count(_name))
+	else if (!m_context.isDeclared(_name))
 	{
-		m_variables.emplace(_name, _sort);
-		write("(declare-fun |" + _name + "| () " + toSmtLibSort(_sort) + ')');
+		m_context.declare(_name, _sort);
+		m_commands.declareVariable(_name, toSmtLibSort(_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))
+	smtAssert(_sort);
+	smtAssert(_sort->kind == Kind::Function);
+	if (!m_context.isDeclared(_name))
 	{
 		auto const& fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
-		std::string domain = toSmtLibSort(fSort->domain);
+		auto domain = toSmtLibSort(fSort->domain);
 		std::string codomain = toSmtLibSort(fSort->codomain);
-		m_variables.emplace(_name, _sort);
-		write(
-			"(declare-fun |" +
-			_name +
-			"| " +
-			domain +
-			" " +
-			codomain +
-			")"
-		);
+		m_context.declare(_name, _sort);
+		m_commands.declareFunction(_name, domain, codomain);
 	}
 }
 
 void SMTLib2Interface::addAssertion(Expression const& _expr)
 {
-	write("(assert " + toSExpr(_expr) + ")");
+	m_commands.assertion(toSExpr(_expr));
 }
 
 std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
-	std::string response = querySolver(
-		boost::algorithm::join(m_accumulatedOutput, "\n") +
-		checkSatAndGetValuesCommand(_expressionsToEvaluate)
-	);
+	std::string response = querySolver(dumpQuery(_expressionsToEvaluate));
 
 	CheckResult result;
 	// TODO proper parsing
@@ -138,140 +131,23 @@ std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::ve
 	return std::make_pair(result, values);
 }
 
-std::string SMTLib2Interface::toSExpr(Expression const& _expr)
+std::string SMTLib2Interface::toSmtLibSort(SortPointer _sort)
 {
-	if (_expr.arguments.empty())
-		return _expr.name;
-
-	std::string sexpr = "(";
-	if (_expr.name == "int2bv")
-	{
-		size_t size = std::stoul(_expr.arguments[1].name);
-		auto arg = toSExpr(_expr.arguments.front());
-		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 += std::string("ite ") +
-			"(>= " + arg + " 0) " +
-			"(" + int2bv + " " + arg + ") " +
-			"(bvneg (" + int2bv + " (- " + arg + ")))";
-	}
-	else if (_expr.name == "bv2int")
-	{
-		auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
-		smtAssert(intSort, "");
-
-		auto arg = toSExpr(_expr.arguments.front());
-		auto nat = "(bv2nat " + arg + ")";
-
-		if (!intSort->isSigned)
-			return nat;
-
-		auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(_expr.arguments.front().sort);
-		smtAssert(bvSort, "");
-		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 += std::string("ite ") +
-			"(= ((_ extract " + pos + " " + pos + ")" + arg + ") #b0) " +
-			nat + " " +
-			"(- (bv2nat (bvneg " + arg + ")))";
-	}
-	else if (_expr.name == "const_array")
-	{
-		smtAssert(_expr.arguments.size() == 2, "");
-		auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments.at(0).sort);
-		smtAssert(sortSort, "");
-		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
-		smtAssert(arraySort, "");
-		sexpr += "(as const " + toSmtLibSort(arraySort) + ") ";
-		sexpr += toSExpr(_expr.arguments.at(1));
-	}
-	else if (_expr.name == "tuple_get")
-	{
-		smtAssert(_expr.arguments.size() == 2, "");
-		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 = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
-		smtAssert(tupleSort, "");
-		sexpr += "|" + tupleSort->name + "|";
-		for (auto const& arg: _expr.arguments)
-			sexpr += " " + toSExpr(arg);
-	}
-	else
-	{
-		sexpr += _expr.name;
-		for (auto const& arg: _expr.arguments)
-			sexpr += " " + toSExpr(arg);
-	}
-	sexpr += ")";
-	return sexpr;
+	return m_context.toSmtLibSort(std::move(_sort));
 }
 
-std::string SMTLib2Interface::toSmtLibSort(solidity::smtutil::SortPointer _sort)
+std::vector<std::string> SMTLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
 {
-	if (!m_sortNames.count(_sort))
-		m_sortNames[_sort] = toSmtLibSortInternal(_sort);
-	return m_sortNames.at(_sort);
-}
-
-std::string SMTLib2Interface::toSmtLibSortInternal(SortPointer _sort)
-{
-	switch (_sort->kind)
-	{
-	case Kind::Int:
-		return "Int";
-	case Kind::Bool:
-		return "Bool";
-	case Kind::BitVector:
-		return "(_ BitVec " + std::to_string(dynamic_cast<BitVectorSort const&>(*_sort).size) + ")";
-	case Kind::Array:
-	{
-		auto const& arraySort = dynamic_cast<ArraySort const&>(*_sort);
-		smtAssert(arraySort.domain && arraySort.range, "");
-		return "(Array " + toSmtLibSort(arraySort.domain) + ' ' + toSmtLibSort(arraySort.range) + ')';
-	}
-	case Kind::Tuple:
-	{
-		auto const& tupleSort = dynamic_cast<TupleSort const&>(*_sort);
-		std::string tupleName = "|" + tupleSort.name + "|";
-		auto isName = [&](auto entry) { return entry.first == tupleName; };
-		if (ranges::find_if(m_userSorts, isName) == m_userSorts.end())
-		{
-			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)) + ")";
-			decl += "))))";
-			m_userSorts.emplace_back(tupleName, decl);
-			write(decl);
-		}
-
-		return tupleName;
-	}
-	default:
-		smtAssert(false, "Invalid SMT sort");
-	}
-}
-
-std::string SMTLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
-{
-	std::string ssort("(");
+	std::vector<std::string> ssorts;
+	ssorts.reserve(_sorts.size());
 	for (auto const& sort: _sorts)
-		ssort += toSmtLibSort(sort) + " ";
-	ssort += ")";
-	return ssort;
+		ssorts.push_back(toSmtLibSort(sort));
+	return ssorts;
 }
 
-void SMTLib2Interface::write(std::string _data)
+std::string SMTLib2Interface::toSExpr(solidity::smtutil::Expression const& _expr)
 {
-	smtAssert(!m_accumulatedOutput.empty(), "");
-	m_accumulatedOutput.back() += std::move(_data) + "\n";
+	return m_context.toSExpr(_expr);
 }
 
 std::string SMTLib2Interface::checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate)
@@ -333,6 +209,70 @@ std::string SMTLib2Interface::querySolver(std::string const& _input)
 
 std::string SMTLib2Interface::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
 {
-	return boost::algorithm::join(m_accumulatedOutput, "\n") +
-		checkSatAndGetValuesCommand(_expressionsToEvaluate);
+	return m_commands.toString() + '\n' + checkSatAndGetValuesCommand(_expressionsToEvaluate);
+}
+
+
+void SMTLib2Commands::push() {
+	m_frameLimits.push_back(m_commands.size());
+}
+
+void SMTLib2Commands::pop() {
+	smtAssert(!m_commands.empty());
+	auto limit = m_frameLimits.back();
+	m_frameLimits.pop_back();
+	while (m_commands.size() > limit)
+		m_commands.pop_back();
+}
+
+std::string SMTLib2Commands::toString() const {
+	return boost::algorithm::join(m_commands, "\n");
+}
+
+void SMTLib2Commands::clear() {
+	m_commands.clear();
+	m_frameLimits.clear();
+}
+
+void SMTLib2Commands::assertion(std::string _expr) {
+	m_commands.push_back("(assert " + std::move(_expr) + ')');
+}
+
+void SMTLib2Commands::setOption(std::string _name, std::string _value)
+{
+	m_commands.push_back("(set-option :" + std::move(_name) + ' ' + std::move(_value) + ')');
+}
+
+void SMTLib2Commands::setLogic(std::string _logic)
+{
+	m_commands.push_back("(set-logic " + std::move(_logic) + ')');
+}
+
+void SMTLib2Commands::declareVariable(std::string _name, std::string _sort)
+{
+	m_commands.push_back("(declare-fun |" + std::move(_name) + "| () " + std::move(_sort) + ')');
+}
+
+void SMTLib2Commands::declareFunction(std::string const& _name, std::vector<std::string> const& _domain, std::string const& _codomain)
+{
+	std::stringstream ss;
+	ss << "(declare-fun |" << _name << "| " << '(' << boost::join(_domain, " ")
+		<< ')' << ' ' << _codomain << ')';
+	m_commands.push_back(ss.str());
+}
+
+void SMTLib2Commands::declareTuple(
+	std::string const& _name,
+	std::vector<std::string> const& _memberNames,
+	std::vector<std::string> const& _memberSorts
+)
+{
+	auto quotedName = '|' + _name + '|';
+	std::stringstream ss;
+	ss << "(declare-datatypes ((" << quotedName << " 0)) (((" << quotedName;
+	for (auto && [memberName, memberSort]: ranges::views::zip(_memberNames, _memberSorts))
+		ss << " (|" << memberName << "| " << memberSort << ")";
+	ss << "))))";
+	auto declaration = ss.str();
+	m_commands.push_back(ss.str());
 }
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
index d60a5bd250..11478223cf 100644
--- a/libsmtutil/SMTLib2Interface.h
+++ b/libsmtutil/SMTLib2Interface.h
@@ -18,7 +18,9 @@
 
 #pragma once
 
-#include <libsmtutil/SolverInterface.h>
+#include <libsmtutil/BMCSolverInterface.h>
+
+#include <libsmtutil/SMTLib2Context.h>
 
 #include <libsolidity/interface/ReadFile.h>
 
@@ -34,7 +36,36 @@
 namespace solidity::smtutil
 {
 
-class SMTLib2Interface: public SolverInterface
+class SMTLib2Commands
+{
+public:
+	void push();
+	void pop();
+
+	void clear();
+
+	void assertion(std::string _expr);
+
+	void setOption(std::string _name, std::string _value);
+
+	void setLogic(std::string _logic);
+
+	void declareVariable(std::string _name, std::string _sort);
+	void declareFunction(std::string const& _name, std::vector<std::string> const& _domain, std::string const& _codomain);
+	void declareTuple(
+		std::string const& _name,
+		std::vector<std::string> const& _memberNames,
+		std::vector<std::string> const& _memberSorts
+	);
+
+	[[nodiscard]] std::string toString() const;
+private:
+	std::vector<std::string> m_commands;
+	std::vector<std::size_t> m_frameLimits;
+
+};
+
+class SMTLib2Interface: public BMCSolverInterface
 {
 public:
 	/// Noncopyable.
@@ -62,12 +93,7 @@ class SMTLib2Interface: public SolverInterface
 	// Used by CHCSmtLib2Interface
 	std::string toSExpr(Expression const& _expr);
 	std::string toSmtLibSort(SortPointer _sort);
-	std::string toSmtLibSort(std::vector<SortPointer> const& _sort);
-
-	std::map<std::string, SortPointer> variables() { return m_variables; }
-
-	std::vector<std::pair<std::string, std::string>> const& userSorts() const { return m_userSorts; }
-	std::map<SortPointer, std::string> const& sortNames() const { return m_sortNames; }
+	std::vector<std::string> toSmtLibSort(std::vector<SortPointer> const& _sort);
 
 	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
 
@@ -76,28 +102,14 @@ class SMTLib2Interface: public SolverInterface
 
 	void declareFunction(std::string const& _name, SortPointer const& _sort);
 
-	void write(std::string _data);
-
 	std::string checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate);
 	std::vector<std::string> parseValues(std::string::const_iterator _start, std::string::const_iterator _end);
 
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
 	std::string querySolver(std::string const& _input);
 
-	std::string toSmtLibSortInternal(SortPointer _sort);
-
-	std::vector<std::string> m_accumulatedOutput;
-	std::map<std::string, SortPointer> m_variables;
-
-	/// Each pair in this vector represents an SMTChecker created
-	/// sort (a user sort), and the smtlib2 declaration of that sort.
-	/// It needs to be a vector so that the declaration order is kept,
-	/// otherwise solvers cannot parse the queries.
-	std::vector<std::pair<std::string, std::string>> m_userSorts;
-
-	/// Maps a user sort to SMT-LIB2 sort.
-	/// Remembers all declared sorts and is used as a cache as well.
-	std::map<SortPointer, std::string> m_sortNames;
+	SMTLib2Commands m_commands;
+	SMTLib2Context m_context;
 
 	std::map<util::h256, std::string> m_queryResponses;
 	std::vector<std::string> m_unhandledQueries;
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index 196f02fdf9..94c92f390a 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -26,10 +26,10 @@ using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 SMTPortfolio::SMTPortfolio(
-	std::vector<std::unique_ptr<SolverInterface>> _solvers,
+	std::vector<std::unique_ptr<BMCSolverInterface>> _solvers,
 	std::optional<unsigned> _queryTimeout
 ):
-	SolverInterface(_queryTimeout), m_solvers(std::move(_solvers))
+	BMCSolverInterface(_queryTimeout), m_solvers(std::move(_solvers))
 {}
 
 
diff --git a/libsmtutil/SMTPortfolio.h b/libsmtutil/SMTPortfolio.h
index 5ffb37eb32..b445f40a2b 100644
--- a/libsmtutil/SMTPortfolio.h
+++ b/libsmtutil/SMTPortfolio.h
@@ -19,7 +19,7 @@
 #pragma once
 
 
-#include <libsmtutil/SolverInterface.h>
+#include <libsmtutil/BMCSolverInterface.h>
 #include <libsolidity/interface/ReadFile.h>
 #include <libsolutil/FixedHash.h>
 
@@ -35,14 +35,14 @@ namespace solidity::smtutil
  * It also checks whether different solvers give conflicting answers
  * to SMT queries.
  */
-class SMTPortfolio: public SolverInterface
+class SMTPortfolio: public BMCSolverInterface
 {
 public:
 	/// Noncopyable.
 	SMTPortfolio(SMTPortfolio const&) = delete;
 	SMTPortfolio& operator=(SMTPortfolio const&) = delete;
 
-	SMTPortfolio(std::vector<std::unique_ptr<SolverInterface>> solvers, std::optional<unsigned> _queryTimeout);
+	SMTPortfolio(std::vector<std::unique_ptr<BMCSolverInterface>> solvers, std::optional<unsigned> _queryTimeout);
 
 	void reset() override;
 
@@ -63,7 +63,7 @@ class SMTPortfolio: public SolverInterface
 private:
 	static bool solverAnswered(CheckResult result);
 
-	std::vector<std::unique_ptr<SolverInterface>> m_solvers;
+	std::vector<std::unique_ptr<BMCSolverInterface>> m_solvers;
 
 	std::vector<Expression> m_assertions;
 };
diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index 92f9c8f75b..2639ae0240 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -512,13 +512,9 @@ DEV_SIMPLE_EXCEPTION(SolverError);
 class SolverInterface
 {
 public:
-	SolverInterface(std::optional<unsigned> _queryTimeout = {}): m_queryTimeout(_queryTimeout) {}
+	SolverInterface() = default;
 
 	virtual ~SolverInterface() = default;
-	virtual void reset() = 0;
-
-	virtual void push() = 0;
-	virtual void pop() = 0;
 
 	virtual void declareVariable(std::string const& _name, SortPointer const& _sort) = 0;
 	Expression newVariable(std::string _name, SortPointer const& _sort)
@@ -529,21 +525,8 @@ class SolverInterface
 		return Expression(std::move(_name), {}, _sort);
 	}
 
-	virtual void addAssertion(Expression const& _expr) = 0;
-
-	/// Checks for satisfiability, evaluates the expressions if a model
-	/// is available. Throws SMTSolverError on error.
-	virtual std::pair<CheckResult, std::vector<std::string>>
-	check(std::vector<Expression> const& _expressionsToEvaluate) = 0;
-
-	/// @returns a list of queries that the system was not able to respond to.
-	virtual std::vector<std::string> unhandledQueries() { return {}; }
-
 	/// @returns how many SMT solvers this interface has.
 	virtual size_t solvers() { return 1; }
-
-protected:
-	std::optional<unsigned> m_queryTimeout;
 };
 
 }
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 4e1d1cec12..efd6562598 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -39,7 +39,7 @@ bool Z3Interface::available()
 }
 
 Z3Interface::Z3Interface(std::optional<unsigned> _queryTimeout):
-	SolverInterface(_queryTimeout),
+	BMCSolverInterface(_queryTimeout),
 	m_solver(m_context)
 {
 	// These need to be set globally.
diff --git a/libsmtutil/Z3Interface.h b/libsmtutil/Z3Interface.h
index d5dc5792e0..ee5270f440 100644
--- a/libsmtutil/Z3Interface.h
+++ b/libsmtutil/Z3Interface.h
@@ -18,13 +18,13 @@
 
 #pragma once
 
-#include <libsmtutil/SolverInterface.h>
+#include <libsmtutil/BMCSolverInterface.h>
 #include <z3++.h>
 
 namespace solidity::smtutil
 {
 
-class Z3Interface: public SolverInterface
+class Z3Interface: public BMCSolverInterface
 {
 public:
 	/// Noncopyable.
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index dbaed29602..fda573d3d4 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -56,7 +56,7 @@ BMC::BMC(
 	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _provedSafeReporter, _charStreamProvider)
 {
 	solAssert(!_settings.printQuery || _settings.solvers == SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
-	std::vector<std::unique_ptr<SolverInterface>> solvers;
+	std::vector<std::unique_ptr<BMCSolverInterface>> solvers;
 	if (_settings.solvers.smtlib2)
 		solvers.emplace_back(std::make_unique<SMTLib2Interface>(_smtlib2Responses, _smtCallback, _settings.timeout));
 	if (_settings.solvers.cvc5)
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index bbd8c10173..a0ee9a3749 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -35,7 +35,7 @@
 
 #include <libsolidity/interface/ReadFile.h>
 
-#include <libsmtutil/SolverInterface.h>
+#include <libsmtutil/BMCSolverInterface.h>
 #include <liblangutil/UniqueErrorReporter.h>
 
 #include <set>
@@ -205,7 +205,7 @@ class BMC: public SMTEncoder
 	smtutil::Expression mergeVariablesFromLoopCheckpoints();
 	bool isInsideLoop() const;
 
-	std::unique_ptr<smtutil::SolverInterface> m_interface;
+	std::unique_ptr<smtutil::BMCSolverInterface> m_interface;
 
 	/// Flags used for better warning messages.
 	bool m_loopExecutionHappened = false;
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 73b9793642..2bd0195375 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1312,7 +1312,7 @@ void CHC::resetSourceAnalysis()
 		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
 		solAssert(smtlib2Interface);
 		smtlib2Interface->reset();
-		m_context.setSolver(smtlib2Interface->smtlib2Interface());
+		m_context.setSolver(smtlib2Interface);
 	}
 
 	m_context.reset();
@@ -1743,7 +1743,6 @@ void CHC::createErrorBlock()
 		"error_target_" + std::to_string(m_context.newUniqueId()),
 		PredicateType::Error
 	);
-	m_interface->registerRelation(m_errorPredicate->functor());
 }
 
 void CHC::connectBlocks(smtutil::Expression const& _from, smtutil::Expression const& _to, smtutil::Expression const& _constraints)
diff --git a/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp b/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
index 4fa94539d8..46416f2d9c 100644
--- a/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
+++ b/libsolidity/formal/EldaricaCHCSmtLib2Interface.cpp
@@ -30,8 +30,10 @@ EldaricaCHCSmtLib2Interface::EldaricaCHCSmtLib2Interface(
 {
 }
 
-void EldaricaCHCSmtLib2Interface::setupSmtCallback()
+std::string EldaricaCHCSmtLib2Interface::querySolver(std::string const& _input)
 {
 	if (auto* universalCallback = m_smtCallback.target<frontend::UniversalCallback>())
 		universalCallback->smtCommand().setEldarica(m_queryTimeout, m_computeInvariants);
+
+	return CHCSmtLib2Interface::querySolver(_input);
 }
diff --git a/libsolidity/formal/EldaricaCHCSmtLib2Interface.h b/libsolidity/formal/EldaricaCHCSmtLib2Interface.h
index 2c83b194ca..a0ebdc3326 100644
--- a/libsolidity/formal/EldaricaCHCSmtLib2Interface.h
+++ b/libsolidity/formal/EldaricaCHCSmtLib2Interface.h
@@ -33,7 +33,7 @@ class EldaricaCHCSmtLib2Interface: public smtutil::CHCSmtLib2Interface
 	);
 
 private:
-	void setupSmtCallback() override;
+	std::string querySolver(std::string const& _input) override;
 
 	bool m_computeInvariants;
 };
diff --git a/test/cmdlineTests/model_checker_print_query_all/err b/test/cmdlineTests/model_checker_print_query_all/err
index 7fbaba3ebe..76dff6664b 100644
--- a/test/cmdlineTests/model_checker_print_query_all/err
+++ b/test/cmdlineTests/model_checker_print_query_all/err
@@ -1,125 +1,85 @@
 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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 
@@ -152,7 +112,6 @@ Info: BMC: Requested query:
 (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))
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/err b/test/cmdlineTests/model_checker_print_query_bmc/err
index ff8b796f87..6fb8440b7b 100644
--- a/test/cmdlineTests/model_checker_print_query_bmc/err
+++ b/test/cmdlineTests/model_checker_print_query_bmc/err
@@ -19,7 +19,6 @@ Info: BMC: Requested query:
 (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))
diff --git a/test/cmdlineTests/model_checker_print_query_chc/err b/test/cmdlineTests/model_checker_print_query_chc/err
index 4da0a7cb5a..28368f5462 100644
--- a/test/cmdlineTests/model_checker_print_query_chc/err
+++ b/test/cmdlineTests/model_checker_print_query_chc/err
@@ -1,125 +1,85 @@
 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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
index 4b5782de31..a800fb34d7 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
@@ -1,131 +1,7 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0xcbd85fe3127d1edfce70355ba6da5a3e9573873d8596ee8b1cfc2222af166628": "(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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
-(=> error_target_3 false)))
-(check-sat)
-",
-            "0xcbfcc2413b217c6564ee01f322c9ca1f34fd79d19961dc3e62aa9c2e5dcb6efc": "(set-option :produce-models true)
+            "0x54683263097e1c4f5e0e75b68e4ebe3e4f7042f899198181df911c8196a1725b": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_5_3| () Int)
@@ -148,12 +24,95 @@
 (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| ))
+",
+            "0x9cfcd53712a0be144c8e7983b3635498ead1af2624885fb89762eae8c43233e5": "(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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 ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |error_target_3| () Bool)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
+(=> error_target_3 false)))
+(check-sat)
 "
         }
     },
@@ -164,125 +123,85 @@
             "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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 
@@ -291,125 +210,85 @@
             "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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 ",
@@ -463,7 +342,6 @@
 (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))
@@ -496,7 +374,6 @@
 (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))
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
index 9fd5f5929a..cee9d4b9bf 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
@@ -1,7 +1,7 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0x8704a7b848b706ef33cbfc06e4f185636f568a29621126b7244355dd0de956bb": "(set-option :produce-models true)
+            "0x2bd3d35071b94d7536d10aad691cee810d94841cca10218c3be21255e258aeb7": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -21,7 +21,6 @@
 (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))
@@ -55,7 +54,6 @@
 (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))
@@ -85,7 +83,6 @@
 (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))
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
index a9956d82b0..9553a3cfb6 100644
--- a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
@@ -1,127 +1,87 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0xcbd85fe3127d1edfce70355ba6da5a3e9573873d8596ee8b1cfc2222af166628": "(set-option :timeout 1000)
+            "0x9cfcd53712a0be144c8e7983b3635498ead1af2624885fb89762eae8c43233e5": "(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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 "
@@ -134,125 +94,85 @@
             "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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 
@@ -261,125 +181,85 @@
             "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 ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_6_f_14_16| (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 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 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__15_16| (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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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 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 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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |block_9_function_f__15_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_16| (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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_16| (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 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_16| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_16| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_16| (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))
+(=> (= error_0 0) (nondet_interface_1_C_16 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |summary_4_function_f__15_16| (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 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__15_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_6_f_14_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_5_function_f__15_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16 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 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| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int) Bool)
+(declare-fun |block_8_function_f__15_16| (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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_2 Int))
+(=> (block_8_function_f__15_16 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16 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|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(=> (and (and (block_7_return_function_f__15_16 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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |block_9_function_f__15_16| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_1 Int))
+(block_9_function_f__15_16 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) (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_1 Int))
+(=> (and (and (block_9_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16 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 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_16| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_16| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_16 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (interface_0_C_16 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 ",
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index 9dff9a3bd4..a3f4cc03d7 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -1,7 +1,7 @@
 {
     "auxiliaryInputRequested": {
         "smtlib2queries": {
-            "0x75b95497d56c30e254a59358d72ddd4e78f9e90db621cfe677e85d05b2252411": "(set-option :produce-models true)
+            "0x51b9801f3e8e35f2ff5f4538b0636fae81aa84a482cbb486ae4db63bede5ecb5": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
 (declare-fun |error_0| () Int)
@@ -21,133 +21,92 @@
 (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| ))
 ",
-            "0xf090d88ff3260790818d140ca909b8f4cb311a0d905e4e0318ad4dd790ff5f19": "(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)))))
+            "0xdb239809dcdaa42e35abca69790cb7e11b105f839e37faa8841f0dd9736688d7": "(set-logic HORN)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| 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| (Int |abi_type| |crypto_type| |state_type| ) Bool)
-(declare-fun |nondet_interface_1_C_14| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
-(declare-fun |summary_constructor_2_C_14| (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_14 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
-
-
-(declare-fun |summary_3_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |summary_4_function_f__13_14| (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) (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 (nondet_interface_1_C_14 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 x_3_0 state_2 x_3_1))) (nondet_interface_1_C_14 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
-
-
-(declare-fun |block_5_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_6_f_12_14| (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) (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))
-(block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_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_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true)) true) (block_6_f_12_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(declare-fun |block_7_return_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
-(declare-fun |block_8_function_f__13_14| (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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(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))
-(=> (block_8_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (summary_3_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(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 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= error_1 error_0) (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)))))))) true) (block_7_return_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(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_7_return_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) true) true) (summary_3_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
-
-
-(declare-fun |block_9_function_f__13_14| (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))
-(block_9_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
-
-
-(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 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2))))
-
-
-(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 (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 0))) (interface_0_C_14 this_0 abi_0 crypto_0 state_1))))
-
-
-(declare-fun |contract_initializer_10_C_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
-(declare-fun |contract_initializer_entry_11_C_14| (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 (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |contract_initializer_after_init_12_C_14| (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 (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_14 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_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 (contract_initializer_after_init_12_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
-
-
-(declare-fun |implicit_constructor_entry_13_C_14| (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 (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 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_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 (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_14 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_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 (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_14 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_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 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 this_0 abi_0 crypto_0 state_1))))
-
-
+(declare-fun |interface_0_C_14| (Int |abi_type| |crypto_type| |state_type|) Bool)
+(declare-fun |nondet_interface_1_C_14| (Int Int |abi_type| |crypto_type| |state_type| |state_type|) Bool)
+(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 |summary_constructor_2_C_14| (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))
+(=> (= error_0 0) (nondet_interface_1_C_14 error_0 this_0 abi_0 crypto_0 state_0 state_0)))
+)
+(declare-fun |summary_3_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int) Bool)
+(declare-fun |summary_4_function_f__13_14| (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) (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 (nondet_interface_1_C_14 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 x_3_0 state_2 x_3_1))) (nondet_interface_1_C_14 error_1 this_0 abi_0 crypto_0 state_0 state_2)))
+)
+(declare-fun |block_5_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int) Bool)
+(declare-fun |block_6_f_12_14| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))
+)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (block_5_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true)) true) (block_6_f_12_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
+)
+(declare-fun |block_7_return_function_f__13_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int) Bool)
+(declare-fun |block_8_function_f__13_14| (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|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (block_6_f_12_14 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
+)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (block_8_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (summary_3_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
+)
+(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|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (block_6_f_12_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= error_1 error_0) (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)))))))) true) (block_7_return_function_f__13_14 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
+)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (block_7_return_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) true) true) (summary_3_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1)))
+)
+(declare-fun |block_9_function_f__13_14| (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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(block_9_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))
+)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 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_3_0 Int) (x_3_1 Int) (x_3_2 Int))
+(=> (and (and (block_9_function_f__13_14 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 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 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2)))
+)
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 0))) (interface_0_C_14 this_0 abi_0 crypto_0 state_1)))
+)
+(declare-fun |contract_initializer_10_C_14| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type|) Bool)
+(declare-fun |contract_initializer_entry_11_C_14| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |contract_initializer_after_init_12_C_14| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_entry_11_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_14 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (contract_initializer_after_init_12_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1)))
+)
+(declare-fun |implicit_constructor_entry_13_C_14| (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|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (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 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_14 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) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (implicit_constructor_entry_13_C_14 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_14 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_14 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) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (summary_constructor_2_C_14 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 this_0 abi_0 crypto_0 state_1)))
+)
 (declare-fun |error_target_3| () 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 (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 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)))
-
-
-
-(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))
+(assert (forall( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (state_1 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
+(=> (and (and (interface_0_C_14 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14 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))
+)(assert
+(forall ((UNUSED Bool))
 (=> error_target_3 false)))
 (check-sat)
 "
diff --git a/test/libsolidity/smtCheckerTests/invariants/array_access.sol b/test/libsolidity/smtCheckerTests/invariants/array_access.sol
new file mode 100644
index 0000000000..be3ad25480
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/invariants/array_access.sol
@@ -0,0 +1,20 @@
+contract C {
+    int[2] a;
+
+    constructor() {
+        a[0] = 1;
+        a[1] = 2;
+    }
+
+    function i() public view {
+            assert(a[1] > a[0]);
+    }
+}
+// ====
+// SMTEngine: chc
+// SMTIgnoreInv: no
+// SMTSolvers: eld
+// SMTTargets: assert
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1180: Contract invariant(s) for :C:\n((a.length = 2) && ((a[1] - a[0]) >= 1))\n
diff --git a/test/libsolidity/smtCheckerTests/invariants/struct_access.sol b/test/libsolidity/smtCheckerTests/invariants/struct_access.sol
new file mode 100644
index 0000000000..afc4eaed7a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/invariants/struct_access.sol
@@ -0,0 +1,15 @@
+contract C {
+    struct S { int x; }
+    S s = S(1);
+
+    function i() public view {
+            assert(s.x > 0);
+    }
+}
+// ====
+// SMTEngine: chc
+// SMTIgnoreInv: no
+// SMTSolvers: eld
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1180: Contract invariant(s) for :C:\n(s.x = 1)\n

From 9a1d7406bb742f808f1822be8baba5e16924357f Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Thu, 12 Oct 2023 17:46:03 +0200
Subject: [PATCH 0965/1140] Add --asm-json option in assembler mode.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: r0qs <rodrigo.saramago@ethereum.org>
Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |   1 +
 libevmasm/Assembly.cpp                        |  23 +-
 libsolidity/interface/StandardCompiler.cpp    |   2 +-
 libyul/Object.cpp                             |  30 ++
 libyul/Object.h                               |   8 +
 libyul/YulStack.cpp                           |   9 +-
 libyul/YulStack.h                             |   7 +-
 solc/CommandLineInterface.cpp                 |  28 +-
 solc/CommandLineParser.cpp                    |   1 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |  17 +
 .../asm_json_yul_export_evm_asm_import/args   |   1 +
 .../asm_json_yul_export_evm_asm_import/output |  39 ++
 .../asm_json_yul_export_evm_asm_import/stdin  |  36 ++
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |   6 +
 .../args                                      |   1 +
 .../output                                    | 426 ++++++++++++++++++
 .../stdin                                     |  51 +++
 .../args                                      |   1 +
 .../output                                    | 384 ++++++++++++++++
 .../stdin                                     |  40 ++
 .../args                                      |   1 +
 .../output                                    | 384 ++++++++++++++++
 .../stdin                                     |  34 ++
 .../strict_asm_asm_json_yul_verbatim/args     |   1 +
 .../strict_asm_asm_json_yul_verbatim/output   |  18 +
 .../strict_asm_asm_json_yul_verbatim/stdin    |   4 +
 .../strict_asm_output_selection_invalid/err   |   2 +-
 test/libyul/ObjectCompilerTest.cpp            |   5 +-
 .../libyul/objectCompiler/sourceLocations.yul |  14 +-
 test/solc/CommandLineParser.cpp               |   2 +
 36 files changed, 1556 insertions(+), 26 deletions(-)
 create mode 100644 test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args
 create mode 100644 test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/err
 create mode 100644 test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/exit
 create mode 100644 test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/stdin
 create mode 100644 test/cmdlineTests/asm_json_yul_export_evm_asm_import/args
 create mode 100644 test/cmdlineTests/asm_json_yul_export_evm_asm_import/output
 create mode 100644 test/cmdlineTests/asm_json_yul_export_evm_asm_import/stdin
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/args
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/err
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/exit
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/stdin
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/args
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/stdin
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/args
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/output
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/stdin
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/args
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/stdin
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_yul_verbatim/args
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_yul_verbatim/output
 create mode 100644 test/cmdlineTests/strict_asm_asm_json_yul_verbatim/stdin

diff --git a/Changelog.md b/Changelog.md
index e67cf0f07d..9c9a9e8fd9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@ Compiler Features:
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
+ * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
 
 
 Bugfixes:
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 356a2818a4..f9b800c908 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -479,8 +479,18 @@ Json Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndice
 	{
 		root["sourceList"] = Json::array();
 		Json& jsonSourceList = root["sourceList"];
-		for (auto const& [name, index]: _sourceIndices)
-			jsonSourceList[index] = name;
+		unsigned maxSourceIndex = 0;
+		for (auto const& [sourceName, sourceIndex]: _sourceIndices)
+		{
+			maxSourceIndex = std::max(sourceIndex, maxSourceIndex);
+			jsonSourceList[sourceIndex] = sourceName;
+		}
+		solAssert(maxSourceIndex + 1 >= _sourceIndices.size());
+		solRequire(
+			_sourceIndices.size() == 0 || _sourceIndices.size() == maxSourceIndex + 1,
+			AssemblyImportException,
+			"The 'sourceList' array contains invalid 'null' item."
+		);
 	}
 
 	if (!m_data.empty() || !m_subs.empty())
@@ -522,7 +532,14 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 		{
 			solRequire(_json["sourceList"].is_array(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
 			for (Json const& sourceName: _json["sourceList"])
-				solRequire(sourceName.is_string(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
+			{
+				solRequire(!sourceName.is_null(), AssemblyImportException, "The 'sourceList' array contains invalid 'null' item.");
+				solRequire(
+					sourceName.is_string(),
+					AssemblyImportException,
+					"The 'sourceList' array contains an item that is not a string."
+				);
+			}
 		}
 	}
 	else
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index cb0c812682..e4b9f9f7ae 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1694,7 +1694,7 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "irOptimized", wildcardMatchesExperimental))
 		output["contracts"][sourceName][contractName]["irOptimized"] = stack.print();
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "evm.assembly", wildcardMatchesExperimental))
-		output["contracts"][sourceName][contractName]["evm"]["assembly"] = object.assembly;
+		output["contracts"][sourceName][contractName]["evm"]["assembly"] = object.assembly->assemblyString(stack.debugInfoSelection());
 
 	return output;
 }
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 736c1bb841..989e7ce809 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -160,3 +160,33 @@ std::vector<size_t> Object::pathToSubObject(std::string_view _qualifiedName) con
 
 	return path;
 }
+
+void Object::collectSourceIndices(std::map<std::string, unsigned>& _indices) const
+{
+	if (debugData && debugData->sourceNames.has_value())
+		for (auto const& [sourceIndex, sourceName]: debugData->sourceNames.value())
+		{
+			solAssert(_indices.count(*sourceName) == 0 || _indices[*sourceName] == sourceIndex);
+			_indices[*sourceName] = sourceIndex;
+		}
+	for (std::shared_ptr<ObjectNode> const& subNode: subObjects)
+		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
+			subObject->collectSourceIndices(_indices);
+}
+
+bool Object::hasContiguousSourceIndices() const
+{
+	std::map<std::string, unsigned> sourceIndices;
+	collectSourceIndices(sourceIndices);
+
+	unsigned maxSourceIndex = 0;
+	std::set<unsigned> indices;
+	for (auto const& [sources, sourceIndex]: sourceIndices)
+	{
+		maxSourceIndex = std::max(sourceIndex, maxSourceIndex);
+		indices.insert(sourceIndex);
+	}
+
+	solAssert(maxSourceIndex + 1 >= indices.size());
+	return indices.size() == 0 || indices.size() == maxSourceIndex + 1;
+}
diff --git a/libyul/Object.h b/libyul/Object.h
index 4e891c2640..c419a6d55e 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -129,6 +129,14 @@ struct Object: public ObjectNode
 
 	std::shared_ptr<ObjectDebugData const> debugData;
 
+	/// Collects names of all Solidity source units present in the debug data
+	/// of the Yul object (including sub-objects) and their assigned indices.
+	/// @param _indices map that will be filled with source indices of the current Yul object & its sub-objects.
+	void collectSourceIndices(std::map<std::string, unsigned>& _indices) const;
+
+	/// @returns true, if the range of source indices starts at zero and is contiguous, false otherwise.
+	bool hasContiguousSourceIndices() const;
+
 	/// @returns the name of the special metadata data object.
 	static std::string metadataName() { return ".metadata"; }
 };
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 223d6c04a1..b9fc6388c6 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -15,10 +15,6 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 // SPDX-License-Identifier: GPL-3.0
-/**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5
- */
-
 
 #include <libyul/YulStack.h>
 
@@ -64,7 +60,6 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 
 }
 
-
 CharStream const& YulStack::charStream(std::string const& _sourceName) const
 {
 	yulAssert(m_charStream, "");
@@ -274,7 +269,7 @@ YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 	{
 		creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
 		yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
-		creationObject.assembly = creationAssembly->assemblyString(m_debugInfoSelection);
+		creationObject.assembly = creationAssembly;
 		creationObject.sourceMappings = std::make_unique<std::string>(
 			evmasm::AssemblyItem::computeSourceMapping(
 				creationAssembly->items(),
@@ -285,7 +280,7 @@ YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 		if (deployedAssembly)
 		{
 			deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
-			deployedObject.assembly = deployedAssembly->assemblyString(m_debugInfoSelection);
+			deployedObject.assembly = deployedAssembly;
 			deployedObject.sourceMappings = std::make_unique<std::string>(
 				evmasm::AssemblyItem::computeSourceMapping(
 					deployedAssembly->items(),
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index c6d78a115c..f547ef7702 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM.
+ * Full assembly stack that can support Yul as input.
  */
 
 #pragma once
@@ -55,7 +55,7 @@ class AbstractAssembly;
 struct MachineAssemblyObject
 {
 	std::shared_ptr<evmasm::LinkerObject> bytecode;
-	std::string assembly;
+	std::shared_ptr<evmasm::Assembly> assembly;
 	std::unique_ptr<std::string> sourceMappings;
 };
 
@@ -137,9 +137,12 @@ class YulStack: public langutil::CharStreamProvider
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
 	Json astJson() const;
+
 	/// Return the parsed and analyzed object.
 	std::shared_ptr<Object> parserResult() const;
 
+	langutil::DebugInfoSelection debugInfoSelection() const { return m_debugInfoSelection; }
+
 private:
 	bool parse(std::string const& _sourceName, std::string const& _source);
 	bool analyzeParsed();
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 5d0272dfa9..1351858405 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -177,7 +177,7 @@ void CommandLineInterface::handleEVMAssembly(std::string const& _contract)
 
 	std::string assembly;
 	if (m_options.compiler.outputs.asmJson)
-		assembly = util::jsonPrint(removeNullMembers(m_assemblyStack->assemblyJSON(_contract)), m_options.formatting.json);
+		assembly = util::jsonPrint(m_assemblyStack->assemblyJSON(_contract), m_options.formatting.json);
 	else
 		assembly = m_assemblyStack->assemblyString(_contract, m_fileReader.sourceUnits());
 
@@ -1197,6 +1197,17 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			successful = false;
 		else
 			stack.optimize();
+
+		if (successful && m_options.compiler.outputs.asmJson)
+		{
+			std::shared_ptr<yul::Object> result = stack.parserResult();
+			if (result && !result->hasContiguousSourceIndices())
+				solThrow(
+					CommandLineExecutionError,
+					"Generating the assembly JSON output was not possible. "
+					"Source indices provided in the @use-src annotation in the Yul input do not start at 0 or are not contiguous."
+				);
+		}
 	}
 
 	for (auto const& sourceAndStack: yulStacks)
@@ -1256,11 +1267,22 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 		if (m_options.compiler.outputs.asm_)
 		{
 			sout() << std::endl << "Text representation:" << std::endl;
-			if (!object.assembly.empty())
-				sout() << object.assembly << std::endl;
+			std::string assemblyText{object.assembly->assemblyString(stack.debugInfoSelection())};
+			if (!assemblyText.empty())
+				sout() << assemblyText << std::endl;
 			else
 				report(Error::Severity::Info, "No text representation found.");
 		}
+		if (m_options.compiler.outputs.asmJson)
+		{
+			sout() << std::endl << "EVM assembly:" << std::endl;
+			std::map<std::string, unsigned> sourceIndices;
+			stack.parserResult()->collectSourceIndices(sourceIndices);
+			sout() << util::jsonPrint(
+				object.assembly->assemblyJSON(sourceIndices),
+				m_options.formatting.json
+			) << std::endl;
+		}
 	}
 }
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 2697f7ebd0..881c656dad 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -472,6 +472,7 @@ void CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentName(&CompilerOutputs::binary),
 			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
 			CompilerOutputs::componentName(&CompilerOutputs::astCompactJson),
+			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
 		};
 		static std::set<std::string> const evmAssemblyJsonImportModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
diff --git a/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args
new file mode 100644
index 0000000000..c1bc80dabf
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4 --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/err b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/err
new file mode 100644
index 0000000000..73f36f9719
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: The 'sourceList' array contains invalid 'null' item.
diff --git a/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/exit b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/stdin b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/stdin
new file mode 100644
index 0000000000..923376f40f
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/stdin
@@ -0,0 +1,17 @@
+{
+    ".code":
+    [
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "STOP",
+            "source": -1
+        }
+    ],
+    "sourceList":
+    [
+        null,
+        null,
+        "L0.sol"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_yul_export_evm_asm_import/args b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/args
new file mode 100644
index 0000000000..15c9628316
--- /dev/null
+++ b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm --bin --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/asm_json_yul_export_evm_asm_import/output b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/output
new file mode 100644
index 0000000000..9ebef41425
--- /dev/null
+++ b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/output
@@ -0,0 +1,39 @@
+Opcodes:
+PUSH1 0x5 PUSH0 SSTORE STOP 
+Binary:
+60055f5500
+EVM assembly:
+{
+    ".code": [
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSHSIZE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "SSTORE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "STOP",
+            "source": -1
+        }
+    ],
+    "sourceList": [
+        "L0.sol",
+        "L1.sol",
+        "L2.sol"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_yul_export_evm_asm_import/stdin b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/stdin
new file mode 100644
index 0000000000..840660f6bc
--- /dev/null
+++ b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/stdin
@@ -0,0 +1,36 @@
+{
+    ".code":
+    [
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSHSIZE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "SSTORE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "STOP",
+            "source": -1
+        }
+    ],
+    "sourceList":
+    [
+        "L0.sol",
+        "L1.sol",
+        "L2.sol"
+    ]
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/args b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/args
new file mode 100644
index 0000000000..bf9bf8851a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/args
@@ -0,0 +1 @@
+--strict-assembly - --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/err b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/err
new file mode 100644
index 0000000000..129c4a8ccc
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/err
@@ -0,0 +1 @@
+Error: Generating the assembly JSON output was not possible. Source indices provided in the @use-src annotation in the Yul input do not start at 0 or are not contiguous.
diff --git a/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/exit b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/stdin b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/stdin
new file mode 100644
index 0000000000..5b36b4118f
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_arbitrary_source_index/stdin
@@ -0,0 +1,6 @@
+/// @use-src 2:"L0.sol"
+object "L0" {
+    code {
+        sstore(0, datasize("L0"))
+    }
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/args b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/args
new file mode 100644
index 0000000000..bf9bf8851a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/args
@@ -0,0 +1 @@
+--strict-assembly - --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
new file mode 100644
index 0000000000..dfa7656834
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
@@ -0,0 +1,426 @@
+
+======= <stdin> (EVM) =======
+
+EVM assembly:
+{
+    ".code": [
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSHSIZE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "2"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "3"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "4"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "5"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "6"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "7"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "8"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "PUSH",
+            "source": 0,
+            "value": "9"
+        },
+        {
+            "begin": 41,
+            "end": 137,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "STOP",
+            "source": -1
+        }
+    ],
+    ".data": {
+        "0": {
+            ".code": [
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH [$]",
+                    "source": 1,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "A"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH #[$]",
+                    "source": 1,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "B"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH [$]",
+                    "source": 1,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "C"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH #[$]",
+                    "source": 1,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "D"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH [$]",
+                    "source": 1,
+                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "E"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH #[$]",
+                    "source": 1,
+                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "PUSH",
+                    "source": 1,
+                    "value": "F"
+                },
+                {
+                    "begin": 57,
+                    "end": 158,
+                    "name": "SSTORE",
+                    "source": 1
+                },
+                {
+                    "begin": -1,
+                    "end": -1,
+                    "name": "STOP",
+                    "source": -1
+                }
+            ],
+            ".data": {
+                "0": {
+                    ".code": [
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "PUSH [$]",
+                            "source": 2,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "PUSH",
+                            "source": 2,
+                            "value": "10"
+                        },
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "SSTORE",
+                            "source": 2
+                        },
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "PUSH #[$]",
+                            "source": 2,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "PUSH",
+                            "source": 2,
+                            "value": "11"
+                        },
+                        {
+                            "begin": 41,
+                            "end": 100,
+                            "name": "SSTORE",
+                            "source": 2
+                        },
+                        {
+                            "begin": -1,
+                            "end": -1,
+                            "name": "STOP",
+                            "source": -1
+                        }
+                    ],
+                    ".data": {
+                        "0": {
+                            ".code": [
+                                {
+                                    "begin": -1,
+                                    "end": -1,
+                                    "name": "INVALID",
+                                    "source": -1
+                                }
+                            ]
+                        }
+                    }
+                },
+                "1": {
+                    ".code": [
+                        {
+                            "begin": -1,
+                            "end": -1,
+                            "name": "INVALID",
+                            "source": -1
+                        }
+                    ]
+                }
+            }
+        },
+        "ACAF3289D7B601CBD114FB36C4D29C85BBFD5E133F14CB355C3FD8D99367964F": "48656c6c6f2c20576f726c6421"
+    },
+    "sourceList": [
+        "a.sol",
+        "b.sol",
+        "c.sol",
+        "d.sol",
+        "e.sol"
+    ]
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/stdin b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/stdin
new file mode 100644
index 0000000000..01db34d6fd
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/stdin
@@ -0,0 +1,51 @@
+/// @use-src 0:"a.sol"
+object "A" {
+    code {
+        /// @src 0:41:137  "contract A {..."
+        sstore(0, dataoffset("A"))
+        sstore(1, datasize("A"))
+        sstore(2, dataoffset("B"))
+        sstore(3, datasize("B"))
+        sstore(4, dataoffset("B.C"))
+        sstore(5, datasize("B.C"))
+        sstore(6, dataoffset("B.E"))
+        sstore(7, datasize("B.E"))
+        sstore(8, dataoffset("B.C.D"))
+        sstore(9, datasize("B.C.D"))
+    }
+
+    data "data1" "Hello, World!"
+
+    /// @use-src 1:"b.sol"
+    object "B" {
+        code {
+            /// @src 1:57:158  "contract B {..."
+            sstore(10, dataoffset("C"))
+            sstore(11, datasize("C"))
+            sstore(12, dataoffset("E"))
+            sstore(13, datasize("E"))
+            sstore(14, dataoffset("C.D"))
+            sstore(15, datasize("C.D"))
+        }
+        /// @use-src 2:"c.sol"
+        object "C" {
+            code {
+                /// @src 2:41:100  "contract C {..."
+                sstore(16, dataoffset("D"))
+                sstore(17, datasize("D"))
+            }
+            /// @use-src 3:"d.sol"
+            object "D" {
+                code {
+                    invalid()
+                }
+            }
+        }
+        /// @use-src 4:"e.sol"
+        object "E" {
+            code {
+                invalid()
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/args b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/args
new file mode 100644
index 0000000000..bf9bf8851a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/args
@@ -0,0 +1 @@
+--strict-assembly - --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/output b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/output
new file mode 100644
index 0000000000..85642e709a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/output
@@ -0,0 +1,384 @@
+
+======= <stdin> (EVM) =======
+
+EVM assembly:
+{
+    ".code": [
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH",
+            "source": 0,
+            "value": "80"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH",
+            "source": 0,
+            "value": "40"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "MSTORE",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "CALLVALUE",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH [tag]",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "JUMPI",
+            "source": 0
+        },
+        {
+            "begin": 56,
+            "end": 57,
+            "name": "PUSH",
+            "source": 0,
+            "value": "2"
+        },
+        {
+            "begin": 33,
+            "end": 34,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 33,
+            "end": 34,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 33,
+            "end": 34,
+            "name": "PUSH",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "SWAP1",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "DUP2",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "DUP3",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "CODECOPY",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "RETURN",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "tag",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "JUMPDEST",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 125,
+            "name": "REVERT",
+            "source": 0
+        }
+    ],
+    ".data": {
+        "0": {
+            ".auxdata": "1234abcd",
+            ".code": [
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "80"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "DUP1",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "40"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "MSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "4"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "CALLDATASIZE",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "LT",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "ISZERO",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH [tag]",
+                    "source": 0,
+                    "value": "1"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "JUMPI",
+                    "source": 0
+                },
+                {
+                    "begin": -1,
+                    "end": -1,
+                    "name": "tag",
+                    "source": -1,
+                    "value": "2"
+                },
+                {
+                    "begin": -1,
+                    "end": -1,
+                    "name": "JUMPDEST",
+                    "source": -1
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "0"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "DUP1",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "REVERT",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "tag",
+                    "source": 0,
+                    "value": "1"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "JUMPDEST",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "0"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "CALLDATALOAD",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "E0"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "SHR",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "B4F40C61"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "SUB",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH [tag]",
+                    "source": 0,
+                    "value": "2"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "JUMPI",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "20"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "SWAP1",
+                    "source": 0
+                },
+                {
+                    "begin": 40,
+                    "end": 57,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "1"
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "SLOAD",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "DUP2",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "MSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 0,
+                    "end": 125,
+                    "name": "RETURN",
+                    "source": 0
+                }
+            ]
+        }
+    },
+    "sourceList": [
+        "state_var_initialization.sol"
+    ]
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/stdin b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/stdin
new file mode 100644
index 0000000000..d96989ec83
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_with_debug_info_annotations/stdin
@@ -0,0 +1,40 @@
+/// @use-src 0:"state_var_initialization.sol"
+object "C_23" {
+    code {
+        {
+            /// @src 0:0:125  "contract C {..."
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            sstore(/** @src 0:33:34  "1" */ 0x00, /** @src 0:56:57  "2" */ 0x02)
+            /// @src 0:0:125  "contract C {..."
+            sstore(/** @src 0:33:34  "1" */ 0x01, 0x00)
+            /// @src 0:0:125  "contract C {..."
+            let _2 := datasize("C_23_deployed")
+            codecopy(_1, dataoffset("C_23_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:"state_var_initialization.sol"
+    object "C_23_deployed" {
+        code {
+            {
+                /// @src 0:0:125  "contract C {..."
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
+                if iszero(lt(calldatasize(), 4))
+                {
+                    let _2 := 0
+                    switch shr(224, calldataload(_2))
+                    case 0xb4f40c61 {
+                        mstore(_1, sload(/** @src 0:40:57  "uint public k = 2" */ 1))
+                        /// @src 0:0:125  "contract C {..."
+                        return(_1, 32)
+                    }
+                }
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex"1234abcd"
+    }
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/args b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/args
new file mode 100644
index 0000000000..bf9bf8851a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/args
@@ -0,0 +1 @@
+--strict-assembly - --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
new file mode 100644
index 0000000000..25fb482d48
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
@@ -0,0 +1,384 @@
+
+======= <stdin> (EVM) =======
+
+EVM assembly:
+{
+    ".code": [
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "80"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "DUP1",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "40"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "MSTORE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "CALLVALUE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH [tag]",
+            "source": -1,
+            "value": "1"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "JUMPI",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "2"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "SSTORE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "1"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "SSTORE",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH #[$]",
+            "source": -1,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "SWAP1",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "DUP2",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH [$]",
+            "source": -1,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "DUP3",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "CODECOPY",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "RETURN",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "tag",
+            "source": -1,
+            "value": "1"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "JUMPDEST",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "DUP1",
+            "source": -1
+        },
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "REVERT",
+            "source": -1
+        }
+    ],
+    ".data": {
+        "0": {
+            ".auxdata": "1234abcd",
+            ".code": [
+                {
+                    "begin": 469,
+                    "end": 486,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "80"
+                },
+                {
+                    "begin": 503,
+                    "end": 517,
+                    "name": "DUP1",
+                    "source": -1
+                },
+                {
+                    "begin": 510,
+                    "end": 512,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "40"
+                },
+                {
+                    "begin": 503,
+                    "end": 517,
+                    "name": "MSTORE",
+                    "source": -1
+                },
+                {
+                    "begin": 563,
+                    "end": 564,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "4"
+                },
+                {
+                    "begin": 547,
+                    "end": 561,
+                    "name": "CALLDATASIZE",
+                    "source": -1
+                },
+                {
+                    "begin": 544,
+                    "end": 565,
+                    "name": "LT",
+                    "source": -1
+                },
+                {
+                    "begin": 537,
+                    "end": 566,
+                    "name": "ISZERO",
+                    "source": -1
+                },
+                {
+                    "begin": 534,
+                    "end": 832,
+                    "name": "PUSH [tag]",
+                    "source": -1,
+                    "value": "1"
+                },
+                {
+                    "begin": 534,
+                    "end": 832,
+                    "name": "JUMPI",
+                    "source": -1
+                },
+                {
+                    "begin": 427,
+                    "end": 885,
+                    "name": "tag",
+                    "source": -1,
+                    "value": "2"
+                },
+                {
+                    "begin": 427,
+                    "end": 885,
+                    "name": "JUMPDEST",
+                    "source": -1
+                },
+                {
+                    "begin": 859,
+                    "end": 860,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "0"
+                },
+                {
+                    "begin": 849,
+                    "end": 861,
+                    "name": "DUP1",
+                    "source": -1
+                },
+                {
+                    "begin": 849,
+                    "end": 861,
+                    "name": "REVERT",
+                    "source": -1
+                },
+                {
+                    "begin": 583,
+                    "end": 832,
+                    "name": "tag",
+                    "source": -1,
+                    "value": "1"
+                },
+                {
+                    "begin": 583,
+                    "end": 832,
+                    "name": "JUMPDEST",
+                    "source": -1
+                },
+                {
+                    "begin": 615,
+                    "end": 616,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "0"
+                },
+                {
+                    "begin": 653,
+                    "end": 669,
+                    "name": "CALLDATALOAD",
+                    "source": -1
+                },
+                {
+                    "begin": 648,
+                    "end": 651,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "E0"
+                },
+                {
+                    "begin": 644,
+                    "end": 670,
+                    "name": "SHR",
+                    "source": -1
+                },
+                {
+                    "begin": 696,
+                    "end": 706,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "B4F40C61"
+                },
+                {
+                    "begin": 691,
+                    "end": 814,
+                    "name": "SUB",
+                    "source": -1
+                },
+                {
+                    "begin": 583,
+                    "end": 832,
+                    "name": "PUSH [tag]",
+                    "source": -1,
+                    "value": "2"
+                },
+                {
+                    "begin": 691,
+                    "end": 814,
+                    "name": "JUMPI",
+                    "source": -1
+                },
+                {
+                    "begin": 789,
+                    "end": 791,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "20"
+                },
+                {
+                    "begin": 744,
+                    "end": 752,
+                    "name": "SWAP1",
+                    "source": -1
+                },
+                {
+                    "begin": 750,
+                    "end": 751,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "1"
+                },
+                {
+                    "begin": 744,
+                    "end": 752,
+                    "name": "SLOAD",
+                    "source": -1
+                },
+                {
+                    "begin": 733,
+                    "end": 753,
+                    "name": "DUP2",
+                    "source": -1
+                },
+                {
+                    "begin": 733,
+                    "end": 753,
+                    "name": "MSTORE",
+                    "source": -1
+                },
+                {
+                    "begin": 778,
+                    "end": 792,
+                    "name": "RETURN",
+                    "source": -1
+                }
+            ]
+        }
+    },
+    "sourceList": [
+        "abc.sol"
+    ]
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/stdin b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/stdin
new file mode 100644
index 0000000000..72c1b650c3
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/stdin
@@ -0,0 +1,34 @@
+/// @use-src 0: "abc.sol"
+object "C_23" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            sstore(0x00, 0x02)
+            sstore(0x01, 0x00)
+            let _2 := datasize("C_23_deployed")
+            codecopy(_1, dataoffset("C_23_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    object "C_23_deployed" {
+        code {
+            {
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
+                if iszero(lt(calldatasize(), 4))
+                {
+                    let _2 := 0
+                    switch shr(224, calldataload(_2))
+                    case 0xb4f40c61 {
+                        mstore(_1, sload(1))
+                        return(_1, 32)
+                    }
+                }
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex"1234abcd"
+    }
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/args b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/args
new file mode 100644
index 0000000000..bf9bf8851a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/args
@@ -0,0 +1 @@
+--strict-assembly - --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/output b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/output
new file mode 100644
index 0000000000..454f4a6d2d
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/output
@@ -0,0 +1,18 @@
+
+======= <stdin> (EVM) =======
+
+EVM assembly:
+{
+    ".code": [
+        {
+            "begin": -1,
+            "end": -1,
+            "name": "VERBATIM",
+            "source": -1,
+            "value": "78797a"
+        }
+    ],
+    "sourceList": [
+        "abc.sol"
+    ]
+}
diff --git a/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/stdin b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/stdin
new file mode 100644
index 0000000000..2dab368548
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_asm_json_yul_verbatim/stdin
@@ -0,0 +1,4 @@
+/// @use-src 0: "abc.sol"
+{
+    verbatim_0i_0o("xyz")
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/err b/test/cmdlineTests/strict_asm_output_selection_invalid/err
index 81d6eff8ae..90fd947046 100644
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/err
+++ b/test/cmdlineTests/strict_asm_output_selection_invalid/err
@@ -1 +1 @@
-Error: 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, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 65ff18a768..5d6dd1b23d 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -26,8 +26,9 @@
 
 #include <libyul/YulStack.h>
 
-#include <libevmasm/Instruction.h>
+#include <libevmasm/Assembly.h>
 #include <libevmasm/Disassemble.h>
+#include <libevmasm/Instruction.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/SourceReferenceFormatter.h>
@@ -83,7 +84,7 @@ TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string
 	solAssert(obj.bytecode, "");
 	solAssert(obj.sourceMappings, "");
 
-	m_obtainedResult = "Assembly:\n" + obj.assembly;
+	m_obtainedResult = "Assembly:\n" + obj.assembly->assemblyString(stack.debugInfoSelection());
 	if (obj.bytecode->bytecode.empty())
 		m_obtainedResult += "-- empty bytecode --\n";
 	else
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
index 1c84773249..883e85b040 100644
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ b/test/libyul/objectCompiler/sourceLocations.yul
@@ -1,28 +1,28 @@
 // something else
 /*-- another unrelated comment --*/
-/// @use-src 3: "abc.sol" , 2: "def.sol"
+/// @use-src 1: "abc.sol" , 0: "def.sol"
 object "a" {
   code {
-    /// @src 3:0:2
+    /// @src 1:0:2
     datacopy(0, dataoffset("sub"), datasize("sub"))
     return(0,
-      /** @src 2:5:6 */
+      /** @src 0:5:6 */
       datasize("sub")
     )
   }
-  /// @use-src 3: "abc.sol" , 2: "def.sol"
+  /// @use-src 1: "abc.sol" , 0: "def.sol"
   object "sub" {
     code {
-      /// @src 2:70:72
+      /// @src 0:70:72
       sstore(0, dataoffset("sub"))
       /**
        * @something else
-       * @src 3:2:5
+       * @src 1:2:5
        */
       mstore(
         0,
         datasize("data1")
-        /// @src 3:90:2
+        /// @src 1:90:2
       )
     }
     data "data1" "Hello, World!"
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 9fe24bcc66..2ba1d43c87 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -310,6 +310,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
 				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
 			"--asm",
+			"--asm-json",
 			"--bin",
 			"--ir-optimized",
 			"--ast-compact-json",
@@ -350,6 +351,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.formatting.coloredOutput = false;
 		expectedOptions.formatting.withErrorIds = true;
 		expectedOptions.compiler.outputs.asm_ = true;
+		expectedOptions.compiler.outputs.asmJson = true;
 		expectedOptions.compiler.outputs.binary = true;
 		expectedOptions.compiler.outputs.irOptimized = true;
 		expectedOptions.compiler.outputs.astCompactJson = true;

From c458c3ec32d99e95fdbcc5fc7073aed840ad9f70 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 31 Jul 2024 15:05:11 +0200
Subject: [PATCH 0966/1140] SMTChecker: Use pipe instead of temporary file in
 solver interface

Since version 2.1 (released in March 2024) Eldarica supports reading
input from standard input. We can therefore update SMTSolverCommand to
interact with the solver using pipe instead of creating temporary file
on which the solver runs.

cvc5 also supports this, and does not require any extra flags to enable
this feature.
---
 libsolidity/interface/SMTSolverCommand.cpp | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 1eaa3f38ca..0558223d66 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -19,15 +19,7 @@
 
 #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>
 
 namespace solidity::frontend
@@ -37,6 +29,8 @@ void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMillisec
 {
 	m_arguments.clear();
 	m_solverCmd = "eld";
+	m_arguments.emplace_back("-hsmt");
+	m_arguments.emplace_back("-in");
 	if (timeoutInMilliseconds)
 	{
 		unsigned int timeoutInSeconds = timeoutInMilliseconds.value() / 1000u;
@@ -73,32 +67,30 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 		if (m_solverCmd.empty())
 			return ReadCallback::Result{false, "No solver set."};
 
-		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 << std::flush;
-
 		auto solverBin = boost::process::search_path(m_solverCmd);
 
 		if (solverBin.empty())
 			return ReadCallback::Result{false, m_solverCmd + " binary not found."};
 
 		auto args = m_arguments;
-		args.push_back(queryFileName.string());
 
-		boost::process::ipstream pipe;
+		boost::process::opstream in;  // input to subprocess written to by the main process
+		boost::process::ipstream out; // output from subprocess read by the main process
 		boost::process::child solverProcess(
 			solverBin,
 			args,
-			boost::process::std_out > pipe,
+			boost::process::std_out > out,
+			boost::process::std_in < in,
 			boost::process::std_err > boost::process::null
 		);
 
+		in << _query << std::flush;
+		in.pipe().close();
+		in.close();
+
 		std::vector<std::string> data;
 		std::string line;
-		while (solverProcess.running() && std::getline(pipe, line))
+		while (solverProcess.running() && std::getline(out, line))
 			if (!line.empty())
 				data.push_back(line);
 

From b4917bbc2d8bf37aa9f07958c04857878cf9dfdb Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Sun, 21 Jul 2024 23:40:16 +0200
Subject: [PATCH 0967/1140] SMTChecker: Do not prematurely end reading solver's
 response

When the main process reads an answer from the solver, it can happen
that the solver process has already finished, while the main process is
not yet done with reading the output from the pipe. In rare occasions,
the caused some test to fail, because SMTChecker could not produced the
expected counterexample from partial answer.
---
 libsolidity/interface/SMTSolverCommand.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 0558223d66..dd62d2c28d 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -90,7 +90,7 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
 
 		std::vector<std::string> data;
 		std::string line;
-		while (solverProcess.running() && std::getline(out, line))
+		while (!(out.fail() || out.eof()) && std::getline(out, line))
 			if (!line.empty())
 				data.push_back(line);
 

From ecfe63a08408dcd56bae82fbcaab452dd3cbe1e4 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 31 Jul 2024 22:58:14 +0200
Subject: [PATCH 0968/1140] SMTChecker: Explain command-line arguments of
 individual solvers

---
 libsolidity/interface/SMTSolverCommand.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index dd62d2c28d..8120e1f11a 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -29,8 +29,8 @@ void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMillisec
 {
 	m_arguments.clear();
 	m_solverCmd = "eld";
-	m_arguments.emplace_back("-hsmt");
-	m_arguments.emplace_back("-in");
+	m_arguments.emplace_back("-hsmt"); // Tell Eldarica to expect input in SMT2 format
+	m_arguments.emplace_back("-in"); // Tell Eldarica to read from standard input
 	if (timeoutInMilliseconds)
 	{
 		unsigned int timeoutInSeconds = timeoutInMilliseconds.value() / 1000u;
@@ -38,7 +38,7 @@ void SMTSolverCommand::setEldarica(std::optional<unsigned int> timeoutInMillisec
 		m_arguments.push_back("-t:" + std::to_string(timeoutInSeconds));
 	}
 	if (computeInvariants)
-		m_arguments.emplace_back("-ssol");
+		m_arguments.emplace_back("-ssol"); // Tell Eldarica to produce model (invariant)
 }
 
 void SMTSolverCommand::setCvc5(std::optional<unsigned int> timeoutInMilliseconds)
@@ -47,12 +47,12 @@ void SMTSolverCommand::setCvc5(std::optional<unsigned int> timeoutInMilliseconds
 	m_solverCmd = "cvc5";
 	if (timeoutInMilliseconds)
 	{
-		m_arguments.push_back("--tlimit-per");
+		m_arguments.emplace_back("--tlimit-per");
 		m_arguments.push_back(std::to_string(timeoutInMilliseconds.value()));
 	}
 	else
 	{
-		m_arguments.push_back("--rlimit");
+		m_arguments.emplace_back("--rlimit"); // Set resource limit cvc5 can spend on a query
 		m_arguments.push_back(std::to_string(12000));
 	}
 }

From c5685e70544c86f25d87b93048a8bffa963177c6 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 24 Jun 2024 15:53:45 -0300
Subject: [PATCH 0969/1140] generate transient storage layout

---
 Changelog.md                                  |   2 +
 docs/internals/layout_in_storage.rst          |  14 +-
 docs/using-the-compiler.rst                   |   5 +-
 libsolidity/analysis/TypeChecker.cpp          |   7 -
 libsolidity/ast/Types.cpp                     |  22 ++-
 libsolidity/ast/Types.h                       |   4 +-
 libsolidity/codegen/Compiler.cpp              |  12 ++
 libsolidity/codegen/ir/IRGenerator.cpp        |  12 ++
 libsolidity/interface/CompilerStack.cpp       |  17 +-
 libsolidity/interface/CompilerStack.h         |   9 +
 libsolidity/interface/StandardCompiler.cpp    |   2 +
 libsolidity/interface/StorageLayout.cpp       |   7 +-
 libsolidity/interface/StorageLayout.h         |   5 +-
 solc/CommandLineInterface.cpp                 |  20 ++-
 solc/CommandLineInterface.h                   |   1 +
 solc/CommandLineParser.cpp                    |   6 +-
 solc/CommandLineParser.h                      |   4 +
 .../output.json                               |   4 +
 .../input.json                                |   2 +-
 .../output.json                               | 159 +++++++++++-------
 .../transient_storage_layout/args             |   1 +
 .../transient_storage_layout/input.sol        |  13 ++
 .../transient_storage_layout/output           |  67 ++++++++
 .../input.json                                |  15 ++
 .../output.json                               |  17 ++
 .../input.json                                |  21 +++
 .../output.json                               |  51 ++++++
 .../in.sol                                    |  23 +++
 .../input.json                                |  13 ++
 .../output.json                               | 123 ++++++++++++++
 .../in.sol                                    |  15 ++
 .../input.json                                |  13 ++
 .../output.json                               | 155 +++++++++++++++++
 .../in.sol                                    |  24 +++
 .../input.json                                |  13 ++
 .../output.json                               | 131 +++++++++++++++
 .../transient_data_location.sol               |  14 ++
 .../transient_storage_state_variable.sol      |   2 +-
 .../dataLocations/transient_function_type.sol |   7 +-
 .../transient_state_variable_visibility.sol   |   7 +-
 .../transient_value_type_state_variables.sol  |   6 +-
 ..._value_type_state_variables_assignment.sol |   4 +-
 test/solc/CommandLineParser.cpp               |   9 +-
 43 files changed, 948 insertions(+), 110 deletions(-)
 create mode 100644 test/cmdlineTests/transient_storage_layout/args
 create mode 100644 test/cmdlineTests/transient_storage_layout/input.sol
 create mode 100644 test/cmdlineTests/transient_storage_layout/output
 create mode 100644 test/cmdlineTests/transient_storage_layout_smoke_empty/input.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_smoke_empty/output.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_smoke_two_contracts/input.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_smoke_two_contracts/output.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types/in.sol
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types/input.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types/output.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/in.sol
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/input.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/output.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_packed/in.sol
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_packed/input.json
 create mode 100644 test/cmdlineTests/transient_storage_layout_value_types_packed/output.json
 create mode 100644 test/libsolidity/astPropertyTests/transient_data_location.sol

diff --git a/Changelog.md b/Changelog.md
index 9c9a9e8fd9..8acee7422b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,11 +8,13 @@ Language Features:
 
 Compiler Features:
  * Command Line Interface: Do not perform IR optimization when only unoptimized IR is requested.
+ * Commandline Interface: Add ``--transient-storage-layout`` output.
  * Error Reporting: Unimplemented features are now properly reported as errors instead of being handled as if they were bugs.
  * EVM: Support for the EVM version "Prague".
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
+ * Standard JSON Interface: Add ``transientStorageLayout`` output.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
  * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
 
diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 7afcfc2ac5..f6b10adeef 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -1,11 +1,17 @@
-.. index:: storage, state variable, mapping
+.. index:: storage, state variable, mapping, transient storage
 
-************************************
-Layout of State Variables in Storage
-************************************
+**********************************************************
+Layout of State Variables in Storage and Transient Storage
+**********************************************************
 
 .. _storage-inplace-encoding:
 
+.. note::
+    The rules described in this section apply for both storage and transient storage data locations.
+    The layouts are completely independent and don't interfere with each other's variable locations.
+    Thus storage and transient storage state variables can be safely interleaved without any side effects.
+    Only value types are supported for transient storage.
+
 State variables of contracts are stored in storage in a compact way such
 that multiple values sometimes use the same storage slot.
 Except for dynamically-sized arrays and mappings (see below), data is stored
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index a306fa835d..97994e1326 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -423,7 +423,8 @@ Input Description
         //   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.
+        //   storageLayout - Slots, offsets and types of the contract's state variables in storage.
+        //   transientStorageLayout - Slots, offsets and types of the contract's state variables in transient storage.
         //   evm.assembly - New assembly format
         //   evm.legacyAssembly - Old-style assembly format in JSON
         //   evm.bytecode.functionDebugData - Debugging information at function level
@@ -578,6 +579,8 @@ Output Description
             "irOptimizedAst": {/* ... */},
             // See the Storage Layout documentation.
             "storageLayout": {"storage": [/* ... */], "types": {/* ... */} },
+            // See the Storage Layout documentation.
+            "transientStorageLayout": {"storage": [/* ... */], "types": {/* ... */} },
             // EVM-related outputs
             "evm": {
               // Assembly (string)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index dfd334295a..918e270333 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -478,13 +478,6 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 	Type const* varType = _variable.annotation().type;
 	solAssert(!!varType, "Variable type not provided.");
 
-	if (_variable.referenceLocation() == VariableDeclaration::Location::Transient)
-		m_errorReporter.unimplementedFeatureError(
-			6715_error,
-			_variable.location(),
-			"Transient storage is not yet implemented."
-		);
-
 	if (_variable.value())
 	{
 		if (_variable.isStateVariable() && varType->containsNestedMapping())
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index a37cc78a41..f6e2a54138 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2140,12 +2140,30 @@ FunctionType const* ContractType::newExpressionType() const
 	return m_constructorType;
 }
 
-std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables() const
+std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables(std::optional<DataLocation> _location) const
 {
+	std::optional<VariableDeclaration::Location> location;
+	if (_location.has_value())
+	{
+		switch (_location.value())
+		{
+		case DataLocation::Storage:
+			location = std::make_optional(VariableDeclaration::Location::Unspecified); // By default state variables have unspecified (storage) data location
+			break;
+		case DataLocation::Transient:
+			location = std::make_optional(VariableDeclaration::Location::Transient);
+			break;
+		default: solAssert(false);
+		}
+	}
+
 	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()))
+			if (
+				!(variable->isConstant() || variable->immutable()) &&
+				variable->referenceLocation() == location.value_or(variable->referenceLocation())
+			)
 				variables.push_back(variable);
 	TypePointers types;
 	for (auto variable: variables)
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 1817c97af4..5a5040c40d 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1001,8 +1001,8 @@ class ContractType: public Type
 	FunctionType const* newExpressionType() const;
 
 	/// @returns a list of all state variables (including inherited) of the contract and their
-	/// offsets in storage.
-	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> stateVariables() const;
+	/// offsets in storage/transient storage.
+	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> stateVariables(std::optional<DataLocation> _location = std::nullopt) const;
 	/// @returns a list of all immutable variables (including inherited) of the contract.
 	std::vector<VariableDeclaration const*> immutableVariables() const;
 protected:
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
index 844de8ba82..07b65fcc8c 100644
--- a/libsolidity/codegen/Compiler.cpp
+++ b/libsolidity/codegen/Compiler.cpp
@@ -26,6 +26,8 @@
 #include <libsolidity/codegen/ContractCompiler.h>
 #include <libevmasm/Assembly.h>
 
+#include <range/v3/algorithm/all_of.hpp>
+
 using namespace solidity;
 using namespace solidity::frontend;
 
@@ -35,6 +37,16 @@ void Compiler::compileContract(
 	bytes const& _metadata
 )
 {
+	auto static notTransient = [](VariableDeclaration const* _varDeclaration) {
+		solAssert(_varDeclaration);
+		return _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient;
+	};
+
+	solUnimplementedAssert(
+		ranges::all_of(_contract.stateVariables(), notTransient),
+		"Transient storage variables are not supported."
+	);
+
 	ContractCompiler runtimeCompiler(nullptr, m_runtimeContext, m_optimiserSettings);
 	runtimeCompiler.compileContract(_contract, _otherCompilers);
 	m_runtimeContext.appendToAuxiliaryData(_metadata);
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index bf0f6d5c0f..00c9fa196b 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -39,6 +39,8 @@
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/JSON.h>
 
+#include <range/v3/algorithm/all_of.hpp>
+
 #include <sstream>
 #include <variant>
 
@@ -101,6 +103,16 @@ std::string IRGenerator::generate(
 	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
 )
 {
+	auto notTransient = [](VariableDeclaration const* _varDeclaration) {
+		solAssert(_varDeclaration);
+		return _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient;
+	};
+
+	solUnimplementedAssert(
+		ranges::all_of(_contract.stateVariables(), notTransient),
+		"Transient storage variables are not supported."
+	);
+
 	auto subObjectSources = [&_otherYulSources](UniqueVector<ContractDefinition const*> const& _subObjects) -> std::string
 	{
 		std::string subObjectsSources;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index f2c37fa685..de7b185d29 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1015,7 +1015,22 @@ Json const& CompilerStack::storageLayout(Contract const& _contract) const
 	solAssert(_contract.contract);
 	solUnimplementedAssert(!isExperimentalSolidity());
 
-	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
+	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract, DataLocation::Storage); });
+}
+
+Json const& CompilerStack::transientStorageLayout(std::string const& _contractName) const
+{
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	return transientStorageLayout(contract(_contractName));
+}
+
+Json const& CompilerStack::transientStorageLayout(Contract const& _contract) const
+{
+	solAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
+	solAssert(_contract.contract);
+	solUnimplementedAssert(!isExperimentalSolidity());
+
+	return _contract.transientStorageLayout.init([&]{ return StorageLayout().generate(*_contract.contract, DataLocation::Transient); });
 }
 
 Json const& CompilerStack::natspecUser(std::string const& _contractName) const
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 2c5ecb132b..159a14d8d8 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -338,6 +338,10 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// Prerequisite: Successful call to parse or compile.
 	Json const& storageLayout(std::string const& _contractName) const;
 
+	/// @returns a JSON representing the transient storage layout of the contract.
+	/// Prerequisite: Successful call to parse or compile.
+	Json const& transientStorageLayout(std::string const& _contractName) const;
+
 	/// @returns a JSON representing the contract's user documentation.
 	/// Prerequisite: Successful call to parse or compile.
 	Json const& natspecUser(std::string const& _contractName) const;
@@ -406,6 +410,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
 		util::LazyInit<Json const> abi;
 		util::LazyInit<Json const> storageLayout;
+		util::LazyInit<Json const> transientStorageLayout;
 		util::LazyInit<Json const> userDocumentation;
 		util::LazyInit<Json const> devDocumentation;
 		util::LazyInit<Json const> generatedSources;
@@ -502,6 +507,10 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
 	Json const& storageLayout(Contract const&) const;
 
+	/// @returns the transient storage layout of the contract as a JSON object.
+	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
+	Json const& transientStorageLayout(Contract const&) const;
+
 	/// @returns the Natspec User documentation as a JSON object.
 	/// This will generate the JSON object and store it in the Contract object if it is not present yet.
 	Json const& natspecUser(Contract const&) const;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index e4b9f9f7ae..b209987ddd 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1466,6 +1466,8 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 			contractData["abi"] = compilerStack.contractABI(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "storageLayout", false))
 			contractData["storageLayout"] = compilerStack.storageLayout(contractName);
+		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "transientStorageLayout", false))
+			contractData["transientStorageLayout"] = compilerStack.transientStorageLayout(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "metadata", wildcardMatchesExperimental))
 			contractData["metadata"] = compilerStack.metadata(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "userdoc", wildcardMatchesExperimental))
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index 0153af1a29..8565fec68f 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -20,10 +20,11 @@
 
 #include <libsolidity/ast/TypeProvider.h>
 
+using namespace std::literals;
 using namespace solidity;
 using namespace solidity::frontend;
 
-Json StorageLayout::generate(ContractDefinition const& _contractDef)
+Json StorageLayout::generate(ContractDefinition const& _contractDef, DataLocation const _location)
 {
 	solAssert(!m_contract, "");
 	m_contract = &_contractDef;
@@ -35,18 +36,18 @@ Json StorageLayout::generate(ContractDefinition const& _contractDef)
 	solAssert(contractType, "");
 
 	Json variables = Json::array();
-	for (auto [var, slot, offset]: contractType->stateVariables())
+	for (auto [var, slot, offset]: contractType->stateVariables(_location))
 		variables.emplace_back(generate(*var, slot, offset));
 
 	Json layout;
 	layout["storage"] = std::move(variables);
 	layout["types"] = std::move(m_types);
+
 	return layout;
 }
 
 Json StorageLayout::generate(VariableDeclaration const& _var, u256 const& _slot, unsigned _offset)
 {
-	solUnimplementedAssert(_var.referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage layout is not supported yet.");
 	Json varEntry;
 	Type const* varType = _var.type();
 
diff --git a/libsolidity/interface/StorageLayout.h b/libsolidity/interface/StorageLayout.h
index b0b2d70b6d..d3c7e2d9f8 100644
--- a/libsolidity/interface/StorageLayout.h
+++ b/libsolidity/interface/StorageLayout.h
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Generates the storage layout of a contract.
+ * Generates the storage/transient storage layout of a contract.
  */
 
 #pragma once
@@ -33,8 +33,9 @@ class StorageLayout
 public:
 	/// Generates the storage layout of the contract
 	/// @param _contractDef The contract definition
+	/// @param _location The location (storage or transient storage) for which to generate the layout
 	/// @return A JSON representation of the contract's storage layout.
-	Json generate(ContractDefinition const& _contractDef);
+	Json generate(ContractDefinition const& _contractDef, DataLocation const _location);
 
 private:
 	/// Generates the JSON information for a variable and its storage location.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 1351858405..02b6dcade2 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -135,6 +135,7 @@ 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_strTransientStorageLayout = "transient-storage-layout";
 static std::string const g_strVersion = "version";
 
 static bool needsHumanTargetedStdout(CommandLineOptions const& _options)
@@ -154,7 +155,8 @@ static bool needsHumanTargetedStdout(CommandLineOptions const& _options)
 		_options.compiler.outputs.natspecDev ||
 		_options.compiler.outputs.opcodes ||
 		_options.compiler.outputs.signatureHashes ||
-		_options.compiler.outputs.storageLayout;
+		_options.compiler.outputs.storageLayout ||
+		_options.compiler.outputs.transientStorageLayout;
 }
 
 static bool coloredOutput(CommandLineOptions const& _options)
@@ -420,6 +422,19 @@ void CommandLineInterface::handleStorageLayout(std::string const& _contract)
 		sout() << "Contract Storage Layout:" << std::endl << data << std::endl;
 }
 
+void CommandLineInterface::handleTransientStorageLayout(std::string const& _contract)
+{
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+
+	if (!m_options.compiler.outputs.transientStorageLayout)
+		return;
+	std::string data = jsonPrint(removeNullMembers(m_compiler->transientStorageLayout(_contract)), m_options.formatting.json);
+	if (!m_options.output.dir.empty())
+		createFile(m_compiler->filesystemFriendlyName(_contract) + "_transient_storage.json", data);
+	else
+		sout() << "Contract Transient Storage Layout:" << std::endl << data << std::endl;
+}
+
 void CommandLineInterface::handleNatspec(bool _natspecDev, std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
@@ -956,6 +971,8 @@ void CommandLineInterface::handleCombinedJSON()
 				contractData["metadata"] = m_compiler->metadata(contractName);
 			if (m_options.compiler.combinedJsonRequests->storageLayout)
 				contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
+			if (m_options.compiler.combinedJsonRequests->transientStorageLayout)
+				contractData[g_strTransientStorageLayout] = m_compiler->transientStorageLayout(contractName);
 			if (m_options.compiler.combinedJsonRequests->generatedSources)
 				contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
 			if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime)
@@ -1322,6 +1339,7 @@ void CommandLineInterface::outputCompilationResults()
 			handleMetadata(contract);
 			handleABI(contract);
 			handleStorageLayout(contract);
+			handleTransientStorageLayout(contract);
 			handleNatspec(true, contract);
 			handleNatspec(false, contract);
 		} // end of contracts iteration
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index bcebcbcfd3..c23fd9e17b 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -115,6 +115,7 @@ class CommandLineInterface
 	void handleNatspec(bool _natspecDev, std::string const& _contract);
 	void handleGasEstimation(std::string const& _contract);
 	void handleStorageLayout(std::string const& _contract);
+	void handleTransientStorageLayout(std::string const& _contract);
 
 	/// Tries to read @ m_sourceCodes as a JSONs holding ASTs
 	/// such that they can be imported into the compiler  (importASTs())
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 881c656dad..97c6901400 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -760,7 +760,8 @@ General Information)").c_str(),
 		(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 IPFS hash is stored on-chain.")
-		(CompilerOutputs::componentName(&CompilerOutputs::storageLayout).c_str(), "Slots, offsets and types of the contract's state variables.")
+		(CompilerOutputs::componentName(&CompilerOutputs::storageLayout).c_str(), "Slots, offsets and types of the contract's state variables located in storage.")
+		(CompilerOutputs::componentName(&CompilerOutputs::transientStorageLayout).c_str(), "Slots, offsets and types of the contract's state variables located in transient storage.")
 	;
 	desc.add(outputComponents);
 
@@ -1469,7 +1470,8 @@ void CommandLineParser::parseCombinedJsonOption()
 			&CombinedJsonRequests::natspecDev,
 			&CombinedJsonRequests::natspecUser,
 			&CombinedJsonRequests::signatureHashes,
-			&CombinedJsonRequests::storageLayout
+			&CombinedJsonRequests::storageLayout,
+			&CombinedJsonRequests::transientStorageLayout
 		};
 
 		for (auto const invalidOption: invalidOptions)
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index b95973562e..5d941f662c 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -86,6 +86,7 @@ struct CompilerOutputs
 			{"devdoc", &CompilerOutputs::natspecDev},
 			{"metadata", &CompilerOutputs::metadata},
 			{"storage-layout", &CompilerOutputs::storageLayout},
+			{"transient-storage-layout", &CompilerOutputs::transientStorageLayout},
 		};
 		return components;
 	}
@@ -106,6 +107,7 @@ struct CompilerOutputs
 	bool natspecDev = false;
 	bool metadata = false;
 	bool storageLayout = false;
+	bool transientStorageLayout = false;
 };
 
 struct CombinedJsonRequests
@@ -125,6 +127,7 @@ struct CombinedJsonRequests
 			{"opcodes", &CombinedJsonRequests::opcodes},
 			{"asm", &CombinedJsonRequests::asm_},
 			{"storage-layout", &CombinedJsonRequests::storageLayout},
+			{"transient-storage-layout", &CombinedJsonRequests::transientStorageLayout},
 			{"generated-sources", &CombinedJsonRequests::generatedSources},
 			{"generated-sources-runtime", &CombinedJsonRequests::generatedSourcesRuntime},
 			{"srcmap", &CombinedJsonRequests::srcMap},
@@ -146,6 +149,7 @@ struct CombinedJsonRequests
 	bool opcodes = false;
 	bool asm_ = false;
 	bool storageLayout = false;
+	bool transientStorageLayout = false;
 	bool generatedSources = false;
 	bool generatedSourcesRuntime = false;
 	bool srcMap = false;
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
index 09f4afc4ef..e0f4e37e6a 100644
--- a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
@@ -37,6 +37,10 @@
                     "storage": [],
                     "types": null
                 },
+                "transientStorageLayout": {
+                    "storage": [],
+                    "types": null
+                },
                 "userdoc": {
                     "kind": "user",
                     "methods": {},
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/input.json b/test/cmdlineTests/storage_layout_transient_value_types/input.json
index 96d71ed30e..8c90a7dde2 100644
--- a/test/cmdlineTests/storage_layout_transient_value_types/input.json
+++ b/test/cmdlineTests/storage_layout_transient_value_types/input.json
@@ -6,7 +6,7 @@
 	"settings": {
 		"outputSelection": {
 			"fileA": {
-				"A": ["storageLayout"]
+				"A": ["storageLayout", "transientStorageLayout"]
 			}
 		}
 	}
diff --git a/test/cmdlineTests/storage_layout_transient_value_types/output.json b/test/cmdlineTests/storage_layout_transient_value_types/output.json
index b77de93262..1f688501e8 100644
--- a/test/cmdlineTests/storage_layout_transient_value_types/output.json
+++ b/test/cmdlineTests/storage_layout_transient_value_types/output.json
@@ -1,62 +1,103 @@
 {
-    "errors": [
-        {
-            "component": "general",
-            "errorCode": "6715",
-            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
- --> fileA:4:5:
-  |
-4 |     uint transient x;
-  |     ^^^^^^^^^^^^^^^^
-
-",
-            "message": "Transient storage is not yet implemented.",
-            "severity": "error",
-            "sourceLocation": {
-                "end": 91,
-                "file": "fileA",
-                "start": 75
-            },
-            "type": "UnimplementedFeatureError"
-        },
-        {
-            "component": "general",
-            "errorCode": "6715",
-            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
- --> fileA:6:5:
-  |
-6 |     bytes32 transient b;
-  |     ^^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "Transient storage is not yet implemented.",
-            "severity": "error",
-            "sourceLocation": {
-                "end": 128,
-                "file": "fileA",
-                "start": 109
-            },
-            "type": "UnimplementedFeatureError"
-        },
-        {
-            "component": "general",
-            "errorCode": "6715",
-            "formattedMessage": "UnimplementedFeatureError: Transient storage is not yet implemented.
- --> fileA:8:5:
-  |
-8 |     address transient a;
-  |     ^^^^^^^^^^^^^^^^^^^
-
-",
-            "message": "Transient storage is not yet implemented.",
-            "severity": "error",
-            "sourceLocation": {
-                "end": 168,
-                "file": "fileA",
-                "start": 149
-            },
-            "type": "UnimplementedFeatureError"
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
+                        {
+                            "astId": 5,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 9,
+                            "contract": "fileA:A",
+                            "label": "c",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_bytes32"
+                        },
+                        {
+                            "astId": 13,
+                            "contract": "fileA:A",
+                            "label": "z",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bytes32": {
+                            "encoding": "inplace",
+                            "label": "bytes32",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                },
+                "transientStorageLayout": {
+                    "storage": [
+                        {
+                            "astId": 3,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 7,
+                            "contract": "fileA:A",
+                            "label": "b",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_bytes32"
+                        },
+                        {
+                            "astId": 11,
+                            "contract": "fileA:A",
+                            "label": "a",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bytes32": {
+                            "encoding": "inplace",
+                            "label": "bytes32",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
         }
-    ],
-    "sources": {}
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        }
+    }
 }
diff --git a/test/cmdlineTests/transient_storage_layout/args b/test/cmdlineTests/transient_storage_layout/args
new file mode 100644
index 0000000000..fe39ed7763
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout/args
@@ -0,0 +1 @@
+--transient-storage-layout --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/transient_storage_layout/input.sol b/test/cmdlineTests/transient_storage_layout/input.sol
new file mode 100644
index 0000000000..e1d028698c
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout/input.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity > 0.0;
+
+contract D { }
+
+contract C {
+    uint transient x;
+    uint y;
+    address transient w;
+    int z;
+    bool transient b;
+    D transient d;
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/transient_storage_layout/output b/test/cmdlineTests/transient_storage_layout/output
new file mode 100644
index 0000000000..0736271b44
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout/output
@@ -0,0 +1,67 @@
+
+======= transient_storage_layout/input.sol:C =======
+Contract Transient Storage Layout:
+{
+    "storage": [
+        {
+            "astId": 4,
+            "contract": "transient_storage_layout/input.sol:C",
+            "label": "x",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint256"
+        },
+        {
+            "astId": 8,
+            "contract": "transient_storage_layout/input.sol:C",
+            "label": "w",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_address"
+        },
+        {
+            "astId": 12,
+            "contract": "transient_storage_layout/input.sol:C",
+            "label": "b",
+            "offset": 20,
+            "slot": "1",
+            "type": "t_bool"
+        },
+        {
+            "astId": 15,
+            "contract": "transient_storage_layout/input.sol:C",
+            "label": "d",
+            "offset": 0,
+            "slot": "2",
+            "type": "t_contract(D)2"
+        }
+    ],
+    "types": {
+        "t_address": {
+            "encoding": "inplace",
+            "label": "address",
+            "numberOfBytes": "20"
+        },
+        "t_bool": {
+            "encoding": "inplace",
+            "label": "bool",
+            "numberOfBytes": "1"
+        },
+        "t_contract(D)2": {
+            "encoding": "inplace",
+            "label": "contract D",
+            "numberOfBytes": "20"
+        },
+        "t_uint256": {
+            "encoding": "inplace",
+            "label": "uint256",
+            "numberOfBytes": "32"
+        }
+    }
+}
+
+======= transient_storage_layout/input.sol:D =======
+Contract Transient Storage Layout:
+{
+    "storage": []
+}
diff --git a/test/cmdlineTests/transient_storage_layout_smoke_empty/input.json b/test/cmdlineTests/transient_storage_layout_smoke_empty/input.json
new file mode 100644
index 0000000000..d167f66630
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_smoke_empty/input.json
@@ -0,0 +1,15 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["transientStorageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/transient_storage_layout_smoke_empty/output.json b/test/cmdlineTests/transient_storage_layout_smoke_empty/output.json
new file mode 100644
index 0000000000..261442c1d7
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_smoke_empty/output.json
@@ -0,0 +1,17 @@
+{
+    "contracts": {
+        "fileA": {
+            "A": {
+                "transientStorageLayout": {
+                    "storage": [],
+                    "types": null
+                }
+            }
+        }
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/input.json b/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/input.json
new file mode 100644
index 0000000000..4ca3cc455a
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/input.json
@@ -0,0 +1,21 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract A { }"
+		},
+		"fileB": {
+			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\ncontract B { uint transient x; uint transient y; }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["transientStorageLayout"]
+			},
+			"fileB": {
+				"B": ["transientStorageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/output.json b/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/output.json
new file mode 100644
index 0000000000..670ff01257
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_smoke_two_contracts/output.json
@@ -0,0 +1,51 @@
+{
+    "contracts": {
+        "fileA": {
+            "A": {
+                "transientStorageLayout": {
+                    "storage": [],
+                    "types": null
+                }
+            }
+        },
+        "fileB": {
+            "B": {
+                "transientStorageLayout": {
+                    "storage": [
+                        {
+                            "astId": 6,
+                            "contract": "fileB:B",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 8,
+                            "contract": "fileB:B",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        }
+                    ],
+                    "types": {
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        },
+        "fileB": {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types/in.sol b/test/cmdlineTests/transient_storage_layout_value_types/in.sol
new file mode 100644
index 0000000000..c2f89a9872
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types/in.sol
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+type MyInt is int256;
+
+enum MyEnum {
+    None,
+    Something,
+    SomethingElse
+}
+
+contract C { }
+
+contract A {
+    uint transient x;
+    int transient y;
+    address transient addr;
+    bool transient b;
+    MyInt transient w;
+    C transient c;
+    MyEnum transient e;
+    function() external transient p;
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types/input.json b/test/cmdlineTests/transient_storage_layout_value_types/input.json
new file mode 100644
index 0000000000..65d9a2231b
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types/input.json
@@ -0,0 +1,13 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {"urls": ["transient_storage_layout_value_types/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["transientStorageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types/output.json b/test/cmdlineTests/transient_storage_layout_value_types/output.json
new file mode 100644
index 0000000000..298a2588a9
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types/output.json
@@ -0,0 +1,123 @@
+{
+    "contracts": {
+        "fileA": {
+            "A": {
+                "transientStorageLayout": {
+                    "storage": [
+                        {
+                            "astId": 10,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 12,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_int256"
+                        },
+                        {
+                            "astId": 14,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 16,
+                            "contract": "fileA:A",
+                            "label": "b",
+                            "offset": 20,
+                            "slot": "2",
+                            "type": "t_bool"
+                        },
+                        {
+                            "astId": 19,
+                            "contract": "fileA:A",
+                            "label": "w",
+                            "offset": 0,
+                            "slot": "3",
+                            "type": "t_userDefinedValueType(MyInt)3"
+                        },
+                        {
+                            "astId": 22,
+                            "contract": "fileA:A",
+                            "label": "c",
+                            "offset": 0,
+                            "slot": "4",
+                            "type": "t_contract(C)8"
+                        },
+                        {
+                            "astId": 25,
+                            "contract": "fileA:A",
+                            "label": "e",
+                            "offset": 20,
+                            "slot": "4",
+                            "type": "t_enum(MyEnum)7"
+                        },
+                        {
+                            "astId": 29,
+                            "contract": "fileA:A",
+                            "label": "p",
+                            "offset": 0,
+                            "slot": "5",
+                            "type": "t_function_external_nonpayable()returns()"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bool": {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_contract(C)8": {
+                            "encoding": "inplace",
+                            "label": "contract C",
+                            "numberOfBytes": "20"
+                        },
+                        "t_enum(MyEnum)7": {
+                            "encoding": "inplace",
+                            "label": "enum MyEnum",
+                            "numberOfBytes": "1"
+                        },
+                        "t_function_external_nonpayable()returns()": {
+                            "encoding": "inplace",
+                            "label": "function () external",
+                            "numberOfBytes": "24"
+                        },
+                        "t_int256": {
+                            "encoding": "inplace",
+                            "label": "int256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_userDefinedValueType(MyInt)3": {
+                            "encoding": "inplace",
+                            "label": "MyInt",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/in.sol b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/in.sol
new file mode 100644
index 0000000000..18af07a159
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/in.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+type MyInt is int8;
+contract A {
+    uint public transient x;
+    uint public y;
+    int private transient z;
+    int private w;
+    address transient addr;
+    address d;
+    bool transient b;
+    bool c;
+    MyInt i;
+    MyInt transient j;
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/input.json b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/input.json
new file mode 100644
index 0000000000..e649fc838b
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/input.json
@@ -0,0 +1,13 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {"urls": ["transient_storage_layout_value_types_interleaved_with_storage/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["storageLayout", "transientStorageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/output.json b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/output.json
new file mode 100644
index 0000000000..ab967985d4
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_interleaved_with_storage/output.json
@@ -0,0 +1,155 @@
+{
+    "contracts": {
+        "fileA": {
+            "A": {
+                "storageLayout": {
+                    "storage": [
+                        {
+                            "astId": 7,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 11,
+                            "contract": "fileA:A",
+                            "label": "w",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_int256"
+                        },
+                        {
+                            "astId": 15,
+                            "contract": "fileA:A",
+                            "label": "d",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 19,
+                            "contract": "fileA:A",
+                            "label": "c",
+                            "offset": 20,
+                            "slot": "2",
+                            "type": "t_bool"
+                        },
+                        {
+                            "astId": 22,
+                            "contract": "fileA:A",
+                            "label": "i",
+                            "offset": 21,
+                            "slot": "2",
+                            "type": "t_userDefinedValueType(MyInt)3"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bool": {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_int256": {
+                            "encoding": "inplace",
+                            "label": "int256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_userDefinedValueType(MyInt)3": {
+                            "encoding": "inplace",
+                            "label": "MyInt",
+                            "numberOfBytes": "1"
+                        }
+                    }
+                },
+                "transientStorageLayout": {
+                    "storage": [
+                        {
+                            "astId": 5,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 9,
+                            "contract": "fileA:A",
+                            "label": "z",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_int256"
+                        },
+                        {
+                            "astId": 13,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 17,
+                            "contract": "fileA:A",
+                            "label": "b",
+                            "offset": 20,
+                            "slot": "2",
+                            "type": "t_bool"
+                        },
+                        {
+                            "astId": 25,
+                            "contract": "fileA:A",
+                            "label": "j",
+                            "offset": 21,
+                            "slot": "2",
+                            "type": "t_userDefinedValueType(MyInt)3"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bool": {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_int256": {
+                            "encoding": "inplace",
+                            "label": "int256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint256": {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_userDefinedValueType(MyInt)3": {
+                            "encoding": "inplace",
+                            "label": "MyInt",
+                            "numberOfBytes": "1"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_packed/in.sol b/test/cmdlineTests/transient_storage_layout_value_types_packed/in.sol
new file mode 100644
index 0000000000..9b50fd810d
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_packed/in.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+type MyInt is int128;
+
+enum MyEnum {
+    None,
+    Something,
+    SomethingElse
+}
+
+contract C { }
+
+contract A {
+    uint64 transient x;
+    uint128 transient y;
+    uint128 transient z;
+    address transient addr;
+    bool transient b;
+    MyInt transient w;
+    C transient c;
+    MyEnum transient e;
+    function() external transient p;
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_packed/input.json b/test/cmdlineTests/transient_storage_layout_value_types_packed/input.json
new file mode 100644
index 0000000000..ee7fb0dec3
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_packed/input.json
@@ -0,0 +1,13 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {"urls": ["transient_storage_layout_value_types_packed/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": ["transientStorageLayout"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/transient_storage_layout_value_types_packed/output.json b/test/cmdlineTests/transient_storage_layout_value_types_packed/output.json
new file mode 100644
index 0000000000..2be40db848
--- /dev/null
+++ b/test/cmdlineTests/transient_storage_layout_value_types_packed/output.json
@@ -0,0 +1,131 @@
+{
+    "contracts": {
+        "fileA": {
+            "A": {
+                "transientStorageLayout": {
+                    "storage": [
+                        {
+                            "astId": 10,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint64"
+                        },
+                        {
+                            "astId": 12,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 8,
+                            "slot": "0",
+                            "type": "t_uint128"
+                        },
+                        {
+                            "astId": 14,
+                            "contract": "fileA:A",
+                            "label": "z",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint128"
+                        },
+                        {
+                            "astId": 16,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 18,
+                            "contract": "fileA:A",
+                            "label": "b",
+                            "offset": 20,
+                            "slot": "2",
+                            "type": "t_bool"
+                        },
+                        {
+                            "astId": 21,
+                            "contract": "fileA:A",
+                            "label": "w",
+                            "offset": 0,
+                            "slot": "3",
+                            "type": "t_userDefinedValueType(MyInt)3"
+                        },
+                        {
+                            "astId": 24,
+                            "contract": "fileA:A",
+                            "label": "c",
+                            "offset": 0,
+                            "slot": "4",
+                            "type": "t_contract(C)8"
+                        },
+                        {
+                            "astId": 27,
+                            "contract": "fileA:A",
+                            "label": "e",
+                            "offset": 20,
+                            "slot": "4",
+                            "type": "t_enum(MyEnum)7"
+                        },
+                        {
+                            "astId": 31,
+                            "contract": "fileA:A",
+                            "label": "p",
+                            "offset": 0,
+                            "slot": "5",
+                            "type": "t_function_external_nonpayable()returns()"
+                        }
+                    ],
+                    "types": {
+                        "t_address": {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bool": {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_contract(C)8": {
+                            "encoding": "inplace",
+                            "label": "contract C",
+                            "numberOfBytes": "20"
+                        },
+                        "t_enum(MyEnum)7": {
+                            "encoding": "inplace",
+                            "label": "enum MyEnum",
+                            "numberOfBytes": "1"
+                        },
+                        "t_function_external_nonpayable()returns()": {
+                            "encoding": "inplace",
+                            "label": "function () external",
+                            "numberOfBytes": "24"
+                        },
+                        "t_uint128": {
+                            "encoding": "inplace",
+                            "label": "uint128",
+                            "numberOfBytes": "16"
+                        },
+                        "t_uint64": {
+                            "encoding": "inplace",
+                            "label": "uint64",
+                            "numberOfBytes": "8"
+                        },
+                        "t_userDefinedValueType(MyInt)3": {
+                            "encoding": "inplace",
+                            "label": "MyInt",
+                            "numberOfBytes": "16"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "fileA": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/libsolidity/astPropertyTests/transient_data_location.sol b/test/libsolidity/astPropertyTests/transient_data_location.sol
new file mode 100644
index 0000000000..be220a366b
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/transient_data_location.sol
@@ -0,0 +1,14 @@
+contract C {
+    /// TransientDataLocation: storageLocation
+    /// TransientVarName: name
+    uint transient x;
+    /// StorageDataLocation: storageLocation
+    /// StorageVarName: name
+    uint y;
+
+}
+// ----
+// TransientDataLocation: transient
+// TransientVarName: x
+// StorageDataLocation: default
+// StorageVarName: y
diff --git a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
index cdb4461656..b2dbc8efe5 100644
--- a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
+++ b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// UnimplementedFeatureError 6715: (17-38): Transient storage is not yet implemented.
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
index a3d741bbe2..5645629088 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
@@ -7,9 +7,4 @@ contract C {
     function () internal internal transient fiit;
 }
 // ----
-// UnimplementedFeatureError 6715: (17-40): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (46-82): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (88-122): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (128-162): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (168-212): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (218-262): Transient storage is not yet implemented.
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
index 561d9f21da..f598fb72c8 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
@@ -8,9 +8,4 @@ contract C {
     uint transient private tprv;
 }
 // ----
-// UnimplementedFeatureError 6715: (17-43): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (49-75): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (81-108): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (115-141): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (147-173): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (179-206): Transient storage is not yet implemented.
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
index ce2db200bb..d2eac46f7b 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
@@ -8,8 +8,4 @@ contract C {
 	bytes32 transient y;
 }
 // ----
-// UnimplementedFeatureError 6715: (30-49): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (52-68): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (71-84): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (87-103): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (106-125): Transient storage is not yet implemented.
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
index 33b7bb28cb..18e6a215dd 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
@@ -6,6 +6,4 @@ contract C {
 	bool transient b = x > 0 ? false : true;
 }
 // ----
-// UnimplementedFeatureError 6715: (30-51): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (54-90): Transient storage is not yet implemented.
-// UnimplementedFeatureError 6715: (93-132): Transient storage is not yet implemented.
+// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 2ba1d43c87..37c638a3bb 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -130,10 +130,11 @@ 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-ast-json", "--ir-optimized", "--ir-optimized-ast-json", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
+			"--ir", "--ir-ast-json", "--ir-optimized", "--ir-optimized-ast-json", "--hashes", "--userdoc", "--devdoc", "--metadata",
+			"--storage-layout", "--transient-storage-layout",
 			"--gas",
 			"--combined-json="
-				"abi,metadata,bin,bin-runtime,opcodes,asm,storage-layout,generated-sources,generated-sources-runtime,"
+				"abi,metadata,bin,bin-runtime,opcodes,asm,storage-layout,transient-storage-layout,generated-sources,generated-sources-runtime,"
 				"srcmap,srcmap-runtime,function-debug,function-debug-runtime,hashes,devdoc,userdoc,ast",
 			"--metadata-hash=swarm",
 			"--metadata-literal",
@@ -192,14 +193,14 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			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 = {
 			true, true, true, true, true,
 			true, true, true, true, true,
 			true, true, true, true, true,
-			true, true,
+			true, true, true,
 		};
 		expectedOptions.metadata.hash = CompilerStack::MetadataHash::Bzzr1;
 		expectedOptions.metadata.literalSources = true;

From 978f9a0cd7e04cea8ad67dc3b5ef130aa9878e72 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:30:58 +0200
Subject: [PATCH 0970/1140] Yul: Immutable AST class with top-level block

---
 libsolidity/analysis/ControlFlowBuilder.cpp   |   2 +-
 libsolidity/analysis/PostTypeChecker.cpp      |   2 +-
 libsolidity/analysis/ReferencesResolver.cpp   |   2 +-
 libsolidity/analysis/SyntaxChecker.cpp        |   2 +-
 libsolidity/analysis/TypeChecker.cpp          |   2 +-
 libsolidity/analysis/ViewPureChecker.cpp      |   2 +-
 libsolidity/ast/AST.h                         |   8 +-
 libsolidity/ast/ASTJsonExporter.cpp           |   2 +-
 libsolidity/ast/ASTJsonImporter.cpp           |   2 +-
 libsolidity/codegen/CompilerContext.cpp       |  10 +-
 libsolidity/codegen/ContractCompiler.cpp      |   6 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |   2 +-
 .../experimental/analysis/TypeInference.cpp   |   2 +-
 .../codegen/IRGeneratorForStatements.cpp      |   2 +-
 libsolidity/formal/SMTEncoder.cpp             |   4 +-
 libsolidity/interface/CompilerStack.cpp       |   4 +-
 libsolidity/parsing/Parser.cpp                |   8 +-
 libyul/AST.h                                  |  12 +
 libyul/ASTForward.h                           |   1 +
 libyul/AsmAnalysis.cpp                        |  13 +-
 libyul/AsmAnalysis.h                          |   5 +
 libyul/AsmJsonImporter.cpp                    |   5 +
 libyul/AsmJsonImporter.h                      |   3 +-
 libyul/AsmParser.cpp                          |  10 +-
 libyul/AsmParser.h                            |   4 +-
 libyul/CompilabilityChecker.cpp               |  17 +-
 libyul/CompilabilityChecker.h                 |   7 +-
 libyul/Object.cpp                             |   4 +-
 libyul/Object.h                               |   2 +-
 libyul/ObjectParser.cpp                       |  10 +-
 libyul/ObjectParser.h                         |   4 +-
 libyul/YulStack.cpp                           |   2 +-
 libyul/backends/evm/EVMObjectCompiler.cpp     |   8 +-
 libyul/optimiser/Semantics.cpp                |   2 +-
 libyul/optimiser/StackCompressor.cpp          |  30 +-
 libyul/optimiser/StackCompressor.h            |  13 +-
 libyul/optimiser/StackLimitEvader.cpp         |  31 +-
 libyul/optimiser/StackLimitEvader.h           |   7 +-
 libyul/optimiser/Suite.cpp                    |  34 +-
 test/libsolidity/MemoryGuardTest.cpp          |   3 +-
 test/libyul/Common.cpp                        |   8 +-
 test/libyul/Common.h                          |   3 +-
 test/libyul/ControlFlowGraphTest.cpp          |   2 +-
 test/libyul/ControlFlowSideEffectsTest.cpp    |   4 +-
 test/libyul/FunctionSideEffects.cpp           |   2 +-
 test/libyul/KnowledgeBaseTest.cpp             |   9 +-
 test/libyul/Metrics.cpp                       |   4 +-
 test/libyul/Parser.cpp                        | 280 +++++------
 test/libyul/StackLayoutGeneratorTest.cpp      |   2 +-
 test/libyul/YulInterpreterTest.cpp            |   3 +-
 test/libyul/YulInterpreterTest.h              |   4 +-
 test/libyul/YulOptimizerTest.cpp              |  15 +-
 test/libyul/YulOptimizerTestCommon.cpp        | 451 +++++++++++-------
 test/libyul/YulOptimizerTestCommon.h          |  19 +-
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |   2 +-
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |   5 +-
 test/tools/ossfuzz/yulFuzzerCommon.cpp        |   4 +-
 test/tools/ossfuzz/yulFuzzerCommon.h          |   2 +-
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |   4 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |   9 +-
 test/tools/yulopti.cpp                        |  28 +-
 test/tools/yulrun.cpp                         |   8 +-
 tools/yulPhaser/Program.cpp                   |  37 +-
 tools/yulPhaser/Program.h                     |  22 +-
 64 files changed, 699 insertions(+), 517 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index c20968a14d..7bc0ebc7bf 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -451,7 +451,7 @@ bool ControlFlowBuilder::visit(InlineAssembly const& _inlineAssembly)
 	solAssert(!!m_currentNode && !m_inlineAssembly, "");
 
 	m_inlineAssembly = &_inlineAssembly;
-	(*this)(_inlineAssembly.operations());
+	(*this)(_inlineAssembly.operations().root());
 	m_inlineAssembly = nullptr;
 
 	return false;
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index 9731ef3cc6..49c5fa4a41 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -506,7 +506,7 @@ class LValueChecker: public ASTConstVisitor
 			return;
 
 		YulLValueChecker yulChecker{m_declaration->name()};
-		yulChecker(_inlineAssembly.operations());
+		yulChecker(_inlineAssembly.operations().root());
 		m_willBeWrittenTo = yulChecker.willBeWrittenTo();
 	}
 private:
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 270e1a55ab..bb3b20e93a 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -236,7 +236,7 @@ bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
 bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
 {
 	m_yulAnnotation = &_inlineAssembly.annotation();
-	(*this)(_inlineAssembly.operations());
+	(*this)(_inlineAssembly.operations().root());
 	m_yulAnnotation = nullptr;
 
 	return false;
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index b083690cce..1e3f5f1c2a 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -354,7 +354,7 @@ bool SyntaxChecker::visit(InlineAssembly const& _inlineAssembly)
 	if (!m_useYulOptimizer)
 		return false;
 
-	if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations()))
+	if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations().root()))
 		m_errorReporter.syntaxError(
 			6553_error,
 			_inlineAssembly.location(),
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 918e270333..3b7a314fe3 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -940,7 +940,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 		_inlineAssembly.dialect(),
 		identifierAccess
 	);
-	if (!analyzer.analyze(_inlineAssembly.operations()))
+	if (!analyzer.analyze(_inlineAssembly.operations().root()))
 		solAssert(m_errorReporter.hasErrors());
 	_inlineAssembly.annotation().hasMemoryEffects =
 		lvalueAccessToMemoryVariable ||
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 3f6b954e75..3b16205e7d 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -226,7 +226,7 @@ void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly)
 	AssemblyViewPureChecker{
 		_inlineAssembly.dialect(),
 		[&](StateMutability _mutability, SourceLocation const& _location) { reportMutability(_mutability, _location); }
-	}(_inlineAssembly.operations());
+	}(_inlineAssembly.operations().root());
 }
 
 void ViewPureChecker::reportMutability(
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 3494ab94b9..727652f560 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -48,7 +48,7 @@
 namespace solidity::yul
 {
 // Forward-declaration to <yul/AST.h>
-struct Block;
+class AST;
 struct Dialect;
 }
 
@@ -1569,7 +1569,7 @@ class InlineAssembly: public Statement
 		ASTPointer<ASTString> const& _docString,
 		yul::Dialect const& _dialect,
 		ASTPointer<std::vector<ASTPointer<ASTString>>> _flags,
-		std::shared_ptr<yul::Block> _operations
+		std::shared_ptr<yul::AST> _operations
 	):
 		Statement(_id, _location, _docString),
 		m_dialect(_dialect),
@@ -1580,7 +1580,7 @@ class InlineAssembly: public Statement
 	void accept(ASTConstVisitor& _visitor) const override;
 
 	yul::Dialect const& dialect() const { return m_dialect; }
-	yul::Block const& operations() const { return *m_operations; }
+	yul::AST const& operations() const { return *m_operations; }
 	ASTPointer<std::vector<ASTPointer<ASTString>>> const& flags() const { return m_flags; }
 
 	InlineAssemblyAnnotation& annotation() const override;
@@ -1588,7 +1588,7 @@ class InlineAssembly: public Statement
 private:
 	yul::Dialect const& m_dialect;
 	ASTPointer<std::vector<ASTPointer<ASTString>>> m_flags;
-	std::shared_ptr<yul::Block> m_operations;
+	std::shared_ptr<yul::AST> m_operations;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 69f51618e3..910cc257eb 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -665,7 +665,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 		externalReferencesJson.emplace_back(std::move(it));
 
 	std::vector<std::pair<std::string, Json>> attributes = {
-		std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
+		std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations().root()))),
 		std::make_pair("externalReferences", std::move(externalReferencesJson)),
 		std::make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
 	};
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 728d77c0de..8d72b41f75 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -733,7 +733,7 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json const& _no
 			flags->emplace_back(std::make_shared<ASTString>(flag.get<std::string>()));
 		}
 	}
-	std::shared_ptr<yul::Block> operations = std::make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
+	std::shared_ptr<yul::AST> operations = std::make_shared<yul::AST>(yul::AsmJsonImporter(m_sourceNames).createAST(member(_node, "AST")));
 	return createASTNode<InlineAssembly>(
 		_node,
 		nullOrASTString(_node, "documentation"),
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 962defdbc8..aa6985503f 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -440,7 +440,7 @@ void CompilerContext::appendInlineAssembly(
 	std::optional<langutil::SourceLocation> locationOverride;
 	if (!_system)
 		locationOverride = m_asm->currentSourceLocation();
-	std::shared_ptr<yul::Block> parserResult =
+	std::shared_ptr<yul::AST> parserResult =
 		yul::Parser(errorReporter, dialect, std::move(locationOverride))
 		.parse(charStream);
 #ifdef SOL_OUTPUT_ASM
@@ -472,7 +472,7 @@ void CompilerContext::appendInlineAssembly(
 			errorReporter,
 			dialect,
 			identifierAccess.resolve
-		).analyze(*parserResult);
+		).analyze(parserResult->root());
 	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
 		reportError("Invalid assembly generated by code generator.");
 
@@ -491,8 +491,8 @@ void CompilerContext::appendInlineAssembly(
 		{
 			// Store as generated sources, but first re-parse to update the source references.
 			solAssert(m_generatedYulUtilityCode.empty(), "");
-			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(*obj.code);
-			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(*obj.code);
+			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code->root());
+			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code->root());
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
 			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
@@ -518,7 +518,7 @@ void CompilerContext::appendInlineAssembly(
 
 	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
 	yul::CodeGenerator::assemble(
-		*parserResult,
+		parserResult->root(),
 		analysisInfo,
 		*m_asm,
 		m_evmVersion,
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 0ed17f6d02..21899f72a6 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -927,7 +927,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		}
 	};
 
-	yul::Block const* code = &_inlineAssembly.operations();
+	yul::AST const* code = &_inlineAssembly.operations();
 	yul::AsmAnalysisInfo* analysisInfo = _inlineAssembly.annotation().analysisInfo.get();
 
 	// Only used in the scope below, but required to live outside to keep the
@@ -944,7 +944,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		solAssert(dialect, "");
 
 		// Create a modifiable copy of the code and analysis
-		object.code = std::make_shared<yul::Block>(yul::ASTCopier().translate(*code));
+		object.code = std::make_shared<yul::AST>(yul::ASTCopier().translate(code->root()));
 		object.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
 
 		m_context.optimizeYul(object, *dialect, m_optimiserSettings);
@@ -954,7 +954,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 	}
 
 	yul::CodeGenerator::assemble(
-		*code,
+		code->root(),
 		*analysisInfo,
 		*m_context.assemblyPtr(),
 		m_context.evmVersion(),
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 4f4f96329a..4599596046 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2252,7 +2252,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 		m_context.setMemoryUnsafeInlineAssemblySeen();
 	CopyTranslate bodyCopier{_inlineAsm.dialect(), m_context, _inlineAsm.annotation().externalReferences};
 
-	yul::Statement modified = bodyCopier(_inlineAsm.operations());
+	yul::Statement modified = bodyCopier(_inlineAsm.operations().root());
 
 	solAssert(std::holds_alternative<yul::Block>(modified));
 
diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index 6913dc0bf7..19f019c86c 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -302,7 +302,7 @@ bool TypeInference::visit(InlineAssembly const& _inlineAssembly)
 		_inlineAssembly.dialect(),
 		identifierAccess
 	);
-	if (!analyzer.analyze(_inlineAssembly.operations()))
+	if (!analyzer.analyze(_inlineAssembly.operations().root()))
 		solAssert(m_errorReporter.hasErrors());
 	return false;
 }
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
index 109c3ee6f1..3c8bcc9bbb 100644
--- a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -130,7 +130,7 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tupleExpression)
 bool IRGeneratorForStatements::visit(InlineAssembly const& _assembly)
 {
 	CopyTranslate bodyCopier{m_context, _assembly.dialect(), _assembly.annotation().externalReferences};
-	yul::Statement modified = bodyCopier(_assembly.operations());
+	yul::Statement modified = bodyCopier(_assembly.operations().root());
 	solAssert(std::holds_alternative<yul::Block>(modified));
 	m_code << yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, _assembly.dialect())(std::get<yul::Block>(modified)) << "\n";
 	return false;
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 44282289d1..7e338d9f80 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -313,7 +313,7 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
 	{
 		AssignedExternalsCollector(InlineAssembly const& _inlineAsm): externalReferences(_inlineAsm.annotation().externalReferences)
 		{
-			this->operator()(_inlineAsm.operations());
+			this->operator()(_inlineAsm.operations().root());
 		}
 
 		std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> const& externalReferences;
@@ -330,7 +330,7 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
 		}
 	};
 
-	yul::SideEffectsCollector sideEffectsCollector(_inlineAsm.dialect(), _inlineAsm.operations());
+	yul::SideEffectsCollector sideEffectsCollector(_inlineAsm.dialect(), _inlineAsm.operations().root());
 	if (sideEffectsCollector.invalidatesMemory())
 		resetMemoryVariables();
 	if (sideEffectsCollector.invalidatesStorage())
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index de7b185d29..dd5d20126e 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -846,9 +846,9 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 				ErrorReporter errorReporter(errors);
 				CharStream charStream(source, sourceName);
 				yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-				std::shared_ptr<yul::Block> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
+				std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
 				solAssert(parserResult, "");
-				sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(*parserResult);
+				sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(parserResult->root());
 				sources[0]["name"] = sourceName;
 				sources[0]["id"] = sourceIndex;
 				sources[0]["language"] = "Yul";
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index b51eb9c440..5c28c44f2c 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1473,12 +1473,12 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 	}
 
 	yul::Parser asmParser(m_errorReporter, dialect);
-	std::shared_ptr<yul::Block> block = asmParser.parseInline(m_scanner);
-	if (block == nullptr)
+	std::shared_ptr<yul::AST> ast = asmParser.parseInline(m_scanner);
+	if (ast == nullptr)
 		BOOST_THROW_EXCEPTION(FatalError());
 
-	location.end = nativeLocationOf(*block).end;
-	return std::make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), block);
+	location.end = nativeLocationOf(ast->root()).end;
+	return std::make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), ast);
 }
 
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
diff --git a/libyul/AST.h b/libyul/AST.h
index 72be60a468..ca4846907e 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -101,6 +101,18 @@ struct Continue { langutil::DebugData::ConstPtr debugData; };
 /// Leave statement (valid within function)
 struct Leave { langutil::DebugData::ConstPtr debugData; };
 
+/// Immutable AST comprised of its top-level block
+class AST
+{
+public:
+	explicit AST(Block _root): m_root(std::move(_root)) {}
+
+	Block const& root() const { return m_root; }
+private:
+	Block m_root;
+};
+
+
 /// Extracts the IR source location from a Yul node.
 template <class T> inline langutil::SourceLocation nativeLocationOf(T const& _node)
 {
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
index 12992edf88..f6fa093877 100644
--- a/libyul/ASTForward.h
+++ b/libyul/ASTForward.h
@@ -46,6 +46,7 @@ struct Continue;
 struct Leave;
 struct ExpressionStatement;
 struct Block;
+class AST;
 
 struct TypedName;
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index cccb3de421..dae945fe87 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -85,6 +85,15 @@ bool AsmAnalyzer::analyze(Block const& _block)
 }
 
 AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object)
+{
+	return analyzeStrictAssertCorrect(_dialect, _object.code->root(), _object.qualifiedDataNames());
+}
+
+AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(
+	Dialect const& _dialect,
+	Block const& _astRoot,
+	std::set<std::string> const& _qualifiedDataNames
+)
 {
 	ErrorList errorList;
 	langutil::ErrorReporter errors(errorList);
@@ -94,8 +103,8 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect,
 		errors,
 		_dialect,
 		{},
-		_object.qualifiedDataNames()
-	).analyze(*_object.code);
+		_qualifiedDataNames
+	).analyze(_astRoot);
 	yulAssert(success && !errors.hasErrors(), "Invalid assembly/yul code.");
 	return analysisInfo;
 }
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index 5aa7fe4968..d479a9970d 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -78,6 +78,11 @@ class AsmAnalyzer
 	/// Performs analysis on the outermost code of the given object and returns the analysis info.
 	/// Asserts on failure.
 	static AsmAnalysisInfo analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object);
+	static AsmAnalysisInfo analyzeStrictAssertCorrect(
+		Dialect const& _dialect,
+		Block const& _astRoot,
+		std::set<std::string> const& _qualifiedDataNames
+	);
 
 	std::vector<YulName> operator()(Literal const& _literal);
 	std::vector<YulName> operator()(Identifier const&);
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 8f211f31b4..65ff22999b 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -49,6 +49,11 @@ SourceLocation const AsmJsonImporter::createSourceLocation(Json const& _node)
 	return solidity::langutil::parseSourceLocation(_node["src"].get<std::string>(), m_sourceNames);
 }
 
+AST AsmJsonImporter::createAST(solidity::Json const& _node)
+{
+	return AST(createBlock(_node));
+}
+
 template <class T>
 T AsmJsonImporter::createAsmNode(Json const& _node)
 {
diff --git a/libyul/AsmJsonImporter.h b/libyul/AsmJsonImporter.h
index 87933761a6..d835e99e39 100644
--- a/libyul/AsmJsonImporter.h
+++ b/libyul/AsmJsonImporter.h
@@ -41,8 +41,8 @@ class AsmJsonImporter
 	explicit AsmJsonImporter(std::vector<std::shared_ptr<std::string const>> const& _sourceNames):
 		m_sourceNames(_sourceNames)
 	{}
-	yul::Block createBlock(Json const& _node);
 
+	yul::AST createAST(Json const& node);
 private:
 	langutil::SourceLocation const createSourceLocation(Json const& _node);
 	template <class T>
@@ -51,6 +51,7 @@ class AsmJsonImporter
 	/// and throw an error if it does not exist
 	Json member(Json const& _node, std::string const& _name);
 
+	yul::Block createBlock(Json const& _node);
 	yul::Statement createStatement(Json const& _node);
 	yul::Expression createExpression(Json const& _node);
 	std::vector<yul::Statement> createStatementVector(Json const& _array);
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 41bef57fe0..6223a1a8e1 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -104,15 +104,15 @@ void Parser::updateLocationEndFrom(
 	}
 }
 
-std::unique_ptr<Block> Parser::parse(CharStream& _charStream)
+std::unique_ptr<AST> Parser::parse(CharStream& _charStream)
 {
 	m_scanner = std::make_shared<Scanner>(_charStream);
-	std::unique_ptr<Block> block = parseInline(m_scanner);
+	std::unique_ptr<AST> ast = parseInline(m_scanner);
 	expectToken(Token::EOS);
-	return block;
+	return ast;
 }
 
-std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
+std::unique_ptr<AST> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
 {
 	m_recursionDepth = 0;
 
@@ -125,7 +125,7 @@ std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scan
 		m_scanner = _scanner;
 		if (m_useSourceLocationFrom == UseSourceLocationFrom::Comments)
 			fetchDebugDataFromComment();
-		return std::make_unique<Block>(parseBlock());
+		return std::make_unique<AST>(parseBlock());
 	}
 	catch (FatalError const& error)
 	{
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index 408c8029cf..dd206b5b1e 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -87,12 +87,12 @@ class Parser: public langutil::ParserBase
 
 	/// Parses an inline assembly block starting with `{` and ending with `}`.
 	/// @returns an empty shared pointer on error.
-	std::unique_ptr<Block> parseInline(std::shared_ptr<langutil::Scanner> const& _scanner);
+	std::unique_ptr<AST> parseInline(std::shared_ptr<langutil::Scanner> const& _scanner);
 
 	/// Parses an assembly block starting with `{` and ending with `}`
 	/// and expects end of input after the '}'.
 	/// @returns an empty shared pointer on error.
-	std::unique_ptr<Block> parse(langutil::CharStream& _charStream);
+	std::unique_ptr<AST> parse(langutil::CharStream& _charStream);
 
 protected:
 	langutil::SourceLocation currentLocation() const override
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index 9e18f48d82..76affbd647 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -33,15 +33,22 @@ using namespace solidity::util;
 CompilabilityChecker::CompilabilityChecker(
 	Dialect const& _dialect,
 	Object const& _object,
-	bool _optimizeStackAllocation
+	bool _optimizeStackAllocation,
+	Block const* _block
 )
 {
+	yulAssert(_object.code || _block);
 	if (auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
 	{
+		if (!_block)
+			_block = &_object.code->root();
 		NoOutputEVMDialect noOutputDialect(*evmDialect);
 
-		yul::AsmAnalysisInfo analysisInfo =
-			yul::AsmAnalyzer::analyzeStrictAssertCorrect(noOutputDialect, _object);
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(
+			noOutputDialect,
+			*_block,
+			_object.qualifiedDataNames()
+		);
 
 		BuiltinContext builtinContext;
 		builtinContext.currentObject = &_object;
@@ -53,12 +60,12 @@ CompilabilityChecker::CompilabilityChecker(
 		CodeTransform transform(
 			assembly,
 			analysisInfo,
-			*_object.code,
+			*_block,
 			noOutputDialect,
 			builtinContext,
 			_optimizeStackAllocation
 		);
-		transform(*_object.code);
+		transform(*_block);
 
 		for (StackTooDeepError const& error: transform.stackErrors())
 		{
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
index 89bb7aa7c9..1dd6699906 100644
--- a/libyul/CompilabilityChecker.h
+++ b/libyul/CompilabilityChecker.h
@@ -44,7 +44,12 @@ namespace solidity::yul
  */
 struct CompilabilityChecker
 {
-	CompilabilityChecker(Dialect const& _dialect, Object const& _object, bool _optimizeStackAllocation);
+	CompilabilityChecker(
+		Dialect const& _dialect,
+		Object const& _object,
+		bool _optimizeStackAllocation,
+		Block const* _blockOverride = nullptr
+	);
 	std::map<YulName, std::vector<YulName>> unreachableVariables;
 	std::map<YulName, int> stackDeficit;
 };
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 989e7ce809..98649b29be 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -69,7 +69,7 @@ std::string Object::toString(
 		debugData->sourceNames,
 		_debugInfoSelection,
 		_soliditySourceProvider
-	)(*code);
+	)(code->root());
 
 	for (auto const& obj: subObjects)
 		inner += "\n" + obj->toString(_dialect, _printingMode, _debugInfoSelection, _soliditySourceProvider);
@@ -91,7 +91,7 @@ Json Object::toJson() const
 
 	Json codeJson;
 	codeJson["nodeType"] = "YulCode";
-	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(*code);
+	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(code->root());
 
 	Json subObjectsJson = Json::array();
 	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)
diff --git a/libyul/Object.h b/libyul/Object.h
index c419a6d55e..cab3bc701b 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -122,7 +122,7 @@ struct Object: public ObjectNode
 	/// sub id for object if it is subobject of another object, max value if it is not subobject
 	size_t subId = std::numeric_limits<size_t>::max();
 
-	std::shared_ptr<Block> code;
+	std::shared_ptr<AST> code;
 	std::vector<std::shared_ptr<ObjectNode>> subObjects;
 	std::map<std::string, size_t, std::less<>> subIndexByName;
 	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index 1f5363fd8d..6813e50593 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -106,7 +106,7 @@ std::shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 	return ret;
 }
 
-std::shared_ptr<Block> ObjectParser::parseCode(std::optional<SourceNameMap> _sourceNames)
+std::shared_ptr<AST> ObjectParser::parseCode(std::optional<SourceNameMap> _sourceNames)
 {
 	if (currentToken() != Token::Identifier || currentLiteral() != "code")
 		fatalParserError(4846_error, "Expected keyword \"code\".");
@@ -169,12 +169,12 @@ std::optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 	return std::nullopt;
 }
 
-std::shared_ptr<Block> ObjectParser::parseBlock(std::optional<SourceNameMap> _sourceNames)
+std::shared_ptr<AST> ObjectParser::parseBlock(std::optional<SourceNameMap> _sourceNames)
 {
 	Parser parser(m_errorReporter, m_dialect, std::move(_sourceNames));
-	std::shared_ptr<Block> block = parser.parseInline(m_scanner);
-	yulAssert(block || m_errorReporter.hasErrors(), "Invalid block but no error!");
-	return block;
+	auto ast = parser.parseInline(m_scanner);
+	yulAssert(ast || m_errorReporter.hasErrors(), "Invalid block but no error!");
+	return ast;
 }
 
 void ObjectParser::parseData(Object& _containingObject)
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h
index a8f75d373c..1d7756f5ae 100644
--- a/libyul/ObjectParser.h
+++ b/libyul/ObjectParser.h
@@ -57,8 +57,8 @@ class ObjectParser: public langutil::ParserBase
 private:
 	std::optional<SourceNameMap> tryParseSourceNameMapping() const;
 	std::shared_ptr<Object> parseObject(Object* _containingObject = nullptr);
-	std::shared_ptr<Block> parseCode(std::optional<SourceNameMap> _sourceNames);
-	std::shared_ptr<Block> parseBlock(std::optional<SourceNameMap> _sourceNames);
+	std::shared_ptr<AST> parseCode(std::optional<SourceNameMap> _sourceNames);
+	std::shared_ptr<AST> parseBlock(std::optional<SourceNameMap> _sourceNames);
 	void parseData(Object& _containingObject);
 
 	/// Tries to parse a name that is non-empty and unique inside the containing object.
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index b9fc6388c6..426551152a 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -149,7 +149,7 @@ bool YulStack::analyzeParsed(Object& _object)
 	bool success = false;
 	try
 	{
-		success = analyzer.analyze(*_object.code);
+		success = analyzer.analyze(_object.code->root());
 		for (auto& subNode: _object.subObjects)
 			if (auto subObject = dynamic_cast<Object*>(subNode.get()))
 				if (!analyzeParsed(*subObject))
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index 422c08bf96..c77bf4e37c 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -83,7 +83,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		auto stackErrors = OptimizedEVMCodeTransform::run(
 			m_assembly,
 			*_object.analysisInfo,
-			*_object.code,
+			_object.code->root(),
 			m_dialect,
 			context,
 			OptimizedEVMCodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
@@ -91,7 +91,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		if (!stackErrors.empty())
 		{
 			std::vector<FunctionCall const*> memoryGuardCalls = findFunctionCalls(
-				std::as_const(*_object.code),
+				_object.code->root(),
 				"memoryguard"_yulname
 			);
 			auto stackError = stackErrors.front();
@@ -113,14 +113,14 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		CodeTransform transform{
 			m_assembly,
 			*_object.analysisInfo,
-			*_object.code,
+			_object.code->root(),
 			m_dialect,
 			context,
 			_optimize,
 			{},
 			CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
 		};
-		transform(*_object.code);
+		transform(_object.code->root());
 		if (!transform.stackErrors().empty())
 			BOOST_THROW_EXCEPTION(transform.stackErrors().front());
 	}
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 7dbbb676b4..88f4f7c45b 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -95,7 +95,7 @@ bool MSizeFinder::containsMSize(Dialect const& _dialect, Block const& _ast)
 
 bool MSizeFinder::containsMSize(Dialect const& _dialect, Object const& _object)
 {
-	if (containsMSize(_dialect, *_object.code))
+	if (containsMSize(_dialect, _object.code->root()))
 		return true;
 
 	for (std::shared_ptr<ObjectNode> const& node: _object.subObjects)
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 23d47b6ee5..10360756d6 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -21,6 +21,7 @@
 
 #include <libyul/optimiser/StackCompressor.h>
 
+#include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Rematerialiser.h>
 #include <libyul/optimiser/UnusedPruner.h>
@@ -241,10 +242,23 @@ bool StackCompressor::run(
 	bool _optimizeStackAllocation,
 	size_t _maxIterations
 )
+{
+	yulAssert(_object.code);
+	auto block = std::get<Block>(ASTCopier{}(_object.code->root()));
+	auto result = run(_dialect, block, _object, _optimizeStackAllocation, _maxIterations);
+	_object.code = std::make_shared<AST>(std::move(block));
+	return result;
+}
+
+bool StackCompressor::run(
+	Dialect const& _dialect,
+	Block& _astRoot,
+	Object const& _object,
+	bool _optimizeStackAllocation,
+	size_t _maxIterations)
 {
 	yulAssert(
-		_object.code &&
-		_object.code->statements.size() > 0 && std::holds_alternative<Block>(_object.code->statements.at(0)),
+		!_astRoot.statements.empty() && std::holds_alternative<Block>(_astRoot.statements.at(0)),
 		"Need to run the function grouper before the stack compressor."
 	);
 	bool usesOptimizedCodeGenerator = false;
@@ -253,14 +267,14 @@ bool StackCompressor::run(
 			_optimizeStackAllocation &&
 			evmDialect->evmVersion().canOverchargeGasForCall() &&
 			evmDialect->providesObjectAccess();
-	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, *_object.code);
+	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _astRoot);
 	if (usesOptimizedCodeGenerator)
 	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _astRoot, _object.qualifiedDataNames());
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, _astRoot);
 		eliminateVariablesOptimizedCodegen(
 			_dialect,
-			*_object.code,
+			_astRoot,
 			StackLayoutGenerator::reportStackTooDeep(*cfg),
 			allowMSizeOptimization
 		);
@@ -268,12 +282,12 @@ bool StackCompressor::run(
 	else
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
 		{
-			std::map<YulName, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
+			std::map<YulName, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation, &_astRoot).stackDeficit;
 			if (stackSurplus.empty())
 				return true;
 			eliminateVariables(
 				_dialect,
-				*_object.code,
+				_astRoot,
 				stackSurplus,
 				allowMSizeOptimization
 			);
diff --git a/libyul/optimiser/StackCompressor.h b/libyul/optimiser/StackCompressor.h
index d18618667f..13b9459a28 100644
--- a/libyul/optimiser/StackCompressor.h
+++ b/libyul/optimiser/StackCompressor.h
@@ -44,7 +44,7 @@ struct FunctionDefinition;
 class StackCompressor
 {
 public:
-	/// Try to remove local variables until the AST is compilable.
+	/// Try to remove local variables until the AST is compilable. Modifies the object's AST.
 	/// @returns true if it was successful.
 	static bool run(
 		Dialect const& _dialect,
@@ -52,6 +52,17 @@ class StackCompressor
 		bool _optimizeStackAllocation,
 		size_t _maxIterations
 	);
+
+	/// Try to remove local variables until the AST is compilable. Operates on provided block,
+	/// disregards the AST contained in object.
+	/// @returns true if it was successful.
+	static bool run(
+		Dialect const& _dialect,
+		Block& _astRoot,
+		Object const& _object,
+		bool _optimizeStackAllocation,
+		size_t _maxIterations
+	);
 };
 
 }
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 24712938f0..210be1cf38 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -119,7 +119,8 @@ u256 literalArgumentValue(FunctionCall const& _call)
 
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
-	Object& _object
+	Block& _astRoot,
+	Object const& _object
 )
 {
 	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
@@ -129,22 +130,23 @@ void StackLimitEvader::run(
 	);
 	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
 	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _object);
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, *_object.code);
-		run(_context, _object, StackLayoutGenerator::reportStackTooDeep(*cfg));
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _astRoot, _object.qualifiedDataNames());
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, _astRoot);
+		run(_context, _astRoot, StackLayoutGenerator::reportStackTooDeep(*cfg));
 	}
 	else
-		run(_context, _object, CompilabilityChecker{
+		run(_context, _astRoot, CompilabilityChecker{
 			_context.dialect,
 			_object,
-			true
+			true,
+			&_astRoot
 		}.unreachableVariables);
 
 }
 
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
-	Object& _object,
+	Block& _astRoot,
 	std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
 )
 {
@@ -158,23 +160,22 @@ void StackLimitEvader::run(
 				if (!util::contains(unreachables, variable))
 					unreachables.emplace_back(variable);
 	}
-	run(_context, _object, unreachableVariables);
+	run(_context, _astRoot, unreachableVariables);
 }
 
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
-	Object& _object,
+	Block& _astRoot,
 	std::map<YulName, std::vector<YulName>> const& _unreachableVariables
 )
 {
-	yulAssert(_object.code, "");
 	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."
 	);
 
-	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(*_object.code, "memoryguard"_yulname);
+	std::vector<FunctionCall*> memoryGuardCalls = findFunctionCalls(_astRoot, "memoryguard"_yulname);
 	// Do not optimise, if no ``memoryguard`` call is found.
 	if (memoryGuardCalls.empty())
 		return;
@@ -187,23 +188,23 @@ void StackLimitEvader::run(
 		if (reservedMemory != literalArgumentValue(*memoryGuardCall))
 			return;
 
-	CallGraph callGraph = CallGraphGenerator::callGraph(*_object.code);
+	CallGraph callGraph = CallGraphGenerator::callGraph(_astRoot);
 
 	// We cannot move variables in recursive functions to fixed memory offsets.
 	for (YulName function: callGraph.recursiveFunctions())
 		if (_unreachableVariables.count(function))
 			return;
 
-	std::map<YulName, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
+	std::map<YulName, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(_astRoot);
 
 	MemoryOffsetAllocator memoryOffsetAllocator{_unreachableVariables, callGraph.functionCalls, functionDefinitions};
 	uint64_t requiredSlots = memoryOffsetAllocator.run();
 	yulAssert(requiredSlots < (uint64_t(1) << 32) - 1, "");
 
-	StackToMemoryMover::run(_context, reservedMemory, memoryOffsetAllocator.slotAllocations, requiredSlots, *_object.code);
+	StackToMemoryMover::run(_context, reservedMemory, memoryOffsetAllocator.slotAllocations, requiredSlots, _astRoot);
 
 	reservedMemory += 32 * requiredSlots;
-	for (FunctionCall* memoryGuardCall: findFunctionCalls(*_object.code, "memoryguard"_yulname))
+	for (FunctionCall* memoryGuardCall: findFunctionCalls(_astRoot, "memoryguard"_yulname))
 	{
 		Literal* literal = std::get_if<Literal>(&memoryGuardCall->arguments.front());
 		yulAssert(literal && literal->kind == LiteralKind::Number, "");
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
index 0411f05735..5029f7825f 100644
--- a/libyul/optimiser/StackLimitEvader.h
+++ b/libyul/optimiser/StackLimitEvader.h
@@ -59,7 +59,7 @@ class StackLimitEvader
 	/// are contained in a recursive function.
 	static void run(
 		OptimiserStepContext& _context,
-		Object& _object,
+		Block& _astRoot,
 		std::map<YulName, std::vector<YulName>> const& _unreachableVariables
 	);
 	/// @a _stackTooDeepErrors can be determined by the StackLayoutGenerator.
@@ -69,7 +69,7 @@ class StackLimitEvader
 	/// are contained in a recursive function.
 	static void run(
 		OptimiserStepContext& _context,
-		Object& _object,
+		Block& _astRoot,
 		std::map<YulName, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
 	);
 	/// Determines stack too deep errors using the appropriate code generation backend.
@@ -79,7 +79,8 @@ class StackLimitEvader
 	/// are contained in a recursive function.
 	static void run(
 		OptimiserStepContext& _context,
-		Object& _object
+		Block& _astRoot,
+		Object const& _object
 	);
 };
 
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index c022fb0d74..b8826bb8a3 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -153,74 +153,76 @@ void OptimiserSuite::run(
 	std::set<YulName> reservedIdentifiers = _externallyUsedIdentifiers;
 	reservedIdentifiers += _dialect.fixedFunctionNames();
 
-	*_object.code = std::get<Block>(Disambiguator(
+	auto astRoot = std::get<Block>(Disambiguator(
 		_dialect,
 		*_object.analysisInfo,
 		reservedIdentifiers
-	)(*_object.code));
-	Block& ast = *_object.code;
+	)(_object.code->root()));
 
-	NameDispenser dispenser{_dialect, ast, reservedIdentifiers};
+	NameDispenser dispenser{_dialect, astRoot, 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.
-	suite.runSequence("hgfo", ast);
+	suite.runSequence("hgfo", astRoot);
 
-	NameSimplifier::run(suite.m_context, ast);
+	NameSimplifier::run(suite.m_context, astRoot);
 	// Now the user-supplied part
-	suite.runSequence(_optimisationSequence, ast);
+	suite.runSequence(_optimisationSequence, astRoot);
 
 	// This is a tuning parameter, but actually just prevents infinite loops.
 	size_t stackCompressorMaxIterations = 16;
-	suite.runSequence("g", ast);
+	suite.runSequence("g", astRoot);
 
 	// We ignore the return value because we will get a much better error
 	// message once we perform code generation.
 	if (!usesOptimizedCodeGenerator)
 		StackCompressor::run(
 			_dialect,
+			astRoot,
 			_object,
 			_optimizeStackAllocation,
 			stackCompressorMaxIterations
 		);
 
 	// Run the user-supplied clean up sequence
-	suite.runSequence(_optimisationCleanupSequence, ast);
+	suite.runSequence(_optimisationCleanupSequence, astRoot);
 	// 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);
+	suite.runSequence("g", astRoot);
 
 	if (evmDialect)
 	{
 		yulAssert(_meter, "");
-		ConstantOptimiser{*evmDialect, *_meter}(ast);
+		ConstantOptimiser{*evmDialect, *_meter}(astRoot);
 		if (usesOptimizedCodeGenerator)
 		{
 			StackCompressor::run(
 				_dialect,
+				astRoot,
 				_object,
 				_optimizeStackAllocation,
 				stackCompressorMaxIterations
 			);
 			if (evmDialect->providesObjectAccess())
-				StackLimitEvader::run(suite.m_context, _object);
+				StackLimitEvader::run(suite.m_context, astRoot, _object);
 		}
 		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
-			StackLimitEvader::run(suite.m_context, _object);
+			StackLimitEvader::run(suite.m_context, astRoot, _object);
 	}
 
-	dispenser.reset(ast);
-	NameSimplifier::run(suite.m_context, ast);
-	VarNameCleaner::run(suite.m_context, ast);
+	dispenser.reset(astRoot);
+	NameSimplifier::run(suite.m_context, astRoot);
+	VarNameCleaner::run(suite.m_context, astRoot);
 
 #ifdef PROFILE_OPTIMIZER_STEPS
 	outputPerformanceMetrics(suite.m_durationPerStepInMicroseconds);
 #endif
 
+	_object.code = std::make_shared<AST>(std::move(astRoot));
 	*_object.analysisInfo = AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
 }
 
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 77274200bb..c5579d84a1 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -26,6 +26,7 @@
 #include <libyul/Object.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/FunctionCallFinder.h>
+#include <libyul/AST.h>
 #include <fstream>
 #include <memory>
 #include <stdexcept>
@@ -74,7 +75,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 
 		auto handleObject = [&](std::string const& _kind, Object const& _object) {
 			m_obtainedResult += contractName + "(" + _kind + ") " + (findFunctionCalls(
-				*_object.code,
+				_object.code->root(),
 				"memoryguard"_yulname
 			).empty() ? "false" : "true") + "\n";
 		};
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index dece0d82b1..26f5e06846 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -50,7 +50,7 @@ Dialect const& defaultDialect(bool _yul)
 }
 }
 
-std::pair<std::shared_ptr<Block>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
+std::pair<std::shared_ptr<AST>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
@@ -83,7 +83,7 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::t
 	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())
+	if (!analyzer.analyze(parserResult->code->root()) || errorReporter.hasErrors())
 		return {};
 	return {std::move(parserResult), std::move(analysisInfo)};
 }
@@ -91,14 +91,14 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::t
 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));
+	return std::get<Block>(Disambiguator(defaultDialect(_yul), *result.second, {})(result.first->root()));
 }
 
 std::string yul::test::format(std::string const& _source, bool _yul)
 {
 	auto const version = solidity::test::CommonOptions::get().evmVersion();
 	Dialect const& dialect = _yul ? EVMDialectTyped::instance(version) : EVMDialect::strictAssemblyForEVMObjects(version);
-	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(*parse(_source, _yul).first);
+	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(parse(_source, _yul).first->root());
 }
 
 namespace
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
index f6c63feb9b..4a9696cd9d 100644
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@@ -39,12 +39,13 @@ struct AsmAnalysisInfo;
 struct Block;
 struct Object;
 struct Dialect;
+class AST;
 }
 
 namespace solidity::yul::test
 {
 
-std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>>
+std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>>
 parse(std::string const& _source, bool _yul = true);
 
 std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>>
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index 9a0e6f092f..8e08bf4889 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -206,7 +206,7 @@ TestCase::TestResult ControlFlowGraphTest::run(std::ostream& _stream, std::strin
 
 	std::ostringstream output;
 
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, *object->code);
+	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code->root());
 
 	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
 	ControlFlowGraphPrinter printer{output};
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index 6ac5a7b0ad..054c705471 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -63,10 +63,10 @@ TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std:
 
 	ControlFlowSideEffectsCollector sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		*obj.code
+		obj.code->root()
 	);
 	m_obtainedResult.clear();
-	forEach<FunctionDefinition const>(*obj.code, [&](FunctionDefinition const& _fun) {
+	forEach<FunctionDefinition const>(obj.code->root(), [&](FunctionDefinition const& _fun) {
 		std::string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
 		m_obtainedResult += _fun.name.str() + (effectStr.empty() ? ":" : ": " + effectStr) + "\n";
 	});
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index f1bd0ea379..3220a8c6f9 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -89,7 +89,7 @@ TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string
 
 	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		CallGraphGenerator::callGraph(*obj.code)
+		CallGraphGenerator::callGraph(obj.code->root())
 	);
 
 	std::map<std::string, std::string> functionSideEffectsStr;
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index 6a9d3e6da8..a149381ca0 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -23,6 +23,7 @@
 #include <test/libyul/Common.h>
 
 #include <libyul/Object.h>
+#include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/NameDispenser.h>
@@ -48,15 +49,17 @@ class KnowledgeBaseTest
 		std::tie(m_object, analysisInfo) = yul::test::parse(_source, m_dialect, errorList);
 		BOOST_REQUIRE(m_object && errorList.empty() && m_object->code);
 
-		NameDispenser dispenser(m_dialect, *m_object->code);
+		auto astRoot = std::get<Block>(yul::ASTCopier{}(m_object->code->root()));
+		NameDispenser dispenser(m_dialect, astRoot);
 		std::set<YulName> reserved;
 		OptimiserStepContext context{m_dialect, dispenser, reserved, 0};
-		CommonSubexpressionEliminator::run(context, *m_object->code);
+		CommonSubexpressionEliminator::run(context, astRoot);
 
-		m_ssaValues(*m_object->code);
+		m_ssaValues(astRoot);
 		for (auto const& [name, expression]: m_ssaValues.values())
 			m_values[name].value = expression;
 
+		m_object->code = std::make_shared<AST>(std::move(astRoot));
 		return KnowledgeBase([this](YulName _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
index ac3153433f..ce65cf2c85 100644
--- a/test/libyul/Metrics.cpp
+++ b/test/libyul/Metrics.cpp
@@ -37,9 +37,9 @@ namespace
 
 size_t codeSize(std::string const& _source, CodeWeights const _weights = {})
 {
-	std::shared_ptr<Block> ast = parse(_source, false).first;
+	std::shared_ptr<AST> ast = parse(_source, false).first;
 	BOOST_REQUIRE(ast);
-	return CodeSize::codeSize(*ast, _weights);
+	return CodeSize::codeSize(ast->root(), _weights);
 }
 
 }
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 7b3cdac8b2..0ed09f6a90 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -54,7 +54,7 @@ namespace solidity::yul::test
 namespace
 {
 
-std::shared_ptr<Block> parse(std::string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
+std::shared_ptr<AST> parse(std::string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
 {
 	auto stream = CharStream(_source, "");
 	std::map<unsigned, std::shared_ptr<std::string const>> indicesToSourceNames;
@@ -73,7 +73,7 @@ std::shared_ptr<Block> parse(std::string const& _source, Dialect const& _dialect
 			analysisInfo,
 			errorReporter,
 			_dialect
-		).analyze(*parserResult))
+		).analyze(parserResult->root()))
 			return parserResult;
 	}
 	return {};
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 {
 	ErrorList errorList;
 	ErrorReporter reporter(errorList);
-	std::shared_ptr<Block> result = parse(
+	std::shared_ptr<AST> result = parse(
 		"{"
 			"let x:bool := true:bool "
 			"let z:bool := true "
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
 	// All types are printed.
-	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::Full, EVMDialectTyped::instance(EVMVersion()))(*result),
+	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::Full, EVMDialectTyped::instance(EVMVersion()))(result->root()),
 		"{\n"
 		"    let x:bool := true:bool\n"
 		"    let z:bool := true:bool\n"
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 	);
 
 	// Now the default types should be omitted.
-	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::OmitDefault, EVMDialectTyped::instance(EVMVersion()))(*result),
+	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::OmitDefault, EVMDialectTyped::instance(EVMVersion()))(result->root()),
 		"{\n"
 		"    let x:bool := true\n"
 		"    let z:bool := true\n"
@@ -204,9 +204,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
 		"/// @src 0:234:543\n"
 		"{}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
@@ -222,14 +222,14 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
-	BOOST_REQUIRE_EQUAL(3, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 234, 543);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 123, 432);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
+	BOOST_REQUIRE_EQUAL(3, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(0)), "source0", 234, 543);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(1)), "source0", 123, 432);
 	// [2] is inherited source location
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source0", 123, 432);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(2)), "source0", 123, 432);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
@@ -245,14 +245,14 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 234, 543);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source1", 123, 432);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
+	BOOST_REQUIRE_EQUAL(3, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(0)), "source0", 234, 543);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(1)), "source1", 123, 432);
 	// [2] is inherited source location
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source1", 123, 432);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(2)), "source1", 123, 432);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
@@ -267,11 +267,11 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
 			"switch y case 0 {} default {}\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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());
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 343, 434);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
+	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(1)), "source0", 343, 434);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
@@ -291,13 +291,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
 			"}\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
 
-	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	BOOST_REQUIRE(std::holds_alternative<Switch>(result->statements.at(1)));
-	auto const& switchStmt = std::get<Switch>(result->statements.at(1));
+	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
+	BOOST_REQUIRE(std::holds_alternative<Switch>(result->root().statements.at(1)));
+	auto const& switchStmt = std::get<Switch>(result->root().statements.at(1));
 
 	CHECK_LOCATION(switchStmt.debugData->originLocation, "source0", 343, 434);
 	BOOST_REQUIRE_EQUAL(1, switchStmt.cases.size());
@@ -323,22 +323,22 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 1, 100);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 1, 100);
 
-	BOOST_REQUIRE_EQUAL(3, result->statements.size());
-	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 1, 100);
+	BOOST_REQUIRE_EQUAL(3, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(0)), "source0", 1, 100);
 
 	// First child element must be a block itself with one statement.
-	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);
+	BOOST_REQUIRE(std::holds_alternative<Block>(result->root().statements.at(0)));
+	BOOST_REQUIRE_EQUAL(std::get<Block>(result->root().statements.at(0)).statements.size(), 1);
+	CHECK_LOCATION(originLocationOf(std::get<Block>(result->root().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);
-	CHECK_LOCATION(originLocationOf(result->statements.at(2)), "source0", 123, 432);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(1)), "source0", 123, 432);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(2)), "source0", 123, 432);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
@@ -354,11 +354,11 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
 			"a := true:bool\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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);
-	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source1", 1, 10);
+	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(0)), "source0", 123, 432);
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(1)), "source1", 1, 10);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
@@ -375,7 +375,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
 			"\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result); // should still parse
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -395,13 +395,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
 			":= true:bool\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
+	CHECK_LOCATION(originLocationOf(result->root().statements.at(0)), "source0", 123, 432);
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(originLocationOf(*varDecl.value), "source0", 234, 2026);
 }
 
@@ -418,14 +418,14 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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);
+	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 0, 5);
 
 	// `let x := add(1, `
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 0, 5);
 	BOOST_REQUIRE(!!varDecl.value);
 	BOOST_REQUIRE(std::holds_alternative<FunctionCall>(*varDecl.value));
@@ -452,24 +452,24 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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_EQUAL(2, result->root().statements.size());
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 23, 45);
 
-	BOOST_REQUIRE(std::holds_alternative<Block>(result->statements.at(0)));
-	Block const& innerBlock = std::get<Block>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<Block>(result->root().statements.at(0)));
+	Block const& innerBlock = std::get<Block>(result->root().statements.at(0));
 	CHECK_LOCATION(innerBlock.debugData->originLocation, "source1", 23, 45);
 
 	BOOST_REQUIRE_EQUAL(1, innerBlock.statements.size());
-	BOOST_REQUIRE(std::holds_alternative<ExpressionStatement>(result->statements.at(1)));
+	BOOST_REQUIRE(std::holds_alternative<ExpressionStatement>(result->root().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(std::holds_alternative<ExpressionStatement>(result->statements.at(1)));
-	ExpressionStatement mstoreStmt = std::get<ExpressionStatement>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<ExpressionStatement>(result->root().statements.at(1)));
+	ExpressionStatement mstoreStmt = std::get<ExpressionStatement>(result->root().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);
@@ -488,13 +488,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> 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_EQUAL(1, result->root().statements.size());
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 23, 45);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 420, 680);
 }
 
@@ -507,12 +507,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
@@ -524,9 +524,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
@@ -538,9 +538,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
@@ -552,12 +552,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
@@ -569,12 +569,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 6367_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
@@ -590,10 +590,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->root().statements.at(0));
 
 	// Ensure the latest @src per documentation-comment is used (0:30:40).
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 30, 40);
@@ -608,12 +608,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_space)
@@ -625,9 +625,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_s
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
@@ -636,9 +636,9 @@ 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{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
@@ -653,10 +653,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->root().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);
@@ -675,16 +675,16 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
 		}
 	)~~~";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
+	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(1)));
+	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->root().statements.at(1));
 	BOOST_REQUIRE(!!varY.value);
 	BOOST_REQUIRE(std::holds_alternative<Literal>(*varY.value));
 	Literal const& literal128 = std::get<Literal>(*varY.value);
@@ -700,9 +700,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_before_snippet)
@@ -714,12 +714,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_befo
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 8387_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_after_snippet)
@@ -731,9 +731,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_afte
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whitespace)
@@ -745,9 +745,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whites
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_unterminated_quote)
@@ -759,12 +759,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 1544_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
@@ -777,12 +777,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 1544_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
@@ -794,11 +794,11 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	// the second source location is not parsed as such, as the hex string isn't interpreted as snippet but
 	// as the beginning of the tail in AsmParser
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
@@ -810,9 +810,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces_and_escapes)
@@ -825,9 +825,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 222, 333);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
 }
 
 BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_are_ignored, boost::unit_test::data::make({"0x ", "/** unterminated comment", "1_23_4"}), invalid)
@@ -840,9 +840,9 @@ BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_ar
 		{{}}
 	)", invalid);
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
-	CHECK_LOCATION(result->debugData->originLocation, "source1", 222, 333);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
@@ -858,9 +858,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
-	CHECK_LOCATION(result->debugData->originLocation, "source0", 333, 444);
+	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 333, 444);
 }
 
 BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locations)
@@ -876,16 +876,16 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locati
 		}
 	)~~~";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
+	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(1)));
+	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->root().statements.at(1));
 	BOOST_REQUIRE(!!varY.value);
 	BOOST_REQUIRE(std::holds_alternative<Literal>(*varY.value));
 	Literal const& literal128 = std::get<Literal>(*varY.value);
@@ -905,13 +905,13 @@ BOOST_AUTO_TEST_CASE(astid)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = std::get<FunctionDefinition>(result->statements.at(0));
+	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
+	auto const& funDef = std::get<FunctionDefinition>(result->root().statements.at(0));
 	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
 	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == std::nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == std::nullopt);
+	BOOST_CHECK(debugDataOf(result->root().statements.at(1))->astID == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(astid_reset)
@@ -927,13 +927,13 @@ BOOST_AUTO_TEST_CASE(astid_reset)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = std::get<FunctionDefinition>(result->statements.at(0));
+	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
+	auto const& funDef = std::get<FunctionDefinition>(result->root().statements.at(0));
 	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
 	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == std::nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == std::nullopt);
+	BOOST_CHECK(debugDataOf(result->root().statements.at(1))->astID == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(astid_multi)
@@ -945,9 +945,9 @@ BOOST_AUTO_TEST_CASE(astid_multi)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
-	BOOST_CHECK(result->debugData->astID == int64_t(8));
+	BOOST_CHECK(result->root().debugData->astID == int64_t(8));
 }
 
 BOOST_AUTO_TEST_CASE(astid_invalid)
@@ -959,12 +959,12 @@ BOOST_AUTO_TEST_CASE(astid_invalid)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
 	BOOST_TEST(errorList[0]->errorId() == 1749_error);
-	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
+	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
 }
 
 BOOST_AUTO_TEST_CASE(astid_too_large)
@@ -976,7 +976,7 @@ BOOST_AUTO_TEST_CASE(astid_too_large)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -992,7 +992,7 @@ BOOST_AUTO_TEST_CASE(astid_way_too_large)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -1008,7 +1008,7 @@ BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -1030,12 +1030,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
 		"    let x := 123\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE_EQUAL(result->statements.size(), 1);
+	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 1);
 
-	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->root().statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source1", 4, 5);
 }
 
diff --git a/test/libyul/StackLayoutGeneratorTest.cpp b/test/libyul/StackLayoutGeneratorTest.cpp
index 02b03ccea7..2abac60e5c 100644
--- a/test/libyul/StackLayoutGeneratorTest.cpp
+++ b/test/libyul/StackLayoutGeneratorTest.cpp
@@ -224,7 +224,7 @@ TestCase::TestResult StackLayoutGeneratorTest::run(std::ostream& _stream, std::s
 
 	std::ostringstream output;
 
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, *object->code);
+	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code->root());
 	StackLayout stackLayout = StackLayoutGenerator::run(*cfg);
 
 	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index eb6a447d12..d987c519c3 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -25,6 +25,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/YulStack.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/ErrorReporter.h>
@@ -98,7 +99,7 @@ std::string YulInterpreterTest::interpret()
 		Interpreter::run(
 			state,
 			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion()),
-			*m_ast,
+			m_ast->root(),
 			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
 			/*disableMemoryTracing=*/ false
 		);
diff --git a/test/libyul/YulInterpreterTest.h b/test/libyul/YulInterpreterTest.h
index a20b0688a2..f536867024 100644
--- a/test/libyul/YulInterpreterTest.h
+++ b/test/libyul/YulInterpreterTest.h
@@ -23,7 +23,7 @@
 namespace solidity::yul
 {
 struct AsmAnalysisInfo;
-struct Block;
+class AST;
 }
 
 namespace solidity::yul::test
@@ -45,7 +45,7 @@ class YulInterpreterTest: public solidity::frontend::test::EVMVersionRestrictedT
 	bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted);
 	std::string interpret();
 
-	std::shared_ptr<Block> m_ast;
+	std::shared_ptr<AST> m_ast;
 	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
 	bool m_simulateExternalCallsToSelf = false;
 };
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index b30fa82511..df28515c37 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -25,6 +25,7 @@
 
 #include <libyul/Object.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/SourceReferenceFormatter.h>
@@ -77,19 +78,23 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << std::endl;
 		return TestResult::FatalError;
 	}
-
-	auto const printed = (m_object->subObjects.empty() ? AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(*m_object->code) : m_object->toString(*m_dialect));
+	auto optimizedObject = tester.optimizedObject();
+	std::string printedOptimizedObject;
+	if (optimizedObject->subObjects.empty())
+		printedOptimizedObject = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(optimizedObject->code->root());
+	else
+		printedOptimizedObject = optimizedObject->toString(*m_dialect);
 
 	// Re-parse new code for compilability
-	if (!std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
+	if (!std::get<0>(parse(_stream, _linePrefix, _formatted, printedOptimizedObject)))
 	{
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
 			<< _linePrefix << "Result after the optimiser:" << std::endl;
-		printPrefixed(_stream, printed, _linePrefix + "  ");
+		printPrefixed(_stream, printedOptimizedObject, _linePrefix + "  ");
 		return TestResult::FatalError;
 	}
 
-	m_obtainedResult = "step: " + m_optimizerStep + "\n\n" + printed + "\n";
+	m_obtainedResult = "step: " + m_optimizerStep + "\n\n" + printedOptimizedObject + "\n";
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 80746c93ba..357e5b6579 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -76,275 +76,361 @@ using namespace solidity::frontend;
 YulOptimizerTestCommon::YulOptimizerTestCommon(
 	std::shared_ptr<Object> _obj,
 	Dialect const& _dialect
-)
+): m_dialect(&_dialect), m_object(_obj), m_optimizedObject(std::make_shared<Object>()), m_analysisInfo(m_object->analysisInfo)
 {
-	m_object = _obj;
-	m_ast = m_object->code;
-	m_analysisInfo = m_object->analysisInfo;
-	m_dialect = &_dialect;
-
+	*m_optimizedObject = *m_object;
 	m_namedSteps = {
-		{"disambiguator", [&]() { disambiguate(); }},
+		{"disambiguator", [&]() { return disambiguate(); }},
 		{"nameDisplacer", [&]() {
-			disambiguate();
+			auto block = disambiguate();
+			updateContext(block);
 			NameDisplacer{
 				*m_nameDispenser,
 				{"illegal1"_yulname, "illegal2"_yulname, "illegal3"_yulname, "illegal4"_yulname, "illegal5"_yulname}
-			}(*m_ast);
+			}(block);
+			return block;
 		}},
 		{"blockFlattener", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-			BlockFlattener::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionGrouper::run(*m_context, block);
+			BlockFlattener::run(*m_context, block);
+			return block;
 		}},
 		{"constantOptimiser", [&]() {
+			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			updateContext(block);
 			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
-			ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(*m_ast);
+			ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(block);
+			return block;
+		}},
+		{"varDeclInitializer", [&]() {
+			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			updateContext(block);
+			VarDeclInitializer::run(*m_context, block);
+			return block;
 		}},
-		{"varDeclInitializer", [&]() { VarDeclInitializer::run(*m_context, *m_ast); }},
 		{"varNameCleaner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			VarNameCleaner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			FunctionGrouper::run(*m_context, block);
+			VarNameCleaner::run(*m_context, block);
+			return block;
 		}},
 		{"forLoopConditionIntoBody", [&]() {
-			disambiguate();
-			ForLoopConditionIntoBody::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopConditionIntoBody::run(*m_context, block);
+			return block;
 		}},
 		{"forLoopInitRewriter", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			return block;
 		}},
 		{"commonSubexpressionEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			CommonSubexpressionEliminator::run(*m_context, block);
+			return block;
 		}},
 		{"conditionalUnsimplifier", [&]() {
-			disambiguate();
-			ConditionalUnsimplifier::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ConditionalUnsimplifier::run(*m_context, block);
+			return block;
 		}},
 		{"conditionalSimplifier", [&]() {
-			disambiguate();
-			ConditionalSimplifier::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ConditionalSimplifier::run(*m_context, block);
+			return block;
+		}},
+		{"expressionSplitter", [&]() {
+			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			updateContext(block);
+			ExpressionSplitter::run(*m_context, block);
+			return block;
 		}},
-		{"expressionSplitter", [&]() { ExpressionSplitter::run(*m_context, *m_ast); }},
 		{"expressionJoiner", [&]() {
-			disambiguate();
-			ExpressionJoiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"splitJoin", [&]() {
-			disambiguate();
-			ExpressionSplitter::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ExpressionSplitter::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"functionGrouper", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionGrouper::run(*m_context, block);
+			return block;
 		}},
 		{"functionHoister", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			return block;
 		}},
 		{"functionSpecializer", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_object->code);
-			FunctionSpecializer::run(*m_context, *m_object->code);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			FunctionSpecializer::run(*m_context, block);
+			return block;
 		}},
 		{"expressionInliner", [&]() {
-			disambiguate();
-			ExpressionInliner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ExpressionInliner::run(*m_context, block);
+			return block;
 		}},
 		{"fullInliner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			FullInliner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			FunctionGrouper::run(*m_context, block);
+			ExpressionSplitter::run(*m_context, block);
+			FullInliner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"fullInlinerWithoutSplitter", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
-			FullInliner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			FunctionGrouper::run(*m_context, block);
+			FullInliner::run(*m_context, block);
+			return block;
 		}},
 		{"rematerialiser", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			Rematerialiser::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			Rematerialiser::run(*m_context, block);
+			return block;
 		}},
 		{"expressionSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			ExpressionSplitter::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			ExpressionSplitter::run(*m_context, block);
+			CommonSubexpressionEliminator::run(*m_context, block);
+			ExpressionSimplifier::run(*m_context, block);
+			ExpressionSimplifier::run(*m_context, block);
+			ExpressionSimplifier::run(*m_context, block);
+			UnusedPruner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"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);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
-			CircularReferencesPruner::run(*m_context, *m_ast);
-			DeadCodeEliminator::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionGrouper::run(*m_context, block);
+			BlockFlattener::run(*m_context, block);
+			ExpressionSplitter::run(*m_context, block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			CommonSubexpressionEliminator::run(*m_context, block);
+			ExpressionSimplifier::run(*m_context, block);
+			UnusedPruner::run(*m_context, block);
+			CircularReferencesPruner::run(*m_context, block);
+			DeadCodeEliminator::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"unusedFunctionParameterPruner", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_object->code);
-			LiteralRematerialiser::run(*m_context, *m_object->code);
-			UnusedFunctionParameterPruner::run(*m_context, *m_object->code);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			LiteralRematerialiser::run(*m_context, block);
+			UnusedFunctionParameterPruner::run(*m_context, block);
+			return block;
 		}},
 		{"unusedPruner", [&]() {
-			disambiguate();
-			UnusedPruner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			UnusedPruner::run(*m_context, block);
+			return block;
 		}},
 		{"circularReferencesPruner", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			CircularReferencesPruner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			CircularReferencesPruner::run(*m_context, block);
+			return block;
 		}},
 		{"deadCodeEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			DeadCodeEliminator::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			DeadCodeEliminator::run(*m_context, block);
+			return block;
 		}},
 		{"ssaTransform", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			SSATransform::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			SSATransform::run(*m_context, block);
+			return block;
 		}},
 		{"unusedAssignEliminator", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			UnusedAssignEliminator::run(*m_context, block);
+			return block;
 		}},
 		{"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);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			ExpressionSplitter::run(*m_context, block);
+			SSATransform::run(*m_context, block);
+			UnusedStoreEliminator::run(*m_context, block);
+			SSAReverser::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"equalStoreEliminator", [&]() {
-			disambiguate();
-			FunctionHoister::run(*m_context, *m_ast);
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			EqualStoreEliminator::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionHoister::run(*m_context, block);
+			ForLoopInitRewriter::run(*m_context, block);
+			EqualStoreEliminator::run(*m_context, block);
+			return block;
 		}},
 		{"ssaPlusCleanup", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			SSATransform::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			SSATransform::run(*m_context, block);
+			UnusedAssignEliminator::run(*m_context, block);
+			return block;
 		}},
 		{"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);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			ExpressionSimplifier::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			FunctionGrouper::run(*m_context, block);
+			BlockFlattener::run(*m_context, block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			ExpressionSplitter::run(*m_context, block);
+			CommonSubexpressionEliminator::run(*m_context, block);
+			ExpressionSimplifier::run(*m_context, block);
 
-			LoadResolver::run(*m_context, *m_ast);
+			LoadResolver::run(*m_context, block);
 
-			UnusedPruner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
-			ExpressionJoiner::run(*m_context, *m_ast);
+			UnusedPruner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			ExpressionJoiner::run(*m_context, block);
+			return block;
 		}},
 		{"loopInvariantCodeMotion", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			LoopInvariantCodeMotion::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			LoopInvariantCodeMotion::run(*m_context, block);
+			return block;
 		}},
 		{"controlFlowSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			ControlFlowSimplifier::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			ControlFlowSimplifier::run(*m_context, block);
+			return block;
 		}},
 		{"structuralSimplifier", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			LiteralRematerialiser::run(*m_context, *m_ast);
-			StructuralSimplifier::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			LiteralRematerialiser::run(*m_context, block);
+			StructuralSimplifier::run(*m_context, block);
+			return block;
 		}},
 		{"equivalentFunctionCombiner", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			EquivalentFunctionCombiner::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			EquivalentFunctionCombiner::run(*m_context, block);
+			return block;
 		}},
 		{"ssaReverser", [&]() {
-			disambiguate();
-			SSAReverser::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			SSAReverser::run(*m_context, block);
+			return block;
 		}},
 		{"ssaAndBack", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
 			// apply SSA
-			SSATransform::run(*m_context, *m_ast);
-			UnusedAssignEliminator::run(*m_context, *m_ast);
+			SSATransform::run(*m_context, block);
+			UnusedAssignEliminator::run(*m_context, block);
 			// reverse SSA
-			SSAReverser::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			CommonSubexpressionEliminator::run(*m_context, *m_ast);
-			UnusedPruner::run(*m_context, *m_ast);
+			SSAReverser::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			CommonSubexpressionEliminator::run(*m_context, block);
+			UnusedPruner::run(*m_context, block);
+			return block;
 		}},
 		{"stackCompressor", [&]() {
-			disambiguate();
-			ForLoopInitRewriter::run(*m_context, *m_ast);
-			FunctionHoister::run(*m_context, *m_ast);
-			FunctionGrouper::run(*m_context, *m_ast);
+			auto block = disambiguate();
+			updateContext(block);
+			ForLoopInitRewriter::run(*m_context, block);
+			FunctionHoister::run(*m_context, block);
+			FunctionGrouper::run(*m_context, block);
 			size_t maxIterations = 16;
-			StackCompressor::run(*m_dialect, *m_object, true, maxIterations);
-			BlockFlattener::run(*m_context, *m_ast);
+			StackCompressor::run(*m_dialect, block, *m_object, true, maxIterations);
+			BlockFlattener::run(*m_context, block);
+			return block;
 		}},
 		{"fullSuite", [&]() {
 			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
 			OptimiserSuite::run(
 				*m_dialect,
 				&meter,
-				*m_object,
+				*m_optimizedObject,
 				true,
 				frontend::OptimiserSettings::DefaultYulOptimiserSteps,
 				frontend::OptimiserSettings::DefaultYulOptimiserCleanupSteps,
 				frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 			);
+			return std::get<Block>(ASTCopier{}(m_optimizedObject->code->root()));
 		}},
 		{"stackLimitEvader", [&]() {
-			disambiguate();
-			StackLimitEvader::run(*m_context, *m_object, CompilabilityChecker{
+			auto block = disambiguate();
+			updateContext(block);
+			StackLimitEvader::run(*m_context, block, CompilabilityChecker{
 				*m_dialect,
 				*m_object,
-				true
+				true,
+				&block
 			}.unreachableVariables);
+			return block;
 		}},
 		{"fakeStackLimitEvader", [&]() {
-			disambiguate();
+			auto block = disambiguate();
+			updateContext(block);
 			// Mark all variables with a name starting with "$" for escalation to memory.
 			struct FakeUnreachableGenerator: ASTWalker
 			{
@@ -381,8 +467,9 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 				YulName m_currentFunction = YulName{};
 			};
 			FakeUnreachableGenerator fakeUnreachableGenerator;
-			fakeUnreachableGenerator(*m_ast);
-			StackLimitEvader::run(*m_context, *m_object, fakeUnreachableGenerator.fakeUnreachables);
+			fakeUnreachableGenerator(block);
+			StackLimitEvader::run(*m_context, block, fakeUnreachableGenerator.fakeUnreachables);
+			return block;
 		}}
 	};
 }
@@ -396,10 +483,11 @@ bool YulOptimizerTestCommon::runStep()
 {
 	yulAssert(m_dialect, "Dialect not set.");
 
-	updateContext();
-
 	if (m_namedSteps.count(m_optimizerStep))
-		m_namedSteps[m_optimizerStep]();
+	{
+		auto block = m_namedSteps[m_optimizerStep]();
+		m_optimizedObject->code = std::make_shared<AST>(std::move(block));
+	}
 	else
 		return false;
 
@@ -435,21 +523,21 @@ std::string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 	yulAssert(false, "Optimiser step selection failed.");
 }
 
-std::shared_ptr<Block> YulOptimizerTestCommon::run()
+Block const* YulOptimizerTestCommon::run()
 {
-	return runStep() ? m_ast : nullptr;
+	return runStep() ? &m_optimizedObject->code->root() : nullptr;
 }
 
-void YulOptimizerTestCommon::disambiguate()
+Block YulOptimizerTestCommon::disambiguate()
 {
-	*m_object->code = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(*m_object->code));
+	auto block = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(m_object->code->root()));
 	m_analysisInfo.reset();
-	updateContext();
+	return block;
 }
 
-void YulOptimizerTestCommon::updateContext()
+void YulOptimizerTestCommon::updateContext(Block const& _block)
 {
-	m_nameDispenser = std::make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
+	m_nameDispenser = std::make_unique<NameDispenser>(*m_dialect, _block, m_reservedIdentifiers);
 	m_context = std::make_unique<OptimiserStepContext>(OptimiserStepContext{
 		*m_dialect,
 		*m_nameDispenser,
@@ -457,3 +545,8 @@ void YulOptimizerTestCommon::updateContext()
 		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 	});
 }
+
+std::shared_ptr<Object> YulOptimizerTestCommon::optimizedObject() const
+{
+	return m_optimizedObject;
+}
diff --git a/test/libyul/YulOptimizerTestCommon.h b/test/libyul/YulOptimizerTestCommon.h
index 0a5d63320d..8a706c328b 100644
--- a/test/libyul/YulOptimizerTestCommon.h
+++ b/test/libyul/YulOptimizerTestCommon.h
@@ -28,9 +28,10 @@
 
 namespace solidity::yul
 {
-	struct AsmAnalysisInfo;
-	struct Object;
-	struct Dialect;
+struct AsmAnalysisInfo;
+struct Object;
+struct Dialect;
+class AST;
 }
 
 namespace solidity::yul::test
@@ -47,7 +48,7 @@ class YulOptimizerTestCommon
 	void setStep(std::string const& _optimizerStep);
 	/// Runs chosen optimiser step returning pointer
 	/// to yul AST Block post optimisation.
-	std::shared_ptr<Block> run();
+	Block const* run();
 	/// Runs chosen optimiser step returning true if
 	/// successful, false otherwise.
 	bool runStep();
@@ -56,9 +57,11 @@ class YulOptimizerTestCommon
 	/// @param _seed is an unsigned integer that
 	/// seeds the random selection.
 	std::string randomOptimiserStep(unsigned _seed);
+	/// the resulting object after performing optimization steps
+	std::shared_ptr<Object> optimizedObject() const;
 private:
-	void disambiguate();
-	void updateContext();
+	Block disambiguate();
+	void updateContext(Block const& _block);
 
 	std::string m_optimizerStep;
 
@@ -68,9 +71,9 @@ class YulOptimizerTestCommon
 	std::unique_ptr<OptimiserStepContext> m_context;
 
 	std::shared_ptr<Object> m_object;
-	std::shared_ptr<Block> m_ast;
+	std::shared_ptr<Object> m_optimizedObject;
 	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
-	std::map<std::string, std::function<void(void)>> m_namedSteps;
+	std::map<std::string, std::function<Block(void)>> m_namedSteps;
 };
 
 }
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 25559bc66f..940fc7374e 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -54,7 +54,7 @@ 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();
+	auto recursiveFunctions = CallGraphGenerator::callGraph(_object.code->root()).recursiveFunctions();
 	for(auto&& [function, variables]: CompilabilityChecker{
 			_dialect,
 			_object,
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index e31391b0e1..40201bd15f 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -21,6 +21,7 @@
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/YulStack.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Exceptions.h>
@@ -88,7 +89,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
-		stack.parserResult()->code,
+		stack.parserResult()->code->root(),
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		/*disableMemoryTracing=*/true
 	);
@@ -98,7 +99,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	stack.optimize();
 	termReason = yulFuzzerUtil::interpret(
 		os2,
-		stack.parserResult()->code,
+		stack.parserResult()->code->root(),
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		/*disableMemoryTracing=*/true
 	);
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.cpp b/test/tools/ossfuzz/yulFuzzerCommon.cpp
index 4f7a871ac8..033dfc044d 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.cpp
+++ b/test/tools/ossfuzz/yulFuzzerCommon.cpp
@@ -23,7 +23,7 @@ using namespace solidity::yul::test::yul_fuzzer;
 
 yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	std::ostream& _os,
-	std::shared_ptr<yul::Block> _ast,
+	yul::Block const& _astRoot,
 	Dialect const& _dialect,
 	bool _disableMemoryTracing,
 	bool _outputStorageOnly,
@@ -52,7 +52,7 @@ yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	TerminationReason reason = TerminationReason::None;
 	try
 	{
-		Interpreter::run(state, _dialect, *_ast, true, _disableMemoryTracing);
+		Interpreter::run(state, _dialect, _astRoot, true, _disableMemoryTracing);
 	}
 	catch (StepLimitReached const&)
 	{
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.h b/test/tools/ossfuzz/yulFuzzerCommon.h
index 4c8f665f61..6575db11fa 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.h
+++ b/test/tools/ossfuzz/yulFuzzerCommon.h
@@ -40,7 +40,7 @@ struct yulFuzzerUtil
 	/// eliminator.
 	static TerminationReason interpret(
 		std::ostream& _os,
-		std::shared_ptr<yul::Block> _ast,
+		yul::Block const& _astRoot,
 		Dialect const& _dialect,
 		bool _disableMemoryTracing = false,
 		bool _outputStorageOnly = false,
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index b27d879d56..092f2dacb7 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -84,6 +84,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		EVMDialect::strictAssemblyForEVMObjects(version)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	std::shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
-	yulAssert(astBlock != nullptr, "Optimiser error.");
+	auto const* astRoot = optimizerTest.run();
+	yulAssert(astRoot != nullptr, "Optimiser error.");
 }
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 49470f7198..4e07eaf646 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -26,6 +26,7 @@
 
 #include <src/libfuzzer/libfuzzer_macro.h>
 
+#include <libyul/AST.h>
 #include <libyul/YulStack.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/Exceptions.h>
@@ -88,7 +89,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
-		stack.parserResult()->code,
+		stack.parserResult()->code->root(),
 		EVMDialect::strictAssemblyForEVMObjects(version),
 		/*disableMemoryTracing=*/true
 	);
@@ -101,11 +102,11 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		EVMDialect::strictAssemblyForEVMObjects(version)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
-	std::shared_ptr<solidity::yul::Block> astBlock = optimizerTest.run();
-	yulAssert(astBlock != nullptr, "Optimiser error.");
+	auto const* astRoot = optimizerTest.run();
+	yulAssert(astRoot != nullptr, "Optimiser error.");
 	termReason = yulFuzzerUtil::interpret(
 		os2,
-		astBlock,
+		*astRoot,
 		EVMDialect::strictAssemblyForEVMObjects(version),
 		true
 	);
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 2b9e530e02..1655b13d38 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -58,9 +58,7 @@
 #include <range/v3/view/stride.hpp>
 #include <range/v3/view/transform.hpp>
 
-#include <cctype>
 #include <string>
-#include <sstream>
 #include <iostream>
 #include <variant>
 
@@ -92,20 +90,21 @@ class YulOpti
 		CharStream _charStream(_input, "");
 		try
 		{
-			m_ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
-			if (!m_ast || !errorReporter.errors().empty())
+			auto ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
+			if (!m_astRoot || !errorReporter.errors().empty())
 			{
 				std::cerr << "Error parsing source." << std::endl;
 				printErrors(_charStream, errors);
 				throw std::runtime_error("Could not parse source.");
 			}
+			m_astRoot = std::make_shared<yul::Block>(std::get<yul::Block>(ASTCopier{}(ast->root())));
 			m_analysisInfo = std::make_unique<yul::AsmAnalysisInfo>();
 			AsmAnalyzer analyzer(
 				*m_analysisInfo,
 				errorReporter,
 				m_dialect
 			);
-			if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())
+			if (!analyzer.analyze(*m_astRoot) || !errorReporter.errors().empty())
 			{
 				std::cerr << "Error analyzing source." << std::endl;
 				printErrors(_charStream, errors);
@@ -171,17 +170,17 @@ class YulOpti
 
 	void disambiguate()
 	{
-		*m_ast = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_ast));
+		*m_astRoot = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_astRoot));
 		m_analysisInfo.reset();
-		m_nameDispenser.reset(*m_ast);
+		m_nameDispenser.reset(*m_astRoot);
 	}
 
 	void runSteps(std::string _source, std::string _steps)
 	{
 		parse(_source);
 		disambiguate();
-		OptimiserSuite{m_context}.runSequence(_steps, *m_ast);
-		std::cout << AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_ast) << std::endl;
+		OptimiserSuite{m_context}.runSequence(_steps, *m_astRoot);
+		std::cout << AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_astRoot) << std::endl;
 	}
 
 	void runInteractive(std::string _source, bool _disambiguated = false)
@@ -212,24 +211,23 @@ class YulOpti
 					case '#':
 						return;
 					case ',':
-						VarNameCleaner::run(m_context, *m_ast);
+						VarNameCleaner::run(m_context, *m_astRoot);
 						// 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);
+						StackCompressor::run(m_dialect, *m_astRoot, obj, true, 16);
 						break;
 					}
 					default:
 						OptimiserSuite{m_context}.runSequence(
 							std::string_view(&option, 1),
-							*m_ast
+							*m_astRoot
 						);
 				}
-				_source = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_ast);
+				_source = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_astRoot);
 			}
 			catch (...)
 			{
@@ -242,7 +240,7 @@ class YulOpti
 	}
 
 private:
-	std::shared_ptr<yul::Block> m_ast;
+	std::shared_ptr<yul::Block> m_astRoot;
 	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
 	std::unique_ptr<AsmAnalysisInfo> m_analysisInfo;
 	std::set<YulName> const m_reservedIdentifiers = {};
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index fb18b4e598..9aee616e0e 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -54,7 +54,7 @@ namespace po = boost::program_options;
 namespace
 {
 
-std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>> parse(std::string const& _source)
+std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>> parse(std::string const& _source)
 {
 	YulStack stack(
 		langutil::EVMVersion(),
@@ -77,7 +77,7 @@ std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>> parse(std::s
 
 void interpret(std::string const& _source, bool _inspect, bool _disableExternalCalls)
 {
-	std::shared_ptr<Block> ast;
+	std::shared_ptr<AST> ast;
 	std::shared_ptr<AsmAnalysisInfo> analysisInfo;
 	tie(ast, analysisInfo) = parse(_source);
 	if (!ast || !analysisInfo)
@@ -90,10 +90,10 @@ void interpret(std::string const& _source, bool _inspect, bool _disableExternalC
 		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
 
 		if (_inspect)
-			InspectedInterpreter::run(std::make_shared<Inspector>(_source, state), state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
+			InspectedInterpreter::run(std::make_shared<Inspector>(_source, state), state, dialect, ast->root(), _disableExternalCalls, /*disableMemoryTracing=*/false);
 
 		else
-			Interpreter::run(state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
+			Interpreter::run(state, dialect, ast->root(), _disableExternalCalls, /*disableMemoryTracing=*/false);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index e0c8ec4fbe..2d5c31cf11 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -59,7 +59,7 @@ std::ostream& operator<<(std::ostream& _stream, Program const& _program);
 }
 
 Program::Program(Program const& program):
-	m_ast(std::make_unique<Block>(std::get<Block>(ASTCopier{}(*program.m_ast)))),
+	m_ast(std::make_unique<AST>(std::get<Block>(ASTCopier{}(program.m_ast->root())))),
 	m_dialect{program.m_dialect},
 	m_nameDispenser(program.m_nameDispenser)
 {
@@ -70,13 +70,13 @@ std::variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 	// ASSUMPTION: parseSource() rewinds the stream on its own
 	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(EVMVersion{});
 
-	std::variant<std::unique_ptr<Block>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
+	std::variant<std::unique_ptr<AST>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
 	if (std::holds_alternative<ErrorList>(astOrErrors))
 		return std::get<ErrorList>(astOrErrors);
 
 	std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> analysisInfoOrErrors = analyzeAST(
 		dialect,
-		*std::get<std::unique_ptr<Block>>(astOrErrors)
+		*std::get<std::unique_ptr<AST>>(astOrErrors)
 	);
 	if (std::holds_alternative<ErrorList>(analysisInfoOrErrors))
 		return std::get<ErrorList>(analysisInfoOrErrors);
@@ -85,7 +85,7 @@ std::variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 		dialect,
 		disambiguateAST(
 			dialect,
-			*std::get<std::unique_ptr<Block>>(astOrErrors),
+			*std::get<std::unique_ptr<AST>>(astOrErrors),
 			*std::get<std::unique_ptr<AsmAnalysisInfo>>(analysisInfoOrErrors)
 		)
 	);
@@ -105,16 +105,16 @@ void Program::optimise(std::vector<std::string> const& _optimisationSteps)
 
 std::ostream& phaser::operator<<(std::ostream& _stream, Program const& _program)
 {
-	return _stream << AsmPrinter(AsmPrinter::TypePrinting::Full, _program.m_dialect)(*_program.m_ast);
+	return _stream << AsmPrinter(AsmPrinter::TypePrinting::Full, _program.m_dialect)(_program.m_ast->root());
 }
 
 std::string Program::toJson() const
 {
-	Json serializedAst = AsmJsonConverter(0)(*m_ast);
+	Json serializedAst = AsmJsonConverter(0)(m_ast->root());
 	return jsonPrettyPrint(removeNullMembers(std::move(serializedAst)));
 }
 
-std::variant<std::unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _dialect, CharStream _source)
+std::variant<std::unique_ptr<AST>, ErrorList> Program::parseObject(Dialect const& _dialect, CharStream _source)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
@@ -149,19 +149,19 @@ std::variant<std::unique_ptr<Block>, ErrorList> Program::parseObject(Dialect con
 	// The public API of the class does not provide access to the smart pointer so it won't be hard
 	// to switch to shared_ptr if the copying turns out to be an issue (though it would be better
 	// to refactor ObjectParser and Object to use unique_ptr instead).
-	auto astCopy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(*selectedObject->code)));
+	auto astCopy = std::make_unique<AST>(std::get<Block>(ASTCopier{}(selectedObject->code->root())));
 
-	return std::variant<std::unique_ptr<Block>, ErrorList>(std::move(astCopy));
+	return std::variant<std::unique_ptr<AST>, ErrorList>(std::move(astCopy));
 }
 
-std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, Block const& _ast)
+std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, AST const& _ast)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
 	auto analysisInfo = std::make_unique<AsmAnalysisInfo>();
 	AsmAnalyzer analyzer(*analysisInfo, errorReporter, _dialect);
 
-	bool analysisSuccessful = analyzer.analyze(_ast);
+	bool analysisSuccessful = analyzer.analyze(_ast.root());
 	if (!analysisSuccessful)
 		return errors;
 
@@ -169,22 +169,22 @@ std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Di
 	return std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
 }
 
-std::unique_ptr<Block> Program::disambiguateAST(
+std::unique_ptr<AST> Program::disambiguateAST(
 	Dialect const& _dialect,
-	Block const& _ast,
+	AST const& _ast,
 	AsmAnalysisInfo const& _analysisInfo
 )
 {
 	std::set<YulName> const externallyUsedIdentifiers = {};
 	Disambiguator disambiguator(_dialect, _analysisInfo, externallyUsedIdentifiers);
 
-	return std::make_unique<Block>(std::get<Block>(disambiguator(_ast)));
+	return std::make_unique<AST>(std::get<Block>(disambiguator(_ast.root())));
 }
 
-std::unique_ptr<Block> Program::applyOptimisationSteps(
+std::unique_ptr<AST> Program::applyOptimisationSteps(
 	Dialect const& _dialect,
 	NameDispenser& _nameDispenser,
-	std::unique_ptr<Block> _ast,
+	std::unique_ptr<AST> _ast,
 	std::vector<std::string> const& _optimisationSteps
 )
 {
@@ -198,10 +198,11 @@ std::unique_ptr<Block> Program::applyOptimisationSteps(
 		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 	};
 
+	auto astRoot = std::get<Block>(ASTCopier{}(_ast->root()));
 	for (std::string const& step: _optimisationSteps)
-		OptimiserSuite::allSteps().at(step)->run(context, *_ast);
+		OptimiserSuite::allSteps().at(step)->run(context, astRoot);
 
-	return _ast;
+	return std::make_unique<AST>(std::move(astRoot));
 }
 
 size_t Program::computeCodeSize(Block const& _ast, CodeWeights const& _weights)
diff --git a/tools/yulPhaser/Program.h b/tools/yulPhaser/Program.h
index e42471d779..be4bf582d6 100644
--- a/tools/yulPhaser/Program.h
+++ b/tools/yulPhaser/Program.h
@@ -75,8 +75,8 @@ class Program
 	static std::variant<Program, langutil::ErrorList> load(langutil::CharStream& _sourceCode);
 	void optimise(std::vector<std::string> const& _optimisationSteps);
 
-	size_t codeSize(yul::CodeWeights const& _weights) const { return computeCodeSize(*m_ast, _weights); }
-	yul::Block const& ast() const { return *m_ast; }
+	size_t codeSize(yul::CodeWeights const& _weights) const { return computeCodeSize(m_ast->root(), _weights); }
+	yul::Block const& ast() const { return m_ast->root(); }
 
 	friend std::ostream& operator<<(std::ostream& _stream, Program const& _program);
 	std::string toJson() const;
@@ -84,35 +84,35 @@ class Program
 private:
 	Program(
 		yul::Dialect const& _dialect,
-		std::unique_ptr<yul::Block> _ast
+		std::unique_ptr<yul::AST> _ast
 	):
 		m_ast(std::move(_ast)),
 		m_dialect{_dialect},
-		m_nameDispenser(_dialect, *m_ast, {})
+		m_nameDispenser(_dialect, m_ast->root(), {})
 	{}
 
-	static std::variant<std::unique_ptr<yul::Block>, langutil::ErrorList> parseObject(
+	static std::variant<std::unique_ptr<yul::AST>, langutil::ErrorList> parseObject(
 		yul::Dialect const& _dialect,
 		langutil::CharStream _source
 	);
 	static std::variant<std::unique_ptr<yul::AsmAnalysisInfo>, langutil::ErrorList> analyzeAST(
 		yul::Dialect const& _dialect,
-		yul::Block const& _ast
+		yul::AST const& _ast
 	);
-	static std::unique_ptr<yul::Block> disambiguateAST(
+	static std::unique_ptr<yul::AST> disambiguateAST(
 		yul::Dialect const& _dialect,
-		yul::Block const& _ast,
+		yul::AST const& _ast,
 		yul::AsmAnalysisInfo const& _analysisInfo
 	);
-	static std::unique_ptr<yul::Block> applyOptimisationSteps(
+	static std::unique_ptr<yul::AST> applyOptimisationSteps(
 		yul::Dialect const& _dialect,
 		yul::NameDispenser& _nameDispenser,
-		std::unique_ptr<yul::Block> _ast,
+		std::unique_ptr<yul::AST> _ast,
 		std::vector<std::string> const& _optimisationSteps
 	);
 	static size_t computeCodeSize(yul::Block const& _ast, yul::CodeWeights const& _weights);
 
-	std::unique_ptr<yul::Block> m_ast;
+	std::unique_ptr<yul::AST> m_ast;
 	yul::Dialect const& m_dialect;
 	yul::NameDispenser m_nameDispenser;
 };

From d109d6bf76335f3db6eb8d570e02ecd0f481f180 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:43:00 +0200
Subject: [PATCH 0971/1140] Yul: StackCompressor/StackLimitEvader return
 modified ast and operate on const object input

---
 libyul/CompilabilityChecker.cpp        | 13 ++++----
 libyul/CompilabilityChecker.h          |  3 +-
 libyul/optimiser/StackCompressor.cpp   | 41 ++++++++++----------------
 libyul/optimiser/StackCompressor.h     | 17 ++---------
 libyul/optimiser/StackLimitEvader.cpp  | 19 +++++++-----
 libyul/optimiser/StackLimitEvader.h    |  3 +-
 libyul/optimiser/Suite.cpp             | 24 ++++++++++-----
 test/libyul/YulOptimizerTestCommon.cpp | 18 +++++++----
 test/tools/yulopti.cpp                 |  3 +-
 9 files changed, 67 insertions(+), 74 deletions(-)

diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index 76affbd647..af7532c75d 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -33,20 +33,17 @@ using namespace solidity::util;
 CompilabilityChecker::CompilabilityChecker(
 	Dialect const& _dialect,
 	Object const& _object,
-	bool _optimizeStackAllocation,
-	Block const* _block
+	bool _optimizeStackAllocation
 )
 {
-	yulAssert(_object.code || _block);
+	yulAssert(_object.code);
 	if (auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
 	{
-		if (!_block)
-			_block = &_object.code->root();
 		NoOutputEVMDialect noOutputDialect(*evmDialect);
 
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(
 			noOutputDialect,
-			*_block,
+			_object.code->root(),
 			_object.qualifiedDataNames()
 		);
 
@@ -60,12 +57,12 @@ CompilabilityChecker::CompilabilityChecker(
 		CodeTransform transform(
 			assembly,
 			analysisInfo,
-			*_block,
+			_object.code->root(),
 			noOutputDialect,
 			builtinContext,
 			_optimizeStackAllocation
 		);
-		transform(*_block);
+		transform(_object.code->root());
 
 		for (StackTooDeepError const& error: transform.stackErrors())
 		{
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
index 1dd6699906..160aeca8c7 100644
--- a/libyul/CompilabilityChecker.h
+++ b/libyul/CompilabilityChecker.h
@@ -47,8 +47,7 @@ struct CompilabilityChecker
 	CompilabilityChecker(
 		Dialect const& _dialect,
 		Object const& _object,
-		bool _optimizeStackAllocation,
-		Block const* _blockOverride = nullptr
+		bool _optimizeStackAllocation
 	);
 	std::map<YulName, std::vector<YulName>> unreachableVariables;
 	std::map<YulName, int> stackDeficit;
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 10360756d6..bdc20a5a8c 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -236,29 +236,15 @@ void eliminateVariablesOptimizedCodegen(
 
 }
 
-bool StackCompressor::run(
+std::tuple<bool, Block> StackCompressor::run(
 	Dialect const& _dialect,
-	Object& _object,
-	bool _optimizeStackAllocation,
-	size_t _maxIterations
-)
-{
-	yulAssert(_object.code);
-	auto block = std::get<Block>(ASTCopier{}(_object.code->root()));
-	auto result = run(_dialect, block, _object, _optimizeStackAllocation, _maxIterations);
-	_object.code = std::make_shared<AST>(std::move(block));
-	return result;
-}
-
-bool StackCompressor::run(
-	Dialect const& _dialect,
-	Block& _astRoot,
 	Object const& _object,
 	bool _optimizeStackAllocation,
 	size_t _maxIterations)
 {
+	yulAssert(_object.code);
 	yulAssert(
-		!_astRoot.statements.empty() && std::holds_alternative<Block>(_astRoot.statements.at(0)),
+		!_object.code->root().statements.empty() && std::holds_alternative<Block>(_object.code->root().statements.at(0)),
 		"Need to run the function grouper before the stack compressor."
 	);
 	bool usesOptimizedCodeGenerator = false;
@@ -267,31 +253,36 @@ bool StackCompressor::run(
 			_optimizeStackAllocation &&
 			evmDialect->evmVersion().canOverchargeGasForCall() &&
 			evmDialect->providesObjectAccess();
-	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _astRoot);
+	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _object.code->root());
+	Block astRoot = std::get<Block>(ASTCopier{}(_object.code->root()));
 	if (usesOptimizedCodeGenerator)
 	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _astRoot, _object.qualifiedDataNames());
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, _astRoot);
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, astRoot, _object.qualifiedDataNames());
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, astRoot);
 		eliminateVariablesOptimizedCodegen(
 			_dialect,
-			_astRoot,
+			astRoot,
 			StackLayoutGenerator::reportStackTooDeep(*cfg),
 			allowMSizeOptimization
 		);
 	}
 	else
+	{
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
 		{
-			std::map<YulName, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation, &_astRoot).stackDeficit;
+			Object object(_object);
+			object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(astRoot)));
+			std::map<YulName, int> stackSurplus = CompilabilityChecker(_dialect, object, _optimizeStackAllocation).stackDeficit;
 			if (stackSurplus.empty())
-				return true;
+				return std::make_tuple(true, std::move(astRoot));
 			eliminateVariables(
 				_dialect,
-				_astRoot,
+				astRoot,
 				stackSurplus,
 				allowMSizeOptimization
 			);
 		}
-	return false;
+	}
+	return std::make_tuple(false, std::move(astRoot));
 }
 
diff --git a/libyul/optimiser/StackCompressor.h b/libyul/optimiser/StackCompressor.h
index 13b9459a28..15d057455a 100644
--- a/libyul/optimiser/StackCompressor.h
+++ b/libyul/optimiser/StackCompressor.h
@@ -44,21 +44,10 @@ struct FunctionDefinition;
 class StackCompressor
 {
 public:
-	/// Try to remove local variables until the AST is compilable. Modifies the object's AST.
-	/// @returns true if it was successful.
-	static bool run(
+	/// Try to remove local variables until the AST is compilable.
+	/// @returns tuple with true if it was successful as first element, second element is the modified AST.
+	static std::tuple<bool, Block> run(
 		Dialect const& _dialect,
-		Object& _object,
-		bool _optimizeStackAllocation,
-		size_t _maxIterations
-	);
-
-	/// Try to remove local variables until the AST is compilable. Operates on provided block,
-	/// disregards the AST contained in object.
-	/// @returns true if it was successful.
-	static bool run(
-		Dialect const& _dialect,
-		Block& _astRoot,
 		Object const& _object,
 		bool _optimizeStackAllocation,
 		size_t _maxIterations
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 210be1cf38..d613ae9937 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -15,6 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/StackLimitEvader.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/FunctionCallFinder.h>
@@ -117,31 +118,33 @@ u256 literalArgumentValue(FunctionCall const& _call)
 }
 }
 
-void StackLimitEvader::run(
+Block StackLimitEvader::run(
 	OptimiserStepContext& _context,
-	Block& _astRoot,
 	Object const& _object
 )
 {
+	yulAssert(_object.code);
 	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."
 	);
+	auto astRoot = std::get<Block>(ASTCopier{}(_object.code->root()));
 	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
 	{
-		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _astRoot, _object.qualifiedDataNames());
-		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, _astRoot);
-		run(_context, _astRoot, StackLayoutGenerator::reportStackTooDeep(*cfg));
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, astRoot, _object.qualifiedDataNames());
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, astRoot);
+		run(_context, astRoot, StackLayoutGenerator::reportStackTooDeep(*cfg));
 	}
 	else
-		run(_context, _astRoot, CompilabilityChecker{
+	{
+		run(_context, astRoot, CompilabilityChecker{
 			_context.dialect,
 			_object,
 			true,
-			&_astRoot
 		}.unreachableVariables);
-
+	}
+	return astRoot;
 }
 
 void StackLimitEvader::run(
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
index 5029f7825f..a5871f7f11 100644
--- a/libyul/optimiser/StackLimitEvader.h
+++ b/libyul/optimiser/StackLimitEvader.h
@@ -77,9 +77,8 @@ class StackLimitEvader
 	/// 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(
+	static Block run(
 		OptimiserStepContext& _context,
-		Block& _astRoot,
 		Object const& _object
 	);
 };
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index b8826bb8a3..cc0c1a7f30 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -179,13 +179,15 @@ void OptimiserSuite::run(
 	// We ignore the return value because we will get a much better error
 	// message once we perform code generation.
 	if (!usesOptimizedCodeGenerator)
-		StackCompressor::run(
+	{
+		_object.code = std::make_shared<AST>(std::move(astRoot));
+		astRoot = std::get<1>(StackCompressor::run(
 			_dialect,
-			astRoot,
 			_object,
 			_optimizeStackAllocation,
 			stackCompressorMaxIterations
-		);
+		));
+	}
 
 	// Run the user-supplied clean up sequence
 	suite.runSequence(_optimisationCleanupSequence, astRoot);
@@ -200,18 +202,24 @@ void OptimiserSuite::run(
 		ConstantOptimiser{*evmDialect, *_meter}(astRoot);
 		if (usesOptimizedCodeGenerator)
 		{
-			StackCompressor::run(
+			_object.code = std::make_shared<AST>(std::move(astRoot));
+			astRoot = std::get<1>(StackCompressor::run(
 				_dialect,
-				astRoot,
 				_object,
 				_optimizeStackAllocation,
 				stackCompressorMaxIterations
-			);
+			));
 			if (evmDialect->providesObjectAccess())
-				StackLimitEvader::run(suite.m_context, astRoot, _object);
+			{
+				_object.code = std::make_shared<AST>(std::move(astRoot));
+				astRoot = StackLimitEvader::run(suite.m_context, _object);
+			}
 		}
 		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
-			StackLimitEvader::run(suite.m_context, astRoot, _object);
+		{
+			_object.code = std::make_shared<AST>(std::move(astRoot));
+			astRoot = StackLimitEvader::run(suite.m_context, _object);
+		}
 	}
 
 	dispenser.reset(astRoot);
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 357e5b6579..2190c10103 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -400,7 +400,11 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			FunctionHoister::run(*m_context, block);
 			FunctionGrouper::run(*m_context, block);
 			size_t maxIterations = 16;
-			StackCompressor::run(*m_dialect, block, *m_object, true, maxIterations);
+			{
+				Object object(*m_object);
+				object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(block)));
+				block = std::get<1>(StackCompressor::run(*m_dialect, object, true, maxIterations));
+			}
 			BlockFlattener::run(*m_context, block);
 			return block;
 		}},
@@ -420,12 +424,14 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		{"stackLimitEvader", [&]() {
 			auto block = disambiguate();
 			updateContext(block);
-			StackLimitEvader::run(*m_context, block, CompilabilityChecker{
+			Object object(*m_object);
+			object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(block)));
+			auto const unreachables = CompilabilityChecker{
 				*m_dialect,
-				*m_object,
-				true,
-				&block
-			}.unreachableVariables);
+				object,
+				true
+			}.unreachableVariables;
+			StackLimitEvader::run(*m_context, block, unreachables);
 			return block;
 		}},
 		{"fakeStackLimitEvader", [&]() {
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 1655b13d38..ad32337bdd 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -218,7 +218,8 @@ class YulOpti
 					case ';':
 					{
 						Object obj;
-						StackCompressor::run(m_dialect, *m_astRoot, obj, true, 16);
+						obj.code = std::make_shared<AST>(std::get<yul::Block>(ASTCopier{}(*m_astRoot)));
+						*m_astRoot = std::get<1>(StackCompressor::run(m_dialect, obj, true, 16));
 						break;
 					}
 					default:

From d067964b29f25985fb71699bc6802e5e06470663 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:00:00 +0200
Subject: [PATCH 0972/1140] Yul: introduce setCode method for yul::Object to
 properly clean up resources

---
 libsolidity/codegen/CompilerContext.cpp       | 16 ++++++-------
 libsolidity/codegen/ContractCompiler.cpp      |  4 ++--
 libyul/AST.h                                  |  2 +-
 libyul/AsmAnalysis.cpp                        |  2 +-
 libyul/CompilabilityChecker.cpp               |  8 +++----
 libyul/Object.cpp                             | 24 +++++++++++++++----
 libyul/Object.h                               |  8 ++++++-
 libyul/ObjectParser.cpp                       |  6 ++---
 libyul/YulStack.cpp                           | 18 +++++++-------
 libyul/backends/evm/EVMObjectCompiler.cpp     | 10 ++++----
 libyul/optimiser/Semantics.cpp                |  2 +-
 libyul/optimiser/StackCompressor.cpp          | 10 ++++----
 libyul/optimiser/StackLimitEvader.cpp         |  4 ++--
 libyul/optimiser/Suite.cpp                    | 14 +++++------
 test/libsolidity/MemoryGuardTest.cpp          |  2 +-
 test/libyul/Common.cpp                        |  8 +++----
 test/libyul/Common.h                          |  2 +-
 test/libyul/CompilabilityChecker.cpp          |  5 ++--
 test/libyul/ControlFlowGraphTest.cpp          |  2 +-
 test/libyul/ControlFlowSideEffectsTest.cpp    |  9 +++----
 test/libyul/FunctionSideEffects.cpp           |  7 +++---
 test/libyul/KnowledgeBaseTest.cpp             |  6 ++---
 test/libyul/Metrics.cpp                       |  3 ++-
 test/libyul/StackLayoutGeneratorTest.cpp      |  2 +-
 test/libyul/YulInterpreterTest.cpp            |  2 +-
 test/libyul/YulInterpreterTest.h              |  4 ++--
 test/libyul/YulOptimizerTest.cpp              |  2 +-
 test/libyul/YulOptimizerTestCommon.cpp        | 22 ++++++++---------
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |  2 +-
 test/tools/ossfuzz/YulEvmoneInterface.cpp     |  2 +-
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |  6 ++---
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |  2 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |  4 ++--
 test/tools/yulopti.cpp                        |  2 +-
 test/tools/yulrun.cpp                         |  6 ++---
 tools/yulPhaser/Program.cpp                   |  2 +-
 36 files changed, 128 insertions(+), 102 deletions(-)

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index aa6985503f..b1b76a97b8 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -475,14 +475,14 @@ void CompilerContext::appendInlineAssembly(
 		).analyze(parserResult->root());
 	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
 		reportError("Invalid assembly generated by code generator.");
+	std::shared_ptr<yul::AST const> toBeAssembledAST = parserResult;
 
 	// Several optimizer steps cannot handle externally supplied stack variables,
 	// so we essentially only optimize the ABI functions.
 	if (_optimiserSettings.runYulOptimiser && _localVariables.empty())
 	{
 		yul::Object obj;
-		obj.code = parserResult;
-		obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(analysisInfo);
+		obj.setCode(parserResult, std::make_shared<yul::AsmAnalysisInfo>(analysisInfo));
 
 		solAssert(!dialect.providesObjectAccess());
 		optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers);
@@ -491,15 +491,15 @@ void CompilerContext::appendInlineAssembly(
 		{
 			// Store as generated sources, but first re-parse to update the source references.
 			solAssert(m_generatedYulUtilityCode.empty(), "");
-			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code->root());
-			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code->root());
+			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code()->root());
+			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code()->root());
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
-			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
-			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
+			obj.setCode(yul::Parser(errorReporter, dialect).parse(charStream));
+			obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj));
 		}
 
 		analysisInfo = std::move(*obj.analysisInfo);
-		parserResult = std::move(obj.code);
+		toBeAssembledAST = obj.code();
 
 #ifdef SOL_OUTPUT_ASM
 		cout << "After optimizer:" << endl;
@@ -518,7 +518,7 @@ void CompilerContext::appendInlineAssembly(
 
 	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
 	yul::CodeGenerator::assemble(
-		parserResult->root(),
+		toBeAssembledAST->root(),
 		analysisInfo,
 		*m_asm,
 		m_evmVersion,
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 21899f72a6..9e0593cdfb 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -944,12 +944,12 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		solAssert(dialect, "");
 
 		// Create a modifiable copy of the code and analysis
-		object.code = std::make_shared<yul::AST>(yul::ASTCopier().translate(code->root()));
+		object.setCode(std::make_shared<yul::AST>(yul::ASTCopier().translate(code->root())));
 		object.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
 
 		m_context.optimizeYul(object, *dialect, m_optimiserSettings);
 
-		code = object.code.get();
+		code = object.code().get();
 		analysisInfo = object.analysisInfo.get();
 	}
 
diff --git a/libyul/AST.h b/libyul/AST.h
index ca4846907e..6b9682580c 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -107,7 +107,7 @@ class AST
 public:
 	explicit AST(Block _root): m_root(std::move(_root)) {}
 
-	Block const& root() const { return m_root; }
+	[[nodiscard]] Block const& root() const { return m_root; }
 private:
 	Block m_root;
 };
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index dae945fe87..09be597424 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -86,7 +86,7 @@ bool AsmAnalyzer::analyze(Block const& _block)
 
 AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect, Object const& _object)
 {
-	return analyzeStrictAssertCorrect(_dialect, _object.code->root(), _object.qualifiedDataNames());
+	return analyzeStrictAssertCorrect(_dialect, _object.code()->root(), _object.qualifiedDataNames());
 }
 
 AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index af7532c75d..8ece236bf4 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -36,14 +36,14 @@ CompilabilityChecker::CompilabilityChecker(
 	bool _optimizeStackAllocation
 )
 {
-	yulAssert(_object.code);
+	yulAssert(_object.hasCode());
 	if (auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
 	{
 		NoOutputEVMDialect noOutputDialect(*evmDialect);
 
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(
 			noOutputDialect,
-			_object.code->root(),
+			_object.code()->root(),
 			_object.qualifiedDataNames()
 		);
 
@@ -57,12 +57,12 @@ CompilabilityChecker::CompilabilityChecker(
 		CodeTransform transform(
 			assembly,
 			analysisInfo,
-			_object.code->root(),
+			_object.code()->root(),
 			noOutputDialect,
 			builtinContext,
 			_optimizeStackAllocation
 		);
-		transform(_object.code->root());
+		transform(_object.code()->root());
 
 		for (StackTooDeepError const& error: transform.stackErrors())
 		{
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 98649b29be..afd237b5b7 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -50,7 +50,7 @@ std::string Object::toString(
 	CharStreamProvider const* _soliditySourceProvider
 ) const
 {
-	yulAssert(code, "No code");
+	yulAssert(hasCode(), "No code");
 	yulAssert(debugData, "No debug data");
 
 	std::string useSrcComment;
@@ -69,7 +69,7 @@ std::string Object::toString(
 		debugData->sourceNames,
 		_debugInfoSelection,
 		_soliditySourceProvider
-	)(code->root());
+	)(code()->root());
 
 	for (auto const& obj: subObjects)
 		inner += "\n" + obj->toString(_dialect, _printingMode, _debugInfoSelection, _soliditySourceProvider);
@@ -87,11 +87,11 @@ Json Data::toJson() const
 
 Json Object::toJson() const
 {
-	yulAssert(code, "No code");
+	yulAssert(hasCode(), "No code");
 
 	Json codeJson;
 	codeJson["nodeType"] = "YulCode";
-	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(code->root());
+	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(code()->root());
 
 	Json subObjectsJson = Json::array();
 	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)
@@ -161,6 +161,22 @@ std::vector<size_t> Object::pathToSubObject(std::string_view _qualifiedName) con
 	return path;
 }
 
+std::shared_ptr<AST const> Object::code() const
+{
+	return m_code;
+}
+
+bool Object::hasCode() const { return code() != nullptr; }
+
+void Object::setCode(std::shared_ptr<AST const> const& _ast, std::shared_ptr<yul::AsmAnalysisInfo> _analysisInfo)
+{
+	if (_ast.get() != m_code.get())
+	{
+		m_code = _ast;
+		analysisInfo = std::move(_analysisInfo);
+	}
+}
+
 void Object::collectSourceIndices(std::map<std::string, unsigned>& _indices) const
 {
 	if (debugData && debugData->sourceNames.has_value())
diff --git a/libyul/Object.h b/libyul/Object.h
index cab3bc701b..41ca74e9f3 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -119,10 +119,13 @@ struct Object: public ObjectNode
 	/// The path must not lead to a @a Data object (will throw in that case).
 	std::vector<size_t> pathToSubObject(std::string_view _qualifiedName) const;
 
+	std::shared_ptr<AST const> code() const;
+	void setCode(std::shared_ptr<AST const> const& _ast, std::shared_ptr<yul::AsmAnalysisInfo> = nullptr);
+	bool hasCode() const;
+
 	/// sub id for object if it is subobject of another object, max value if it is not subobject
 	size_t subId = std::numeric_limits<size_t>::max();
 
-	std::shared_ptr<AST> code;
 	std::vector<std::shared_ptr<ObjectNode>> subObjects;
 	std::map<std::string, size_t, std::less<>> subIndexByName;
 	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
@@ -139,6 +142,9 @@ struct Object: public ObjectNode
 
 	/// @returns the name of the special metadata data object.
 	static std::string metadataName() { return ".metadata"; }
+
+private:
+	std::shared_ptr<AST const> m_code;
 };
 
 }
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index 6813e50593..123dedcb48 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -53,8 +53,8 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 			object->name = "object";
 			auto sourceNameMapping = tryParseSourceNameMapping();
 			object->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
-			object->code = parseBlock(sourceNameMapping);
-			if (!object->code)
+			object->setCode(parseBlock(sourceNameMapping));
+			if (!object->hasCode())
 				return nullptr;
 		}
 		else
@@ -87,7 +87,7 @@ std::shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 
 	expectToken(Token::LBrace);
 
-	ret->code = parseCode(std::move(sourceNameMapping));
+	ret->setCode(parseCode(std::move(sourceNameMapping)));
 
 	while (currentToken() != Token::RBrace)
 	{
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 426551152a..dbe30bb136 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -97,7 +97,7 @@ bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const
 
 	yulAssert(m_stackState == Parsed);
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode());
 
 	return analyzeParsed();
 }
@@ -135,7 +135,7 @@ bool YulStack::analyzeParsed()
 bool YulStack::analyzeParsed(Object& _object)
 {
 	yulAssert(m_stackState >= Parsed);
-	yulAssert(_object.code, "");
+	yulAssert(_object.hasCode());
 	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>();
 
 	AsmAnalyzer analyzer(
@@ -149,7 +149,7 @@ bool YulStack::analyzeParsed(Object& _object)
 	bool success = false;
 	try
 	{
-		success = analyzer.analyze(_object.code->root());
+		success = analyzer.analyze(_object.code()->root());
 		for (auto& subNode: _object.subObjects)
 			if (auto subObject = dynamic_cast<Object*>(subNode.get()))
 				if (!analyzeParsed(*subObject))
@@ -189,7 +189,7 @@ void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 
 void YulStack::optimize(Object& _object, bool _isCreation)
 {
-	yulAssert(_object.code, "");
+	yulAssert(_object.hasCode(), "");
 	yulAssert(_object.analysisInfo, "");
 	for (auto& subNode: _object.subObjects)
 		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
@@ -245,7 +245,7 @@ MachineAssemblyObject YulStack::assemble(Machine _machine)
 {
 	yulAssert(m_stackState >= AnalysisSuccessful);
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode(), "");
 	yulAssert(m_parserResult->analysisInfo, "");
 
 	switch (_machine)
@@ -302,7 +302,7 @@ YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName)
 {
 	yulAssert(m_stackState >= AnalysisSuccessful);
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode(), "");
 	yulAssert(m_parserResult->analysisInfo, "");
 
 	evmasm::Assembly assembly(m_evmVersion, true, {});
@@ -359,7 +359,7 @@ std::string YulStack::print(
 {
 	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode(), "");
 	return m_parserResult->toString(
 		languageToDialect(m_language, m_evmVersion),
 		AsmPrinter::TypePrinting::OmitDefault,
@@ -372,7 +372,7 @@ Json YulStack::astJson() const
 {
 	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode(), "");
 	return  m_parserResult->toJson();
 }
 
@@ -380,7 +380,7 @@ std::shared_ptr<Object> YulStack::parserResult() const
 {
 	yulAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
 	yulAssert(m_parserResult, "");
-	yulAssert(m_parserResult->code, "");
+	yulAssert(m_parserResult->hasCode(), "");
 	return m_parserResult;
 }
 
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index c77bf4e37c..ca9f90dfae 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -72,7 +72,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		}
 
 	yulAssert(_object.analysisInfo, "No analysis info.");
-	yulAssert(_object.code, "No code.");
+	yulAssert(_object.hasCode(), "No code.");
 	if (m_eofVersion.has_value())
 		yulAssert(
 			_optimize && (m_dialect.evmVersion() == langutil::EVMVersion()),
@@ -83,7 +83,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		auto stackErrors = OptimizedEVMCodeTransform::run(
 			m_assembly,
 			*_object.analysisInfo,
-			_object.code->root(),
+			_object.code()->root(),
 			m_dialect,
 			context,
 			OptimizedEVMCodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
@@ -91,7 +91,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		if (!stackErrors.empty())
 		{
 			std::vector<FunctionCall const*> memoryGuardCalls = findFunctionCalls(
-				_object.code->root(),
+				_object.code()->root(),
 				"memoryguard"_yulname
 			);
 			auto stackError = stackErrors.front();
@@ -113,14 +113,14 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		CodeTransform transform{
 			m_assembly,
 			*_object.analysisInfo,
-			_object.code->root(),
+			_object.code()->root(),
 			m_dialect,
 			context,
 			_optimize,
 			{},
 			CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
 		};
-		transform(_object.code->root());
+		transform(_object.code()->root());
 		if (!transform.stackErrors().empty())
 			BOOST_THROW_EXCEPTION(transform.stackErrors().front());
 	}
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 88f4f7c45b..d945dbcac7 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -95,7 +95,7 @@ bool MSizeFinder::containsMSize(Dialect const& _dialect, Block const& _ast)
 
 bool MSizeFinder::containsMSize(Dialect const& _dialect, Object const& _object)
 {
-	if (containsMSize(_dialect, _object.code->root()))
+	if (containsMSize(_dialect, _object.code()->root()))
 		return true;
 
 	for (std::shared_ptr<ObjectNode> const& node: _object.subObjects)
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index bdc20a5a8c..2c2ef42729 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -242,9 +242,9 @@ std::tuple<bool, Block> StackCompressor::run(
 	bool _optimizeStackAllocation,
 	size_t _maxIterations)
 {
-	yulAssert(_object.code);
+	yulAssert(_object.hasCode());
 	yulAssert(
-		!_object.code->root().statements.empty() && std::holds_alternative<Block>(_object.code->root().statements.at(0)),
+		!_object.code()->root().statements.empty() && std::holds_alternative<Block>(_object.code()->root().statements.at(0)),
 		"Need to run the function grouper before the stack compressor."
 	);
 	bool usesOptimizedCodeGenerator = false;
@@ -253,8 +253,8 @@ std::tuple<bool, Block> StackCompressor::run(
 			_optimizeStackAllocation &&
 			evmDialect->evmVersion().canOverchargeGasForCall() &&
 			evmDialect->providesObjectAccess();
-	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _object.code->root());
-	Block astRoot = std::get<Block>(ASTCopier{}(_object.code->root()));
+	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _object.code()->root());
+	Block astRoot = std::get<Block>(ASTCopier{}(_object.code()->root()));
 	if (usesOptimizedCodeGenerator)
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, astRoot, _object.qualifiedDataNames());
@@ -271,7 +271,7 @@ std::tuple<bool, Block> StackCompressor::run(
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
 		{
 			Object object(_object);
-			object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(astRoot)));
+			object.setCode(std::make_shared<AST>(std::get<Block>(ASTCopier{}(astRoot))));
 			std::map<YulName, int> stackSurplus = CompilabilityChecker(_dialect, object, _optimizeStackAllocation).stackDeficit;
 			if (stackSurplus.empty())
 				return std::make_tuple(true, std::move(astRoot));
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index d613ae9937..6e6da63e60 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -123,13 +123,13 @@ Block StackLimitEvader::run(
 	Object const& _object
 )
 {
-	yulAssert(_object.code);
+	yulAssert(_object.hasCode());
 	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."
 	);
-	auto astRoot = std::get<Block>(ASTCopier{}(_object.code->root()));
+	auto astRoot = std::get<Block>(ASTCopier{}(_object.code()->root()));
 	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, astRoot, _object.qualifiedDataNames());
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index cc0c1a7f30..a06f48a7f2 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -157,7 +157,7 @@ void OptimiserSuite::run(
 		_dialect,
 		*_object.analysisInfo,
 		reservedIdentifiers
-	)(_object.code->root()));
+	)(_object.code()->root()));
 
 	NameDispenser dispenser{_dialect, astRoot, reservedIdentifiers};
 	OptimiserStepContext context{_dialect, dispenser, reservedIdentifiers, _expectedExecutionsPerDeployment};
@@ -180,7 +180,7 @@ void OptimiserSuite::run(
 	// message once we perform code generation.
 	if (!usesOptimizedCodeGenerator)
 	{
-		_object.code = std::make_shared<AST>(std::move(astRoot));
+		_object.setCode(std::make_shared<AST>(std::move(astRoot)));
 		astRoot = std::get<1>(StackCompressor::run(
 			_dialect,
 			_object,
@@ -202,7 +202,7 @@ void OptimiserSuite::run(
 		ConstantOptimiser{*evmDialect, *_meter}(astRoot);
 		if (usesOptimizedCodeGenerator)
 		{
-			_object.code = std::make_shared<AST>(std::move(astRoot));
+			_object.setCode(std::make_shared<AST>(std::move(astRoot)));
 			astRoot = std::get<1>(StackCompressor::run(
 				_dialect,
 				_object,
@@ -211,13 +211,13 @@ void OptimiserSuite::run(
 			));
 			if (evmDialect->providesObjectAccess())
 			{
-				_object.code = std::make_shared<AST>(std::move(astRoot));
+				_object.setCode(std::make_shared<AST>(std::move(astRoot)));
 				astRoot = StackLimitEvader::run(suite.m_context, _object);
 			}
 		}
 		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
 		{
-			_object.code = std::make_shared<AST>(std::move(astRoot));
+			_object.setCode(std::make_shared<AST>(std::move(astRoot)));
 			astRoot = StackLimitEvader::run(suite.m_context, _object);
 		}
 	}
@@ -230,8 +230,8 @@ void OptimiserSuite::run(
 	outputPerformanceMetrics(suite.m_durationPerStepInMicroseconds);
 #endif
 
-	_object.code = std::make_shared<AST>(std::move(astRoot));
-	*_object.analysisInfo = AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
+	_object.setCode(std::make_shared<AST>(std::move(astRoot)));
+	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>(AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object));
 }
 
 namespace
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index c5579d84a1..b2e0b75d36 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -75,7 +75,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 
 		auto handleObject = [&](std::string const& _kind, Object const& _object) {
 			m_obtainedResult += contractName + "(" + _kind + ") " + (findFunctionCalls(
-				_object.code->root(),
+				_object.code()->root(),
 				"memoryguard"_yulname
 			).empty() ? "false" : "true") + "\n";
 		};
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 26f5e06846..d147e03d00 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -50,7 +50,7 @@ Dialect const& defaultDialect(bool _yul)
 }
 }
 
-std::pair<std::shared_ptr<AST>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
+std::pair<std::shared_ptr<AST const>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
@@ -63,7 +63,7 @@ std::pair<std::shared_ptr<AST>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test
 	);
 	if (!stack.parseAndAnalyze("", _source) || !stack.errors().empty())
 		BOOST_FAIL("Invalid source.");
-	return make_pair(stack.parserResult()->code, stack.parserResult()->analysisInfo);
+	return std::make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 }
 
 std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(
@@ -78,12 +78,12 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::t
 	std::shared_ptr<Object> parserResult = yul::ObjectParser(errorReporter, _dialect).parse(scanner, false);
 	if (!parserResult)
 		return {};
-	if (!parserResult->code || errorReporter.hasErrors())
+	if (!parserResult->hasCode() || errorReporter.hasErrors())
 		return {};
 	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->root()) || errorReporter.hasErrors())
+	if (!analyzer.analyze(parserResult->code()->root()) || errorReporter.hasErrors())
 		return {};
 	return {std::move(parserResult), std::move(analysisInfo)};
 }
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
index 4a9696cd9d..14d73d77e1 100644
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@@ -45,7 +45,7 @@ class AST;
 namespace solidity::yul::test
 {
 
-std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>>
+std::pair<std::shared_ptr<AST const>, std::shared_ptr<AsmAnalysisInfo>>
 parse(std::string const& _source, bool _yul = true);
 
 std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>>
diff --git a/test/libyul/CompilabilityChecker.cpp b/test/libyul/CompilabilityChecker.cpp
index 27310cd898..5b64b5e5d3 100644
--- a/test/libyul/CompilabilityChecker.cpp
+++ b/test/libyul/CompilabilityChecker.cpp
@@ -35,8 +35,9 @@ namespace
 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 parsingResult = yul::test::parse(_input, false);
+	obj.setCode(parsingResult.first, parsingResult.second);
+	BOOST_REQUIRE(obj.hasCode());
 	auto functions = CompilabilityChecker(EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion()), obj, true).stackDeficit;
 	std::string out;
 	for (auto const& function: functions)
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index 8e08bf4889..5c9bba8d41 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -206,7 +206,7 @@ TestCase::TestResult ControlFlowGraphTest::run(std::ostream& _stream, std::strin
 
 	std::ostringstream output;
 
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code->root());
+	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code()->root());
 
 	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
 	ControlFlowGraphPrinter printer{output};
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index 054c705471..20df176a39 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -57,16 +57,17 @@ ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(std::string const& _filen
 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)
+	auto parsingResult = yul::test::parse(m_source, false);
+	obj.setCode(parsingResult.first, parsingResult.second);
+	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
 	ControlFlowSideEffectsCollector sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		obj.code->root()
+		obj.code()->root()
 	);
 	m_obtainedResult.clear();
-	forEach<FunctionDefinition const>(obj.code->root(), [&](FunctionDefinition const& _fun) {
+	forEach<FunctionDefinition const>(obj.code()->root(), [&](FunctionDefinition const& _fun) {
 		std::string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
 		m_obtainedResult += _fun.name.str() + (effectStr.empty() ? ":" : ": " + effectStr) + "\n";
 	});
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index 3220a8c6f9..a39024d278 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -83,13 +83,14 @@ FunctionSideEffects::FunctionSideEffects(std::string const& _filename):
 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)
+	auto parsingResult = yul::test::parse(m_source, false);
+	obj.setCode(parsingResult.first, parsingResult.second);
+	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
 	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-		CallGraphGenerator::callGraph(obj.code->root())
+		CallGraphGenerator::callGraph(obj.code()->root())
 	);
 
 	std::map<std::string, std::string> functionSideEffectsStr;
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index a149381ca0..0293f8ee44 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -47,9 +47,9 @@ class KnowledgeBaseTest
 		ErrorList errorList;
 		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);
+		BOOST_REQUIRE(m_object && errorList.empty() && m_object->hasCode());
 
-		auto astRoot = std::get<Block>(yul::ASTCopier{}(m_object->code->root()));
+		auto astRoot = std::get<Block>(yul::ASTCopier{}(m_object->code()->root()));
 		NameDispenser dispenser(m_dialect, astRoot);
 		std::set<YulName> reserved;
 		OptimiserStepContext context{m_dialect, dispenser, reserved, 0};
@@ -59,7 +59,7 @@ class KnowledgeBaseTest
 		for (auto const& [name, expression]: m_ssaValues.values())
 			m_values[name].value = expression;
 
-		m_object->code = std::make_shared<AST>(std::move(astRoot));
+		m_object->setCode(std::make_shared<AST>(std::move(astRoot)));
 		return KnowledgeBase([this](YulName _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
index ce65cf2c85..bf09a1c2be 100644
--- a/test/libyul/Metrics.cpp
+++ b/test/libyul/Metrics.cpp
@@ -24,6 +24,7 @@
 
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/AST.h>
+#include <libyul/Object.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -37,7 +38,7 @@ namespace
 
 size_t codeSize(std::string const& _source, CodeWeights const _weights = {})
 {
-	std::shared_ptr<AST> ast = parse(_source, false).first;
+	std::shared_ptr<AST const> ast = parse(_source, false).first;
 	BOOST_REQUIRE(ast);
 	return CodeSize::codeSize(ast->root(), _weights);
 }
diff --git a/test/libyul/StackLayoutGeneratorTest.cpp b/test/libyul/StackLayoutGeneratorTest.cpp
index 2abac60e5c..9c16eaefc1 100644
--- a/test/libyul/StackLayoutGeneratorTest.cpp
+++ b/test/libyul/StackLayoutGeneratorTest.cpp
@@ -224,7 +224,7 @@ TestCase::TestResult StackLayoutGeneratorTest::run(std::ostream& _stream, std::s
 
 	std::ostringstream output;
 
-	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code->root());
+	std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(*analysisInfo, *m_dialect, object->code()->root());
 	StackLayout stackLayout = StackLayoutGenerator::run(*cfg);
 
 	output << "digraph CFG {\nnodesep=0.7;\nnode[shape=box];\n\n";
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index d987c519c3..9d4ccd81ba 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -75,7 +75,7 @@ bool YulInterpreterTest::parse(std::ostream& _stream, std::string const& _linePr
 	);
 	if (stack.parseAndAnalyze("", m_source))
 	{
-		m_ast = stack.parserResult()->code;
+		m_ast = stack.parserResult()->code();
 		m_analysisInfo = stack.parserResult()->analysisInfo;
 		return true;
 	}
diff --git a/test/libyul/YulInterpreterTest.h b/test/libyul/YulInterpreterTest.h
index f536867024..d591591332 100644
--- a/test/libyul/YulInterpreterTest.h
+++ b/test/libyul/YulInterpreterTest.h
@@ -45,8 +45,8 @@ class YulInterpreterTest: public solidity::frontend::test::EVMVersionRestrictedT
 	bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted);
 	std::string interpret();
 
-	std::shared_ptr<AST> m_ast;
-	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
+	std::shared_ptr<AST const> m_ast;
+	std::shared_ptr<AsmAnalysisInfo const> m_analysisInfo;
 	bool m_simulateExternalCallsToSelf = false;
 };
 
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index df28515c37..048eb7145d 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -81,7 +81,7 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 	auto optimizedObject = tester.optimizedObject();
 	std::string printedOptimizedObject;
 	if (optimizedObject->subObjects.empty())
-		printedOptimizedObject = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(optimizedObject->code->root());
+		printedOptimizedObject = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(optimizedObject->code()->root());
 	else
 		printedOptimizedObject = optimizedObject->toString(*m_dialect);
 
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 2190c10103..2898086e8a 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -98,14 +98,14 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			return block;
 		}},
 		{"constantOptimiser", [&]() {
-			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			auto block = std::get<Block>(ASTCopier{}(m_object->code()->root()));
 			updateContext(block);
 			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
 			ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(block);
 			return block;
 		}},
 		{"varDeclInitializer", [&]() {
-			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			auto block = std::get<Block>(ASTCopier{}(m_object->code()->root()));
 			updateContext(block);
 			VarDeclInitializer::run(*m_context, block);
 			return block;
@@ -151,7 +151,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			return block;
 		}},
 		{"expressionSplitter", [&]() {
-			auto block = std::get<Block>(ASTCopier{}(m_object->code->root()));
+			auto block = std::get<Block>(ASTCopier{}(m_object->code()->root()));
 			updateContext(block);
 			ExpressionSplitter::run(*m_context, block);
 			return block;
@@ -401,8 +401,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			FunctionGrouper::run(*m_context, block);
 			size_t maxIterations = 16;
 			{
-				Object object(*m_object);
-				object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(block)));
+				Object object; // (*m_object) ??
+				object.setCode(std::make_shared<AST>(std::get<Block>(ASTCopier{}(block))));
 				block = std::get<1>(StackCompressor::run(*m_dialect, object, true, maxIterations));
 			}
 			BlockFlattener::run(*m_context, block);
@@ -419,13 +419,13 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 				frontend::OptimiserSettings::DefaultYulOptimiserCleanupSteps,
 				frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 			);
-			return std::get<Block>(ASTCopier{}(m_optimizedObject->code->root()));
+			return std::get<Block>(ASTCopier{}(m_optimizedObject->code()->root()));
 		}},
 		{"stackLimitEvader", [&]() {
 			auto block = disambiguate();
 			updateContext(block);
-			Object object(*m_object);
-			object.code = std::make_shared<AST>(std::get<Block>(ASTCopier{}(block)));
+			Object object; // (*m_object);
+			object.setCode(std::make_shared<AST>(std::get<Block>(ASTCopier{}(block))));
 			auto const unreachables = CompilabilityChecker{
 				*m_dialect,
 				object,
@@ -492,7 +492,7 @@ bool YulOptimizerTestCommon::runStep()
 	if (m_namedSteps.count(m_optimizerStep))
 	{
 		auto block = m_namedSteps[m_optimizerStep]();
-		m_optimizedObject->code = std::make_shared<AST>(std::move(block));
+		m_optimizedObject->setCode(std::make_shared<AST>(std::move(block)));
 	}
 	else
 		return false;
@@ -531,12 +531,12 @@ std::string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 
 Block const* YulOptimizerTestCommon::run()
 {
-	return runStep() ? &m_optimizedObject->code->root() : nullptr;
+	return runStep() ? &m_optimizedObject->code()->root() : nullptr;
 }
 
 Block YulOptimizerTestCommon::disambiguate()
 {
-	auto block = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(m_object->code->root()));
+	auto block = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(m_object->code()->root()));
 	m_analysisInfo.reset();
 	return block;
 }
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 940fc7374e..a064fcdc80 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -54,7 +54,7 @@ namespace
 /// @returns true if there are recursive functions, false otherwise.
 bool recursiveFunctionExists(Dialect const& _dialect, yul::Object& _object)
 {
-	auto recursiveFunctions = CallGraphGenerator::callGraph(_object.code->root()).recursiveFunctions();
+	auto recursiveFunctions = CallGraphGenerator::callGraph(_object.code()->root()).recursiveFunctions();
 	for(auto&& [function, variables]: CompilabilityChecker{
 			_dialect,
 			_object,
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.cpp b/test/tools/ossfuzz/YulEvmoneInterface.cpp
index b892454430..74da5a1f02 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/YulEvmoneInterface.cpp
@@ -27,7 +27,7 @@ bytes YulAssembler::assemble()
 {
 	if (
 		!m_stack.parseAndAnalyze("source", m_yulProgram) ||
-		!m_stack.parserResult()->code ||
+		!m_stack.parserResult()->code() ||
 		!m_stack.parserResult()->analysisInfo ||
 		langutil::Error::containsErrors(m_stack.errors())
 	)
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index 40201bd15f..f685aa90da 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -71,7 +71,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	{
 		if (
 			!stack.parseAndAnalyze("source", input) ||
-			!stack.parserResult()->code ||
+			!stack.parserResult()->hasCode() ||
 			!stack.parserResult()->analysisInfo
 		)
 			return 0;
@@ -89,7 +89,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
-		stack.parserResult()->code->root(),
+		stack.parserResult()->code()->root(),
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		/*disableMemoryTracing=*/true
 	);
@@ -99,7 +99,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	stack.optimize();
 	termReason = yulFuzzerUtil::interpret(
 		os2,
-		stack.parserResult()->code->root(),
+		stack.parserResult()->code()->root(),
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		/*disableMemoryTracing=*/true
 	);
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index 092f2dacb7..cfdb208130 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -72,7 +72,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// Parse protobuf mutated YUL code
 	if (
 		!stack.parseAndAnalyze("source", yul_source) ||
-		!stack.parserResult()->code ||
+		!stack.parserResult()->code() ||
 		!stack.parserResult()->analysisInfo ||
 		Error::containsErrors(stack.errors())
 	)
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 4e07eaf646..13ac4aea84 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -72,7 +72,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// Parse protobuf mutated YUL code
 	if (
 		!stack.parseAndAnalyze("source", yul_source) ||
-		!stack.parserResult()->code ||
+		!stack.parserResult()->code() ||
 		!stack.parserResult()->analysisInfo ||
 		Error::containsErrors(stack.errors())
 	)
@@ -89,7 +89,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
-		stack.parserResult()->code->root(),
+		stack.parserResult()->code()->root(),
 		EVMDialect::strictAssemblyForEVMObjects(version),
 		/*disableMemoryTracing=*/true
 	);
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index ad32337bdd..faab89e792 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -218,7 +218,7 @@ class YulOpti
 					case ';':
 					{
 						Object obj;
-						obj.code = std::make_shared<AST>(std::get<yul::Block>(ASTCopier{}(*m_astRoot)));
+						obj.setCode(std::make_shared<AST>(std::get<yul::Block>(ASTCopier{}(*m_astRoot))));
 						*m_astRoot = std::get<1>(StackCompressor::run(m_dialect, obj, true, 16));
 						break;
 					}
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index 9aee616e0e..c3a7fb19fc 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -54,7 +54,7 @@ namespace po = boost::program_options;
 namespace
 {
 
-std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>> parse(std::string const& _source)
+std::pair<std::shared_ptr<AST const>, std::shared_ptr<AsmAnalysisInfo>> parse(std::string const& _source)
 {
 	YulStack stack(
 		langutil::EVMVersion(),
@@ -66,7 +66,7 @@ std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>> parse(std::str
 	if (stack.parseAndAnalyze("--INPUT--", _source))
 	{
 		yulAssert(stack.errors().empty(), "Parsed successfully but had errors.");
-		return make_pair(stack.parserResult()->code, stack.parserResult()->analysisInfo);
+		return make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 	}
 	else
 	{
@@ -77,7 +77,7 @@ std::pair<std::shared_ptr<AST>, std::shared_ptr<AsmAnalysisInfo>> parse(std::str
 
 void interpret(std::string const& _source, bool _inspect, bool _disableExternalCalls)
 {
-	std::shared_ptr<AST> ast;
+	std::shared_ptr<AST const> ast;
 	std::shared_ptr<AsmAnalysisInfo> analysisInfo;
 	tie(ast, analysisInfo) = parse(_source);
 	if (!ast || !analysisInfo)
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 2d5c31cf11..14b6406493 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -149,7 +149,7 @@ std::variant<std::unique_ptr<AST>, ErrorList> Program::parseObject(Dialect const
 	// The public API of the class does not provide access to the smart pointer so it won't be hard
 	// to switch to shared_ptr if the copying turns out to be an issue (though it would be better
 	// to refactor ObjectParser and Object to use unique_ptr instead).
-	auto astCopy = std::make_unique<AST>(std::get<Block>(ASTCopier{}(selectedObject->code->root())));
+	auto astCopy = std::make_unique<AST>(std::get<Block>(ASTCopier{}(selectedObject->code()->root())));
 
 	return std::variant<std::unique_ptr<AST>, ErrorList>(std::move(astCopy));
 }

From 44bfa720d0bc6d3ab51154bd44fc66776d453276 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:34:20 +0200
Subject: [PATCH 0973/1140] Yul: optimizer tests assert that there are no
 subobjects but Data

---
 test/libyul/YulOptimizerTestCommon.cpp        | 21 ++++++++++++-------
 test/libyul/YulOptimizerTestCommon.h          |  5 ++---
 .../long_literals_as_builtin_args.yul         |  8 ++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 2898086e8a..bf374c21fc 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -74,11 +74,19 @@ using namespace solidity::yul::test;
 using namespace solidity::frontend;
 
 YulOptimizerTestCommon::YulOptimizerTestCommon(
-	std::shared_ptr<Object> _obj,
+	std::shared_ptr<Object const> _obj,
 	Dialect const& _dialect
-): m_dialect(&_dialect), m_object(_obj), m_optimizedObject(std::make_shared<Object>()), m_analysisInfo(m_object->analysisInfo)
+): m_dialect(&_dialect), m_object(_obj), m_optimizedObject(std::make_shared<Object>(*_obj))
 {
-	*m_optimizedObject = *m_object;
+	if (
+		std::any_of(
+			m_object->subObjects.begin(),
+			m_object->subObjects.end(),
+			[](auto const& subObject) { return dynamic_cast<Data*>(subObject.get()) == nullptr;}
+		)
+	)
+		solUnimplementedAssert(false, "The current implementation of YulOptimizerTests ignores subobjects that are not Data.");
+
 	m_namedSteps = {
 		{"disambiguator", [&]() { return disambiguate(); }},
 		{"nameDisplacer", [&]() {
@@ -401,7 +409,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			FunctionGrouper::run(*m_context, block);
 			size_t maxIterations = 16;
 			{
-				Object object; // (*m_object) ??
+				Object object(*m_optimizedObject);
 				object.setCode(std::make_shared<AST>(std::get<Block>(ASTCopier{}(block))));
 				block = std::get<1>(StackCompressor::run(*m_dialect, object, true, maxIterations));
 			}
@@ -424,7 +432,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		{"stackLimitEvader", [&]() {
 			auto block = disambiguate();
 			updateContext(block);
-			Object object; // (*m_object);
+			Object object(*m_optimizedObject);
 			object.setCode(std::make_shared<AST>(std::get<Block>(ASTCopier{}(block))));
 			auto const unreachables = CompilabilityChecker{
 				*m_dialect,
@@ -536,8 +544,7 @@ Block const* YulOptimizerTestCommon::run()
 
 Block YulOptimizerTestCommon::disambiguate()
 {
-	auto block = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(m_object->code()->root()));
-	m_analysisInfo.reset();
+	auto block = std::get<Block>(Disambiguator(*m_dialect, *m_object->analysisInfo)(m_object->code()->root()));
 	return block;
 }
 
diff --git a/test/libyul/YulOptimizerTestCommon.h b/test/libyul/YulOptimizerTestCommon.h
index 8a706c328b..41806fcd6a 100644
--- a/test/libyul/YulOptimizerTestCommon.h
+++ b/test/libyul/YulOptimizerTestCommon.h
@@ -40,7 +40,7 @@ class YulOptimizerTestCommon
 {
 public:
 	explicit YulOptimizerTestCommon(
-		std::shared_ptr<Object> _obj,
+		std::shared_ptr<Object const> _obj,
 		Dialect const& _dialect
 	);
 	/// Sets optimiser step to be run to @param
@@ -70,9 +70,8 @@ class YulOptimizerTestCommon
 	std::unique_ptr<NameDispenser> m_nameDispenser;
 	std::unique_ptr<OptimiserStepContext> m_context;
 
-	std::shared_ptr<Object> m_object;
+	std::shared_ptr<Object const> m_object;
 	std::shared_ptr<Object> m_optimizedObject;
-	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
 	std::map<std::string, std::function<Block(void)>> m_namedSteps;
 };
 
diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul
index 34b44aad94..f480bec9e1 100644
--- a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/long_literals_as_builtin_args.yul
@@ -7,9 +7,7 @@ object "AccessControlDefaultAdminRules4233_14" {
         let j := datasize("AccessControlDefaultAdminRules4233_14_deployed")
         codecopy(i, dataoffset("AccessControlDefaultAdminRules4233_14_deployed"), j)
     }
-    object "AccessControlDefaultAdminRules4233_14_deployed" {
-        code {}
-    }
+    data "AccessControlDefaultAdminRules4233_14_deployed" "AccessControlDefaultAdminRules4233_14_deployed"
 
 }
 // ----
@@ -22,7 +20,5 @@ object "AccessControlDefaultAdminRules4233_14" {
 //         let j := datasize("AccessControlDefaultAdminRules4233_14_deployed")
 //         codecopy(i, dataoffset("AccessControlDefaultAdminRules4233_14_deployed"), j)
 //     }
-//     object "AccessControlDefaultAdminRules4233_14_deployed" {
-//         code { }
-//     }
+//     data "AccessControlDefaultAdminRules4233_14_deployed" hex"416363657373436f6e74726f6c44656661756c7441646d696e52756c6573343233335f31345f6465706c6f796564"
 // }

From 860f0d4601ee2b2ad200344e7e4a133e71432a57 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 13 Apr 2023 00:10:31 +0200
Subject: [PATCH 0974/1140] Change the constant optimizer to make use of PUSH0

---
 libevmasm/Assembly.cpp                       |  4 +-
 libevmasm/AssemblyItem.cpp                   |  6 +-
 libevmasm/AssemblyItem.h                     |  7 +-
 libevmasm/ConstantOptimiser.cpp              | 95 ++++++++++++++------
 libevmasm/ConstantOptimiser.h                |  4 +-
 libevmasm/GasMeter.cpp                       | 16 ++--
 libevmasm/GasMeter.h                         |  3 +
 libevmasm/Inliner.cpp                        | 16 ++--
 libevmasm/PeepholeOptimiser.cpp              | 31 ++++---
 libevmasm/PeepholeOptimiser.h                |  9 +-
 libyul/backends/evm/EVMMetrics.cpp           |  9 +-
 libyul/backends/evm/StackLayoutGenerator.cpp |  2 +-
 test/libevmasm/Optimiser.cpp                 | 77 +++++++++++++---
 test/libsolidity/StandardCompiler.cpp        | 13 ++-
 14 files changed, 206 insertions(+), 86 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index f9b800c908..91773a8e84 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -74,7 +74,7 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 			ret += i.second.size();
 
 		for (AssemblyItem const& i: m_items)
-			ret += i.bytesRequired(tagSize, Precision::Approximate);
+			ret += i.bytesRequired(tagSize, m_evmVersion, Precision::Approximate);
 		if (numberEncodingSize(ret) <= tagSize)
 			return static_cast<unsigned>(ret);
 	}
@@ -753,7 +753,7 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 
 		if (_settings.runPeephole)
 		{
-			PeepholeOptimiser peepOpt{m_items};
+			PeepholeOptimiser peepOpt{m_items, m_evmVersion};
 			while (peepOpt.optimise())
 			{
 				count++;
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index c88a9663f3..837dad8afe 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -116,7 +116,7 @@ void AssemblyItem::setPushTagSubIdAndTag(size_t _subId, size_t _tag)
 	setData(data);
 }
 
-size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision) const
+size_t AssemblyItem::bytesRequired(size_t _addressLength, langutil::EVMVersion _evmVersion, Precision _precision) const
 {
 	switch (m_type)
 	{
@@ -124,7 +124,9 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 	case Tag: // 1 byte for the JUMPDEST
 		return 1;
 	case Push:
-		return 1 + std::max<size_t>(1, numberEncodingSize(data()));
+		return
+			1 +
+			std::max<size_t>((_evmVersion.hasPush0() ? 0 : 1), numberEncodingSize(data()));
 	case PushSubSize:
 	case PushProgramSize:
 		return 1 + 4; // worst case: a 16MB program
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index c2b3603c63..f06c72bac2 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -161,10 +161,11 @@ class AssemblyItem
 
 	/// @returns an upper bound for the number of bytes required by this item, assuming that
 	/// the value of a jump tag takes @a _addressLength bytes.
+	/// @param _evmVersion the EVM version
 	/// @param _precision Whether to return a precise count (which involves
 	///                   counting immutable references which are only set after
 	///                   a call to `assemble()`) or an approx. count.
-	size_t bytesRequired(size_t _addressLength, Precision _precision = Precision::Precise) const;
+	size_t bytesRequired(size_t _addressLength, langutil::EVMVersion _evmVersion, Precision _precision = Precision::Precise) const;
 	size_t arguments() const;
 	size_t returnValues() const;
 	size_t deposit() const { return returnValues() - arguments(); }
@@ -228,11 +229,11 @@ class AssemblyItem
 	mutable std::optional<size_t> m_immutableOccurrences;
 };
 
-inline size_t bytesRequired(AssemblyItems const& _items, size_t _addressLength,  Precision _precision = Precision::Precise)
+inline size_t bytesRequired(AssemblyItems const& _items, size_t _addressLength, langutil::EVMVersion _evmVersion, Precision _precision = Precision::Precise)
 {
 	size_t size = 0;
 	for (AssemblyItem const& item: _items)
-		size += item.bytesRequired(_addressLength, _precision);
+		size += item.bytesRequired(_addressLength, _evmVersion, _precision);
 	return size;
 }
 
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index 62dbc803bb..360fb781f4 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -83,7 +83,7 @@ bigint ConstantOptimisationMethod::simpleRunGas(AssemblyItems const& _items, lan
 	bigint gas = 0;
 	for (AssemblyItem const& item: _items)
 		if (item.type() == Push)
-			gas += GasMeter::runGas(Instruction::PUSH1, _evmVersion);
+			gas += GasMeter::pushGas(item.data(), _evmVersion);
 		else if (item.type() == Operation)
 		{
 			if (item.instruction() == Instruction::EXP)
@@ -100,9 +100,9 @@ bigint ConstantOptimisationMethod::dataGas(bytes const& _data) const
 	return bigint(GasMeter::dataGas(_data, m_params.isCreation, m_params.evmVersion));
 }
 
-size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items)
+size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items, langutil::EVMVersion _evmVersion)
 {
-	return evmasm::bytesRequired(_items, 3, Precision::Approximate); // assume 3 byte addresses
+	return evmasm::bytesRequired(_items, 3, _evmVersion, Precision::Approximate); // assume 3 byte addresses
 }
 
 void ConstantOptimisationMethod::replaceConstants(
@@ -143,7 +143,7 @@ bigint CodeCopyMethod::gasNeeded() const
 		// Run gas: we ignore memory increase costs
 		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),
+		bytesRequired(copyRoutine(), m_params.evmVersion) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
 		// Data gas for data itself
 		dataGas(toBigEndian(m_value))
 	);
@@ -153,37 +153,74 @@ AssemblyItems CodeCopyMethod::execute(Assembly& _assembly) const
 {
 	bytes data = toBigEndian(m_value);
 	assertThrow(data.size() == 32, OptimizerException, "Invalid number encoding.");
-	AssemblyItems actualCopyRoutine = copyRoutine();
-	actualCopyRoutine[4] = _assembly.newData(data);
-	return actualCopyRoutine;
+	AssemblyItem newPushData = _assembly.newData(data);
+	return copyRoutine(&newPushData);
 }
 
-AssemblyItems const& CodeCopyMethod::copyRoutine()
+AssemblyItems CodeCopyMethod::copyRoutine(AssemblyItem* _pushData) const
 {
-	AssemblyItems static copyRoutine{
-		// constant to be reused 3+ times
-		u256(0),
+	if (_pushData)
+		assertThrow(_pushData->type() == PushData, OptimizerException, "Invalid Assembly Item.");
 
-		// back up memory
-		// mload(0)
-		Instruction::DUP1,
-		Instruction::MLOAD,
+	AssemblyItem dataUsed = _pushData ? *_pushData : AssemblyItem(PushData, u256(1) << 16);
 
-		// codecopy(0, <offset>, 32)
-		u256(32),
-		AssemblyItem(PushData, u256(1) << 16), // replaced above in actualCopyRoutine[4]
-		Instruction::DUP4,
-		Instruction::CODECOPY,
+	// PUSH0 is cheaper than PUSHn/DUP/SWAP.
+	if (m_params.evmVersion.hasPush0())
+	{
+		// This costs ~29 gas.
+		AssemblyItems copyRoutine{
+			// back up memory
+			// mload(0)
+			u256(0),
+			Instruction::MLOAD,
+
+			// codecopy(0, <offset>, 32)
+			u256(32),
+			dataUsed,
+			u256(0),
+			Instruction::CODECOPY,
+
+			// mload(0)
+			u256(0),
+			Instruction::MLOAD,
+
+			// restore original memory
+			// mstore(0, x)
+			Instruction::SWAP1,
+			u256(0),
+			Instruction::MSTORE
+		};
+		return copyRoutine;
+	}
+	else
+	{
+		// This costs ~33 gas.
+		AssemblyItems copyRoutine{
+			// constant to be reused 3+ times
+			u256(0),
+
+			// back up memory
+			// mload(0)
+			Instruction::DUP1,
+			Instruction::MLOAD,
 
-		// mload(0)
-		Instruction::DUP2,
-		Instruction::MLOAD,
+			// codecopy(0, <offset>, 32)
+			u256(32),
+			dataUsed,
+			Instruction::DUP4,
+			Instruction::CODECOPY,
 
-		// restore original memory
-		Instruction::SWAP2,
-		Instruction::MSTORE
-	};
-	return copyRoutine;
+			// mload(0)
+			Instruction::DUP2,
+			Instruction::MLOAD,
+
+			// restore original memory
+			// mstore(0, x)
+			Instruction::SWAP2,
+			Instruction::MSTORE
+		};
+		return copyRoutine;
+	}
 }
 
 AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
@@ -323,7 +360,7 @@ bigint ComputeMethod::gasNeeded(AssemblyItems const& _routine) const
 	return combineGas(
 		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),
+		bytesRequired(_routine, m_params.evmVersion) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
 		0
 	);
 }
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
index 139e263ba3..7a929939ef 100644
--- a/libevmasm/ConstantOptimiser.h
+++ b/libevmasm/ConstantOptimiser.h
@@ -79,7 +79,7 @@ class ConstantOptimisationMethod
 	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);
+	static size_t bytesRequired(AssemblyItems const& _items, langutil::EVMVersion _evmVersion);
 	/// @returns the combined estimated gas usage taking @a m_params into account.
 	bigint combineGas(
 		bigint const& _runGas,
@@ -123,7 +123,7 @@ class CodeCopyMethod: public ConstantOptimisationMethod
 	AssemblyItems execute(Assembly& _assembly) const override;
 
 protected:
-	static AssemblyItems const& copyRoutine();
+	AssemblyItems copyRoutine(AssemblyItem* _pushData = nullptr) const;
 };
 
 /**
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index b3d160585e..a501b487f4 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -44,12 +44,8 @@ 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]];
+		gas = pushGas(_item.data(), m_evmVersion);
+		break;
 	case PushTag:
 	case PushData:
 	case PushSub:
@@ -290,6 +286,14 @@ unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVer
 	util::unreachable();
 }
 
+unsigned GasMeter::pushGas(u256 _value, langutil::EVMVersion _evmVersion)
+{
+	return runGas(
+		(_evmVersion.hasPush0() && _value == u256(0)) ? Instruction::PUSH0 : Instruction::PUSH1,
+		_evmVersion
+	);
+}
+
 u256 GasMeter::dataGas(bytes const& _data, bool _inCreation, langutil::EVMVersion _evmVersion)
 {
 	bigint gas = 0;
diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
index c91e0f0971..50a783e1a6 100644
--- a/libevmasm/GasMeter.h
+++ b/libevmasm/GasMeter.h
@@ -225,6 +225,9 @@ class GasMeter
 	/// change with EVM versions)
 	static unsigned runGas(Instruction _instruction, langutil::EVMVersion _evmVersion);
 
+	/// @returns gas costs for push instructions (may change depending on EVM version)
+	static unsigned pushGas(u256 _value, 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
 	/// otherwise code will be stored and have to pay "createDataGas" cost.
diff --git a/libevmasm/Inliner.cpp b/libevmasm/Inliner.cpp
index 67918e558b..f3358128c6 100644
--- a/libevmasm/Inliner.cpp
+++ b/libevmasm/Inliner.cpp
@@ -59,10 +59,10 @@ u256 executionCost(RangeType const& _itemRange, langutil::EVMVersion _evmVersion
 }
 /// @returns an estimation of the code size in bytes needed for the AssemblyItems in @a _itemRange.
 template<typename RangeType>
-uint64_t codeSize(RangeType const& _itemRange)
+uint64_t codeSize(RangeType const& _itemRange, langutil::EVMVersion _evmVersion)
 {
 	return ranges::accumulate(_itemRange | ranges::views::transform(
-		[](auto const& _item) { return _item.bytesRequired(2, Precision::Approximate); }
+		[&](auto const& _item) { return _item.bytesRequired(2, _evmVersion, Precision::Approximate); }
 	), 0u);
 }
 /// @returns the tag id, if @a _item is a PushTag or Tag into the current subassembly, std::nullopt otherwise.
@@ -139,7 +139,7 @@ std::map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(Asse
 bool Inliner::shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyItem const> _block, uint64_t _pushTagCount) const
 {
 	// Accumulate size of the inline candidate block in bytes (without the return jump).
-	uint64_t functionBodySize = codeSize(ranges::views::drop_last(_block, 1));
+	uint64_t functionBodySize = codeSize(ranges::views::drop_last(_block, 1), m_evmVersion);
 
 	// Use the number of push tags as approximation of the average number of calls to the function per run.
 	uint64_t numberOfCalls = _pushTagCount;
@@ -167,8 +167,8 @@ bool Inliner::shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyIte
 	);
 	// Each call site deposits the call site pattern, whereas the jump site pattern and the function itself are deposited once.
 	bigint uninlinedDepositCost = GasMeter::dataGas(
-		numberOfCallSites * codeSize(uninlinedCallSitePattern) +
-		codeSize(uninlinedFunctionPattern) +
+		numberOfCallSites * codeSize(uninlinedCallSitePattern, m_evmVersion) +
+		codeSize(uninlinedFunctionPattern, m_evmVersion) +
 		functionBodySize,
 		m_isCreation,
 		m_evmVersion
@@ -185,7 +185,7 @@ bool Inliner::shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyIte
 	// the heuristics is optimistic.
 	if (m_tagsReferencedFromOutside.count(_tag))
 		inlinedDepositCost += GasMeter::dataGas(
-			codeSize(uninlinedFunctionPattern) + functionBodySize,
+			codeSize(uninlinedFunctionPattern, m_evmVersion) + functionBodySize,
 			m_isCreation,
 			m_evmVersion
 		);
@@ -225,8 +225,8 @@ std::optional<AssemblyItem> Inliner::shouldInline(size_t _tag, AssemblyItem cons
 			AssemblyItem{Instruction::JUMP},
 		};
 		if (
-			GasMeter::dataGas(codeSize(_block.items), m_isCreation, m_evmVersion) <=
-			GasMeter::dataGas(codeSize(jumpPattern), m_isCreation, m_evmVersion)
+			GasMeter::dataGas(codeSize(_block.items, m_evmVersion), m_isCreation, m_evmVersion) <=
+			GasMeter::dataGas(codeSize(jumpPattern, m_evmVersion), m_isCreation, m_evmVersion)
 		)
 			return blockExit;
 	}
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 257a3727c0..df33e04e51 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -38,6 +38,7 @@ struct OptimiserState
 	AssemblyItems const& items;
 	size_t i;
 	std::back_insert_iterator<AssemblyItems> out;
+	langutil::EVMVersion evmVersion = langutil::EVMVersion();
 };
 
 template<typename FunctionType>
@@ -199,16 +200,26 @@ 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 apply(OptimiserState& _state)
 	{
-		if (_push1.type() == Push && _push2.type() == Push && _push1.data() == _push2.data())
+		size_t windowSize = 2;
+		if (_state.i + windowSize > _state.items.size())
+			return false;
+
+		auto push1 = _state.items.begin() + static_cast<ptrdiff_t>(_state.i);
+		auto push2 = _state.items.begin() + static_cast<ptrdiff_t>(_state.i + 1);
+		assertThrow(push1 != _state.items.end() && push2 != _state.items.end(), OptimizerException, "");
+
+		if (
+			push1->type() == Push &&
+			push2->type() == Push &&
+			push1->data() == push2->data() &&
+			(!_state.evmVersion.hasPush0() || push1->data() != 0)
+		)
 		{
-			*_out = _push1;
-			*_out = {Instruction::DUP1, _push2.debugData()};
+			*_state.out = *push1;
+			*_state.out = {Instruction::DUP1, push2->debugData()};
+			_state.i += windowSize;
 			return true;
 		}
 		else
@@ -510,7 +521,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, back_inserter(m_optimisedItems)};
+	OptimiserState state {m_items, 0, back_inserter(m_optimisedItems), m_evmVersion};
 	while (state.i < m_items.size())
 		applyMethods(
 			state,
@@ -520,7 +531,7 @@ bool PeepholeOptimiser::optimise()
 		);
 	if (m_optimisedItems.size() < m_items.size() || (
 		m_optimisedItems.size() == m_items.size() && (
-			evmasm::bytesRequired(m_optimisedItems, 3, approx) < evmasm::bytesRequired(m_items, 3, approx) ||
+			evmasm::bytesRequired(m_optimisedItems, 3, m_evmVersion, approx) < evmasm::bytesRequired(m_items, 3, m_evmVersion, approx) ||
 			numberOfPops(m_optimisedItems) > numberOfPops(m_items)
 		)
 	))
diff --git a/libevmasm/PeepholeOptimiser.h b/libevmasm/PeepholeOptimiser.h
index 64ad5227fa..8e3161b212 100644
--- a/libevmasm/PeepholeOptimiser.h
+++ b/libevmasm/PeepholeOptimiser.h
@@ -25,6 +25,8 @@
 #include <cstddef>
 #include <iterator>
 
+#include <liblangutil/EVMVersion.h>
+
 namespace solidity::evmasm
 {
 class AssemblyItem;
@@ -41,7 +43,11 @@ class PeepholeOptimisationMethod
 class PeepholeOptimiser
 {
 public:
-	explicit PeepholeOptimiser(AssemblyItems& _items): m_items(_items) {}
+	explicit PeepholeOptimiser(AssemblyItems& _items, langutil::EVMVersion const _evmVersion):
+	m_items(_items),
+	m_evmVersion(_evmVersion)
+	{
+	}
 	virtual ~PeepholeOptimiser() = default;
 
 	bool optimise();
@@ -49,6 +55,7 @@ class PeepholeOptimiser
 private:
 	AssemblyItems& m_items;
 	AssemblyItems m_optimisedItems;
+	langutil::EVMVersion const m_evmVersion;
 };
 
 }
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index 84ebdab1d2..539279bf20 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -87,10 +87,11 @@ void GasMeterVisitor::operator()(FunctionCall const& _funCall)
 
 void GasMeterVisitor::operator()(Literal const& _lit)
 {
-	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::PUSH1, m_dialect.evmVersion());
-	m_dataGas +=
-		singleByteDataGas() +
-		evmasm::GasMeter::dataGas(
+	m_runGas += evmasm::GasMeter::pushGas(_lit.value.value(), m_dialect.evmVersion());
+
+	m_dataGas += singleByteDataGas();
+	if (!m_dialect.evmVersion().hasPush0() || _lit.value.value() != u256(0))
+		m_dataGas += evmasm::GasMeter::dataGas(
 			toCompactBigEndian(_lit.value.value(), 1),
 			m_isCreation,
 			m_dialect.evmVersion()
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index c781d7c1b8..1a30842aec 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -771,7 +771,7 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 					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());
+					opGas += evmasm::GasMeter::pushGas(u256(0), langutil::EVMVersion());
 				}
 			}
 		};
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 04d41fffeb..afc3c09fa9 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1000,7 +1000,7 @@ BOOST_AUTO_TEST_CASE(clear_unreachable_code)
 		AssemblyItem(PushTag, 1),
 		Instruction::JUMP
 	};
-	PeepholeOptimiser peepOpt(items);
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 	BOOST_REQUIRE(peepOpt.optimise());
 	BOOST_CHECK_EQUAL_COLLECTIONS(
 		items.begin(), items.end(),
@@ -1026,7 +1026,19 @@ BOOST_AUTO_TEST_CASE(peephole_double_push)
 		u256(4),
 		u256(5)
 	};
-	PeepholeOptimiser peepOpt(items);
+
+	// `PUSH0 PUSH0` is cheaper than `DUP1 PUSH0`
+	if (solidity::test::CommonOptions::get().evmVersion() >= EVMVersion::shanghai())
+		expectation = {
+			u256(0),
+			u256(0),
+			u256(5),
+			Instruction::DUP1,
+			u256(4),
+			u256(5)
+		};
+
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 	BOOST_REQUIRE(peepOpt.optimise());
 	BOOST_CHECK_EQUAL_COLLECTIONS(
 		items.begin(), items.end(),
@@ -1042,7 +1054,7 @@ BOOST_AUTO_TEST_CASE(peephole_pop_calldatasize)
 		Instruction::LT,
 		Instruction::POP
 	};
-	PeepholeOptimiser peepOpt(items);
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 	for (size_t i = 0; i < 3; i++)
 		BOOST_CHECK(peepOpt.optimise());
 	BOOST_CHECK(items.empty());
@@ -1075,7 +1087,7 @@ BOOST_AUTO_TEST_CASE(peephole_commutative_swap1)
 			u256(4),
 			u256(5)
 		};
-		PeepholeOptimiser peepOpt(items);
+		PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 		BOOST_REQUIRE(peepOpt.optimise());
 		BOOST_CHECK_EQUAL_COLLECTIONS(
 			items.begin(), items.end(),
@@ -1113,7 +1125,7 @@ BOOST_AUTO_TEST_CASE(peephole_noncommutative_swap1)
 			u256(4),
 			u256(5)
 		};
-		PeepholeOptimiser peepOpt(items);
+		PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 		BOOST_REQUIRE(!peepOpt.optimise());
 		BOOST_CHECK_EQUAL_COLLECTIONS(
 			items.begin(), items.end(),
@@ -1148,7 +1160,7 @@ BOOST_AUTO_TEST_CASE(peephole_swap_comparison)
 			u256(4),
 			u256(5)
 		};
-		PeepholeOptimiser peepOpt(items);
+		PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 		BOOST_REQUIRE(peepOpt.optimise());
 		BOOST_CHECK_EQUAL_COLLECTIONS(
 			items.begin(), items.end(),
@@ -1174,7 +1186,7 @@ BOOST_AUTO_TEST_CASE(peephole_truthy_and)
 		AssemblyItem(PushTag, 1),
 		Instruction::JUMPI
 	};
-	PeepholeOptimiser peepOpt(items);
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 	BOOST_REQUIRE(peepOpt.optimise());
 	BOOST_CHECK_EQUAL_COLLECTIONS(
 		items.begin(), items.end(),
@@ -1207,7 +1219,7 @@ BOOST_AUTO_TEST_CASE(peephole_iszero_iszero_jumpi)
 		u256(0x20),
 		Instruction::RETURN
 	};
-	PeepholeOptimiser peepOpt(items);
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
 	BOOST_REQUIRE(peepOpt.optimise());
 	BOOST_CHECK_EQUAL_COLLECTIONS(
 	  items.begin(), items.end(),
@@ -1649,6 +1661,40 @@ BOOST_AUTO_TEST_CASE(cse_replace_too_large_shift)
 	});
 }
 
+BOOST_AUTO_TEST_CASE(cse_dup)
+{
+	AssemblyItems input{
+		u256(0),
+		Instruction::DUP1,
+		Instruction::REVERT
+	};
+	AssemblyItems output = input;
+
+	checkCSE(input, output);
+	checkFullCSE(input, output);
+}
+
+BOOST_AUTO_TEST_CASE(cse_push0)
+{
+	AssemblyItems input{
+		u256(0),
+		u256(0),
+		Instruction::REVERT
+	};
+	AssemblyItems output{
+		u256(0),
+		Instruction::DUP1,
+		Instruction::REVERT
+	};
+	// The CSE has a rule to replace with DUP1 PUSH0
+	checkCSE(input, output);
+
+	// The full handling by the compiler (Assembly::optimiseInternal)
+	// will not choose to replace the pattern, because the new size is the same as the old one
+	output = input;
+	checkFullCSE(input, output);
+}
+
 BOOST_AUTO_TEST_CASE(inliner)
 {
 	AssemblyItem jumpInto{Instruction::JUMP};
@@ -1873,9 +1919,10 @@ BOOST_AUTO_TEST_CASE(inliner_revert)
 	);
 }
 
-BOOST_AUTO_TEST_CASE(inliner_revert_increased_datagas)
+BOOST_AUTO_TEST_CASE(inliner_revert_push0)
 {
-	// Inlining this would increase data gas (5 bytes v/s 4 bytes), therefore, skipped.
+	// Inlining this without PUSH0 would increase data gas (5 bytes v/s 4 bytes), therefore, it would be skipped.
+	// However, with PUSH0 it is inlined (3 bytes vs 4 bytes).
 	AssemblyItems items{
 		AssemblyItem(PushTag, 1),
 		Instruction::JUMP,
@@ -1884,8 +1931,16 @@ BOOST_AUTO_TEST_CASE(inliner_revert_increased_datagas)
 		u256(0),
 		Instruction::REVERT
 	};
+	AssemblyItems expectation{
+		u256(0),
+		u256(0),
+		Instruction::REVERT,
+		AssemblyItem(Tag, 1),
+		u256(0),
+		u256(0),
+		Instruction::REVERT
+	};
 
-	AssemblyItems expectation = items;
 	Inliner{items, {}, Assembly::OptimiserSettings{}.expectedExecutionsPerDeployment, false, {}}.optimise();
 	BOOST_CHECK_EQUAL_COLLECTIONS(
 		items.begin(), items.end(),
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index cdb6c5bd2d..4cb0b3c930 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -29,6 +29,7 @@
 #include <libsolutil/JSON.h>
 #include <libsolutil/CommonData.h>
 #include <test/Metadata.h>
+#include <test/Common.h>
 
 #include <algorithm>
 #include <set>
@@ -383,22 +384,20 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 	BOOST_CHECK(contract["evm"]["bytecode"]["object"].is_string());
 	BOOST_CHECK_EQUAL(
 		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].get<std::string>()),
-		std::string("6080604052348015600e575f80fd5b5060") +
+		std::string("6080604052348015600e575f5ffd5b5060") +
 		(VersionIsRelease ? "3e" : util::toHex(bytes{uint8_t(60 + VersionStringStrict.size())})) +
-		"80601a5f395ff3fe60806040525f80fdfe"
+		"80601a5f395ff3fe60806040525f5ffdfe"
 	);
 	BOOST_CHECK(contract["evm"]["assembly"].is_string());
 	BOOST_CHECK(contract["evm"]["assembly"].get<std::string>().find(
 		"    /* \"fileA\":0:14  contract A { } */\n  mstore(0x40, 0x80)\n  "
 		"callvalue\n  dup1\n  "
 		"iszero\n  tag_1\n  jumpi\n  "
-		"0x00\n  "
-		"dup1\n  revert\n"
+		"revert(0x00, 0x00)\n"
 		"tag_1:\n  pop\n  dataSize(sub_0)\n  dup1\n  "
 		"dataOffset(sub_0)\n  0x00\n  codecopy\n  0x00\n  return\nstop\n\nsub_0: assembly {\n        "
 		"/* \"fileA\":0:14  contract A { } */\n      mstore(0x40, 0x80)\n      "
-		"0x00\n      "
-		"dup1\n      revert\n\n    auxdata: 0xa26469706673582212"
+		"revert(0x00, 0x00)\n\n    auxdata: 0xa26469706673582212"
 	) == 0);
 	BOOST_CHECK(contract["evm"]["gasEstimates"].is_object());
 	BOOST_CHECK_EQUAL(contract["evm"]["gasEstimates"].size(), 1);
@@ -427,7 +426,7 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 		"{\"begin\":0,\"end\":14,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},"
 		"{\"begin\":0,\"end\":14,\"name\":\"JUMPI\",\"source\":0},"
 		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
-		"{\"begin\":0,\"end\":14,\"name\":\"DUP1\",\"source\":0},"
+		"{\"begin\":0,\"end\":14,\"name\":\"PUSH\",\"source\":0,\"value\":\"0\"},"
 		"{\"begin\":0,\"end\":14,\"name\":\"REVERT\",\"source\":0},"
 		"{\"begin\":0,\"end\":14,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
 		"{\"begin\":0,\"end\":14,\"name\":\"JUMPDEST\",\"source\":0},"

From 6e7d94e886a14e195bc703293e72e2dffe00819b Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sat, 30 Mar 2024 15:32:16 -0300
Subject: [PATCH 0975/1140] Add new Peephole Optimiser method
 (deduplicateNextTag)

---
 Changelog.md                      |  3 +
 libevmasm/PeepholeOptimiser.cpp   | 99 ++++++++++++++++++++++++++++++-
 libevmasm/SemanticInformation.cpp |  7 +++
 libevmasm/SemanticInformation.h   |  1 +
 test/libevmasm/Optimiser.cpp      | 75 +++++++++++++++++++++++
 5 files changed, 182 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8acee7422b..632ec787e9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,8 +9,11 @@ Language Features:
 Compiler Features:
  * Command Line Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Commandline Interface: Add ``--transient-storage-layout`` output.
+ * Constant Optimizer: Uses ``PUSH0`` if supported by the selected evm version.
  * Error Reporting: Unimplemented features are now properly reported as errors instead of being handled as if they were bugs.
  * EVM: Support for the EVM version "Prague".
+ * Peephole Optimizer: ``PUSH0``, when supported, is duplicated explicitly instead of using ``DUP1``.
+ * Peephole optimizer: Remove identical code snippets that terminate the control flow if they occur one after another.
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index df33e04e51..40937e73f1 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -198,7 +198,7 @@ struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 	}
 };
 
-struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
+struct DoublePush
 {
 	static bool apply(OptimiserState& _state)
 	{
@@ -498,6 +498,99 @@ struct UnreachableCode
 	}
 };
 
+struct DeduplicateNextTagSize3 : SimplePeepholeOptimizerMethod<DeduplicateNextTagSize3>
+{
+	static bool applySimple(
+		AssemblyItem const& _precedingItem,
+		AssemblyItem const& _itemA,
+		AssemblyItem const& _itemB,
+		AssemblyItem const& _breakingItem,
+		AssemblyItem const& _tag,
+		AssemblyItem const& _itemC,
+		AssemblyItem const& _itemD,
+		AssemblyItem const& _breakingItem2,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			_precedingItem.type() != Tag &&
+			_itemA == _itemC &&
+			_itemB == _itemD &&
+			_breakingItem == _breakingItem2 &&
+			_tag.type() == Tag &&
+			SemanticInformation::terminatesControlFlow(_breakingItem)
+		)
+		{
+			*_out = _precedingItem;
+			*_out = _tag;
+			*_out = _itemC;
+			*_out = _itemD;
+			*_out = _breakingItem2;
+			return true;
+		}
+
+		return false;
+	}
+};
+
+struct DeduplicateNextTagSize2 : SimplePeepholeOptimizerMethod<DeduplicateNextTagSize2>
+{
+	static bool applySimple(
+		AssemblyItem const& _precedingItem,
+		AssemblyItem const& _itemA,
+		AssemblyItem const& _breakingItem,
+		AssemblyItem const& _tag,
+		AssemblyItem const& _itemC,
+		AssemblyItem const& _breakingItem2,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			_precedingItem.type() != Tag &&
+			_itemA == _itemC &&
+			_breakingItem == _breakingItem2 &&
+			_tag.type() == Tag &&
+			SemanticInformation::terminatesControlFlow(_breakingItem)
+		)
+		{
+			*_out = _precedingItem;
+			*_out = _tag;
+			*_out = _itemC;
+			*_out = _breakingItem2;
+			return true;
+		}
+
+		return false;
+	}
+};
+
+struct DeduplicateNextTagSize1 : SimplePeepholeOptimizerMethod<DeduplicateNextTagSize1>
+{
+	static bool applySimple(
+		AssemblyItem const& _precedingItem,
+		AssemblyItem const& _breakingItem,
+		AssemblyItem const& _tag,
+		AssemblyItem const& _breakingItem2,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			_precedingItem.type() != Tag &&
+			_breakingItem == _breakingItem2 &&
+			_tag.type() == Tag &&
+			SemanticInformation::terminatesControlFlow(_breakingItem)
+		)
+		{
+			*_out = _precedingItem;
+			*_out = _tag;
+			*_out = _breakingItem2;
+			return true;
+		}
+
+		return false;
+	}
+};
+
 void applyMethods(OptimiserState&)
 {
 	assertThrow(false, OptimizerException, "Peephole optimizer failed to apply identity.");
@@ -526,8 +619,8 @@ bool PeepholeOptimiser::optimise()
 		applyMethods(
 			state,
 			PushPop(), OpPop(), OpStop(), OpReturnRevert(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
-			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(),
-			TagConjunctions(), TruthyAnd(), Identity()
+			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(), DeduplicateNextTagSize3(),
+			DeduplicateNextTagSize2(), DeduplicateNextTagSize1(), TagConjunctions(), TruthyAnd(), Identity()
 		);
 	if (m_optimisedItems.size() < m_items.size() || (
 		m_optimisedItems.size() == m_items.size() && (
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 978fb7ce2a..87d41f6c13 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -299,6 +299,13 @@ bool SemanticInformation::altersControlFlow(AssemblyItem const& _item)
 	}
 }
 
+bool SemanticInformation::terminatesControlFlow(AssemblyItem const& _item)
+{
+	if (_item.type() != evmasm::Operation)
+		return false;
+	return terminatesControlFlow(_item.instruction());
+}
+
 bool SemanticInformation::terminatesControlFlow(Instruction _instruction)
 {
 	switch (_instruction)
diff --git a/libevmasm/SemanticInformation.h b/libevmasm/SemanticInformation.h
index c3491cda8b..b62832f238 100644
--- a/libevmasm/SemanticInformation.h
+++ b/libevmasm/SemanticInformation.h
@@ -84,6 +84,7 @@ struct SemanticInformation
 	static bool isSwapInstruction(AssemblyItem const& _item);
 	static bool isJumpInstruction(AssemblyItem const& _item);
 	static bool altersControlFlow(AssemblyItem const& _item);
+	static bool terminatesControlFlow(AssemblyItem const& _item);
 	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
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index afc3c09fa9..13fa58bf4b 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1008,6 +1008,81 @@ BOOST_AUTO_TEST_CASE(clear_unreachable_code)
 	);
 }
 
+BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize3)
+{
+	AssemblyItems items{
+		Instruction::JUMP,
+		u256(0),
+		u256(1),
+		Instruction::REVERT,
+		AssemblyItem(Tag, 2),
+		u256(0),
+		u256(1),
+		Instruction::REVERT
+	};
+
+	AssemblyItems expectation{
+		Instruction::JUMP,
+		AssemblyItem(Tag, 2),
+		u256(0),
+		u256(1),
+		Instruction::REVERT
+	};
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
+	BOOST_REQUIRE(peepOpt.optimise());
+	BOOST_CHECK_EQUAL_COLLECTIONS(
+		items.begin(), items.end(),
+		expectation.begin(), expectation.end()
+	);
+}
+
+BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize2)
+{
+	AssemblyItems items{
+		Instruction::JUMP,
+		u256(0),
+		Instruction::SELFDESTRUCT,
+		AssemblyItem(Tag, 2),
+		u256(0),
+		Instruction::SELFDESTRUCT
+	};
+
+	AssemblyItems expectation{
+		Instruction::JUMP,
+		AssemblyItem(Tag, 2),
+		u256(0),
+		Instruction::SELFDESTRUCT
+	};
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
+	BOOST_REQUIRE(peepOpt.optimise());
+	BOOST_CHECK_EQUAL_COLLECTIONS(
+		items.begin(), items.end(),
+		expectation.begin(), expectation.end()
+	);
+}
+
+BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize1)
+{
+	AssemblyItems items{
+		Instruction::JUMP,
+		Instruction::STOP,
+		AssemblyItem(Tag, 2),
+		Instruction::STOP
+	};
+
+	AssemblyItems expectation{
+		Instruction::JUMP,
+		AssemblyItem(Tag, 2),
+		Instruction::STOP
+	};
+	PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
+	BOOST_REQUIRE(peepOpt.optimise());
+	BOOST_CHECK_EQUAL_COLLECTIONS(
+		items.begin(), items.end(),
+		expectation.begin(), expectation.end()
+	);
+}
+
 BOOST_AUTO_TEST_CASE(peephole_double_push)
 {
 	AssemblyItems items{

From 7e67811a82d55bb280f5a21e9b623e4c3d99fbca Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sat, 30 Mar 2024 17:34:55 -0300
Subject: [PATCH 0976/1140] Update tests

---
 test/cmdlineTests/asm_json/output             | 30 +++++++++++--------
 .../asm_json_no_pretty_print/output           |  2 +-
 .../output                                    | 12 ++------
 .../output                                    | 12 ++------
 .../output                                    | 12 ++------
 test/cmdlineTests/dup_opt_peephole/output     |  8 ++---
 .../optimize_full_storage_write/output        | 12 ++------
 .../optimizer_BlockDeDuplicator/output        | 12 ++------
 .../cmdlineTests/optimizer_inliner_add/output | 12 ++------
 .../output                                    | 12 ++------
 .../output                                    | 12 ++------
 .../output                                    | 12 ++------
 .../cmdlineTests/optimizer_inliner_inc/output | 12 ++------
 .../optimizer_inliner_multireturn/output      | 12 ++------
 test/cmdlineTests/optimizer_user_yul/output   |  8 ++---
 .../output.json                               | 12 ++------
 .../output.json                               | 12 ++------
 .../output.json                               | 12 ++------
 .../output                                    |  5 ++--
 .../strict_asm_msize_without_optimizer/output |  4 +--
 .../viair_msize_without_optimizer/output      | 21 ++++---------
 .../abiEncoderV1/abi_decode_v2_storage.sol    |  2 +-
 .../abi_encode_calldata_slice.sol             |  8 ++---
 .../struct/struct_storage_ptr.sol             |  6 ++--
 .../abi_encode_calldata_slice.sol             |  8 ++---
 .../abiEncoderV2/abi_encode_v2.sol            |  2 +-
 ...ode_v2_in_modifier_used_in_v1_contract.sol |  2 +-
 .../calldata_overlapped_dynamic_arrays.sol    |  6 ++--
 .../abiEncoderV2/storage_array_encoding.sol   |  6 ++--
 .../abi_decode_simple_storage.sol             |  6 ++--
 .../array/array_memory_index_access.sol       |  4 +--
 .../array/array_storage_index_access.sol      | 18 +++++------
 .../array_storage_index_boundary_test.sol     |  8 ++---
 .../array/array_storage_index_zeroed_test.sol | 16 +++++-----
 .../array/array_storage_push_empty.sol        |  4 +--
 .../array/array_storage_push_pop.sol          |  4 +--
 .../arrays_complex_from_and_to_storage.sol    |  2 +-
 .../array/byte_array_storage_layout.sol       |  4 +--
 .../array/byte_array_transitional_2.sol       |  4 +--
 .../array/bytes_length_member.sol             |  4 +--
 .../copying/array_copy_calldata_storage.sol   |  4 +--
 .../copying/array_copy_cleanup_uint40.sol     |  4 +--
 .../copying/array_copy_clear_storage.sol      |  4 +--
 .../copying/array_copy_different_packing.sol  |  6 ++--
 .../copying/array_copy_including_array.sol    | 10 +++----
 .../array/copying/array_copy_nested_array.sol |  6 ++--
 ...ay_copy_storage_storage_different_base.sol |  2 +-
 ..._storage_storage_different_base_nested.sol |  4 +--
 .../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     |  4 +--
 .../array_copy_storage_to_memory_nested.sol   |  2 +-
 .../copying/array_copy_target_leftover.sol    |  6 ++--
 .../copying/array_copy_target_simple.sol      |  4 +--
 .../copying/array_copy_target_simple_2.sol    |  4 +--
 .../copying/array_elements_to_mapping.sol     |  6 ++--
 .../array_nested_calldata_to_storage.sol      |  4 +--
 .../array_nested_memory_to_storage.sol        |  6 ++--
 ...ts_containing_arrays_memory_to_storage.sol |  2 +-
 .../array_storage_multi_items_per_slot.sol    |  2 +-
 .../array/copying/array_to_mapping.sol        |  6 ++--
 .../array/copying/bytes_inside_mappings.sol   |  4 +--
 .../copying/bytes_storage_to_storage.sol      | 20 ++++++-------
 .../calldata_array_dynamic_to_storage.sol     |  6 ++--
 .../copy_byte_array_in_struct_to_storage.sol  |  6 ++--
 .../copying/copy_byte_array_to_storage.sol    |  6 ++--
 .../copy_function_internal_storage_array.sol  |  2 +-
 .../array/copying/copy_removes_bytes_data.sol |  2 +-
 .../copying/copying_bytes_multiassign.sol     |  2 +-
 .../function_type_array_to_storage.sol        |  8 ++---
 .../memory_dyn_2d_bytes_to_storage.sol        |  2 +-
 ...ested_array_element_storage_to_storage.sol |  4 +--
 ...d_array_of_structs_calldata_to_storage.sol |  4 +--
 ...ted_array_of_structs_memory_to_storage.sol |  4 +--
 ...amic_array_element_calldata_to_storage.sol |  2 +-
 .../array/copying/storage_memory_nested.sol   |  4 +--
 .../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     |  4 +--
 .../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       |  4 +--
 .../array/fixed_array_cleanup.sol             |  2 +-
 .../array/fixed_arrays_in_constructors.sol    |  4 +--
 .../array/function_array_cross_calls.sol      |  4 +--
 ...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 |  4 +--
 ...ray_pop_long_storage_empty_garbage_ref.sol |  4 +--
 .../array/pop/byte_array_pop_masking_long.sol |  4 +--
 .../semanticTests/array/push/array_push.sol   |  2 +-
 .../push/array_push_nested_from_calldata.sol  |  6 ++--
 .../array/push/array_push_struct.sol          |  4 +--
 .../push/array_push_struct_from_calldata.sol  |  4 +--
 .../array/push/byte_array_push_transition.sol |  2 +-
 .../array/push/nested_bytes_push.sol          |  4 +--
 .../array/push/push_no_args_2d.sol            |  6 ++--
 .../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 |  2 +-
 .../constructor/arrays_in_constructors.sol    |  4 +--
 .../bytes_in_constructors_packer.sol          |  4 +--
 .../bytes_in_constructors_unpacker.sol        |  4 +--
 .../constructor_arguments_external.sol        |  4 +--
 .../constructor_function_complex.sol          |  2 +-
 .../constructor_static_array_argument.sol     |  4 +--
 .../constructor_inheritance_init_order_2.sol  |  2 +-
 .../semanticTests/constructor_with_params.sol |  2 +-
 ...ructor_with_params_diamond_inheritance.sol |  4 +--
 .../constructor_with_params_inheritance.sol   |  4 +--
 .../errors/small_error_optimization.sol       |  6 ++--
 .../events/event_dynamic_array_storage.sol    |  4 +--
 .../events/event_dynamic_array_storage_v2.sol |  4 +--
 .../event_dynamic_nested_array_storage_v2.sol |  4 +--
 .../events/event_emit_from_other_contract.sol |  4 +--
 .../events/event_indexed_string.sol           |  6 ++--
 .../externalContracts/base64.sol              |  8 ++---
 .../externalContracts/deposit_contract.sol    | 14 ++++-----
 .../externalContracts/prbmath_signed.sol      |  4 +--
 .../externalContracts/prbmath_unsigned.sol    |  4 +--
 .../externalContracts/ramanujan_pi.sol        |  6 ++--
 .../semanticTests/externalContracts/snark.sol | 12 ++++----
 .../externalContracts/strings.sol             |  8 ++---
 .../creation_function_call_with_args.sol      |  2 +-
 .../creation_function_call_with_salt.sol      |  2 +-
 .../external_call_to_nonexisting.sol          |  8 ++---
 ...ernal_call_to_nonexisting_debugstrings.sol |  8 ++---
 .../functionCall/failed_create.sol            |  4 +--
 .../functionCall/gas_and_value_basic.sol      |  4 +--
 .../gas_and_value_brace_syntax.sol            |  4 +--
 .../mapping_array_internal_argument.sol       |  4 +--
 .../functionTypes/store_function.sol          |  4 +--
 .../immutable/multi_creation.sol              |  4 +--
 .../semanticTests/immutable/use_scratch.sol   |  2 +-
 ...d_function_calldata_calldata_interface.sol |  2 +-
 ...ted_function_calldata_memory_interface.sol |  4 +--
 .../inheritance/member_notation_ctor.sol      |  4 +--
 .../inheritance/value_for_constructor.sol     |  6 ++--
 .../transient_storage_selfdestruct.sol        | 12 ++++----
 .../tstore_hidden_staticcall.sol              |  4 +--
 .../balance_other_contract.sol                |  2 +-
 .../libraries/internal_types_in_library.sol   |  4 +--
 .../using_library_mappings_public.sol         |  4 +--
 .../using_library_mappings_return.sol         |  4 +--
 .../libraries/using_library_structs.sol       |  2 +-
 .../operator_making_pure_external_call.sol    |  6 ++--
 .../operator_making_view_external_call.sol    |  6 ++--
 .../salted_create/prediction_example.sol      |  2 +-
 .../salted_create_with_value.sol              |  4 +--
 .../semanticTests/smoke/constructor.sol       |  4 +--
 .../storage/empty_nonempty_empty.sol          |  2 +-
 .../storage/packed_storage_structs_bytes.sol  |  2 +-
 ...ta_struct_with_nested_array_to_storage.sol |  4 +--
 .../conversion/recursive_storage_memory.sol   |  4 +--
 .../structs/copy_from_mapping.sol             |  2 +-
 .../copy_struct_array_from_storage.sol        |  4 +--
 .../copy_substructures_from_mapping.sol       |  2 +-
 .../structs/copy_substructures_to_mapping.sol | 12 ++++----
 .../semanticTests/structs/copy_to_mapping.sol | 12 ++++----
 .../structs/memory_structs_nested_load.sol    |  2 +-
 ...truct_containing_bytes_copy_and_delete.sol | 12 ++++----
 .../semanticTests/structs/struct_copy.sol     |  6 ++--
 .../struct_delete_storage_with_array.sol      |  8 ++---
 .../struct_memory_to_storage_function_ptr.sol |  2 +-
 .../semanticTests/structs/structs.sol         |  2 +-
 .../mapping/copy_from_mapping_to_mapping.sol  |  2 +-
 .../userDefinedValueType/calldata.sol         | 10 +++----
 .../userDefinedValueType/erc20.sol            |  2 +-
 .../using/using_global_invisible.sol          |  2 +-
 .../semanticTests/various/address_code.sol    |  2 +-
 .../various/code_access_content.sol           |  4 +--
 .../various/code_access_create.sol            |  2 +-
 .../various/code_access_runtime.sol           |  2 +-
 .../semanticTests/various/code_length.sol     |  4 +--
 .../semanticTests/various/create_calldata.sol |  2 +-
 .../various/destructuring_assignment.sol      |  4 +--
 .../semanticTests/various/erc20.sol           |  2 +-
 .../various/external_types_in_calls.sol       |  2 +-
 .../various/selfdestruct_post_cancun.sol      |  4 +--
 ...uct_post_cancun_multiple_beneficiaries.sol |  6 ++--
 .../selfdestruct_post_cancun_redeploy.sol     | 10 +++----
 .../semanticTests/various/senders_balance.sol |  2 +-
 .../skip_dynamic_types_for_structs.sol        |  4 +--
 .../various/staticcall_for_view_and_pure.sol  |  8 ++---
 .../various/swap_in_storage_overwrite.sol     |  2 +-
 .../semanticTests/various/value_complex.sol   |  4 +--
 .../semanticTests/various/value_insane.sol    |  2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |  4 +--
 test/libyul/objectCompiler/datacopy.yul       |  6 ++--
 .../libyul/objectCompiler/dataoffset_self.yul |  6 ++--
 .../libyul/objectCompiler/sourceLocations.yul |  8 ++---
 198 files changed, 472 insertions(+), 566 deletions(-)

diff --git a/test/cmdlineTests/asm_json/output b/test/cmdlineTests/asm_json/output
index 38d9c9fdf5..820eda6ec4 100644
--- a/test/cmdlineTests/asm_json/output
+++ b/test/cmdlineTests/asm_json/output
@@ -64,8 +64,9 @@ EVM assembly:
     {
       "begin": 60,
       "end": 160,
-      "name": "DUP1",
-      "source": 0
+      "name": "PUSH",
+      "source": 0,
+      "value": "0"
     },
     {
       "begin": 60,
@@ -204,8 +205,9 @@ EVM assembly:
         {
           "begin": 60,
           "end": 160,
-          "name": "DUP1",
-          "source": 0
+          "name": "PUSH",
+          "source": 0,
+          "value": "0"
         },
         {
           "begin": 60,
@@ -345,8 +347,9 @@ EVM assembly:
         {
           "begin": 60,
           "end": 160,
-          "name": "DUP1",
-          "source": 0
+          "name": "PUSH",
+          "source": 0,
+          "value": "0"
         },
         {
           "begin": 60,
@@ -622,8 +625,9 @@ EVM assembly:
         {
           "begin": 135,
           "end": 151,
-          "name": "DUP1",
-          "source": 0
+          "name": "PUSH",
+          "source": 0,
+          "value": "0"
         },
         {
           "begin": 135,
@@ -680,8 +684,9 @@ EVM assembly:
         {
           "begin": 194,
           "end": 195,
-          "name": "DUP1",
-          "source": 1
+          "name": "PUSH",
+          "source": 1,
+          "value": "0"
         },
         {
           "begin": 187,
@@ -840,8 +845,9 @@ EVM assembly:
         {
           "begin": 526,
           "end": 527,
-          "name": "DUP1",
-          "source": 1
+          "name": "PUSH",
+          "source": 1,
+          "value": "0"
         },
         {
           "begin": 519,
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/output b/test/cmdlineTests/asm_json_no_pretty_print/output
index b713097bbc..8fce2f4827 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":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"]}
+{".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":"PUSH","source":0,"value":"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":"PUSH","source":0,"value":"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":"PUSH","source":0,"value":"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":"PUSH","source":0,"value":"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":"PUSH","source":1,"value":"0"},{"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":"PUSH","source":1,"value":"0"},{"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/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index a232fed8fc..4833a9f620 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
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "debug_info_in_yul_and_evm_asm_print_all/input.sol":77:99  function f() public {} */
     tag_3:
       stop
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 00a6b290f8..00b04a01ad 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
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "debug_info_in_yul_and_evm_asm_print_location_only/input.sol":77:99 */
     tag_3:
       stop
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 c8715df150..9527edf769 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
@@ -7,9 +7,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -28,9 +26,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -41,9 +37,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_3:
       stop
 
diff --git a/test/cmdlineTests/dup_opt_peephole/output b/test/cmdlineTests/dup_opt_peephole/output
index 2f75f2bdda..a9e0203ed1 100644
--- a/test/cmdlineTests/dup_opt_peephole/output
+++ b/test/cmdlineTests/dup_opt_peephole/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_3
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_3:
       pop
         /* "dup_opt_peephole/input.sol":134:135  0 */
diff --git a/test/cmdlineTests/optimize_full_storage_write/output b/test/cmdlineTests/optimize_full_storage_write/output
index 1a73220308..9ebec71f03 100644
--- a/test/cmdlineTests/optimize_full_storage_write/output
+++ b/test/cmdlineTests/optimize_full_storage_write/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimize_full_storage_write/input.sol":111:211  function f() public {... */
     tag_3:
       tag_4
diff --git a/test/cmdlineTests/optimizer_BlockDeDuplicator/output b/test/cmdlineTests/optimizer_BlockDeDuplicator/output
index ddf17bdae9..fb72e4bc1e 100644
--- a/test/cmdlineTests/optimizer_BlockDeDuplicator/output
+++ b/test/cmdlineTests/optimizer_BlockDeDuplicator/output
@@ -23,9 +23,7 @@ EVM assembly:
   iszero
   tag_5
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_5:
   pop
   jump(tag_6)
@@ -51,9 +49,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -74,9 +70,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_BlockDeDuplicator/input.sol":138:174  function f() public { true ? 1 : 3;} */
     tag_3:
       stop
diff --git a/test/cmdlineTests/optimizer_inliner_add/output b/test/cmdlineTests/optimizer_inliner_add/output
index 648d20fe8e..9ebc9977da 100644
--- a/test/cmdlineTests/optimizer_inliner_add/output
+++ b/test/cmdlineTests/optimizer_inliner_add/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_add/input.sol":182:303  function f() public pure {... */
     tag_3:
       tag_4
diff --git a/test/cmdlineTests/optimizer_inliner_call_from_constructor/output b/test/cmdlineTests/optimizer_inliner_call_from_constructor/output
index 86c09e27ed..f42f9de094 100644
--- a/test/cmdlineTests/optimizer_inliner_call_from_constructor/output
+++ b/test/cmdlineTests/optimizer_inliner_call_from_constructor/output
@@ -9,9 +9,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
     /* "optimizer_inliner_call_from_constructor/input.sol":257:258  6 */
@@ -38,9 +36,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -51,9 +47,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_call_from_constructor/input.sol":120:175  function a() public pure returns (uint) { return f(); } */
     tag_3:
         /* "optimizer_inliner_call_from_constructor/input.sol":257:258  6 */
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
index 2ddef4d768..b1c5c74d90 100644
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
+++ b/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -53,9 +49,7 @@ sub_0: assembly {
       tag_5
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_dynamic_reference/input.sol":160:215  function a() public pure returns (uint) { return f(); } */
     tag_3:
         /* "optimizer_inliner_dynamic_reference/input.sol":361:362  6 */
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
index edc93c0bec..24ecaede07 100644
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
+++ b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
@@ -9,9 +9,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
     /* "optimizer_inliner_dynamic_reference_constructor/input.sol":93:94  x */
@@ -57,9 +55,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -75,9 +71,7 @@ sub_0: assembly {
       tag_4
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_dynamic_reference_constructor/input.sol":154:209  function a() public pure returns (uint) { return f(); } */
     tag_3:
         /* "optimizer_inliner_dynamic_reference_constructor/input.sol":355:356  6 */
diff --git a/test/cmdlineTests/optimizer_inliner_inc/output b/test/cmdlineTests/optimizer_inliner_inc/output
index 04f5f745a2..3a3639e190 100644
--- a/test/cmdlineTests/optimizer_inliner_inc/output
+++ b/test/cmdlineTests/optimizer_inliner_inc/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_inc/input.sol":174:277  function f() public pure {... */
     tag_3:
       tag_4
diff --git a/test/cmdlineTests/optimizer_inliner_multireturn/output b/test/cmdlineTests/optimizer_inliner_multireturn/output
index ca7b0abdf3..46d74055a2 100644
--- a/test/cmdlineTests/optimizer_inliner_multireturn/output
+++ b/test/cmdlineTests/optimizer_inliner_multireturn/output
@@ -8,9 +8,7 @@ EVM assembly:
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* "optimizer_inliner_multireturn/input.sol":179:296  function f() public pure {... */
     tag_3:
       tag_4
diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output
index 689e82ddb4..c106c011b3 100644
--- a/test/cmdlineTests/optimizer_user_yul/output
+++ b/test/cmdlineTests/optimizer_user_yul/output
@@ -6,9 +6,9 @@ EVM assembly:
     /* "optimizer_user_yul/input.sol":101:106  int a */
   0x00
     /* "optimizer_user_yul/input.sol":181:190  let x,y,z */
-  dup1
   0x00
-  dup1
+  0x00
+  0x00
     /* "optimizer_user_yul/input.sol":205:206  1 */
   0x01
     /* "optimizer_user_yul/input.sol":202:203  0 */
@@ -78,9 +78,7 @@ stop
 sub_0: assembly {
         /* "optimizer_user_yul/input.sol":60:518  contract C... */
       mstore(0x40, 0x80)
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
 
     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 9489a75bf3..e004ab7424 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
@@ -10,9 +10,7 @@
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -32,9 +30,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -45,9 +41,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* \"C\":77:99  function f() public {} */
     tag_3:
       stop
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 f8f2958b03..5c7a936447 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
@@ -10,9 +10,7 @@
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -32,9 +30,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -45,9 +41,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
         /* \"C\":77:99 */
     tag_3:
       stop
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 2a5a2bc2ae..6f2f9243c6 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
@@ -9,9 +9,7 @@
   iszero
   tag_1
   jumpi
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_1:
   pop
   dataSize(sub_0)
@@ -30,9 +28,7 @@ sub_0: assembly {
       iszero
       tag_1
       jumpi
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_1:
       pop
       jumpi(tag_2, lt(calldatasize, 0x04))
@@ -43,9 +39,7 @@ sub_0: assembly {
       tag_3
       jumpi
     tag_2:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_3:
       stop
 
diff --git a/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
index dfa7656834..10a0231f52 100644
--- a/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
+++ b/test/cmdlineTests/strict_asm_asm_json_subobjects_with_debug/output
@@ -14,8 +14,9 @@ EVM assembly:
         {
             "begin": 41,
             "end": 137,
-            "name": "DUP1",
-            "source": 0
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
         },
         {
             "begin": 41,
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/output b/test/cmdlineTests/strict_asm_msize_without_optimizer/output
index fabd2e874a..ac19efbcbc 100644
--- a/test/cmdlineTests/strict_asm_msize_without_optimizer/output
+++ b/test/cmdlineTests/strict_asm_msize_without_optimizer/output
@@ -15,13 +15,13 @@ object "object" {
 
 
 Binary representation:
-600b565b5f8051905090565b5f8060136003565b5f525050
+600b565b5f5f51905090565b5f8060136003565b5f525050
 
 Text representation:
   jump(tag_2)
 tag_1:
   0x00
-  dup1
+  0x00
   mload
   swap1
   pop
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/output b/test/cmdlineTests/viair_msize_without_optimizer/output
index b54f8a3f56..f94c973bff 100644
--- a/test/cmdlineTests/viair_msize_without_optimizer/output
+++ b/test/cmdlineTests/viair_msize_without_optimizer/output
@@ -31,9 +31,7 @@ tag_1:
   swap1
   jump	// out
 tag_2:
-  0x00
-  dup1
-  revert
+  revert(0x00, 0x00)
 tag_3:
   jump	// out
 stop
@@ -84,13 +82,9 @@ sub_0: assembly {
       swap1
       jump	// out
     tag_3:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_4:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_5:
       0x00
       dup2
@@ -110,7 +104,7 @@ sub_0: assembly {
       jump	// out
     tag_6:
       0x00
-      dup1
+      0x00
       dup3
       add
       swap1
@@ -151,15 +145,12 @@ sub_0: assembly {
       dup3
       return
     tag_8:
-      0x00
-      dup1
-      revert
+      revert(0x00, 0x00)
     tag_9:
       jump(tag_35)
     tag_34:
       0x00
-      dup1
-      mload
+      mload(0x00)
       swap1
       pop
       swap1
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 8d74a34f48..5c3bcba971 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: 203173
+// gas irOptimized: 203167
 // gas legacy: 206263
 // gas legacyOptimized: 203172
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index a518a3750e..a6a4f8fd87 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,9 +60,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 314884
-// gas legacy: 305827
-// gas legacyOptimized: 253681
+// gas legacy: 305816
+// gas legacyOptimized: 253573
 // test_uint256() ->
 // gas irOptimized: 448346
-// gas legacy: 421315
-// gas legacyOptimized: 351650
+// gas legacy: 421304
+// gas legacyOptimized: 351544
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index c8eb954189..ed983c77b5 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: 166759
-// gas legacy: 169283
-// gas legacyOptimized: 167248
+// gas irOptimized: 166761
+// gas legacy: 169273
+// gas legacyOptimized: 167243
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index b80d14d6b0..0c59c33c4b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,9 +61,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 314884
-// gas legacy: 305827
-// gas legacyOptimized: 253681
+// gas legacy: 305816
+// gas legacyOptimized: 253573
 // test_uint256() ->
 // gas irOptimized: 448346
-// gas legacy: 421315
-// gas legacyOptimized: 351650
+// gas legacy: 421304
+// gas legacyOptimized: 351544
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index f07d4039d5..edfe075ddd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -51,5 +51,5 @@ contract C {
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
 // gas irOptimized: 111816
-// gas legacy: 113892
+// gas legacy: 113890
 // gas legacyOptimized: 111658
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 7a2395549b..8df4090c36 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,5 +39,5 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
-// gas legacy: 66251
+// gas legacy: 66250
 // gas legacy code: 36400
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 81c9c46c6e..aa1e494c21 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -33,8 +33,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: 111415
-// gas legacy: 112709
-// gas legacyOptimized: 111847
+// gas irOptimized: 111409
+// gas legacy: 112707
+// gas legacyOptimized: 111845
 // 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 7eb93d4019..9599af6c88 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,9 +18,9 @@ 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: 180086
-// gas legacy: 184235
-// gas legacyOptimized: 180857
+// gas irOptimized: 180080
+// gas legacy: 184233
+// gas legacyOptimized: 180856
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
 // gas irOptimized: 112031
 // gas legacy: 115091
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 93e20b475e..54ce693d5c 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: 135505
-// gas legacy: 137096
-// gas legacyOptimized: 135824
+// gas irOptimized: 135499
+// gas legacy: 137095
+// gas legacyOptimized: 135823
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index 49fc58c45d..d992014c4a 100644
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
@@ -27,8 +27,8 @@ contract C {
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
 // gas irOptimized: 108272
-// gas legacy: 181523
-// gas legacyOptimized: 117443
+// gas legacy: 181536
+// gas legacyOptimized: 117442
 // 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 2957e6d98d..325323c5cb 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
@@ -17,37 +17,37 @@ contract C {
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
 // gas irOptimized: 3017687
-// gas legacy: 3038654
+// gas legacy: 3038668
 // gas legacyOptimized: 2995964
 // test_indices(uint256): 5 ->
 // gas irOptimized: 579670
-// gas legacy: 573810
+// gas legacy: 573821
 // gas legacyOptimized: 571847
 // test_indices(uint256): 10 ->
 // gas irOptimized: 157953
-// gas legacy: 160108
+// gas legacy: 160122
 // gas legacyOptimized: 156996
 // test_indices(uint256): 15 ->
 // gas irOptimized: 172733
-// gas legacy: 175973
+// gas legacy: 175987
 // gas legacyOptimized: 171596
 // test_indices(uint256): 0xFF ->
 // gas irOptimized: 5673823
-// gas legacy: 5715748
+// gas legacy: 5715762
 // gas legacyOptimized: 5632556
 // test_indices(uint256): 1000 ->
 // gas irOptimized: 18173005
-// gas legacy: 18347810
+// gas legacy: 18347824
 // gas legacyOptimized: 18037248
 // test_indices(uint256): 129 ->
 // gas irOptimized: 4166279
-// gas legacy: 4140113
+// gas legacy: 4140124
 // gas legacyOptimized: 4108272
 // test_indices(uint256): 128 ->
 // gas irOptimized: 405522
-// gas legacy: 433498
+// gas legacy: 433512
 // gas legacyOptimized: 400909
 // test_indices(uint256): 1 ->
 // gas irOptimized: 583437
-// gas legacy: 576715
+// gas legacy: 576726
 // gas legacyOptimized: 575542
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 494c99782f..712a7cdebe 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
@@ -17,11 +17,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
 // gas irOptimized: 147246
-// gas legacy: 133633
-// gas legacyOptimized: 114354
+// gas legacy: 133632
+// gas legacyOptimized: 114353
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
 // gas irOptimized: 149422
-// gas legacy: 135949
-// gas legacyOptimized: 116533
+// gas legacy: 135948
+// gas legacyOptimized: 116532
 // 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 de260b3735..23feb0da11 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -53,17 +53,17 @@ contract C {
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
 // gas irOptimized: 133763
-// gas legacy: 131671
-// gas legacyOptimized: 129994
+// gas legacy: 131664
+// gas legacyOptimized: 129990
 // test_zeroed_indicies(uint256): 10 ->
 // gas irOptimized: 228556
-// gas legacy: 225237
-// gas legacyOptimized: 222359
+// gas legacy: 225215
+// gas legacyOptimized: 222351
 // test_zeroed_indicies(uint256): 15 ->
 // gas irOptimized: 327360
-// gas legacy: 322937
-// gas legacyOptimized: 318919
+// gas legacy: 322899
+// gas legacyOptimized: 318907
 // test_zeroed_indicies(uint256): 0xFF ->
 // gas irOptimized: 5180120
-// gas legacy: 5093941
-// gas legacyOptimized: 5020727
+// gas legacy: 5093135
+// gas legacyOptimized: 5020523
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
index b84cdd90a3..b6965f62b2 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
@@ -13,11 +13,11 @@ contract C {
 // ----
 // pushEmpty(uint256): 128
 // gas irOptimized: 410745
-// gas legacy: 400640
+// gas legacy: 400519
 // gas legacyOptimized: 388804
 // pushEmpty(uint256): 256
 // gas irOptimized: 698285
-// gas legacy: 685108
+// gas legacy: 684859
 // gas legacyOptimized: 671480
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
 // gas irOptimized: 100000000
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
index 78a74ab5d4..a4c7d34d7f 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
@@ -18,10 +18,10 @@ contract C {
 // gas legacyOptimized: 103508
 // set_get_length(uint256): 0xFF -> 0
 // gas irOptimized: 833586
-// gas legacy: 808020
+// gas legacy: 807764
 // gas legacyOptimized: 784467
 // set_get_length(uint256): 0xFFF -> 0
 // gas irOptimized: 13029438
-// gas legacy: 12612192
+// gas legacy: 12608096
 // 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 918185e9af..a9d08ec0c0 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: 185219
+// gas irOptimized: 185216
 // gas legacy: 211054
 // gas legacyOptimized: 206077
 // 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 942c7337aa..060cafe39a 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: 101601
-// gas legacyOptimized: 100477
+// gas legacy: 101607
+// gas legacyOptimized: 100479
 // 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 401f97a1c9..e83cc54580 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: 122719
-// gas legacy: 147098
+// gas irOptimized: 122717
+// gas legacy: 147108
 // gas legacyOptimized: 144200
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 105bbfba8d..5159538bc1 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: 110425
-// gas legacy: 110952
+// gas irOptimized: 110422
+// gas legacy: 110951
 // 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 96580c47db..ecfe565f12 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -21,6 +21,6 @@ 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: 647725
-// gas legacy: 694356
-// gas legacyOptimized: 693850
+// gas legacy: 694354
+// gas legacyOptimized: 693849
 // 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 9609215a7d..d65f4f37c1 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: 122592
-// gas legacy: 124660
+// gas irOptimized: 122541
+// gas legacy: 124643
 // 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 6c0ba7af69..e9f1448a27 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: 108246
-// gas legacy: 108218
+// gas irOptimized: 108229
+// gas legacy: 108216
 // 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 2176655fe3..ee564d01a2 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: 208459
-// gas legacy: 220707
-// gas legacyOptimized: 220098
+// gas irOptimized: 208415
+// gas legacy: 220711
+// gas legacyOptimized: 220097
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 20aee3a293..bb621fcc84 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: 4549703
-// gas legacy: 4475396
+// gas irOptimized: 4549676
+// gas legacy: 4475394
 // gas legacyOptimized: 4447665
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4478226
-// gas legacy: 4407188
-// gas legacyOptimized: 4381336
+// gas irOptimized: 4478184
+// gas legacy: 4407185
+// gas legacyOptimized: 4381337
 // 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 0420f953bb..2d325a804b 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: 689558
-// gas legacy: 686178
-// gas legacyOptimized: 685612
+// gas irOptimized: 689552
+// gas legacy: 686176
+// gas legacyOptimized: 685611
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 e292809b80..54639df55d 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,4 +19,4 @@ contract c {
 // test() -> 5, 4
 // gas irOptimized: 205667
 // gas legacy: 213863
-// gas legacyOptimized: 212902
+// gas legacyOptimized: 212901
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 44fede749c..ad745ff420 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
@@ -22,5 +22,5 @@ contract c {
 // ----
 // test() -> 3, 4
 // gas irOptimized: 169669
-// gas legacy: 175424
-// gas legacyOptimized: 172535
+// gas legacy: 175415
+// gas legacyOptimized: 172533
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 1f102ea14a..a38685404d 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: 111353
+// gas irOptimized: 111350
 // 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 03c1f4e875..83df3aef8f 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
@@ -19,4 +19,4 @@ contract c {
 // test() -> 5, 4
 // gas irOptimized: 253591
 // gas legacy: 250892
-// gas legacyOptimized: 250046
+// gas legacyOptimized: 250045
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 f4bf1b2d21..94e57c96da 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,5 +12,5 @@ contract c {
 // ----
 // test() -> 9, 4
 // gas irOptimized: 123180
-// gas legacy: 123567
+// gas legacy: 123566
 // 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 145a8060ed..d1f2cbdedc 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,5 +15,5 @@ contract c {
 // ----
 // test() -> 8, 0
 // gas irOptimized: 196251
-// gas legacy: 194843
+// gas legacy: 194842
 // 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 7fa5ee515f..e638f2dad1 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
@@ -18,6 +18,6 @@ contract c {
 // ----
 // test() -> 4, 5
 // gas irOptimized: 190628
-// gas legacy: 190852
-// gas legacyOptimized: 189658
+// gas legacy: 190828
+// gas legacyOptimized: 189657
 // 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 d88ac06746..120e728843 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
@@ -16,5 +16,5 @@ contract C {
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
 // gas irOptimized: 161793
-// gas legacy: 162203
+// gas legacy: 162200
 // gas legacyOptimized: 159953
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 ebfbdeab97..22105f6429 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: 100495
-// gas legacy: 158142
-// gas legacyOptimized: 141020
+// gas irOptimized: 100496
+// gas legacy: 158109
+// gas legacyOptimized: 141019
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 3097530665..27fb9f0c57 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: 273545
-// gas legacy: 282604
+// gas irOptimized: 273543
+// gas legacy: 282601
 // 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 b084874175..980e414d14 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: 232997
-// gas legacy: 235697
+// gas irOptimized: 232995
+// gas legacy: 235694
 // gas legacyOptimized: 235193
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 085f72ed96..becc3d4cde 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: 149880
-// gas legacy: 150745
-// gas legacyOptimized: 148700
+// gas irOptimized: 149868
+// gas legacy: 150737
+// gas legacyOptimized: 148690
 // 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 ac37f794e1..5d4e5b45e4 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: 181041
+// gas irOptimized: 181029
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // gas irOptimized: 157604
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134813
+// gas irOptimized: 134801
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
 // gas irOptimized: 111177
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 e2228f993f..b892ec991c 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: 226743
-// gas legacy: 227084
+// gas irOptimized: 226734
+// gas legacy: 227083
 // gas legacyOptimized: 226529
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 141325
+// gas irOptimized: 141319
 // gas legacy: 142238
 // gas legacyOptimized: 141365
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 8b6ad78ea7..355c268f25 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: 181932
+// gas irOptimized: 181928
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 82e65edf1d..3578f0a81e 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
@@ -13,5 +13,5 @@ contract C {
 // ----
 // f() -> 1, 2, 3
 // gas irOptimized: 131939
-// gas legacy: 134606
+// gas legacy: 134605
 // 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 75a68759b6..c5519e83aa 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: 147761
-// gas legacy: 148896
-// gas legacyOptimized: 146923
+// gas irOptimized: 147755
+// gas legacy: 148892
+// gas legacyOptimized: 146917
 // 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 e61b7dff7a..90012eed4c 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -6,11 +6,11 @@ contract c {
 // ----
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110550
-// gas legacy: 111312
+// gas legacy: 111310
 // gas legacyOptimized: 110741
 // set(uint256): 2, 2, 3, 4, 5 -> true
 // gas irOptimized: 177501
-// gas legacy: 178314
+// gas legacy: 178312
 // gas legacyOptimized: 177716
 // storageEmpty -> 0
 // copy(uint256,uint256): 1, 2 -> true
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 ea364d4378..fe758fe8fd 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: 103269
-// gas legacy: 112883
+// gas irOptimized: 103268
+// gas legacy: 112904
 // gas legacyOptimized: 112647
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 117928
-// gas legacy: 128943
+// gas irOptimized: 117825
+// gas legacy: 128964
 // gas legacyOptimized: 128854
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124200
-// gas legacy: 136071
+// gas irOptimized: 124091
+// gas legacy: 136092
 // gas legacyOptimized: 135469
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 127350
-// gas legacy: 148671
+// gas irOptimized: 127151
+// gas legacy: 148692
 // gas legacyOptimized: 148699
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 417312
-// gas legacy: 458976
+// gas irOptimized: 416918
+// gas legacy: 458997
 // gas legacyOptimized: 460664
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 1da1d0a40c..3df22c7251 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: 111096
-// gas legacy: 111551
-// gas legacyOptimized: 111323
+// gas irOptimized: 111084
+// gas legacy: 111548
+// gas legacyOptimized: 111321
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 7c0459ef13..787973c5f0 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: 179408
+// gas irOptimized: 179405
 // gas legacy: 180675
 // gas legacyOptimized: 179686
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106344
-// gas legacy: 109394
+// gas irOptimized: 106338
+// gas legacy: 109415
 // gas legacyOptimized: 106600
 // 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 1fd42ab346..fc274bf47b 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: 143867
-// gas legacy: 153395
-// gas legacyOptimized: 146689
+// gas irOptimized: 143857
+// gas legacy: 153404
+// gas legacyOptimized: 146676
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 a6a64942d2..7db82f891d 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: 122461
+// gas irOptimized: 122459
 // 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 48d02bdc77..46216e912c 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -8,7 +8,7 @@ contract c {
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
 // gas irOptimized: 177344
-// gas legacy: 177954
+// gas legacy: 177953
 // gas legacyOptimized: 177550
 // storageEmpty -> 0
 // reset() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 58b5dd0454..ce4344e871 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -18,7 +18,7 @@ contract sender {
 }
 // ----
 // (): 7 ->
-// gas irOptimized: 110831
+// gas irOptimized: 110822
 // gas legacy: 111388
 // gas legacyOptimized: 111065
 // val() -> 0
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 e3490e2db0..640046a11a 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: 116531
-// gas legacy: 118845
-// gas legacyOptimized: 116844
+// gas irOptimized: 116518
+// gas legacy: 118841
+// gas legacyOptimized: 116843
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103150
+// gas irOptimized: 103144
 // gas legacy: 102654
 // gas legacyOptimized: 101556
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 c549754790..8a4d870b22 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: 128296
-// gas legacy: 129050
+// gas legacy: 129077
 // gas legacyOptimized: 128210
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 ad00ee8c51..f3934fec0f 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
@@ -75,8 +75,8 @@ contract C {
 // gas legacyOptimized: 150906
 // test2() -> FAILURE
 // gas irOptimized: 150389
-// gas legacy: 150673
-// gas legacyOptimized: 150576
+// gas legacy: 150672
+// gas legacyOptimized: 150575
 // test3() ->
 // gas irOptimized: 124300
 // gas legacy: 125333
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 3b774f56e4..7621b2477e 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: 304794
+// gas irOptimized: 304788
 // 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: 116653
 // 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: 188000
+// gas irOptimized: 187994
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 35e7943b8b..8ec3f77691 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: 309078
+// gas irOptimized: 309072
 // 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: 118314
 // 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: 191051
+// gas irOptimized: 191045
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 a4222be0b4..57b3dc521f 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: 137897
 // test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164506
+// gas irOptimized: 164482
 // 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 ac92189e48..2a486d2563 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -18,5 +18,5 @@ contract C {
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 206440
-// gas legacy: 211765
-// gas legacyOptimized: 211181
+// gas legacy: 211758
+// gas legacyOptimized: 211179
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 b743a5825a..e5a6ae53b2 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: 202083
-// gas legacy: 204328
-// gas legacyOptimized: 202900
+// gas legacy: 204327
+// gas legacyOptimized: 202899
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 da7187a27e..5ec2cbcf43 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,4 +20,4 @@ contract C {
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 206440
 // gas legacy: 211770
-// gas legacyOptimized: 211186
+// gas legacyOptimized: 211191
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 d4a348ea40..b37aa96ea6 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -25,5 +25,5 @@ contract C {
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
 // gas irOptimized: 291212
-// gas legacy: 293407
+// gas legacy: 293398
 // 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 c5bd7d0b0c..a8a1b36e1b 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -14,5 +14,5 @@ contract C {
 // ----
 // f() -> 2, 3, 4
 // gas irOptimized: 114338
-// gas legacy: 122235
-// gas legacyOptimized: 118411
+// gas legacy: 122231
+// gas legacyOptimized: 118409
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index a95499fd8a..00f32a6e08 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -19,5 +19,5 @@ contract C {
 // ----
 // f() -> "A", 8, 4, "B"
 // gas irOptimized: 136664
-// gas legacy: 121382
+// gas legacy: 121380
 // 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 5deaa7d4e8..f776626ae8 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: 218452
-// gas legacy: 242256
+// gas irOptimized: 218449
+// gas legacy: 242263
 // gas legacyOptimized: 241182
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 380e302425..b2be566a9d 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -15,7 +15,7 @@ contract c {
 // storageEmpty -> 1
 // fill() ->
 // gas irOptimized: 519494
-// gas legacy: 518936
+// gas legacy: 518943
 // gas legacyOptimized: 515555
 // storageEmpty -> 0
 // halfClear() ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 62b611a878..f96473739f 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -42,8 +42,8 @@ contract c {
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
 // gas irOptimized: 112674
-// gas legacy: 108273
-// gas legacyOptimized: 100269
+// gas legacy: 108272
+// gas legacyOptimized: 100268
 // getLengths() -> 48, 49
 // setIDStatic(uint256): 11 ->
 // getID(uint256): 2 -> 11
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index cc009b7e9e..ebe2186fd6 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -11,7 +11,7 @@ contract c {
 // storageEmpty -> 1
 // fill() ->
 // gas irOptimized: 465013
-// gas legacy: 468818
+// gas legacy: 468825
 // gas legacyOptimized: 466238
 // storageEmpty -> 0
 // clear() ->
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 817d06c0f5..8e9780e337 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -11,9 +11,9 @@ contract Creator {
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 104102
 // gas irOptimized code: 22400
-// gas legacy: 115186
+// gas legacy: 115185
 // gas legacy code: 59000
-// gas legacyOptimized: 104909
+// gas legacyOptimized: 104908
 // gas legacyOptimized code: 23800
 // 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 e9517c0e38..f3dea83bfb 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -44,7 +44,7 @@ contract C {
 // test() -> 5, 6, 7
 // gas irOptimized: 86484
 // gas irOptimized code: 161200
-// gas legacy: 97576
+// gas legacy: 97551
 // gas legacy code: 342800
-// gas legacyOptimized: 87811
+// gas legacyOptimized: 87808
 // gas legacyOptimized code: 193000
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 5fd53c6d12..95df74b4d7 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: 121104
+// gas irOptimized: 121095
 // gas legacy: 121904
 // gas legacyOptimized: 121388
 // 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 be1916ef13..96fb11a2dc 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -24,6 +24,6 @@ contract c {
 // ----
 // test() -> 1, 2, 3
 // gas irOptimized: 1828226
-// gas legacy: 1822466
+// gas legacy: 1822464
 // 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 73870d4285..0c68ab70c6 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -19,6 +19,6 @@ contract c {
 // ----
 // test() -> 38, 28, 18
 // gas irOptimized: 148380
-// gas legacy: 151184
+// gas legacy: 151182
 // 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 e0fc165815..86165dde28 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -19,6 +19,6 @@ contract c {
 // ----
 // test() -> 20, 10
 // gas irOptimized: 125889
-// gas legacy: 127216
+// gas legacy: 127215
 // 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 c567c4509e..18afa649c8 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: 138848
-// gas legacy: 178397
+// gas irOptimized: 138795
+// gas legacy: 178396
 // 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 d9d2d9d2d9..cbb10a0a1b 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: 113679
-// gas legacy: 131245
+// gas irOptimized: 113631
+// gas legacy: 131256
 // 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 490de759b5..3ef3571f4b 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: 106778
-// gas legacy: 121245
+// gas irOptimized: 106762
+// gas legacy: 121252
 // gas legacyOptimized: 120370
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index 6198ba1635..b8eab87333 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -17,5 +17,5 @@ contract c {
 // ----
 // test() -> 5, 4, 3, 3
 // gas irOptimized: 111834
-// gas legacy: 111807
+// gas legacy: 111804
 // 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 4bcac0f138..77ae8c4e23 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: 112853
-// gas legacy: 113659
-// gas legacyOptimized: 113466
+// gas irOptimized: 112852
+// gas legacy: 113657
+// gas legacyOptimized: 113465
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index b6db507ea3..92f071e1fb 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -21,5 +21,5 @@ contract c {
 // ----
 // test() -> 2, 3, 4, 5
 // gas irOptimized: 135329
-// gas legacy: 147443
-// gas legacyOptimized: 146434
+// gas legacy: 147437
+// gas legacyOptimized: 146429
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 37de90cb69..254c14b061 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
@@ -17,5 +17,5 @@ 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: 137153
-// gas legacy: 142423
-// gas legacyOptimized: 137981
+// gas legacy: 142414
+// gas legacyOptimized: 137975
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 763cb9a040..ffc47eaa39 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -16,5 +16,5 @@ contract c {
 // ----
 // test() -> 0
 // gas irOptimized: 167569
-// gas legacy: 206219
+// gas legacy: 206218
 // gas legacyOptimized: 197297
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index aeaeb9ee72..5633199d48 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: 179534
-// gas legacy: 181014
-// gas legacyOptimized: 180398
+// gas legacy: 181013
+// gas legacyOptimized: 180397
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 00e4545163..3b35719dbb 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -28,14 +28,14 @@ contract C {
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
 // gas irOptimized: 112288
-// gas legacy: 107920
-// gas legacyOptimized: 101897
+// gas legacy: 107925
+// gas legacyOptimized: 101896
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
 // gas irOptimized: 118708
-// gas legacy: 109972
+// gas legacy: 109977
 // 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 b013a7ebbc..de737593c0 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -22,7 +22,7 @@ contract C {
 // l() -> 0
 // g(uint256): 70 ->
 // gas irOptimized: 181778
-// gas legacy: 175185
+// gas legacy: 175192
 // gas legacyOptimized: 175005
 // l() -> 70
 // a(uint256): 69 -> left(69)
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 621860c075..fd352dd61a 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,7 +26,7 @@ contract Main {
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
 // gas irOptimized: 99552
 // gas irOptimized code: 12400
-// gas legacy: 101554
+// gas legacy: 101551
 // gas legacy code: 23600
 // gas legacyOptimized: 99612
 // gas legacyOptimized code: 13400
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index dab01b5983..238f96b7e5 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -30,8 +30,8 @@ contract C {
 // constructor() ->
 // gas irOptimized: 82100
 // gas irOptimized code: 357600
-// gas legacy: 101472
-// gas legacy code: 604200
+// gas legacy: 101532
+// gas legacy code: 604800
 // gas legacyOptimized: 84956
 // gas legacyOptimized code: 391800
 // 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 09dcd03479..33ab184506 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,7 +9,7 @@ contract c {
 // EVMVersion: >=byzantium
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155125
+// gas irOptimized: 155122
 // gas legacy: 155473
 // gas legacyOptimized: 155295
 // checkIfDataIsEmpty() -> false
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 685b1a9389..8fe8d36f9b 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,7 +26,7 @@ contract Creator {
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 327784
 // gas irOptimized code: 94000
-// gas legacy: 336626
+// gas legacy: 336623
 // gas legacy code: 244800
-// gas legacyOptimized: 329518
+// gas legacyOptimized: 329515
 // gas legacyOptimized code: 117000
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 0310d58d7a..69896ebf15 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,7 +26,7 @@ contract Creator {
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 169292
 // gas irOptimized code: 99600
-// gas legacy: 172944
+// gas legacy: 172941
 // gas legacy code: 239800
-// gas legacyOptimized: 169818
+// gas legacyOptimized: 169815
 // gas legacyOptimized code: 118600
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 4194e14a69..036d6ca629 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -10,9 +10,9 @@ contract Test {
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 181465
 // gas irOptimized code: 78400
-// gas legacy: 195165
+// gas legacy: 195212
 // gas legacy code: 109400
-// gas legacyOptimized: 181609
+// gas legacyOptimized: 181608
 // gas legacyOptimized code: 71400
 // 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 8fa725dad5..7d068338b0 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,9 +19,9 @@ contract Main {
 // constructor(): "abc", true
 // gas irOptimized: 80174
 // gas irOptimized code: 24200
-// gas legacy: 85100
+// gas legacy: 85098
 // gas legacy code: 58200
-// gas legacyOptimized: 80133
+// gas legacyOptimized: 80132
 // gas legacyOptimized code: 22800
 // 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 33650aff6f..13abe72c5c 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -17,5 +17,5 @@ contract C {
 }
 // ----
 // f() -> 16
-// gas legacy: 78482
+// gas legacy: 78477
 // gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 327c41d9be..5947b25736 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -11,9 +11,9 @@ contract C {
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 148129
 // gas irOptimized code: 23000
-// gas legacy: 157978
+// gas legacy: 157977
 // gas legacy code: 60400
-// gas legacyOptimized: 149974
+// gas legacyOptimized: 149973
 // gas legacyOptimized code: 26200
 // a() -> 1
 // b(uint256): 0 -> 2
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index e19ad39cfa..d5cca6420e 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 {
 // constructor() ->
 // gas irOptimized: 99436
 // gas irOptimized code: 20200
-// gas legacy: 100974
+// gas legacy: 100973
 // gas legacy code: 32600
 // gas legacyOptimized: 99137
 // gas legacyOptimized code: 16200
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 1c5a170202..c888020292 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -11,7 +11,7 @@ contract C {
 // constructor(): 2, 0 ->
 // gas irOptimized: 81170
 // gas irOptimized code: 20200
-// gas legacy: 83614
+// gas legacy: 83613
 // gas legacy code: 32000
 // 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 29f401a773..decb6fc259 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,9 +23,9 @@ contract D is B, C {
 // constructor(): 2, 0 ->
 // gas irOptimized: 124350
 // gas irOptimized code: 27600
-// gas legacy: 128223
+// gas legacy: 128222
 // gas legacy code: 40400
-// gas legacyOptimized: 123921
+// gas legacyOptimized: 123920
 // gas legacyOptimized code: 20600
 // i() -> 2
 // j() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index b0373b74f1..097e2f8088 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -14,9 +14,9 @@ contract D is C {
 // constructor(): 2, 0 ->
 // gas irOptimized: 101581
 // gas irOptimized code: 20200
-// gas legacy: 105193
+// gas legacy: 105192
 // gas legacy code: 32000
-// gas legacyOptimized: 101504
+// gas legacyOptimized: 101503
 // gas legacyOptimized code: 17000
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/errors/small_error_optimization.sol b/test/libsolidity/semanticTests/errors/small_error_optimization.sol
index 0c9cd750aa..8128193b70 100644
--- a/test/libsolidity/semanticTests/errors/small_error_optimization.sol
+++ b/test/libsolidity/semanticTests/errors/small_error_optimization.sol
@@ -16,7 +16,7 @@ contract B {
 // f() -> FAILURE, hex"92bbf6e8"
 // gas irOptimized: 221918
 // gas irOptimized code: 42800
-// gas legacy: 233746
-// gas legacy code: 37400
-// gas legacyOptimized: 224864
+// gas legacy: 233752
+// gas legacy code: 38000
+// gas legacyOptimized: 224863
 // gas legacyOptimized code: 34200
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index 76acd4a0b2..bdd355f689 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -14,5 +14,5 @@ contract C {
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
 // gas irOptimized: 114231
-// gas legacy: 116314
-// gas legacyOptimized: 114408
+// gas legacy: 116313
+// 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 bdcda3a093..cecf31b42d 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -15,5 +15,5 @@ contract C {
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
 // gas irOptimized: 114231
-// gas legacy: 116314
-// gas legacyOptimized: 114408
+// gas legacy: 116313
+// 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 324f456f67..1ff58d65b5 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: 185148
-// gas legacy: 187495
-// gas legacyOptimized: 184550
+// gas legacy: 187493
+// gas legacyOptimized: 184548
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 6a01d00192..61e1bbdd6c 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,8 +17,8 @@ contract C {
 // constructor() ->
 // gas irOptimized: 113970
 // gas irOptimized code: 51400
-// gas legacy: 119776
-// gas legacy code: 125000
+// gas legacy: 119791
+// gas legacy code: 125200
 // gas legacyOptimized: 114187
 // gas legacyOptimized code: 57400
 // 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 0ad2affe37..2e4b110692 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: 332789
-// gas legacy: 365828
-// gas legacyOptimized: 362250
+// gas irOptimized: 332788
+// gas legacy: 366022
+// gas legacyOptimized: 362429
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index a986be149b..6e23da8557 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -35,8 +35,8 @@ contract test {
 // constructor()
 // gas irOptimized: 79076
 // gas irOptimized code: 322000
-// gas legacy: 102034
-// gas legacy code: 627400
+// gas legacy: 102214
+// gas legacy code: 629800
 // gas legacyOptimized: 87926
 // gas legacyOptimized code: 429800
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
@@ -55,9 +55,9 @@ contract test {
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
 // gas irOptimized: 1406025
-// gas legacy: 1554031
+// gas legacy: 1554038
 // gas legacyOptimized: 1132031
 // encode_no_asm_large()
 // gas irOptimized: 3512081
-// gas legacy: 4587075
+// gas legacy: 4600082
 // gas legacyOptimized: 2813075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 9bfa3a340e..c53e49f1f0 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,10 +176,10 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 809602
+// gas irOptimized: 809570
 // gas irOptimized code: 558000
-// gas legacy: 919945
-// gas legacy code: 1437600
+// gas legacy: 920228
+// gas legacy code: 1438800
 // gas legacyOptimized: 848699
 // gas legacyOptimized code: 878200
 // supportsInterface(bytes4): 0x0 -> 0
@@ -188,26 +188,26 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
 // gas irOptimized: 109178
-// gas legacy: 142735
+// gas legacy: 142741
 // gas legacyOptimized: 117558
 // 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: 109178
-// gas legacy: 142735
+// gas legacy: 142741
 // gas legacyOptimized: 117558
 // 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: 109174
-// gas legacy: 142744
+// gas legacy: 142750
 // gas legacyOptimized: 117570
 // 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: 109174
-// gas legacy: 142744
+// gas legacy: 142750
 // gas legacyOptimized: 117570
 // 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 4990d24e9a..cb345757f8 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,8 +50,8 @@ contract test {
 // constructor()
 // gas irOptimized: 177903
 // gas irOptimized code: 1674400
-// gas legacy: 209687
-// gas legacy code: 2204400
+// gas legacy: 209723
+// gas legacy code: 2205000
 // gas legacyOptimized: 178012
 // gas legacyOptimized code: 1669600
 // 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 5d95c7a75c..5902ba4905 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,8 +50,8 @@ contract test {
 // constructor()
 // gas irOptimized: 170626
 // gas irOptimized code: 1577400
-// gas legacy: 195146
-// gas legacy code: 1998400
+// gas legacy: 195206
+// gas legacy code: 1999000
 // gas legacyOptimized: 168857
 // gas legacyOptimized code: 1556200
 // 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 1aa72b897b..70a3004ac4 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,11 +35,11 @@ contract test {
 // constructor()
 // gas irOptimized: 77816
 // gas irOptimized code: 307600
-// gas legacy: 92086
-// gas legacy code: 523000
+// gas legacy: 92110
+// gas legacy code: 523600
 // gas legacyOptimized: 82667
 // gas legacyOptimized code: 369200
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
-// gas legacy: 100947
+// gas legacy: 100657
 // gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 97d15183a1..906279d179 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: 270424
-// gas legacy: 275206
-// gas legacyOptimized: 266925
+// gas irOptimized: 270409
+// gas legacy: 275219
+// gas legacyOptimized: 266862
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 785783
-// gas legacy: 801868
-// gas legacyOptimized: 770942
+// gas irOptimized: 785720
+// gas legacy: 801903
+// gas legacyOptimized: 770941
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 773d7156af..cb9616bbe4 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -51,8 +51,8 @@ contract test {
 // constructor()
 // gas irOptimized: 95303
 // gas irOptimized code: 520000
-// gas legacy: 126106
-// gas legacy code: 930200
+// gas legacy: 126346
+// gas legacy code: 932600
 // gas legacyOptimized: 102639
 // gas legacyOptimized code: 612400
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -73,5 +73,5 @@ contract test {
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
 // gas irOptimized: 1976778
-// gas legacy: 4233999
-// gas legacyOptimized: 2318670
+// gas legacy: 4234020
+// gas legacyOptimized: 2318668
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 f7c05c10c4..08e9f36f59 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 {
 // constructor(): 2 ->
 // gas irOptimized: 138930
 // gas irOptimized code: 53800
-// gas legacy: 145570
+// gas legacy: 145569
 // gas legacy code: 95600
 // gas legacyOptimized: 138297
 // gas legacyOptimized code: 54600
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 9742a1d2f3..320b105637 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -19,7 +19,7 @@ contract D {
 // constructor(): 2 ->
 // gas irOptimized: 139112
 // gas irOptimized code: 53800
-// gas legacy: 145936
+// gas legacy: 145935
 // gas legacy code: 95600
 // gas legacyOptimized: 138529
 // gas legacyOptimized code: 54600
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 87f7cbebb0..472921c1d2 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -24,10 +24,10 @@ contract C {
 // constructor(), 1 ether ->
 // gas irOptimized: 88853
 // gas irOptimized code: 164400
-// gas legacy: 102626
-// gas legacy code: 333200
-// gas legacyOptimized: 91599
-// gas legacyOptimized code: 197800
+// gas legacy: 102721
+// gas legacy code: 334400
+// gas legacyOptimized: 91499
+// gas legacyOptimized code: 196400
 // 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 9da010e9bc..d1b6e8e866 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,10 +27,10 @@ contract C {
 // constructor(), 1 ether ->
 // gas irOptimized: 98698
 // gas irOptimized code: 284200
-// gas legacy: 123163
-// gas legacy code: 681200
-// gas legacyOptimized: 107069
-// gas legacyOptimized code: 387800
+// gas legacy: 123258
+// gas legacy code: 682400
+// gas legacyOptimized: 106969
+// gas legacyOptimized code: 386400
 // 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 b6c077753a..657b4b5cff 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -29,8 +29,8 @@ contract C {
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
 // gas irOptimized: 252410
-// gas legacy: 477722
-// gas legacyOptimized: 299567
+// gas legacy: 476845
+// gas legacyOptimized: 299061
 // 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 bf6f2c4baf..e6187d06e2 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -40,8 +40,8 @@ contract test {
 // constructor(), 20 wei ->
 // gas irOptimized: 120218
 // gas irOptimized code: 132000
-// gas legacy: 130568
-// gas legacy code: 261000
+// gas legacy: 130583
+// gas legacy code: 261200
 // gas legacyOptimized: 121069
 // gas legacyOptimized code: 147000
 // 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 ebc78a437f..41079af039 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -39,8 +39,8 @@ contract test {
 // constructor(), 20 wei ->
 // gas irOptimized: 120218
 // gas irOptimized code: 132000
-// gas legacy: 130568
-// gas legacy code: 261000
+// gas legacy: 130583
+// gas legacy code: 261200
 // gas legacyOptimized: 121069
 // gas legacyOptimized code: 147000
 // 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 7a9bf6014b..7505e20cce 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -19,8 +19,8 @@ contract test {
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
 // gas irOptimized: 111237
-// gas legacy: 113748
-// gas legacyOptimized: 111772
+// gas legacy: 113742
+// gas legacyOptimized: 111768
 // 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/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index 5397d0b701..eeab740aa0 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -26,7 +26,7 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99064
-// gas legacy: 79495
+// gas legacy: 79492
 // gas legacy code: 69600
-// gas legacyOptimized: 77588
+// gas legacyOptimized: 77587
 // gas legacyOptimized code: 28600
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index e1eb0621a6..aa8a1ad8a8 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,9 +29,9 @@ contract C {
 // f() -> 3, 7, 5
 // gas irOptimized: 86796
 // gas irOptimized code: 37200
-// gas legacy: 87728
+// gas legacy: 87727
 // gas legacy code: 60800
-// gas legacyOptimized: 86771
+// gas legacyOptimized: 86770
 // gas legacyOptimized code: 37200
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 2ee05af918..432c3c2072 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -17,7 +17,7 @@ contract C {
 // constructor(): 3 ->
 // gas irOptimized: 81194
 // gas irOptimized code: 42400
-// gas legacy: 88245
+// gas legacy: 88244
 // gas legacy code: 109400
 // gas legacyOptimized: 81858
 // gas legacyOptimized code: 55800
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 0567c2ab14..f64a2e12a1 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -23,5 +23,5 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 80813
-// gas legacy: 55871
+// gas legacy: 55868
 // gas legacy code: 66600
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 5234c27adf..07beb2c537 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -23,7 +23,7 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 100282
-// gas legacy: 56840
+// gas legacy: 56839
 // gas legacy code: 123600
-// gas legacyOptimized: 55002
+// gas legacyOptimized: 55001
 // gas legacyOptimized code: 60600
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index e704a297bb..b9697c5ae1 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -19,8 +19,8 @@ contract A {
 }
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 77878
+// gas legacy: 77876
 // gas legacy code: 24200
 // g(int256): 10 -> 10
-// gas legacy: 77506
+// gas legacy: 77504
 // gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index fdd0bafaad..39b25c005f 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -41,9 +41,9 @@ contract Main {
 // constructor(), 22 wei ->
 // gas irOptimized: 143864
 // gas irOptimized code: 118000
-// gas legacy: 156586
-// gas legacy code: 236200
-// gas legacyOptimized: 143593
+// gas legacy: 156599
+// gas legacy code: 236400
+// gas legacyOptimized: 143592
 // gas legacyOptimized code: 118000
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
index a375207252..c2066ef8be 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
@@ -42,13 +42,13 @@ contract D {
 // constructor() ->
 // gas irOptimized: 127596
 // gas irOptimized code: 221000
-// gas legacy: 149357
-// gas legacy code: 499800
-// gas legacyOptimized: 125830
-// gas legacyOptimized code: 203200
+// gas legacy: 149480
+// gas legacy code: 501200
+// gas legacyOptimized: 125846
+// gas legacyOptimized code: 203400
 // destroy() ->
 // createAndDestroy() ->
-// gas legacy: 67044
+// gas legacy: 67048
 // gas legacy code: 92600
-// gas legacyOptimized: 65675
+// gas legacyOptimized: 65677
 // gas legacyOptimized code: 39400
diff --git a/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
index d64c7dfb5f..4e4f30a756 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
@@ -19,5 +19,5 @@ contract C {
 // ----
 // test() -> FAILURE
 // gas irOptimized: 98437877
-// gas legacy: 98437872
-// gas legacyOptimized: 98437873
+// gas legacy: 98437871
+// gas legacyOptimized: 98437872
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 8ec19fffa5..1240a82514 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 {
 // constructor(), 2000 wei ->
 // gas irOptimized: 114353
 // gas irOptimized code: 58800
-// gas legacy: 118618
+// gas legacy: 118617
 // gas legacy code: 111400
 // gas legacyOptimized: 114067
 // gas legacyOptimized code: 59800
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 8171184731..d59cedfdc8 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -23,5 +23,5 @@ contract Test {
 // library: Lib
 // f() -> 4, 0x11
 // gas irOptimized: 111419
-// gas legacy: 132935
-// gas legacyOptimized: 118023
+// gas legacy: 132930
+// gas legacyOptimized: 118020
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index bbdc920471..17406a907a 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -20,5 +20,5 @@ contract Test {
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
 // gas irOptimized: 119837
-// gas legacy: 124674
-// gas legacyOptimized: 119669
+// gas legacy: 124661
+// gas legacyOptimized: 119665
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index 98cdf4fd18..6e852fdce0 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -18,5 +18,5 @@ contract Test {
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
 // gas irOptimized: 119568
-// gas legacy: 125109
-// gas legacyOptimized: 120128
+// gas legacy: 125087
+// gas legacyOptimized: 120120
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index e709a5b5b9..c2ecf1036e 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -21,4 +21,4 @@ contract Test {
 // library: Lib
 // f() -> 7, 8
 // gas irOptimized: 101818
-// gas legacy: 101429
+// gas legacy: 101428
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 a621b4c12a..ec41099eec 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
@@ -53,13 +53,13 @@ contract C {
 // ----
 // testMul(int32,int32): 42, 10 -> 420
 // gas irOptimized: 102563
-// gas legacy: 56981
+// gas legacy: 56978
 // gas legacy code: 127000
-// gas legacyOptimized: 55163
+// gas legacyOptimized: 55161
 // gas legacyOptimized code: 68400
 // testInc(int32): 42 -> 43
 // gas irOptimized: 102386
-// gas legacy: 56239
+// gas legacy: 56238
 // gas legacy code: 127000
 // gas legacyOptimized: 54851
 // gas legacyOptimized code: 68400
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 84f6bf08e7..7e70eb091b 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
@@ -59,13 +59,13 @@ contract C {
 // ----
 // testMul(int32,int32): 42, 10 -> 420
 // gas irOptimized: 102563
-// gas legacy: 56981
+// gas legacy: 56978
 // gas legacy code: 127000
-// gas legacyOptimized: 55163
+// gas legacyOptimized: 55161
 // gas legacyOptimized code: 68400
 // testInc(int32): 42 -> 43
 // gas irOptimized: 102386
-// gas legacy: 56239
+// gas legacy: 56238
 // gas legacy code: 127000
 // gas legacyOptimized: 54851
 // gas legacyOptimized code: 68400
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index 7517472932..7d0e3c8b0d 100644
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -26,5 +26,5 @@ contract C {
 // compileViaYul: also
 // ----
 // createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 78574
+// gas legacy: 78573
 // gas legacy code: 23600
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 083c9a5e48..25d1935770 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -23,7 +23,7 @@ contract A {
 // f(), 10 ether -> 3007, 3008, 3009
 // gas irOptimized: 187022
 // gas irOptimized code: 67200
-// gas legacy: 190863
+// gas legacy: 190858
 // gas legacy code: 190200
-// gas legacyOptimized: 187258
+// gas legacyOptimized: 187256
 // gas legacyOptimized code: 92400
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 2783fe4a8c..d5c5280aef 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,9 +14,9 @@ contract C {
 // constructor(), 2 wei: 3 ->
 // gas irOptimized: 78996
 // gas irOptimized code: 25400
-// gas legacy: 83056
+// gas legacy: 83055
 // gas legacy code: 65200
-// gas legacyOptimized: 78899
+// gas legacyOptimized: 78898
 // gas legacyOptimized code: 27800
 // state() -> 3
 // balance() -> 2
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index 0c2f54b9e7..8a795373e0 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: 111852
+// gas irOptimized: 111849
 // gas legacy: 112734
 // gas legacyOptimized: 112084
 // 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 75edb1c9e0..7d19bc4716 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -43,5 +43,5 @@ contract C {
 // ----
 // test() -> true
 // gas irOptimized: 132633
-// gas legacy: 136009
+// gas legacy: 136010
 // 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 ebf546fe28..2767486131 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
@@ -17,5 +17,5 @@ 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: 202902
-// gas legacy: 207384
-// gas legacyOptimized: 203588
+// gas legacy: 207376
+// 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 4465b1a3ee..8ec31a5c10 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -24,5 +24,5 @@ contract CopyTest {
 // ----
 // run() -> 2, 23, 42
 // gas irOptimized: 192828
-// gas legacy: 185731
-// gas legacyOptimized: 184458
+// gas legacy: 185730
+// gas legacyOptimized: 184457
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index a072fb0576..037ff20679 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -37,7 +37,7 @@ contract C {
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121282
-// gas legacy: 122978
+// gas legacy: 122977
 // gas legacyOptimized: 121652
 // 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 29e7afca36..600eb35ab2 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -88,8 +88,8 @@ contract Test {
 // ----
 // test1() -> true
 // gas irOptimized: 152965
-// gas legacy: 153012
-// gas legacyOptimized: 152637
+// gas legacy: 153010
+// gas legacyOptimized: 152636
 // 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 61d2d68aad..7188e1befe 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -45,7 +45,7 @@ contract C {
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121454
-// gas legacy: 123117
+// gas legacy: 123114
 // gas legacyOptimized: 121659
 // 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 7d458ca293..54b659ba07 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -53,13 +53,13 @@ contract C {
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 122720
-// gas legacy: 130136
-// gas legacyOptimized: 128649
+// gas legacy: 130131
+// gas legacyOptimized: 128648
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121424
-// gas legacy: 123191
-// gas legacyOptimized: 121764
+// gas legacy: 123190
+// gas legacyOptimized: 121758
 // 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: 114852
-// gas legacy: 122425
-// gas legacyOptimized: 120700
+// gas legacy: 122423
+// gas legacyOptimized: 120698
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index 068dc3d8c6..d020998b47 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -46,17 +46,17 @@ contract C {
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121515
-// gas legacy: 123053
+// gas legacy: 123051
 // gas legacyOptimized: 121704
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121559
-// gas legacy: 123102
+// gas legacy: 123109
 // gas legacyOptimized: 121756
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 122740
-// gas legacy: 129997
-// gas legacyOptimized: 128645
+// gas legacy: 129996
+// gas legacyOptimized: 128644
 // 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: 114824
-// gas legacy: 118210
-// gas legacyOptimized: 115329
+// gas legacy: 118207
+// gas legacyOptimized: 115327
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 5ba9765415..6785f2108b 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -67,6 +67,6 @@ contract Test {
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
 // gas irOptimized: 110772
-// gas legacy: 112964
+// gas legacy: 112959
 // 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 955e082b72..e50265e517 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: 133560
-// gas legacy: 134628
-// gas legacyOptimized: 133858
+// gas irOptimized: 133557
+// gas legacy: 134624
+// gas legacyOptimized: 133856
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133560
-// gas legacy: 134628
-// gas legacyOptimized: 133858
+// gas irOptimized: 133557
+// gas legacy: 134624
+// gas legacyOptimized: 133856
 // 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 1fb9ef2168..e148f81cc8 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -36,13 +36,13 @@ contract c {
 // ----
 // set(uint256): 7 -> true
 // gas irOptimized: 109932
-// gas legacy: 110597
+// gas legacy: 110593
 // gas legacyOptimized: 110003
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
 // gas irOptimized: 118581
-// gas legacy: 119147
-// gas legacyOptimized: 118619
+// gas legacy: 119144
+// gas legacyOptimized: 118618
 // 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_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 28998df448..cea1105669 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: 113477
+// gas irOptimized: 113465
 // gas legacy: 113591
-// gas legacyOptimized: 113103
+// gas legacyOptimized: 113098
 // g() ->
-// gas irOptimized: 118843
+// gas irOptimized: 118828
 // gas legacy: 118764
-// gas legacyOptimized: 118172
+// gas legacyOptimized: 118168
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 bd9fcf3e23..0de21947a4 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,5 +29,5 @@ contract C {
 // ----
 // f() -> 42, 23, 34, 42, 42
 // gas irOptimized: 110682
-// gas legacy: 111993
+// gas legacy: 111990
 // gas legacyOptimized: 110546
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 1903870513..96503fa11e 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -31,6 +31,6 @@ contract test {
 // check() -> false
 // set() ->
 // gas irOptimized: 134073
-// gas legacy: 135246
+// gas legacy: 135243
 // 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 19c31f2880..26e8294e3a 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,5 +30,5 @@ contract C {
 // ----
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
 // gas irOptimized: 197102
-// gas legacy: 199891
+// gas legacy: 199887
 // gas legacyOptimized: 196845
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 1433386e5a..015d51c1f5 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,12 +49,12 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122212
-// gas legacy: 125322
-// gas legacyOptimized: 122694
+// gas irOptimized: 122201
+// gas legacy: 125333
+// gas legacyOptimized: 122693
 // test_g() -> true
-// gas irOptimized: 106428
-// gas legacy: 111120
+// gas irOptimized: 106408
+// gas legacy: 111133
 // gas legacyOptimized: 106925
 // 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 30aa590d6f..0e0759d62a 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,7 +115,7 @@ contract ERC20 {
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
 // gas irOptimized: 121322
 // gas irOptimized code: 234600
-// gas legacy: 163352
+// gas legacy: 163350
 // gas legacy code: 671400
 // gas legacyOptimized: 127464
 // gas legacyOptimized code: 285400
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index 818707f6fe..1971980131 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -40,5 +40,5 @@ contract D {
 // ----
 // library: "A":L
 // test() -> 3
-// gas legacy: 59681
+// gas legacy: 59680
 // gas legacy code: 61200
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 8b601ca8c1..549512eb3e 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -16,7 +16,7 @@ contract C {
 // constructor() ->
 // gas irOptimized: 70760
 // gas irOptimized code: 94600
-// gas legacy: 82380
+// gas legacy: 82428
 // gas legacy code: 153800
 // gas legacyOptimized: 69400
 // gas legacyOptimized code: 79200
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index dc4e49b2da..22ceff337f 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -38,8 +38,8 @@ contract C {
 }
 // ----
 // testRuntime() -> true
-// gas legacy: 76577
+// gas legacy: 76575
 // gas legacy code: 23600
 // testCreation() -> true
-// gas legacy: 77000
+// gas legacy: 76999
 // gas legacy code: 23600
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index d2b7f92f4e..f5f0b86444 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -23,5 +23,5 @@ contract C {
 }
 // ----
 // test() -> 7
-// gas legacy: 76649
+// gas legacy: 76647
 // gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index b62eb0b853..10d7c1852e 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -23,5 +23,5 @@ contract C {
 // EVMVersion: >=constantinople
 // ----
 // test() -> 42
-// gas legacy: 76035
+// gas legacy: 76034
 // gas legacy code: 24200
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index c30ac838fe..844a0f6570 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -59,6 +59,6 @@ contract C {
 }
 // ----
 // constructor()
-// gas legacy: 66936
-// gas legacy code: 57200
+// gas legacy: 66989
+// gas legacy code: 57800
 // f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index 3ca50db136..a5f61d2ddd 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -10,7 +10,7 @@ contract C {
 // constructor(): 42 ->
 // gas irOptimized: 68239
 // gas irOptimized code: 69000
-// gas legacy: 78029
+// gas legacy: 78076
 // gas legacy code: 90200
 // gas legacyOptimized: 68321
 // gas legacyOptimized code: 64600
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 82183a1121..a961870ee5 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,5 +34,5 @@ contract C {
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 242027
-// gas legacy: 243284
-// gas legacyOptimized: 242395
+// gas legacy: 243281
+// gas legacyOptimized: 242392
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 1a7718f683..1cc77270f6 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,7 +98,7 @@ contract ERC20 {
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
 // gas irOptimized: 121632
 // gas irOptimized code: 236800
-// gas legacy: 159959
+// gas legacy: 159957
 // gas legacy code: 647600
 // gas legacyOptimized: 126934
 // gas legacyOptimized code: 282000
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index aff302d26e..84e4d36d50 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: 80314
-// gas legacy code: 47200
+// gas legacy code: 47400
 // t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
index 263da7133f..4cb5c8c713 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
@@ -66,8 +66,8 @@ contract D {
 // constructor(), 1 ether ->
 // gas irOptimized: 67028
 // gas irOptimized code: 175400
-// gas legacy: 76163
-// gas legacy code: 297400
+// gas legacy: 76227
+// gas legacy code: 298200
 // gas legacyOptimized: 66516
 // gas legacyOptimized code: 168000
 // exists() -> false
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
index 690bff8d55..a582649196 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
@@ -37,8 +37,8 @@ contract D {
 // constructor(), 2 ether ->
 // gas irOptimized: 108104
 // gas irOptimized code: 119200
-// gas legacy: 120424
-// gas legacy code: 253600
+// gas legacy: 120439
+// gas legacy code: 253800
 // gas legacyOptimized: 109015
 // gas legacyOptimized code: 130800
 // balance: 0x1111111111111111111111111111111111111111 -> 0
@@ -48,7 +48,7 @@ contract D {
 // test_deploy_and_terminate_twice() ->
 // gas irOptimized: 121395
 // gas irOptimized code: 14000
-// gas legacy: 122384
+// gas legacy: 122386
 // gas legacy code: 43200
 // gas legacyOptimized: 121596
 // gas legacyOptimized code: 22800
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
index 1ae89a558e..dd550d31a0 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
@@ -84,8 +84,8 @@ contract D {
 // constructor(), 1 ether ->
 // gas irOptimized: 132974
 // gas irOptimized code: 293800
-// gas legacy: 151217
-// gas legacy code: 533400
+// gas legacy: 151236
+// gas legacy code: 533800
 // gas legacyOptimized: 131436
 // gas legacyOptimized code: 276600
 // exists() -> false
@@ -95,7 +95,7 @@ contract D {
 // gas irOptimized code: 20800
 // gas legacy: 97788
 // gas legacy code: 20800
-// gas legacyOptimized: 96044
+// gas legacyOptimized: 96043
 // gas legacyOptimized code: 20800
 // exists() -> false
 // deploy_create2() ->
@@ -107,5 +107,5 @@ contract D {
 // exists() -> true
 // deploy_create2() -> FAILURE
 // gas irOptimized: 96903654
-// gas legacy: 96903660
-// gas legacyOptimized: 96903641
+// gas legacy: 96903658
+// gas legacyOptimized: 96903639
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 5b4371149f..fff16befe6 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -18,7 +18,7 @@ contract D {
 // constructor(), 27 wei ->
 // gas irOptimized: 114057
 // gas irOptimized code: 53800
-// gas legacy: 117835
+// gas legacy: 117834
 // gas legacy code: 100600
 // gas legacyOptimized: 113676
 // gas legacyOptimized code: 53600
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 9d078cfd69..8430da4e8d 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -20,5 +20,5 @@ contract C {
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178195
-// gas legacy: 180657
-// gas legacyOptimized: 179146
+// gas legacy: 180653
+// gas legacyOptimized: 179144
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 2063fff7a5..2a9834aab7 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -40,14 +40,14 @@ contract D {
 // fview() -> FAILURE
 // gas irOptimized: 98425388
 // gas irOptimized code: 13200
-// gas legacy: 98413174
+// gas legacy: 98413173
 // gas legacy code: 25600
-// gas legacyOptimized: 98425380
+// gas legacyOptimized: 98425379
 // gas legacyOptimized code: 13200
 // fpure() -> FAILURE
 // gas irOptimized: 98425388
 // gas irOptimized code: 13200
-// gas legacy: 98413174
+// gas legacy: 98413173
 // gas legacy code: 25600
-// gas legacyOptimized: 98425380
+// gas legacyOptimized: 98425379
 // gas legacyOptimized code: 13200
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index bd5a59519c..3422c81211 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -27,7 +27,7 @@ contract c {
 // y() -> 0, 0
 // set() ->
 // gas irOptimized: 109684
-// gas legacy: 109728
+// gas legacy: 109727
 // gas legacyOptimized: 109680
 // x() -> 1, 2
 // y() -> 3, 4
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index dc92e38df5..4639d34c70 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -21,8 +21,8 @@ contract test {
 // constructor(), 20 wei ->
 // gas irOptimized: 114463
 // gas irOptimized code: 58800
-// gas legacy: 120076
-// gas legacy code: 132200
+// gas legacy: 120091
+// gas legacy code: 132400
 // gas legacyOptimized: 114536
 // gas legacyOptimized code: 65800
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index ad0e95701d..bc6a803de9 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -20,7 +20,7 @@ contract test {
 // constructor(), 20 wei ->
 // gas irOptimized: 114527
 // gas irOptimized code: 59600
-// gas legacy: 120200
+// gas legacy: 120199
 // gas legacy code: 133600
 // gas legacyOptimized: 114568
 // gas legacyOptimized code: 66200
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 fbaa7789ea..0db482c040 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: 113118
-// gas legacy: 112890
+// gas irOptimized: 113117
+// gas legacy: 112888
 // gas legacyOptimized: 112580
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
index cb9fbcb18b..719b109f1d 100644
--- a/test/libyul/objectCompiler/datacopy.yul
+++ b/test/libyul/objectCompiler/datacopy.yul
@@ -33,7 +33,7 @@ object "a" {
 //         /* "source":153:170   */
 //       0x00
 //         /* "source":150:151   */
-//       dup1
+//       0x00
 //         /* "source":143:171   */
 //       sstore
 //         /* "source":188:205   */
@@ -47,6 +47,6 @@ object "a" {
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
-// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
+// Bytecode: 6009600b5f3960095ff3fe5f5f55600d5f5200fe
+// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 PUSH0 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_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
index 7c38b9502a..ae123ba49a 100644
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ b/test/libyul/objectCompiler/dataoffset_self.yul
@@ -7,13 +7,13 @@ object "a" {
 //     /* "source":32:47   */
 //   0x00
 //     /* "source":29:30   */
-//   dup1
+//   0x00
 //     /* "source":22:48   */
 //   sstore
 //     /* "source":20:50   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 5f805500fe
-// Opcodes: PUSH0 DUP1 SSTORE STOP INVALID
+// Bytecode: 5f5f5500fe
+// Opcodes: PUSH0 PUSH0 SSTORE STOP INVALID
 // SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
index 883e85b040..d9f1d84fcb 100644
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ b/test/libyul/objectCompiler/sourceLocations.yul
@@ -41,15 +41,13 @@ object "a" {
 //
 // sub_0: assembly {
 //         /* "def.sol":70:72   */
-//       0x00
-//       dup1
-//       sstore
+//       sstore(0x00, 0x00)
 //         /* "abc.sol":2:5   */
 //       mstore(0x00, 0x0d)
 //       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
-// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
+// Bytecode: 6009600b5f3960095ff3fe5f5f55600d5f5200fe
+// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 PUSH0 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
 // SourceMappings: 0:2::-:0;;;;5:1;0:2;

From a500a63e7029299928211de433124ae69333b3f2 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 28 Jun 2024 16:48:11 -0300
Subject: [PATCH 0977/1140] workaround to skip failing hardhat tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6c3f33da0..3426db3293 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1438,6 +1438,14 @@ jobs:
             # TODO: temporarily set hardhat stack traces tests to use cancun hardfork
             # Remove this when hardhat switch to cancun by default: https://github.com/NomicFoundation/hardhat/issues/4851
             sed -i 's/hardfork: "shanghai",/hardfork: "cancun",/' test/internal/hardhat-network/stack-traces/execution.ts
+            # TODO: Remove these tests because they rely on specific stack sequence which has changed since
+            # Remove when hardhat properly fix a specific version for the tests: https://github.com/NomicFoundation/hardhat/issues/5443
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/modifiers/call-message/multiple-modifiers-require/
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/modifiers/create-message/multiple-modifiers-require/
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/between-statements/
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/no-other-statements/
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/statement-after/
+            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/statement-before/
             pnpm test
       - matrix_notify_failure_unless_pr
 

From 57ab4dce5a7031d83915f3c43cd331bba940c63e Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 5 Aug 2024 10:03:13 +0200
Subject: [PATCH 0978/1140] Parser: Fix spuriously emitted parser error for
 unary plus operations when used as binary operator in some cases

---
 Changelog.md                                         |  1 +
 libsolidity/parsing/Parser.cpp                       |  2 +-
 .../declaration_unary_plus_tuple_compound_assign.sol |  9 +++++++++
 .../591_access_to_internal_variable.sol              |  9 +++++++++
 test/libsolidity/syntaxTests/types/binary_add_op.sol | 12 ++++++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple_compound_assign.sol
 create mode 100644 test/libsolidity/syntaxTests/nameAndTypeResolution/591_access_to_internal_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/types/binary_add_op.sol

diff --git a/Changelog.md b/Changelog.md
index 8acee7422b..d6aaf35125 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Parser: Fix spuriously emitted parser error for unary plus operations when used as binary operator in some cases.
  * SMTChecker: Fix error that reports invalid number of verified checks for BMC and CHC engines.
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index b51eb9c440..a6a4d735ad 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -2152,7 +2152,7 @@ ASTPointer<Expression> Parser::parseUnaryExpression(
 		ASTNodeFactory(*this, _partiallyParsedExpression) : ASTNodeFactory(*this);
 	Token token = m_scanner->currentToken();
 
-	if (token == Token::Add)
+	if (!_partiallyParsedExpression && token == Token::Add)
 		fatalParserError(9636_error, "Use of unary + is disallowed.");
 
 	if (!_partiallyParsedExpression && (TokenTraits::isUnaryOp(token) || TokenTraits::isCountOp(token)))
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple_compound_assign.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple_compound_assign.sol
new file mode 100644
index 0000000000..24c795f140
--- /dev/null
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple_compound_assign.sol
@@ -0,0 +1,9 @@
+contract C
+{
+    function f(int x) public
+    {
+        (x /= 1) + +(1,1);
+    }
+}
+// ----
+// ParserError 9636: (67-68): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/591_access_to_internal_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/591_access_to_internal_variable.sol
new file mode 100644
index 0000000000..f8fba4f7de
--- /dev/null
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/591_access_to_internal_variable.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f(int32 x) external pure returns (int32)
+    {
+        this.x + 1;
+        return x;
+    }
+}
+// ----
+// TypeError 9582: (81-87): Member "x" not found or not visible after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/types/binary_add_op.sol b/test/libsolidity/syntaxTests/types/binary_add_op.sol
new file mode 100644
index 0000000000..1217ed2438
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/binary_add_op.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(int32 x) external pure returns (int32)
+    {
+        x = 1 + 1;
+        (x /= 1) + 1;
+        (x = ++x) + 1;
+        (0) + 1;
+        return x;
+    }
+}
+// ----
+// Warning 6133: (145-152): Statement has no effect.

From 40aec73c18b4dc7ed684fac1e574c0de6ff2f142 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@ekpyron.org>
Date: Tue, 6 Aug 2024 16:26:47 +0200
Subject: [PATCH 0979/1140] Update libyul/Object.cpp

---
 libyul/Object.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index afd237b5b7..c4e7971ab4 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -170,11 +170,8 @@ bool Object::hasCode() const { return code() != nullptr; }
 
 void Object::setCode(std::shared_ptr<AST const> const& _ast, std::shared_ptr<yul::AsmAnalysisInfo> _analysisInfo)
 {
-	if (_ast.get() != m_code.get())
-	{
-		m_code = _ast;
-		analysisInfo = std::move(_analysisInfo);
-	}
+	m_code = _ast;
+	analysisInfo = std::move(_analysisInfo);
 }
 
 void Object::collectSourceIndices(std::map<std::string, unsigned>& _indices) const

From 961c99db087108d406206d50f405b9b4f33d940d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 31 Jul 2024 19:21:14 +0200
Subject: [PATCH 0980/1140] Tests for warnings sensitive to optimization

---
 test/cmdlineTests/strict_asm_warning/args             |  1 +
 test/cmdlineTests/strict_asm_warning/err              | 11 +++++++++++
 test/cmdlineTests/strict_asm_warning/input.yul        |  5 +++++
 test/cmdlineTests/strict_asm_warning/output           |  7 +++++++
 .../strict_asm_warning_and_error_optimize/args        |  1 +
 .../strict_asm_warning_and_error_optimize/err         | 11 +++++++++++
 .../strict_asm_warning_and_error_optimize/exit        |  1 +
 .../strict_asm_warning_and_error_optimize/input.yul   |  5 +++++
 test/cmdlineTests/strict_asm_warning_optimize/args    |  1 +
 test/cmdlineTests/strict_asm_warning_optimize/err     | 11 +++++++++++
 .../strict_asm_warning_optimize/input.yul             |  5 +++++
 test/cmdlineTests/strict_asm_warning_optimize/output  |  7 +++++++
 .../strict_asm_warning_optimize_unreachable/args      |  1 +
 .../strict_asm_warning_optimize_unreachable/err       |  5 +++++
 .../strict_asm_warning_optimize_unreachable/input.yul |  8 ++++++++
 .../strict_asm_warning_optimize_unreachable/output    |  7 +++++++
 16 files changed, 87 insertions(+)
 create mode 100644 test/cmdlineTests/strict_asm_warning/args
 create mode 100644 test/cmdlineTests/strict_asm_warning/err
 create mode 100644 test/cmdlineTests/strict_asm_warning/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_warning/output
 create mode 100644 test/cmdlineTests/strict_asm_warning_and_error_optimize/args
 create mode 100644 test/cmdlineTests/strict_asm_warning_and_error_optimize/err
 create mode 100644 test/cmdlineTests/strict_asm_warning_and_error_optimize/exit
 create mode 100644 test/cmdlineTests/strict_asm_warning_and_error_optimize/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize/args
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize/err
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize/output
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize_unreachable/args
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize_unreachable/err
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize_unreachable/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_warning_optimize_unreachable/output

diff --git a/test/cmdlineTests/strict_asm_warning/args b/test/cmdlineTests/strict_asm_warning/args
new file mode 100644
index 0000000000..57996b90ac
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning/args
@@ -0,0 +1 @@
+--strict-assembly --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_warning/err b/test/cmdlineTests/strict_asm_warning/err
new file mode 100644
index 0000000000..1024e870f9
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning/err
@@ -0,0 +1,11 @@
+Warning: "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.
+ --> strict_asm_warning/input.yul:4:5:
+  |
+4 |     selfdestruct(0)
+  |     ^^^^^^^^^^^^
+
+Warning: "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.
+ --> strict_asm_warning/input.yul:4:5:
+  |
+4 |     selfdestruct(0)
+  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/strict_asm_warning/input.yul b/test/cmdlineTests/strict_asm_warning/input.yul
new file mode 100644
index 0000000000..cfe85c7846
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning/input.yul
@@ -0,0 +1,5 @@
+{
+    // The code is valid and will proceed through the whole pipeline, possibly being reparsed multiple times.
+    // This should produce exactly one warning.
+    selfdestruct(0)
+}
diff --git a/test/cmdlineTests/strict_asm_warning/output b/test/cmdlineTests/strict_asm_warning/output
new file mode 100644
index 0000000000..71cb2ce69a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning/output
@@ -0,0 +1,7 @@
+
+======= strict_asm_warning/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { selfdestruct(0) } }
+}
diff --git a/test/cmdlineTests/strict_asm_warning_and_error_optimize/args b/test/cmdlineTests/strict_asm_warning_and_error_optimize/args
new file mode 100644
index 0000000000..90b16d1f0e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_and_error_optimize/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_warning_and_error_optimize/err b/test/cmdlineTests/strict_asm_warning_and_error_optimize/err
new file mode 100644
index 0000000000..22366e3e7b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_and_error_optimize/err
@@ -0,0 +1,11 @@
+Warning: "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.
+ --> strict_asm_warning_and_error_optimize/input.yul:4:5:
+  |
+4 |     selfdestruct()
+  |     ^^^^^^^^^^^^
+
+Error: Function "selfdestruct" expects 1 arguments but got 0.
+ --> strict_asm_warning_and_error_optimize/input.yul:4:5:
+  |
+4 |     selfdestruct()
+  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/strict_asm_warning_and_error_optimize/exit b/test/cmdlineTests/strict_asm_warning_and_error_optimize/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_and_error_optimize/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/strict_asm_warning_and_error_optimize/input.yul b/test/cmdlineTests/strict_asm_warning_and_error_optimize/input.yul
new file mode 100644
index 0000000000..75800c7ff9
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_and_error_optimize/input.yul
@@ -0,0 +1,5 @@
+{
+    // The code does not compile so the optimizer will not run.
+    // This should generate exactly one warning and one error.
+    selfdestruct()
+}
diff --git a/test/cmdlineTests/strict_asm_warning_optimize/args b/test/cmdlineTests/strict_asm_warning_optimize/args
new file mode 100644
index 0000000000..90b16d1f0e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_warning_optimize/err b/test/cmdlineTests/strict_asm_warning_optimize/err
new file mode 100644
index 0000000000..2f3c9bb4a0
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize/err
@@ -0,0 +1,11 @@
+Warning: "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.
+ --> strict_asm_warning_optimize/input.yul:4:5:
+  |
+4 |     selfdestruct(0)
+  |     ^^^^^^^^^^^^
+
+Warning: "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.
+ --> strict_asm_warning_optimize/input.yul:4:5:
+  |
+4 |     selfdestruct(0)
+  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/strict_asm_warning_optimize/input.yul b/test/cmdlineTests/strict_asm_warning_optimize/input.yul
new file mode 100644
index 0000000000..cfe85c7846
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize/input.yul
@@ -0,0 +1,5 @@
+{
+    // The code is valid and will proceed through the whole pipeline, possibly being reparsed multiple times.
+    // This should produce exactly one warning.
+    selfdestruct(0)
+}
diff --git a/test/cmdlineTests/strict_asm_warning_optimize/output b/test/cmdlineTests/strict_asm_warning_optimize/output
new file mode 100644
index 0000000000..d933dcb055
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize/output
@@ -0,0 +1,7 @@
+
+======= strict_asm_warning_optimize/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { selfdestruct(0) } }
+}
diff --git a/test/cmdlineTests/strict_asm_warning_optimize_unreachable/args b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/args
new file mode 100644
index 0000000000..90b16d1f0e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_warning_optimize_unreachable/err b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/err
new file mode 100644
index 0000000000..4535680baa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/err
@@ -0,0 +1,5 @@
+Warning: "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.
+ --> strict_asm_warning_optimize_unreachable/input.yul:7:5:
+  |
+7 |     selfdestruct(0)
+  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/strict_asm_warning_optimize_unreachable/input.yul b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/input.yul
new file mode 100644
index 0000000000..c07ecd43ea
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/input.yul
@@ -0,0 +1,8 @@
+{
+    revert(0, 0)
+
+    // The code is valid and will proceed through the whole pipeline, possibly being reparsed multiple times.
+    // Note that the code is unreachable, so the warning would not appear in the optimized version.
+    // This should produce exactly one warning.
+    selfdestruct(0)
+}
diff --git a/test/cmdlineTests/strict_asm_warning_optimize_unreachable/output b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/output
new file mode 100644
index 0000000000..508e9d8ed4
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_warning_optimize_unreachable/output
@@ -0,0 +1,7 @@
+
+======= strict_asm_warning_optimize_unreachable/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { revert(0, 0) } }
+}

From ea262ed56c7317f4399262d03fd05f34148c7660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 31 Jul 2024 15:45:34 +0200
Subject: [PATCH 0981/1140] EVMObjectCompiler: Don't require a mutable object

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

diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index ca9f90dfae..ccd8af6d29 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -35,7 +35,7 @@
 using namespace solidity::yul;
 
 void EVMObjectCompiler::compile(
-	Object& _object,
+	Object const& _object,
 	AbstractAssembly& _assembly,
 	EVMDialect const& _dialect,
 	bool _optimize,
@@ -46,7 +46,7 @@ void EVMObjectCompiler::compile(
 	compiler.run(_object, _optimize);
 }
 
-void EVMObjectCompiler::run(Object& _object, bool _optimize)
+void EVMObjectCompiler::run(Object const& _object, bool _optimize)
 {
 	BuiltinContext context;
 	context.currentObject = &_object;
diff --git a/libyul/backends/evm/EVMObjectCompiler.h b/libyul/backends/evm/EVMObjectCompiler.h
index df8d71c2ce..d37ade2cd2 100644
--- a/libyul/backends/evm/EVMObjectCompiler.h
+++ b/libyul/backends/evm/EVMObjectCompiler.h
@@ -34,7 +34,7 @@ class EVMObjectCompiler
 {
 public:
 	static void compile(
-		Object& _object,
+		Object const& _object,
 		AbstractAssembly& _assembly,
 		EVMDialect const& _dialect,
 		bool _optimize,
@@ -45,7 +45,7 @@ class EVMObjectCompiler
 		m_assembly(_assembly), m_dialect(_dialect), m_eofVersion(_eofVersion)
 	{}
 
-	void run(Object& _object, bool _optimize);
+	void run(Object const& _object, bool _optimize);
 
 	AbstractAssembly& m_assembly;
 	EVMDialect const& m_dialect;

From fe4c52e3357ba92da81521c0ad200fa5294ada5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 31 Jul 2024 16:47:28 +0200
Subject: [PATCH 0982/1140] Move optimized IR reparsing from CompilerStack to
 YulStack

- This makes it apply to yul compilation as well.
- Also fixes warnings being reported again when optimizing IR.
---
 Changelog.md                                  |   3 +-
 libsolidity/interface/CompilerStack.cpp       |  47 ++-
 libyul/YulStack.cpp                           |  33 ++-
 libyul/YulStack.h                             |   7 +
 test/cmdlineTests/ast_ir/output               |  92 +++---
 .../linking_strict_assembly/output            |   8 +-
 .../output                                    |  16 +-
 .../output                                    |  16 +-
 .../output                                    |  16 +-
 test/cmdlineTests/object_compiler/output      |  32 +-
 .../output.json                               | 142 ++++-----
 test/cmdlineTests/standard_yul/output.json    |  10 +-
 .../standard_yul_object/output.json           |  10 +-
 .../standard_yul_object_name/output.json      |  14 +-
 .../standard_yul_optimiserSteps/output.json   |   8 +-
 .../standard_yul_optimized/output.json        |   8 +-
 .../standard_yul_stack_opt/output.json        |  14 +-
 .../output.json                               |  12 +-
 .../output                                    | 128 ++++----
 .../strict_asm_ast_compact_json/output        |  14 +-
 .../strict_asm_evm_version_byzantium/output   |   2 +-
 .../output                                    |   2 +-
 .../strict_asm_optimizer_steps/output         |  48 +--
 .../output                                    |   8 +-
 test/cmdlineTests/strict_asm_warning/err      |   6 -
 .../strict_asm_warning_optimize/err           |   6 -
 .../output                                    |  26 +-
 test/cmdlineTests/yul_optimize_runs/output    |  20 +-
 test/cmdlineTests/yul_verbatim_msize/output   |  15 +-
 test/libyul/objectCompiler/data.yul           |   4 +-
 test/libyul/objectCompiler/datacopy.yul       |  30 +-
 .../libyul/objectCompiler/dataoffset_code.yul |  18 +-
 .../libyul/objectCompiler/dataoffset_data.yul |  10 +-
 .../libyul/objectCompiler/dataoffset_self.yul |  10 +-
 test/libyul/objectCompiler/datasize_code.yul  |  18 +-
 test/libyul/objectCompiler/datasize_data.yul  |  10 +-
 test/libyul/objectCompiler/datasize_self.yul  |  10 +-
 ..._long_name_does_not_end_up_in_bytecode.yul |  10 +-
 .../leading_and_trailing_dots.yul             |  22 +-
 test/libyul/objectCompiler/linkersymbol.yul   |  24 +-
 .../objectCompiler/long_object_name.yul       |  12 +-
 test/libyul/objectCompiler/manySubObjects.yul | 276 +++++++++---------
 test/libyul/objectCompiler/metadata.yul       |  26 +-
 test/libyul/objectCompiler/namedObject.yul    |   4 +-
 .../libyul/objectCompiler/namedObjectCode.yul |  10 +-
 .../objectCompiler/nested_optimizer.yul       |  18 +-
 test/libyul/objectCompiler/simple.yul         |  10 +-
 .../objectCompiler/simple_optimizer.yul       |  10 +-
 test/libyul/objectCompiler/smoke.yul          |   4 +-
 test/libyul/objectCompiler/subObject.yul      |  12 +-
 .../libyul/objectCompiler/subObjectAccess.yul | 138 ++++-----
 test/libyul/objectCompiler/subSubObject.yul   |  20 +-
 test/libyul/objectCompiler/verbatim_bug.yul   |  82 +++---
 53 files changed, 783 insertions(+), 768 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5e8a7bef84..0395b624b5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,8 +28,9 @@ Bugfixes:
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
- * Yul AST: Fix ``nativeSrc`` attributes in optimized IR AST referring to locations in unoptimized IR.
  * Yul IR Code Generation: Deterministic order of Yul subobjects.
+ * Yul Optimizer: Fix Yul source locations always referring to unoptimized source, even in optimized outputs.
+ * Yul Optimizer: Fix warnings being generated twice when there are no errors.
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
  * Yul Parser: Fix segfault when parsing very long location comments.
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index dd5d20126e..0ea7131db1 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1488,39 +1488,26 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 		);
 	}
 
-	auto const parseYul = [&](std::string const& _irSource) {
-		YulStack stack(
-			m_evmVersion,
-			m_eofVersion,
-			YulStack::Language::StrictAssembly,
-			m_optimiserSettings,
-			m_debugInfoSelection
-		);
-		bool yulAnalysisSuccessful = stack.parseAndAnalyze("", _irSource);
-		solAssert(
-			yulAnalysisSuccessful,
-			_irSource + "\n\n"
-			"Invalid IR generated:\n" +
-			langutil::SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
-		);
-		return stack;
-	};
-
-	{
-		YulStack stack = parseYul(compiledContract.yulIR);
-		compiledContract.yulIRAst = stack.astJson();
-		if (!_unoptimizedOnly)
-		{
-			stack.optimize();
-			compiledContract.yulIROptimized = stack.print(this);
-		}
-	}
+	YulStack stack(
+		m_evmVersion,
+		m_eofVersion,
+		YulStack::Language::StrictAssembly,
+		m_optimiserSettings,
+		m_debugInfoSelection
+	);
+	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
+	solAssert(
+		yulAnalysisSuccessful,
+		compiledContract.yulIR + "\n\n"
+		"Invalid IR generated:\n" +
+		SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
+	);
 
+	compiledContract.yulIRAst = stack.astJson();
 	if (!_unoptimizedOnly)
 	{
-		// Optimizer does not maintain correct native source locations in the AST.
-		// We can work around it by regenerating the AST from scratch from optimized IR.
-		YulStack stack = parseYul(compiledContract.yulIROptimized);
+		stack.optimize();
+		compiledContract.yulIROptimized = stack.print(this);
 		compiledContract.yulIROptimizedAst = stack.astJson();
 	}
 }
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index dbe30bb136..a391a69635 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -30,6 +30,7 @@
 #include <libyul/optimiser/Suite.h>
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
+#include <liblangutil/SourceReferenceFormatter.h>
 #include <libsolidity/interface/OptimiserSettings.h>
 
 #include <boost/algorithm/string.hpp>
@@ -117,7 +118,10 @@ void YulStack::optimize()
 
 		m_stackState = Parsed;
 		optimize(*m_parserResult, true);
-		yulAssert(analyzeParsed(), "Invalid source code after optimization.");
+
+		// Optimizer does not maintain correct native source locations in the AST.
+		// We can work around it by regenerating the AST from scratch from optimized IR.
+		reparse();
 	}
 	catch (UnimplementedFeatureError const& _error)
 	{
@@ -241,6 +245,33 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 	);
 }
 
+void YulStack::reparse()
+{
+	yulAssert(m_parserResult);
+	yulAssert(m_charStream);
+
+	// NOTE: Without passing in _soliditySourceProvider, printed debug info will not include code
+	// snippets, but it does not matter - we'll still get the same AST after we parse it. Snippets
+	// are not stored in the AST and the other info that is (location, AST ID, etc) will still be present.
+	std::string source = print(nullptr /* _soliditySourceProvider */);
+
+	YulStack cleanStack(m_evmVersion, m_eofVersion, m_language, m_optimiserSettings, m_debugInfoSelection);
+	bool reanalysisSuccessful = cleanStack.parseAndAnalyze(m_charStream->name(), source);
+	yulAssert(
+		reanalysisSuccessful,
+		source + "\n\n"
+		"Invalid IR generated:\n" +
+		SourceReferenceFormatter::formatErrorInformation(cleanStack.errors(), cleanStack) + "\n"
+	);
+
+	m_stackState = AnalysisSuccessful;
+	m_parserResult = std::move(cleanStack.m_parserResult);
+
+	// NOTE: We keep the char stream, and errors, even though they no longer match the object,
+	// because it's the original source that matters to the user. Optimized code may have different
+	// locations and fewer warnings.
+}
+
 MachineAssemblyObject YulStack::assemble(Machine _machine)
 {
 	yulAssert(m_stackState >= AnalysisSuccessful);
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index f547ef7702..4dc262a25c 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -152,6 +152,13 @@ class YulStack: public langutil::CharStreamProvider
 
 	void optimize(yul::Object& _object, bool _isCreation);
 
+	/// Prints the Yul object stored internally and parses it again.
+	/// This ensures that the debug info in the AST matches the source that printing would produce
+	/// rather than the initial source.
+	/// @warning Does not update the error list or the original source (@a m_charStream) to make
+	/// it possible to report errors to the user even after the optimization has been performed.
+	void reparse();
+
 	void reportUnimplementedFeatureError(langutil::UnimplementedFeatureError const& _error);
 
 	Language m_language = Language::Assembly;
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
index 76f1119908..3211ef49b3 100644
--- a/test/cmdlineTests/ast_ir/output
+++ b/test/cmdlineTests/ast_ir/output
@@ -637,24 +637,24 @@ Optimized IR AST:
 {
     "code": {
         "block": {
-            "nativeSrc": "58:315:0",
+            "nativeSrc": "58:298:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
             "statements": [
                 {
-                    "nativeSrc": "68:299:0",
+                    "nativeSrc": "68:282:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "128:27:0",
+                            "nativeSrc": "111:27:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "150:4:0",
+                                        "nativeSrc": "133:4:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -663,18 +663,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "memoryguard",
-                                    "nativeSrc": "138:11:0",
+                                    "nativeSrc": "121:11:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "138:17:0",
+                                "nativeSrc": "121:17:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_1",
-                                    "nativeSrc": "132:2:0",
+                                    "nativeSrc": "115:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -686,7 +686,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "175:2:0",
+                                        "nativeSrc": "158:2:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -694,28 +694,28 @@ Optimized IR AST:
                                     },
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "179:2:0",
+                                        "nativeSrc": "162:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "mstore",
-                                    "nativeSrc": "168:6:0",
+                                    "nativeSrc": "151:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "168:14:0",
+                                "nativeSrc": "151:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "168:14:0",
+                            "nativeSrc": "151:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
                         {
                             "body": {
-                                "nativeSrc": "210:16:0",
+                                "nativeSrc": "193:16:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
                                 "statements": [
@@ -724,7 +724,7 @@ Optimized IR AST:
                                             "arguments": [
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "219:1:0",
+                                                    "nativeSrc": "202:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -732,7 +732,7 @@ Optimized IR AST:
                                                 },
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "222:1:0",
+                                                    "nativeSrc": "205:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -741,15 +741,15 @@ Optimized IR AST:
                                             ],
                                             "functionName": {
                                                 "name": "revert",
-                                                "nativeSrc": "212:6:0",
+                                                "nativeSrc": "195:6:0",
                                                 "nodeType": "YulIdentifier",
                                                 "src": "60:13:0"
                                             },
-                                            "nativeSrc": "212:12:0",
+                                            "nativeSrc": "195:12:0",
                                             "nodeType": "YulFunctionCall",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "212:12:0",
+                                        "nativeSrc": "195:12:0",
                                         "nodeType": "YulExpressionStatement",
                                         "src": "60:13:0"
                                     }
@@ -759,20 +759,20 @@ Optimized IR AST:
                                 "arguments": [],
                                 "functionName": {
                                     "name": "callvalue",
-                                    "nativeSrc": "198:9:0",
+                                    "nativeSrc": "181:9:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "198:11:0",
+                                "nativeSrc": "181:11:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "195:31:0",
+                            "nativeSrc": "178:31:0",
                             "nodeType": "YulIf",
                             "src": "60:13:0"
                         },
                         {
-                            "nativeSrc": "239:34:0",
+                            "nativeSrc": "222:34:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
@@ -780,7 +780,7 @@ Optimized IR AST:
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
-                                        "nativeSrc": "258:14:0",
+                                        "nativeSrc": "241:14:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -789,18 +789,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "datasize",
-                                    "nativeSrc": "249:8:0",
+                                    "nativeSrc": "232:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "249:24:0",
+                                "nativeSrc": "232:24:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_2",
-                                    "nativeSrc": "243:2:0",
+                                    "nativeSrc": "226:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -812,7 +812,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "295:2:0",
+                                        "nativeSrc": "278:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
@@ -821,7 +821,7 @@ Optimized IR AST:
                                             {
                                                 "hexValue": "435f325f6465706c6f796564",
                                                 "kind": "string",
-                                                "nativeSrc": "310:14:0",
+                                                "nativeSrc": "293:14:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -830,32 +830,32 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "dataoffset",
-                                            "nativeSrc": "299:10:0",
+                                            "nativeSrc": "282:10:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "299:26:0",
+                                        "nativeSrc": "282:26:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "327:2:0",
+                                        "nativeSrc": "310:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "codecopy",
-                                    "nativeSrc": "286:8:0",
+                                    "nativeSrc": "269:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "286:44:0",
+                                "nativeSrc": "269:44:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "286:44:0",
+                            "nativeSrc": "269:44:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
@@ -864,28 +864,28 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "350:2:0",
+                                        "nativeSrc": "333:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "354:2:0",
+                                        "nativeSrc": "337:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "return",
-                                    "nativeSrc": "343:6:0",
+                                    "nativeSrc": "326:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "343:14:0",
+                                "nativeSrc": "326:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "343:14:0",
+                            "nativeSrc": "326:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         }
@@ -901,12 +901,12 @@ Optimized IR AST:
         {
             "code": {
                 "block": {
-                    "nativeSrc": "453:118:0",
+                    "nativeSrc": "436:101:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "467:94:0",
+                            "nativeSrc": "450:77:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
@@ -915,7 +915,7 @@ Optimized IR AST:
                                         "arguments": [
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "542:1:0",
+                                                "nativeSrc": "508:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -923,7 +923,7 @@ Optimized IR AST:
                                             },
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "545:1:0",
+                                                "nativeSrc": "511:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -932,15 +932,15 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "revert",
-                                            "nativeSrc": "535:6:0",
+                                            "nativeSrc": "501:6:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "535:12:0",
+                                        "nativeSrc": "501:12:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
-                                    "nativeSrc": "535:12:0",
+                                    "nativeSrc": "501:12:0",
                                     "nodeType": "YulExpressionStatement",
                                     "src": "60:13:0"
                                 }
diff --git a/test/cmdlineTests/linking_strict_assembly/output b/test/cmdlineTests/linking_strict_assembly/output
index 29a8abdfae..4fa6edc0c3 100644
--- a/test/cmdlineTests/linking_strict_assembly/output
+++ b/test/cmdlineTests/linking_strict_assembly/output
@@ -16,11 +16,11 @@ Binary representation:
 7312345678901234567890123456789012345678905f5500
 
 Text representation:
-    /* "linking_strict_assembly/input.yul":44:79   */
+    /* "linking_strict_assembly/input.yul":58:93   */
   linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
-    /* "linking_strict_assembly/input.yul":95:96   */
+    /* "linking_strict_assembly/input.yul":113:114   */
   0x00
-    /* "linking_strict_assembly/input.yul":88:103   */
+    /* "linking_strict_assembly/input.yul":106:121   */
   sstore
-    /* "linking_strict_assembly/input.yul":22:109   */
+    /* "linking_strict_assembly/input.yul":22:137   */
   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 4aecfc6b26..69c0a21f63 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
@@ -18,19 +18,19 @@ Binary representation:
 731111111111111111111111111111111111111111732222222222222222222222222222222222222222905f5560015500
 
 Text representation:
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":45:75   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":59:89   */
   linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":97:127   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":115:145   */
   linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":158:174   */
   swap1
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":143:144   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":165:166   */
   0x00
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":158:174   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":168:169   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":194:195   */
   0x01
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":161:177   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":187:203   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":22:183   */
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":22:219   */
   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 10a7fe7fe0..14fafa4e46 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
@@ -18,19 +18,19 @@ Binary representation:
 73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__905f5560015500
 
 Text representation:
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":45:75   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":59:89   */
   linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":97:127   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":115:145   */
   linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":158:174   */
   swap1
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":143:144   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":165:166   */
   0x00
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":158:174   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":168:169   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":194:195   */
   0x01
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":161:177   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":187:203   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":22:183   */
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":22:219   */
   stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
index a110db5a3e..3b2d84ab3c 100644
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
+++ b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
@@ -18,19 +18,19 @@ Binary representation:
 73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__905f5560015500
 
 Text representation:
-    /* "linking_strict_assembly_unresolved_references/input.yul":45:81   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":59:95   */
   linkerSymbol("05b0326038374a21e0895480a58bda0768cdcc04c8d18f154362d1ca5223d245")
-    /* "linking_strict_assembly_unresolved_references/input.yul":103:139   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":121:157   */
   linkerSymbol("fb58009a6b1ecea3b9d99bedd645df4ec308f17bc0087e5f39d078f77f809177")
-    /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":170:186   */
   swap1
-    /* "linking_strict_assembly_unresolved_references/input.yul":155:156   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":177:178   */
   0x00
-    /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":170:186   */
   sstore
-    /* "linking_strict_assembly_unresolved_references/input.yul":180:181   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":206:207   */
   0x01
-    /* "linking_strict_assembly_unresolved_references/input.yul":173:189   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":199:215   */
   sstore
-    /* "linking_strict_assembly_unresolved_references/input.yul":22:195   */
+    /* "linking_strict_assembly_unresolved_references/input.yul":22:231   */
   stop
diff --git a/test/cmdlineTests/object_compiler/output b/test/cmdlineTests/object_compiler/output
index 5dd572272a..a88851b96c 100644
--- a/test/cmdlineTests/object_compiler/output
+++ b/test/cmdlineTests/object_compiler/output
@@ -26,40 +26,40 @@ Binary representation:
 335f55600880600d5f395ff3fe5f545f5260205ff3
 
 Text representation:
-    /* "object_compiler/input.yul":128:136   */
+    /* "object_compiler/input.yul":65:73   */
   caller
-    /* "object_compiler/input.yul":125:126   */
+    /* "object_compiler/input.yul":62:63   */
   0x00
-    /* "object_compiler/input.yul":118:137   */
+    /* "object_compiler/input.yul":55:74   */
   sstore
-    /* "object_compiler/input.yul":240:259   */
+    /* "object_compiler/input.yul":97:116   */
   dataSize(sub_0)
-    /* "object_compiler/input.yul":217:238   */
+    /* "object_compiler/input.yul":141:162   */
   dup1
   dataOffset(sub_0)
-    /* "object_compiler/input.yul":125:126   */
+    /* "object_compiler/input.yul":138:139   */
   0x00
-    /* "object_compiler/input.yul":205:260   */
+    /* "object_compiler/input.yul":129:167   */
   codecopy
-    /* "object_compiler/input.yul":125:126   */
+    /* "object_compiler/input.yul":187:188   */
   0x00
-    /* "object_compiler/input.yul":265:295   */
+    /* "object_compiler/input.yul":180:193   */
   return
 stop
 
 sub_0: assembly {
-        /* "object_compiler/input.yul":397:398   */
+        /* "object_compiler/input.yul":294:295   */
       0x00
-        /* "object_compiler/input.yul":391:399   */
+        /* "object_compiler/input.yul":288:296   */
       sload
-        /* "object_compiler/input.yul":397:398   */
+        /* "object_compiler/input.yul":285:286   */
       0x00
-        /* "object_compiler/input.yul":381:400   */
+        /* "object_compiler/input.yul":278:297   */
       mstore
-        /* "object_compiler/input.yul":417:421   */
+        /* "object_compiler/input.yul":324:328   */
       0x20
-        /* "object_compiler/input.yul":397:398   */
+        /* "object_compiler/input.yul":321:322   */
       0x00
-        /* "object_compiler/input.yul":407:422   */
+        /* "object_compiler/input.yul":314:329   */
       return
 }
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
index 5c6762ac99..f80f4466ca 100644
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -5,12 +5,12 @@
                 "irOptimizedAst": {
                     "code": {
                         "block": {
-                            "nativeSrc": "43:639:0",
+                            "nativeSrc": "43:622:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
                                 {
-                                    "nativeSrc": "53:421:0",
+                                    "nativeSrc": "53:404:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
@@ -19,7 +19,7 @@
                                                 "arguments": [
                                                     {
                                                         "kind": "number",
-                                                        "nativeSrc": "120:2:0",
+                                                        "nativeSrc": "103:2:0",
                                                         "nodeType": "YulLiteral",
                                                         "src": "56:13:0",
                                                         "type": "",
@@ -29,7 +29,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "136:4:0",
+                                                                "nativeSrc": "119:4:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -38,32 +38,32 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "memoryguard",
-                                                            "nativeSrc": "124:11:0",
+                                                            "nativeSrc": "107:11:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "124:17:0",
+                                                        "nativeSrc": "107:17:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "mstore",
-                                                    "nativeSrc": "113:6:0",
+                                                    "nativeSrc": "96:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "113:29:0",
+                                                "nativeSrc": "96:29:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "113:29:0",
+                                            "nativeSrc": "96:29:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "182:111:0",
+                                                "nativeSrc": "165:111:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -72,15 +72,15 @@
                                                             "arguments": [],
                                                             "functionName": {
                                                                 "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                                "nativeSrc": "200:77:0",
+                                                                "nativeSrc": "183:77:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "200:79:0",
+                                                            "nativeSrc": "183:79:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "200:79:0",
+                                                        "nativeSrc": "183:79:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
@@ -90,38 +90,38 @@
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "callvalue",
-                                                    "nativeSrc": "158:9:0",
+                                                    "nativeSrc": "141:9:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "158:11:0",
+                                                "nativeSrc": "141:11:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "155:138:0",
+                                            "nativeSrc": "138:138:0",
                                             "nodeType": "YulIf",
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "nativeSrc": "306:30:0",
+                                            "nativeSrc": "289:30:0",
                                             "nodeType": "YulVariableDeclaration",
                                             "src": "56:13:0",
                                             "value": {
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "allocate_unbounded",
-                                                    "nativeSrc": "316:18:0",
+                                                    "nativeSrc": "299:18:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "316:20:0",
+                                                "nativeSrc": "299:20:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
                                             "variables": [
                                                 {
                                                     "name": "_1",
-                                                    "nativeSrc": "310:2:0",
+                                                    "nativeSrc": "293:2:0",
                                                     "nodeType": "YulTypedName",
                                                     "src": "56:13:0",
                                                     "type": ""
@@ -133,7 +133,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "358:2:0",
+                                                        "nativeSrc": "341:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -142,7 +142,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "373:14:0",
+                                                                "nativeSrc": "356:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -151,11 +151,11 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "dataoffset",
-                                                            "nativeSrc": "362:10:0",
+                                                            "nativeSrc": "345:10:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "362:26:0",
+                                                        "nativeSrc": "345:26:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
@@ -164,7 +164,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "399:14:0",
+                                                                "nativeSrc": "382:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -173,26 +173,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "390:8:0",
+                                                            "nativeSrc": "373:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "390:24:0",
+                                                        "nativeSrc": "373:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "codecopy",
-                                                    "nativeSrc": "349:8:0",
+                                                    "nativeSrc": "332:8:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "349:66:0",
+                                                "nativeSrc": "332:66:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "349:66:0",
+                                            "nativeSrc": "332:66:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
@@ -201,7 +201,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "435:2:0",
+                                                        "nativeSrc": "418:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -210,7 +210,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "448:14:0",
+                                                                "nativeSrc": "431:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -219,26 +219,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "439:8:0",
+                                                            "nativeSrc": "422:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "439:24:0",
+                                                        "nativeSrc": "422:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "return",
-                                                    "nativeSrc": "428:6:0",
+                                                    "nativeSrc": "411:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "428:36:0",
+                                                "nativeSrc": "411:36:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "428:36:0",
+                                            "nativeSrc": "411:36:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         }
@@ -246,19 +246,19 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "531:23:0",
+                                        "nativeSrc": "514:23:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
                                             {
-                                                "nativeSrc": "533:19:0",
+                                                "nativeSrc": "516:19:0",
                                                 "nodeType": "YulAssignment",
                                                 "src": "56:13:0",
                                                 "value": {
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "549:2:0",
+                                                            "nativeSrc": "532:2:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -267,18 +267,18 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "mload",
-                                                        "nativeSrc": "543:5:0",
+                                                        "nativeSrc": "526:5:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "543:9:0",
+                                                    "nativeSrc": "526:9:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
                                                 "variableNames": [
                                                     {
                                                         "name": "memPtr",
-                                                        "nativeSrc": "533:6:0",
+                                                        "nativeSrc": "516:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     }
@@ -287,12 +287,12 @@
                                         ]
                                     },
                                     "name": "allocate_unbounded",
-                                    "nativeSrc": "483:71:0",
+                                    "nativeSrc": "466:71:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "returnVariables": [
                                         {
                                             "name": "memPtr",
-                                            "nativeSrc": "516:6:0",
+                                            "nativeSrc": "499:6:0",
                                             "nodeType": "YulTypedName",
                                             "src": "56:13:0",
                                             "type": ""
@@ -302,7 +302,7 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "660:16:0",
+                                        "nativeSrc": "643:16:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
@@ -311,7 +311,7 @@
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "669:1:0",
+                                                            "nativeSrc": "652:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -319,7 +319,7 @@
                                                         },
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "672:1:0",
+                                                            "nativeSrc": "655:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -328,22 +328,22 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "revert",
-                                                        "nativeSrc": "662:6:0",
+                                                        "nativeSrc": "645:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "662:12:0",
+                                                    "nativeSrc": "645:12:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "662:12:0",
+                                                "nativeSrc": "645:12:0",
                                                 "nodeType": "YulExpressionStatement",
                                                 "src": "56:13:0"
                                             }
                                         ]
                                     },
                                     "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                    "nativeSrc": "563:113:0",
+                                    "nativeSrc": "546:113:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "src": "56:13:0"
                                 }
@@ -357,12 +357,12 @@
                         {
                             "code": {
                                 "block": {
-                                    "nativeSrc": "747:361:0",
+                                    "nativeSrc": "730:344:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
                                         {
-                                            "nativeSrc": "761:207:0",
+                                            "nativeSrc": "744:190:0",
                                             "nodeType": "YulBlock",
                                             "src": "-1:-1:0",
                                             "statements": [
@@ -371,7 +371,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "836:2:0",
+                                                                "nativeSrc": "802:2:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -381,7 +381,7 @@
                                                                 "arguments": [
                                                                     {
                                                                         "kind": "number",
-                                                                        "nativeSrc": "852:4:0",
+                                                                        "nativeSrc": "818:4:0",
                                                                         "nodeType": "YulLiteral",
                                                                         "src": "56:13:0",
                                                                         "type": "",
@@ -390,26 +390,26 @@
                                                                 ],
                                                                 "functionName": {
                                                                     "name": "memoryguard",
-                                                                    "nativeSrc": "840:11:0",
+                                                                    "nativeSrc": "806:11:0",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "56:13:0"
                                                                 },
-                                                                "nativeSrc": "840:17:0",
+                                                                "nativeSrc": "806:17:0",
                                                                 "nodeType": "YulFunctionCall",
                                                                 "src": "56:13:0"
                                                             }
                                                         ],
                                                         "functionName": {
                                                             "name": "mstore",
-                                                            "nativeSrc": "829:6:0",
+                                                            "nativeSrc": "795:6:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "829:29:0",
+                                                        "nativeSrc": "795:29:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "829:29:0",
+                                                    "nativeSrc": "795:29:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 },
@@ -418,15 +418,15 @@
                                                         "arguments": [],
                                                         "functionName": {
                                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                            "nativeSrc": "875:77:0",
+                                                            "nativeSrc": "841:77:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "875:79:0",
+                                                        "nativeSrc": "841:79:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "875:79:0",
+                                                    "nativeSrc": "841:79:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 }
@@ -434,7 +434,7 @@
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "1082:16:0",
+                                                "nativeSrc": "1048:16:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -443,7 +443,7 @@
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1091:1:0",
+                                                                    "nativeSrc": "1057:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -451,7 +451,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1094:1:0",
+                                                                    "nativeSrc": "1060:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -460,22 +460,22 @@
                                                             ],
                                                             "functionName": {
                                                                 "name": "revert",
-                                                                "nativeSrc": "1084:6:0",
+                                                                "nativeSrc": "1050:6:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "1084:12:0",
+                                                            "nativeSrc": "1050:12:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "1084:12:0",
+                                                        "nativeSrc": "1050:12:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                            "nativeSrc": "981:117:0",
+                                            "nativeSrc": "947:117:0",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "56:13:0"
                                         }
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index 8d2ab00747..30fe1dd7ec 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -3,17 +3,17 @@
         "A": {
             "object": {
                 "evm": {
-                    "assembly": "    /* \"A\":38:39   */
+                    "assembly": "    /* \"A\":99:100   */
   0x00
-    /* \"A\":11:19   */
+    /* \"A\":60:68   */
   dup1
   dup1
   mload
-    /* \"A\":27:36   */
+    /* \"A\":88:97   */
   add
-    /* \"A\":20:40   */
+    /* \"A\":81:101   */
   sstore
-    /* \"A\":0:42   */
+    /* \"A\":27:117   */
   stop
 ",
                     "bytecode": {
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index 87d0cab8f4..3181da4260 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -3,16 +3,16 @@
         "A": {
             "NamedObject": {
                 "evm": {
-                    "assembly": "    /* \"A\":80:81   */
+                    "assembly": "    /* \"A\":118:119   */
   0x00
-    /* \"A\":39:61   */
+    /* \"A\":65:87   */
   dup1
   data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":69:78   */
+    /* \"A\":107:116   */
   add
-    /* \"A\":62:82   */
+    /* \"A\":100:120   */
   sstore
-    /* \"A\":28:84   */
+    /* \"A\":32:136   */
   stop
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index c6e98130d2..1512900e1c 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -3,24 +3,24 @@
         "A": {
             "NamedObject": {
                 "evm": {
-                    "assembly": "    /* \"A\":80:81   */
+                    "assembly": "    /* \"A\":118:119   */
   0x00
-    /* \"A\":39:61   */
+    /* \"A\":65:87   */
   dup1
   data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":69:78   */
+    /* \"A\":107:116   */
   add
-    /* \"A\":62:82   */
+    /* \"A\":100:120   */
   sstore
-    /* \"A\":28:84   */
+    /* \"A\":32:136   */
   stop
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 
 sub_0: assembly {
-        /* \"A\":147:148   */
+        /* \"A\":223:224   */
       0x00
-        /* \"A\":137:149   */
+        /* \"A\":213:225   */
       dup1
       revert
 }
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 1c72379c61..2a654d20a9 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -3,14 +3,14 @@
         "A": {
             "object": {
                 "evm": {
-                    "assembly": "    /* \"A\":38:39   */
+                    "assembly": "    /* \"A\":99:100   */
   0x00
-    /* \"A\":11:19   */
+    /* \"A\":60:68   */
   dup1
   mload
-    /* \"A\":20:40   */
+    /* \"A\":81:101   */
   sstore
-    /* \"A\":0:42   */
+    /* \"A\":27:117   */
   stop
 ",
                     "bytecode": {
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index c443b2863f..513f8148a0 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -3,14 +3,14 @@
         "A": {
             "object": {
                 "evm": {
-                    "assembly": "    /* \"A\":17:18   */
+                    "assembly": "    /* \"A\":48:49   */
   0x00
-    /* \"A\":11:19   */
+    /* \"A\":38:46   */
   dup1
   mload
-    /* \"A\":20:40   */
+    /* \"A\":31:50   */
   sstore
-    /* \"A\":0:42   */
+    /* \"A\":27:54   */
   stop
 ",
                     "bytecode": {
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
index 9d89edfb4a..4d7d96b49d 100644
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt/output.json
@@ -3,19 +3,19 @@
         "A": {
             "object": {
                 "evm": {
-                    "assembly": "    /* \"A\":16:17   */
+                    "assembly": "    /* \"A\":61:62   */
   0x01
-    /* \"A\":27:28   */
+    /* \"A\":58:59   */
   0x00
-    /* \"A\":20:32   */
+    /* \"A\":51:63   */
   sstore
-    /* \"A\":50:51   */
+    /* \"A\":87:88   */
   0x02
-    /* \"A\":61:63   */
+    /* \"A\":83:85   */
   0x20
-    /* \"A\":54:67   */
+    /* \"A\":76:89   */
   sstore
-    /* \"A\":0:72   */
+    /* \"A\":27:105   */
   stop
 "
                 }
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
index f0752b812b..ca7e2de199 100644
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
@@ -3,17 +3,17 @@
         "A": {
             "object": {
                 "evm": {
-                    "assembly": "    /* \"A\":16:17   */
+                    "assembly": "    /* \"A\":61:62   */
   0x01
-    /* \"A\":27:28   */
+    /* \"A\":58:59   */
   0x00
-    /* \"A\":20:32   */
+    /* \"A\":51:63   */
   sstore
-    /* \"A\":50:51   */
+    /* \"A\":87:88   */
   0x02
-    /* \"A\":61:63   */
+    /* \"A\":83:85   */
   0x20
-    /* \"A\":54:67   */
+    /* \"A\":76:89   */
   sstore
 "
                 }
diff --git a/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
index 25fb482d48..305185f016 100644
--- a/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
+++ b/test/cmdlineTests/strict_asm_asm_json_without_debug_info_annotations/output
@@ -171,207 +171,207 @@ EVM assembly:
             ".auxdata": "1234abcd",
             ".code": [
                 {
-                    "begin": 469,
-                    "end": 486,
+                    "begin": 468,
+                    "end": 485,
                     "name": "PUSH",
                     "source": -1,
                     "value": "80"
                 },
                 {
-                    "begin": 503,
-                    "end": 517,
+                    "begin": 502,
+                    "end": 516,
                     "name": "DUP1",
                     "source": -1
                 },
                 {
-                    "begin": 510,
-                    "end": 512,
+                    "begin": 509,
+                    "end": 511,
                     "name": "PUSH",
                     "source": -1,
                     "value": "40"
                 },
                 {
-                    "begin": 503,
-                    "end": 517,
+                    "begin": 502,
+                    "end": 516,
                     "name": "MSTORE",
                     "source": -1
                 },
                 {
-                    "begin": 563,
-                    "end": 564,
+                    "begin": 562,
+                    "end": 563,
                     "name": "PUSH",
                     "source": -1,
                     "value": "4"
                 },
                 {
-                    "begin": 547,
-                    "end": 561,
+                    "begin": 546,
+                    "end": 560,
                     "name": "CALLDATASIZE",
                     "source": -1
                 },
                 {
-                    "begin": 544,
-                    "end": 565,
+                    "begin": 543,
+                    "end": 564,
                     "name": "LT",
                     "source": -1
                 },
                 {
-                    "begin": 537,
-                    "end": 566,
+                    "begin": 536,
+                    "end": 565,
                     "name": "ISZERO",
                     "source": -1
                 },
                 {
-                    "begin": 534,
-                    "end": 832,
+                    "begin": 533,
+                    "end": 831,
                     "name": "PUSH [tag]",
                     "source": -1,
                     "value": "1"
                 },
                 {
-                    "begin": 534,
-                    "end": 832,
+                    "begin": 533,
+                    "end": 831,
                     "name": "JUMPI",
                     "source": -1
                 },
                 {
-                    "begin": 427,
-                    "end": 885,
+                    "begin": 426,
+                    "end": 884,
                     "name": "tag",
                     "source": -1,
                     "value": "2"
                 },
                 {
-                    "begin": 427,
-                    "end": 885,
+                    "begin": 426,
+                    "end": 884,
                     "name": "JUMPDEST",
                     "source": -1
                 },
                 {
-                    "begin": 859,
-                    "end": 860,
+                    "begin": 858,
+                    "end": 859,
                     "name": "PUSH",
                     "source": -1,
                     "value": "0"
                 },
                 {
-                    "begin": 849,
-                    "end": 861,
+                    "begin": 848,
+                    "end": 860,
                     "name": "DUP1",
                     "source": -1
                 },
                 {
-                    "begin": 849,
-                    "end": 861,
+                    "begin": 848,
+                    "end": 860,
                     "name": "REVERT",
                     "source": -1
                 },
                 {
-                    "begin": 583,
-                    "end": 832,
+                    "begin": 582,
+                    "end": 831,
                     "name": "tag",
                     "source": -1,
                     "value": "1"
                 },
                 {
-                    "begin": 583,
-                    "end": 832,
+                    "begin": 582,
+                    "end": 831,
                     "name": "JUMPDEST",
                     "source": -1
                 },
                 {
-                    "begin": 615,
-                    "end": 616,
+                    "begin": 614,
+                    "end": 615,
                     "name": "PUSH",
                     "source": -1,
                     "value": "0"
                 },
                 {
-                    "begin": 653,
-                    "end": 669,
+                    "begin": 652,
+                    "end": 668,
                     "name": "CALLDATALOAD",
                     "source": -1
                 },
                 {
-                    "begin": 648,
-                    "end": 651,
+                    "begin": 647,
+                    "end": 650,
                     "name": "PUSH",
                     "source": -1,
                     "value": "E0"
                 },
                 {
-                    "begin": 644,
-                    "end": 670,
+                    "begin": 643,
+                    "end": 669,
                     "name": "SHR",
                     "source": -1
                 },
                 {
-                    "begin": 696,
-                    "end": 706,
+                    "begin": 695,
+                    "end": 705,
                     "name": "PUSH",
                     "source": -1,
                     "value": "B4F40C61"
                 },
                 {
-                    "begin": 691,
-                    "end": 814,
+                    "begin": 690,
+                    "end": 813,
                     "name": "SUB",
                     "source": -1
                 },
                 {
-                    "begin": 583,
-                    "end": 832,
+                    "begin": 582,
+                    "end": 831,
                     "name": "PUSH [tag]",
                     "source": -1,
                     "value": "2"
                 },
                 {
-                    "begin": 691,
-                    "end": 814,
+                    "begin": 690,
+                    "end": 813,
                     "name": "JUMPI",
                     "source": -1
                 },
                 {
-                    "begin": 789,
-                    "end": 791,
+                    "begin": 788,
+                    "end": 790,
                     "name": "PUSH",
                     "source": -1,
                     "value": "20"
                 },
                 {
-                    "begin": 744,
-                    "end": 752,
+                    "begin": 743,
+                    "end": 751,
                     "name": "SWAP1",
                     "source": -1
                 },
                 {
-                    "begin": 750,
-                    "end": 751,
+                    "begin": 749,
+                    "end": 750,
                     "name": "PUSH",
                     "source": -1,
                     "value": "1"
                 },
                 {
-                    "begin": 744,
-                    "end": 752,
+                    "begin": 743,
+                    "end": 751,
                     "name": "SLOAD",
                     "source": -1
                 },
                 {
-                    "begin": 733,
-                    "end": 753,
+                    "begin": 732,
+                    "end": 752,
                     "name": "DUP2",
                     "source": -1
                 },
                 {
-                    "begin": 733,
-                    "end": 753,
+                    "begin": 732,
+                    "end": 752,
                     "name": "MSTORE",
                     "source": -1
                 },
                 {
-                    "begin": 778,
-                    "end": 792,
+                    "begin": 777,
+                    "end": 791,
                     "name": "RETURN",
                     "source": -1
                 }
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/output b/test/cmdlineTests/strict_asm_ast_compact_json/output
index b4c6dc1424..b2271c36cb 100644
--- a/test/cmdlineTests/strict_asm_ast_compact_json/output
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/output
@@ -5,12 +5,12 @@ AST:
 {
     "code": {
         "block": {
-            "nativeSrc": "60:246:0",
+            "nativeSrc": "60:85:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
             "statements": [
                 {
-                    "nativeSrc": "60:246:0",
+                    "nativeSrc": "70:69:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
@@ -19,7 +19,7 @@ AST:
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "122:2:0",
+                                        "nativeSrc": "121:2:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:41:0",
                                         "type": "",
@@ -27,7 +27,7 @@ AST:
                                     },
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "126:3:0",
+                                        "nativeSrc": "125:3:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:41:0",
                                         "type": "",
@@ -36,15 +36,15 @@ AST:
                                 ],
                                 "functionName": {
                                     "name": "mstore",
-                                    "nativeSrc": "115:6:0",
+                                    "nativeSrc": "114:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:41:0"
                                 },
-                                "nativeSrc": "115:15:0",
+                                "nativeSrc": "114:15:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:41:0"
                             },
-                            "nativeSrc": "115:15:0",
+                            "nativeSrc": "114:15:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:41:0"
                         }
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/output b/test/cmdlineTests/strict_asm_evm_version_byzantium/output
index 3a23390a40..2840e1d2b6 100644
--- a/test/cmdlineTests/strict_asm_evm_version_byzantium/output
+++ b/test/cmdlineTests/strict_asm_evm_version_byzantium/output
@@ -11,5 +11,5 @@ Binary representation:
 00
 
 Text representation:
-    /* "strict_asm_evm_version_byzantium/input.yul":0:2   */
+    /* "strict_asm_evm_version_byzantium/input.yul":27:34   */
   stop
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/output b/test/cmdlineTests/strict_asm_evm_version_constantinople/output
index c8febd6f17..9362866b43 100644
--- a/test/cmdlineTests/strict_asm_evm_version_constantinople/output
+++ b/test/cmdlineTests/strict_asm_evm_version_constantinople/output
@@ -11,5 +11,5 @@ Binary representation:
 00
 
 Text representation:
-    /* "strict_asm_evm_version_constantinople/input.yul":0:2   */
+    /* "strict_asm_evm_version_constantinople/input.yul":27:34   */
   stop
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/output b/test/cmdlineTests/strict_asm_optimizer_steps/output
index c10fb02fb9..58c9197618 100644
--- a/test/cmdlineTests/strict_asm_optimizer_steps/output
+++ b/test/cmdlineTests/strict_asm_optimizer_steps/output
@@ -27,58 +27,58 @@ Binary representation:
 608060405234601357600c60185f39600c5ff35b5f80fdfe608060405236155f555f80fd
 
 Text representation:
-    /* "strict_asm_optimizer_steps/input.yul":45:48   */
+    /* "strict_asm_optimizer_steps/input.yul":59:62   */
   0x80
-    /* "strict_asm_optimizer_steps/input.yul":41:43   */
+    /* "strict_asm_optimizer_steps/input.yul":55:57   */
   0x40
-    /* "strict_asm_optimizer_steps/input.yul":34:49   */
+    /* "strict_asm_optimizer_steps/input.yul":48:63   */
   mstore
-    /* "strict_asm_optimizer_steps/input.yul":61:72   */
+    /* "strict_asm_optimizer_steps/input.yul":79:90   */
   callvalue
-    /* "strict_asm_optimizer_steps/input.yul":58:89   */
+    /* "strict_asm_optimizer_steps/input.yul":76:107   */
   tag_1
   jumpi
-    /* "strict_asm_optimizer_steps/input.yul":138:162   */
+    /* "strict_asm_optimizer_steps/input.yul":160:184   */
   dataSize(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":110:136   */
+    /* "strict_asm_optimizer_steps/input.yul":132:158   */
   dataOffset(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":107:108   */
+    /* "strict_asm_optimizer_steps/input.yul":129:130   */
   0x00
-    /* "strict_asm_optimizer_steps/input.yul":98:163   */
+    /* "strict_asm_optimizer_steps/input.yul":120:185   */
   codecopy
-    /* "strict_asm_optimizer_steps/input.yul":182:206   */
+    /* "strict_asm_optimizer_steps/input.yul":208:232   */
   dataSize(sub_0)
-    /* "strict_asm_optimizer_steps/input.yul":179:180   */
+    /* "strict_asm_optimizer_steps/input.yul":205:206   */
   0x00
-    /* "strict_asm_optimizer_steps/input.yul":172:207   */
+    /* "strict_asm_optimizer_steps/input.yul":198:233   */
   return
-    /* "strict_asm_optimizer_steps/input.yul":73:89   */
+    /* "strict_asm_optimizer_steps/input.yul":91:107   */
 tag_1:
-    /* "strict_asm_optimizer_steps/input.yul":85:86   */
+    /* "strict_asm_optimizer_steps/input.yul":103:104   */
   0x00
-    /* "strict_asm_optimizer_steps/input.yul":75:87   */
+    /* "strict_asm_optimizer_steps/input.yul":93:105   */
   dup1
   revert
 stop
 
 sub_0: assembly {
-        /* "strict_asm_optimizer_steps/input.yul":298:301   */
+        /* "strict_asm_optimizer_steps/input.yul":334:337   */
       0x80
-        /* "strict_asm_optimizer_steps/input.yul":294:296   */
+        /* "strict_asm_optimizer_steps/input.yul":330:332   */
       0x40
-        /* "strict_asm_optimizer_steps/input.yul":287:302   */
+        /* "strict_asm_optimizer_steps/input.yul":323:338   */
       mstore
-        /* "strict_asm_optimizer_steps/input.yul":533:547   */
+        /* "strict_asm_optimizer_steps/input.yul":372:386   */
       calldatasize
-        /* "strict_asm_optimizer_steps/input.yul":526:548   */
+        /* "strict_asm_optimizer_steps/input.yul":365:387   */
       iszero
-        /* "strict_asm_optimizer_steps/input.yul":523:524   */
+        /* "strict_asm_optimizer_steps/input.yul":362:363   */
       0x00
-        /* "strict_asm_optimizer_steps/input.yul":516:549   */
+        /* "strict_asm_optimizer_steps/input.yul":355:388   */
       sstore
-        /* "strict_asm_optimizer_steps/input.yul":576:577   */
+        /* "strict_asm_optimizer_steps/input.yul":415:416   */
       0x00
-        /* "strict_asm_optimizer_steps/input.yul":566:578   */
+        /* "strict_asm_optimizer_steps/input.yul":405:417   */
       dup1
       revert
 }
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/output b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
index abe2143d3f..317c9a9ae2 100644
--- a/test/cmdlineTests/strict_asm_output_selection_asm_only/output
+++ b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
@@ -2,11 +2,11 @@
 ======= strict_asm_output_selection_asm_only/input.yul (EVM) =======
 
 Text representation:
-    /* "strict_asm_output_selection_asm_only/input.yul":15:17   */
+    /* "strict_asm_output_selection_asm_only/input.yul":41:43   */
   0x2a
-    /* "strict_asm_output_selection_asm_only/input.yul":29:30   */
+    /* "strict_asm_output_selection_asm_only/input.yul":38:39   */
   0x00
-    /* "strict_asm_output_selection_asm_only/input.yul":22:34   */
+    /* "strict_asm_output_selection_asm_only/input.yul":31:44   */
   sstore
-    /* "strict_asm_output_selection_asm_only/input.yul":0:36   */
+    /* "strict_asm_output_selection_asm_only/input.yul":27:48   */
   stop
diff --git a/test/cmdlineTests/strict_asm_warning/err b/test/cmdlineTests/strict_asm_warning/err
index 1024e870f9..0661ae1ffe 100644
--- a/test/cmdlineTests/strict_asm_warning/err
+++ b/test/cmdlineTests/strict_asm_warning/err
@@ -3,9 +3,3 @@ Warning: "selfdestruct" has been deprecated. Note that, starting from the Cancun
   |
 4 |     selfdestruct(0)
   |     ^^^^^^^^^^^^
-
-Warning: "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.
- --> strict_asm_warning/input.yul:4:5:
-  |
-4 |     selfdestruct(0)
-  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/strict_asm_warning_optimize/err b/test/cmdlineTests/strict_asm_warning_optimize/err
index 2f3c9bb4a0..098aa00baf 100644
--- a/test/cmdlineTests/strict_asm_warning_optimize/err
+++ b/test/cmdlineTests/strict_asm_warning_optimize/err
@@ -3,9 +3,3 @@ Warning: "selfdestruct" has been deprecated. Note that, starting from the Cancun
   |
 4 |     selfdestruct(0)
   |     ^^^^^^^^^^^^
-
-Warning: "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.
- --> strict_asm_warning_optimize/input.yul:4:5:
-  |
-4 |     selfdestruct(0)
-  |     ^^^^^^^^^^^^
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/output b/test/cmdlineTests/yul_function_name_clashes_different_params/output
index 22cee64c1f..85884a6a0e 100644
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/output
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/output
@@ -23,37 +23,37 @@ Binary representation:
 60056011565b600d60706016565b9055005b5f3590565b359056
 
 Text representation:
-    /* "yul_function_name_clashes_different_params/input.yul":151:154   */
+    /* "yul_function_name_clashes_different_params/input.yul":92:95   */
   tag_3
   tag_1
   jump	// in
 tag_3:
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+    /* "yul_function_name_clashes_different_params/input.yul":113:122   */
   tag_4
-    /* "yul_function_name_clashes_different_params/input.yul":262:266   */
+    /* "yul_function_name_clashes_different_params/input.yul":117:121   */
   0x70
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+    /* "yul_function_name_clashes_different_params/input.yul":113:122   */
   tag_2
   jump	// in
 tag_4:
-    /* "yul_function_name_clashes_different_params/input.yul":286:298   */
+    /* "yul_function_name_clashes_different_params/input.yul":135:147   */
   swap1
   sstore
-    /* "yul_function_name_clashes_different_params/input.yul":27:304   */
+    /* "yul_function_name_clashes_different_params/input.yul":27:284   */
   stop
-    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
+    /* "yul_function_name_clashes_different_params/input.yul":166:216   */
 tag_1:
-    /* "yul_function_name_clashes_different_params/input.yul":129:130   */
+    /* "yul_function_name_clashes_different_params/input.yul":212:213   */
   0x00
-    /* "yul_function_name_clashes_different_params/input.yul":116:131   */
+    /* "yul_function_name_clashes_different_params/input.yul":199:214   */
   calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
+    /* "yul_function_name_clashes_different_params/input.yul":166:216   */
   swap1
   jump	// out
-    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
+    /* "yul_function_name_clashes_different_params/input.yul":225:278   */
 tag_2:
-    /* "yul_function_name_clashes_different_params/input.yul":225:240   */
+    /* "yul_function_name_clashes_different_params/input.yul":261:276   */
   calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
+    /* "yul_function_name_clashes_different_params/input.yul":225:278   */
   swap1
   jump	// out
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
index b7fcabaaca..589f8ce1a1 100644
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ b/test/cmdlineTests/yul_optimize_runs/output
@@ -24,28 +24,28 @@ Binary representation:
 602480600a5f395ff3fe7fabc12345000000000000000000000000000000000000000000000000000000005f5500
 
 Text representation:
-    /* "yul_optimize_runs/input.yul":115:143   */
+    /* "yul_optimize_runs/input.yul":64:92   */
   dataSize(sub_0)
-    /* "yul_optimize_runs/input.yul":83:113   */
+    /* "yul_optimize_runs/input.yul":117:147   */
   dup1
   dataOffset(sub_0)
-    /* "yul_optimize_runs/input.yul":80:81   */
+    /* "yul_optimize_runs/input.yul":114:115   */
   0x00
-    /* "yul_optimize_runs/input.yul":71:144   */
+    /* "yul_optimize_runs/input.yul":105:152   */
   codecopy
-    /* "yul_optimize_runs/input.yul":80:81   */
+    /* "yul_optimize_runs/input.yul":172:173   */
   0x00
-    /* "yul_optimize_runs/input.yul":153:192   */
+    /* "yul_optimize_runs/input.yul":165:178   */
   return
 stop
 
 sub_0: assembly {
-        /* "yul_optimize_runs/input.yul":273:293   */
+        /* "yul_optimize_runs/input.yul":282:348   */
       0xabc1234500000000000000000000000000000000000000000000000000000000
-        /* "yul_optimize_runs/input.yul":313:314   */
+        /* "yul_optimize_runs/input.yul":279:280   */
       0x00
-        /* "yul_optimize_runs/input.yul":306:324   */
+        /* "yul_optimize_runs/input.yul":272:349   */
       sstore
-        /* "yul_optimize_runs/input.yul":244:334   */
+        /* "yul_optimize_runs/input.yul":240:373   */
       stop
 }
diff --git a/test/cmdlineTests/yul_verbatim_msize/output b/test/cmdlineTests/yul_verbatim_msize/output
index 22259fff71..f684bac217 100644
--- a/test/cmdlineTests/yul_verbatim_msize/output
+++ b/test/cmdlineTests/yul_verbatim_msize/output
@@ -17,18 +17,19 @@ Binary representation:
 6120005150616160025f5500
 
 Text representation:
-    /* "yul_verbatim_msize/input.yul":125:131   */
+    /* "yul_verbatim_msize/input.yul":61:67   */
   0x2000
-    /* "yul_verbatim_msize/input.yul":119:132   */
+    /* "yul_verbatim_msize/input.yul":55:68   */
   mload
+    /* "yul_verbatim_msize/input.yul":51:69   */
   pop
-    /* "yul_verbatim_msize/input.yul":137:157   */
+    /* "yul_verbatim_msize/input.yul":82:102   */
   verbatimbytecode_6161
-    /* "yul_verbatim_msize/input.yul":172:173   */
+    /* "yul_verbatim_msize/input.yul":125:126   */
   0x02
-    /* "yul_verbatim_msize/input.yul":169:170   */
+    /* "yul_verbatim_msize/input.yul":122:123   */
   0x00
-    /* "yul_verbatim_msize/input.yul":162:174   */
+    /* "yul_verbatim_msize/input.yul":115:127   */
   sstore
-    /* "yul_verbatim_msize/input.yul":0:176   */
+    /* "yul_verbatim_msize/input.yul":27:143   */
   stop
diff --git a/test/libyul/objectCompiler/data.yul b/test/libyul/objectCompiler/data.yul
index caa6499218..ad8899fb11 100644
--- a/test/libyul/objectCompiler/data.yul
+++ b/test/libyul/objectCompiler/data.yul
@@ -5,10 +5,10 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":20:22   */
+//     /* "source":22:29   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // Bytecode: 00fe
 // Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
+// SourceMappings: 22:7:0:-:0
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
index 719b109f1d..9f7fca9adc 100644
--- a/test/libyul/objectCompiler/datacopy.yul
+++ b/test/libyul/objectCompiler/datacopy.yul
@@ -13,40 +13,40 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":57:72   */
+//     /* "source":77:92   */
 //   dataSize(sub_0)
-//     /* "source":38:55   */
+//     /* "source":58:75   */
 //   dataOffset(sub_0)
-//     /* "source":35:36   */
+//     /* "source":55:56   */
 //   0x00
-//     /* "source":26:73   */
+//     /* "source":46:93   */
 //   codecopy
-//     /* "source":88:103   */
+//     /* "source":116:131   */
 //   dataSize(sub_0)
-//     /* "source":85:86   */
+//     /* "source":113:114   */
 //   0x00
-//     /* "source":78:104   */
+//     /* "source":106:132   */
 //   return
 // stop
 //
 // sub_0: assembly {
-//         /* "source":153:170   */
+//         /* "source":223:240   */
 //       0x00
-//         /* "source":150:151   */
+//         /* "source":220:221   */
 //       0x00
-//         /* "source":143:171   */
+//         /* "source":213:241   */
 //       sstore
-//         /* "source":188:205   */
+//         /* "source":268:285   */
 //       0x0d
-//         /* "source":185:186   */
+//         /* "source":265:266   */
 //       0x00
-//         /* "source":178:206   */
+//         /* "source":258:286   */
 //       mstore
-//         /* "source":135:212   */
+//         /* "source":181:310   */
 //       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
 // Bytecode: 6009600b5f3960095ff3fe5f5f55600d5f5200fe
 // Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 PUSH0 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
-// SourceMappings: 57:15:0:-:0;38:17;35:1;26:47;88:15;85:1;78:26
+// SourceMappings: 77:15:0:-:0;58:17;55:1;46:47;116:15;113:1;106:26
diff --git a/test/libyul/objectCompiler/dataoffset_code.yul b/test/libyul/objectCompiler/dataoffset_code.yul
index 58521c87f9..8ca10add2f 100644
--- a/test/libyul/objectCompiler/dataoffset_code.yul
+++ b/test/libyul/objectCompiler/dataoffset_code.yul
@@ -7,28 +7,28 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:49   */
+//     /* "source":44:61   */
 //   dataOffset(sub_0)
-//     /* "source":29:30   */
+//     /* "source":41:42   */
 //   0x00
-//     /* "source":22:50   */
+//     /* "source":34:62   */
 //   sstore
-//     /* "source":20:52   */
+//     /* "source":22:70   */
 //   stop
 // stop
 //
 // sub_0: assembly {
-//         /* "source":91:92   */
+//         /* "source":117:118   */
 //       0x08
-//         /* "source":88:89   */
+//         /* "source":114:115   */
 //       0x00
-//         /* "source":81:93   */
+//         /* "source":107:119   */
 //       sstore
-//         /* "source":79:95   */
+//         /* "source":103:123   */
 //       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
 // 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
+// SourceMappings: 44:17:0:-:0;41:1;34:28;22:48
diff --git a/test/libyul/objectCompiler/dataoffset_data.yul b/test/libyul/objectCompiler/dataoffset_data.yul
index 61f0c44189..9155674898 100644
--- a/test/libyul/objectCompiler/dataoffset_data.yul
+++ b/test/libyul/objectCompiler/dataoffset_data.yul
@@ -4,16 +4,16 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:51   */
+//     /* "source":56:75   */
 //   data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f
-//     /* "source":29:30   */
+//     /* "source":53:54   */
 //   0x00
-//     /* "source":22:52   */
+//     /* "source":46:76   */
 //   sstore
-//     /* "source":20:54   */
+//     /* "source":22:92   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // 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
+// SourceMappings: 56:19:0:-:0;53:1;46:30;22:70
diff --git a/test/libyul/objectCompiler/dataoffset_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
index ae123ba49a..681c24c0ee 100644
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ b/test/libyul/objectCompiler/dataoffset_self.yul
@@ -4,16 +4,16 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:47   */
+//     /* "source":44:59   */
 //   0x00
-//     /* "source":29:30   */
+//     /* "source":41:42   */
 //   0x00
-//     /* "source":22:48   */
+//     /* "source":34:60   */
 //   sstore
-//     /* "source":20:50   */
+//     /* "source":22:68   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // Bytecode: 5f5f5500fe
 // Opcodes: PUSH0 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
+// SourceMappings: 44:15:0:-:0;41:1;34:26;22:46
diff --git a/test/libyul/objectCompiler/datasize_code.yul b/test/libyul/objectCompiler/datasize_code.yul
index 4e559ab895..cab7987ea9 100644
--- a/test/libyul/objectCompiler/datasize_code.yul
+++ b/test/libyul/objectCompiler/datasize_code.yul
@@ -7,28 +7,28 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:47   */
+//     /* "source":44:59   */
 //   dataSize(sub_0)
-//     /* "source":29:30   */
+//     /* "source":41:42   */
 //   0x00
-//     /* "source":22:48   */
+//     /* "source":34:60   */
 //   sstore
-//     /* "source":20:50   */
+//     /* "source":22:68   */
 //   stop
 // stop
 //
 // sub_0: assembly {
-//         /* "source":89:90   */
+//         /* "source":115:116   */
 //       0x08
-//         /* "source":86:87   */
+//         /* "source":112:113   */
 //       0x00
-//         /* "source":79:91   */
+//         /* "source":105:117   */
 //       sstore
-//         /* "source":77:93   */
+//         /* "source":101:121   */
 //       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
 // Bytecode: 60065f5500fe
 // Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
+// SourceMappings: 44:15:0:-:0;41:1;34:26;22:46
diff --git a/test/libyul/objectCompiler/datasize_data.yul b/test/libyul/objectCompiler/datasize_data.yul
index 3281bd9ba7..d1261d2464 100644
--- a/test/libyul/objectCompiler/datasize_data.yul
+++ b/test/libyul/objectCompiler/datasize_data.yul
@@ -4,16 +4,16 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:49   */
+//     /* "source":44:61   */
 //   0x0d
-//     /* "source":29:30   */
+//     /* "source":41:42   */
 //   0x00
-//     /* "source":22:50   */
+//     /* "source":34:62   */
 //   sstore
-//     /* "source":20:52   */
+//     /* "source":22:70   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // Bytecode: 600d5f5500fe
 // Opcodes: PUSH1 0xD PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:17:0:-:0;29:1;22:28;20:32
+// SourceMappings: 44:17:0:-:0;41:1;34:28;22:48
diff --git a/test/libyul/objectCompiler/datasize_self.yul b/test/libyul/objectCompiler/datasize_self.yul
index 6bc520af58..2a19d0a88f 100644
--- a/test/libyul/objectCompiler/datasize_self.yul
+++ b/test/libyul/objectCompiler/datasize_self.yul
@@ -4,16 +4,16 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:45   */
+//     /* "source":36:49   */
 //   bytecodeSize
-//     /* "source":29:30   */
+//     /* "source":33:34   */
 //   0x00
-//     /* "source":22:46   */
+//     /* "source":26:50   */
 //   sstore
-//     /* "source":20:48   */
+//     /* "source":22:54   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // Bytecode: 60065f5500fe
 // Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 32:13:0:-:0;29:1;22:24;20:28
+// SourceMappings: 36:13:0:-:0;33:1;26:24;22:32
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 285a8a8d54..c6fd0ac805 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
@@ -9,14 +9,14 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":167:209   */
+//     /* "source":143:185   */
 //   0x1234567890123456789012345678901234567890
-//     /* "source":58:59   */
+//     /* "source":59:60   */
 //   0x00
-//     /* "source":32:219   */
+//     /* "source":46:186   */
 //   assignImmutable("0x85a5b1db611c82c46f5fa18e39ae218397536256c451e5de155a86de843a9ad6")
-//     /* "source":22:225   */
+//     /* "source":22:202   */
 //   stop
 // Bytecode: 7312345678901234567890123456789012345678905f505000
 // Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH0 POP POP STOP
-// SourceMappings: 167:42:0:-:0;58:1;32:187;;22:203
+// SourceMappings: 143:42:0:-:0;59:1;46:140;;22:180
diff --git a/test/libyul/objectCompiler/leading_and_trailing_dots.yul b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
index ea6a8fcd8b..13c9523557 100644
--- a/test/libyul/objectCompiler/leading_and_trailing_dots.yul
+++ b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
@@ -14,29 +14,29 @@
 }
 // ----
 // Assembly:
-//     /* "source":49:50   */
+//     /* "source":53:54   */
 //   0x02
-//     /* "source":6:42   */
+//     /* "source":108:140   */
 // tag_1:
-//     /* "source":34:35   */
+//     /* "source":136:137   */
 //   0x00
-//     /* "source":32:36   */
+//     /* "source":134:138   */
 //   tag_1
 //   jump	// in
-//     /* "source":56:92   */
+//     /* "source":149:181   */
 // tag_2:
-//     /* "source":84:85   */
+//     /* "source":177:178   */
 //   0x00
-//     /* "source":82:86   */
+//     /* "source":175:179   */
 //   tag_2
 //   jump	// in
-//     /* "source":106:142   */
+//     /* "source":190:222   */
 // tag_3:
-//     /* "source":134:135   */
+//     /* "source":218:219   */
 //   0x00
-//     /* "source":132:136   */
+//     /* "source":216:220   */
 //   tag_3
 //   jump	// in
 // Bytecode: 60025b5f6002565b5f6007565b5f600c56
 // Opcodes: PUSH1 0x2 JUMPDEST PUSH0 PUSH1 0x2 JUMP JUMPDEST PUSH0 PUSH1 0x7 JUMP JUMPDEST PUSH0 PUSH1 0xC JUMP
-// SourceMappings: 49:1:0:-:0;6:36;34:1;32:4;:::i;56:36::-;84:1;82:4;:::i;106:36::-;134:1;132:4;:::i
+// SourceMappings: 53:1:0:-:0;108:32;136:1;134:4;:::i;149:32::-;177:1;175:4;:::i;190:32::-;218:1;216:4;:::i
diff --git a/test/libyul/objectCompiler/linkersymbol.yul b/test/libyul/objectCompiler/linkersymbol.yul
index c4da288e61..91a456461f 100644
--- a/test/libyul/objectCompiler/linkersymbol.yul
+++ b/test/libyul/objectCompiler/linkersymbol.yul
@@ -7,31 +7,31 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":179:180   */
+//     /* "source":190:191   */
 //   0x00
-//     /* "source":174:177   */
+//     /* "source":185:188   */
 //   0x80
-//     /* "source":171:172   */
+//     /* "source":182:183   */
 //   0x04
-//     /* "source":44:79   */
+//     /* "source":58:93   */
 //   dup2
 //   dup4
 //   linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
-//     /* "source":109:119   */
+//     /* "source":127:137   */
 //   0x18530aaf
-//     /* "source":104:107   */
+//     /* "source":122:125   */
 //   0xe3
-//     /* "source":100:120   */
+//     /* "source":118:138   */
 //   shl
-//     /* "source":88:121   */
+//     /* "source":106:139   */
 //   dup4
 //   mstore
-//     /* "source":150:155   */
+//     /* "source":161:166   */
 //   gas
-//     /* "source":145:181   */
+//     /* "source":156:192   */
 //   call
-//     /* "source":130:181   */
+//     /* "source":152:193   */
 //   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
+// SourceMappings: 190:1:0:-:0;185:3;182:1;58:35;;;127:10;122:3;118:20;106:33;;161:5;156:36;152:41
diff --git a/test/libyul/objectCompiler/long_object_name.yul b/test/libyul/objectCompiler/long_object_name.yul
index aa2dd1ac2e..f752602240 100644
--- a/test/libyul/objectCompiler/long_object_name.yul
+++ b/test/libyul/objectCompiler/long_object_name.yul
@@ -10,20 +10,20 @@ object "t" {
 // optimizationPreset: full
 // ----
 // Assembly:
-//     /* "source":33:146   */
+//     /* "source":56:169   */
 //   dataSize(sub_0)
-//     /* "source":30:31   */
+//     /* "source":53:54   */
 //   0x00
-//     /* "source":23:147   */
+//     /* "source":46:170   */
 //   sstore
-//     /* "source":19:150   */
+//     /* "source":22:186   */
 //   stop
 // stop
 //
 // sub_0: assembly {
-//         /* "source":272:274   */
+//         /* "source":317:324   */
 //       stop
 // }
 // Bytecode: 60015f5500fe
 // Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP INVALID
-// SourceMappings: 33:113:0:-:0;30:1;23:124;19:131
+// SourceMappings: 56:113:0:-:0;53:1;46:124;22:164
diff --git a/test/libyul/objectCompiler/manySubObjects.yul b/test/libyul/objectCompiler/manySubObjects.yul
index 2f4b163876..c046b182ff 100644
--- a/test/libyul/objectCompiler/manySubObjects.yul
+++ b/test/libyul/objectCompiler/manySubObjects.yul
@@ -136,340 +136,340 @@ object "root" {
 }
 // ----
 // Assembly:
-//     /* "source":45:61   */
+//     /* "source":59:75   */
 //   bytecodeSize
-//     /* "source":42:43   */
+//     /* "source":56:57   */
 //   0x00
-//     /* "source":35:62   */
+//     /* "source":49:76   */
 //   sstore
-//     /* "source":81:94   */
+//     /* "source":99:112   */
 //   dataSize(sub_0)
-//     /* "source":78:79   */
+//     /* "source":96:97   */
 //   0x01
-//     /* "source":71:95   */
+//     /* "source":89:113   */
 //   sstore
-//     /* "source":114:127   */
+//     /* "source":136:149   */
 //   dataSize(sub_1)
-//     /* "source":111:112   */
+//     /* "source":133:134   */
 //   0x02
-//     /* "source":104:128   */
+//     /* "source":126:150   */
 //   sstore
-//     /* "source":147:160   */
+//     /* "source":173:186   */
 //   dataSize(sub_2)
-//     /* "source":144:145   */
+//     /* "source":170:171   */
 //   0x03
-//     /* "source":137:161   */
+//     /* "source":163:187   */
 //   sstore
-//     /* "source":180:193   */
+//     /* "source":210:223   */
 //   dataSize(sub_3)
-//     /* "source":177:178   */
+//     /* "source":207:208   */
 //   0x04
-//     /* "source":170:194   */
+//     /* "source":200:224   */
 //   sstore
-//     /* "source":213:226   */
+//     /* "source":247:260   */
 //   dataSize(sub_4)
-//     /* "source":210:211   */
+//     /* "source":244:245   */
 //   0x05
-//     /* "source":203:227   */
+//     /* "source":237:261   */
 //   sstore
-//     /* "source":246:259   */
+//     /* "source":284:297   */
 //   dataSize(sub_5)
-//     /* "source":243:244   */
+//     /* "source":281:282   */
 //   0x06
-//     /* "source":236:260   */
+//     /* "source":274:298   */
 //   sstore
-//     /* "source":279:292   */
+//     /* "source":321:334   */
 //   dataSize(sub_6)
-//     /* "source":276:277   */
+//     /* "source":318:319   */
 //   0x07
-//     /* "source":269:293   */
+//     /* "source":311:335   */
 //   sstore
-//     /* "source":312:325   */
+//     /* "source":358:371   */
 //   dataSize(sub_7)
-//     /* "source":309:310   */
+//     /* "source":355:356   */
 //   0x08
-//     /* "source":302:326   */
+//     /* "source":348:372   */
 //   sstore
-//     /* "source":345:358   */
+//     /* "source":395:408   */
 //   dataSize(sub_8)
-//     /* "source":342:343   */
+//     /* "source":392:393   */
 //   0x09
-//     /* "source":335:359   */
+//     /* "source":385:409   */
 //   sstore
-//     /* "source":379:392   */
+//     /* "source":433:446   */
 //   dataSize(sub_9)
-//     /* "source":375:377   */
+//     /* "source":429:431   */
 //   0x0a
-//     /* "source":368:393   */
+//     /* "source":422:447   */
 //   sstore
-//     /* "source":413:426   */
+//     /* "source":471:484   */
 //   dataSize(sub_10)
-//     /* "source":409:411   */
+//     /* "source":467:469   */
 //   0x0b
-//     /* "source":402:427   */
+//     /* "source":460:485   */
 //   sstore
-//     /* "source":447:460   */
+//     /* "source":509:522   */
 //   dataSize(sub_11)
-//     /* "source":443:445   */
+//     /* "source":505:507   */
 //   0x0c
-//     /* "source":436:461   */
+//     /* "source":498:523   */
 //   sstore
-//     /* "source":481:494   */
+//     /* "source":547:560   */
 //   dataSize(sub_12)
-//     /* "source":477:479   */
+//     /* "source":543:545   */
 //   0x0d
-//     /* "source":470:495   */
+//     /* "source":536:561   */
 //   sstore
-//     /* "source":515:528   */
+//     /* "source":585:598   */
 //   dataSize(sub_13)
-//     /* "source":511:513   */
+//     /* "source":581:583   */
 //   0x0e
-//     /* "source":504:529   */
+//     /* "source":574:599   */
 //   sstore
-//     /* "source":549:562   */
+//     /* "source":623:636   */
 //   dataSize(sub_14)
-//     /* "source":545:547   */
+//     /* "source":619:621   */
 //   0x0f
-//     /* "source":538:563   */
+//     /* "source":612:637   */
 //   sstore
-//     /* "source":583:596   */
+//     /* "source":661:674   */
 //   dataSize(sub_15)
-//     /* "source":579:581   */
+//     /* "source":657:659   */
 //   0x10
-//     /* "source":572:597   */
+//     /* "source":650:675   */
 //   sstore
-//     /* "source":617:631   */
+//     /* "source":699:713   */
 //   dataSize(sub_16)
-//     /* "source":613:615   */
+//     /* "source":695:697   */
 //   0x11
-//     /* "source":606:632   */
+//     /* "source":688:714   */
 //   sstore
-//     /* "source":25:638   */
+//     /* "source":25:730   */
 //   stop
 // stop
 //
 // sub_0: assembly {
-//         /* "source":696:697   */
+//         /* "source":805:806   */
 //       0x00
-//         /* "source":691:694   */
+//         /* "source":800:803   */
 //       0x64
-//         /* "source":684:698   */
+//         /* "source":793:807   */
 //       sstore
-//         /* "source":723:739   */
+//         /* "source":836:852   */
 //       dataSize(sub_0)
-//         /* "source":718:721   */
+//         /* "source":831:834   */
 //       0xc8
-//         /* "source":711:740   */
+//         /* "source":824:853   */
 //       sstore
-//         /* "source":670:750   */
+//         /* "source":761:877   */
 //       stop
 //     stop
 //
 //     sub_0: assembly {
-//             /* "source":822:823   */
+//             /* "source":935:936   */
 //           0x00
-//             /* "source":817:820   */
+//             /* "source":930:933   */
 //           0x012c
-//             /* "source":810:824   */
+//             /* "source":923:937   */
 //           sstore
-//             /* "source":792:838   */
+//             /* "source":919:941   */
 //           stop
 //     }
 // }
 //
 // sub_1: assembly {
-//         /* "source":912:913   */
+//         /* "source":1004:1005   */
 //       0x01
-//         /* "source":907:910   */
+//         /* "source":999:1002   */
 //       0x64
-//         /* "source":900:914   */
+//         /* "source":992:1006   */
 //       sstore
-//         /* "source":886:924   */
+//         /* "source":988:1010   */
 //       stop
 // }
 //
 // sub_2: assembly {
-//         /* "source":988:989   */
+//         /* "source":1063:1064   */
 //       0x02
-//         /* "source":983:986   */
+//         /* "source":1058:1061   */
 //       0x65
-//         /* "source":976:990   */
+//         /* "source":1051:1065   */
 //       sstore
-//         /* "source":962:1000   */
+//         /* "source":1047:1069   */
 //       stop
 // }
 //
 // sub_3: assembly {
-//         /* "source":1064:1065   */
+//         /* "source":1122:1123   */
 //       0x03
-//         /* "source":1059:1062   */
+//         /* "source":1117:1120   */
 //       0x66
-//         /* "source":1052:1066   */
+//         /* "source":1110:1124   */
 //       sstore
-//         /* "source":1038:1076   */
+//         /* "source":1106:1128   */
 //       stop
 // }
 //
 // sub_4: assembly {
-//         /* "source":1140:1141   */
+//         /* "source":1181:1182   */
 //       0x04
-//         /* "source":1135:1138   */
+//         /* "source":1176:1179   */
 //       0x67
-//         /* "source":1128:1142   */
+//         /* "source":1169:1183   */
 //       sstore
-//         /* "source":1114:1152   */
+//         /* "source":1165:1187   */
 //       stop
 // }
 //
 // sub_5: assembly {
-//         /* "source":1216:1217   */
+//         /* "source":1240:1241   */
 //       0x05
-//         /* "source":1211:1214   */
+//         /* "source":1235:1238   */
 //       0x68
-//         /* "source":1204:1218   */
+//         /* "source":1228:1242   */
 //       sstore
-//         /* "source":1190:1228   */
+//         /* "source":1224:1246   */
 //       stop
 // }
 //
 // sub_6: assembly {
-//         /* "source":1292:1293   */
+//         /* "source":1299:1300   */
 //       0x06
-//         /* "source":1287:1290   */
+//         /* "source":1294:1297   */
 //       0x69
-//         /* "source":1280:1294   */
+//         /* "source":1287:1301   */
 //       sstore
-//         /* "source":1266:1304   */
+//         /* "source":1283:1305   */
 //       stop
 // }
 //
 // sub_7: assembly {
-//         /* "source":1368:1369   */
+//         /* "source":1358:1359   */
 //       0x07
-//         /* "source":1363:1366   */
+//         /* "source":1353:1356   */
 //       0x6a
-//         /* "source":1356:1370   */
+//         /* "source":1346:1360   */
 //       sstore
-//         /* "source":1342:1380   */
+//         /* "source":1342:1364   */
 //       stop
 // }
 //
 // sub_8: assembly {
-//         /* "source":1444:1445   */
+//         /* "source":1417:1418   */
 //       0x08
-//         /* "source":1439:1442   */
+//         /* "source":1412:1415   */
 //       0x6b
-//         /* "source":1432:1446   */
+//         /* "source":1405:1419   */
 //       sstore
-//         /* "source":1418:1456   */
+//         /* "source":1401:1423   */
 //       stop
 // }
 //
 // sub_9: assembly {
-//         /* "source":1520:1521   */
+//         /* "source":1476:1477   */
 //       0x09
-//         /* "source":1515:1518   */
+//         /* "source":1471:1474   */
 //       0x6c
-//         /* "source":1508:1522   */
+//         /* "source":1464:1478   */
 //       sstore
-//         /* "source":1494:1532   */
+//         /* "source":1460:1482   */
 //       stop
 // }
 //
 // sub_10: assembly {
-//         /* "source":1596:1598   */
+//         /* "source":1535:1537   */
 //       0x0a
-//         /* "source":1591:1594   */
+//         /* "source":1530:1533   */
 //       0x6d
-//         /* "source":1584:1599   */
+//         /* "source":1523:1538   */
 //       sstore
-//         /* "source":1570:1609   */
+//         /* "source":1519:1542   */
 //       stop
 // }
 //
 // sub_11: assembly {
-//         /* "source":1673:1675   */
+//         /* "source":1595:1597   */
 //       0x0b
-//         /* "source":1668:1671   */
+//         /* "source":1590:1593   */
 //       0x6e
-//         /* "source":1661:1676   */
+//         /* "source":1583:1598   */
 //       sstore
-//         /* "source":1647:1686   */
+//         /* "source":1579:1602   */
 //       stop
 // }
 //
 // sub_12: assembly {
-//         /* "source":1750:1752   */
+//         /* "source":1655:1657   */
 //       0x0c
-//         /* "source":1745:1748   */
+//         /* "source":1650:1653   */
 //       0x6f
-//         /* "source":1738:1753   */
+//         /* "source":1643:1658   */
 //       sstore
-//         /* "source":1724:1763   */
+//         /* "source":1639:1662   */
 //       stop
 // }
 //
 // sub_13: assembly {
-//         /* "source":1827:1829   */
+//         /* "source":1715:1717   */
 //       0x0d
-//         /* "source":1822:1825   */
+//         /* "source":1710:1713   */
 //       0x70
-//         /* "source":1815:1830   */
+//         /* "source":1703:1718   */
 //       sstore
-//         /* "source":1801:1840   */
+//         /* "source":1699:1722   */
 //       stop
 // }
 //
 // sub_14: assembly {
-//         /* "source":1904:1906   */
+//         /* "source":1775:1777   */
 //       0x0e
-//         /* "source":1899:1902   */
+//         /* "source":1770:1773   */
 //       0x71
-//         /* "source":1892:1907   */
+//         /* "source":1763:1778   */
 //       sstore
-//         /* "source":1878:1917   */
+//         /* "source":1759:1782   */
 //       stop
 // }
 //
 // sub_15: assembly {
-//         /* "source":1981:1983   */
+//         /* "source":1835:1837   */
 //       0x0f
-//         /* "source":1976:1979   */
+//         /* "source":1830:1833   */
 //       0x72
-//         /* "source":1969:1984   */
+//         /* "source":1823:1838   */
 //       sstore
-//         /* "source":1955:1994   */
+//         /* "source":1819:1842   */
 //       stop
 // }
 //
 // sub_16: assembly {
-//         /* "source":2059:2061   */
+//         /* "source":1924:1926   */
 //       0x10
-//         /* "source":2054:2057   */
+//         /* "source":1919:1922   */
 //       0x73
-//         /* "source":2047:2062   */
+//         /* "source":1912:1927   */
 //       sstore
-//         /* "source":2087:2104   */
+//         /* "source":1956:1973   */
 //       dataSize(sub_0)
-//         /* "source":2082:2085   */
+//         /* "source":1951:1954   */
 //       0xc9
-//         /* "source":2075:2105   */
+//         /* "source":1944:1974   */
 //       sstore
-//         /* "source":2033:2115   */
+//         /* "source":1880:1998   */
 //       stop
 //     stop
 //
 //     sub_0: assembly {
-//             /* "source":2188:2190   */
+//             /* "source":2057:2059   */
 //           0x10
-//             /* "source":2183:2186   */
+//             /* "source":2052:2055   */
 //           0x012c
-//             /* "source":2176:2191   */
+//             /* "source":2045:2060   */
 //           sstore
-//             /* "source":2158:2205   */
+//             /* "source":2041:2064   */
 //           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
+// SourceMappings: 59:16:0:-:0;56:1;49:27;99:13;96:1;89:24;136:13;133:1;126:24;173:13;170:1;163:24;210:13;207:1;200:24;247:13;244:1;237:24;284:13;281:1;274:24;321:13;318:1;311:24;358:13;355:1;348:24;395:13;392:1;385:24;433:13;429:2;422:25;471:13;467:2;460:25;509:13;505:2;498:25;547:13;543:2;536:25;585:13;581:2;574:25;623:13;619:2;612:25;661:13;657:2;650:25;699:14;695:2;688:26;25:705
diff --git a/test/libyul/objectCompiler/metadata.yul b/test/libyul/objectCompiler/metadata.yul
index 335522d04d..4f8cda7a4c 100644
--- a/test/libyul/objectCompiler/metadata.yul
+++ b/test/libyul/objectCompiler/metadata.yul
@@ -21,34 +21,34 @@ object "A" {
 }
 // ----
 // Assembly:
-//     /* "source":35:48   */
+//     /* "source":55:68   */
 //   0x0e
-//     /* "source":62:75   */
+//     /* "source":90:103   */
 //   0x03
-//     /* "source":80:92   */
+//     /* "source":116:128   */
 //   swap1
-//     /* "source":87:88   */
+//     /* "source":123:124   */
 //   0x00
-//     /* "source":80:92   */
+//     /* "source":116:128   */
 //   sstore
-//     /* "source":104:106   */
+//     /* "source":148:150   */
 //   0x20
-//     /* "source":97:110   */
+//     /* "source":141:154   */
 //   sstore
-//     /* "source":20:114   */
+//     /* "source":22:170   */
 //   stop
 // stop
 // data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
 // data_e1629b9dda060bb30c7908346f6af189c16773fa148d3366701fbaa35d54f3c8 414243
 //
 // sub_0: assembly {
-//         /* "source":157:176   */
+//         /* "source":242:261   */
 //       data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336
-//         /* "source":190:191   */
+//         /* "source":285:286   */
 //       0x00
-//         /* "source":183:195   */
+//         /* "source":278:290   */
 //       sstore
-//         /* "source":140:201   */
+//         /* "source":201:314   */
 //       stop
 //     stop
 //     data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
@@ -59,4 +59,4 @@ object "A" {
 // auxdata: 0x4d32
 // 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
+// SourceMappings: 55:13:0:-:0;90;116:12;123:1;116:12;148:2;141:13;22:148
diff --git a/test/libyul/objectCompiler/namedObject.yul b/test/libyul/objectCompiler/namedObject.yul
index d55c3ca253..06539dd893 100644
--- a/test/libyul/objectCompiler/namedObject.yul
+++ b/test/libyul/objectCompiler/namedObject.yul
@@ -3,8 +3,8 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":20:22   */
+//     /* "source":22:29   */
 //   stop
 // Bytecode: 00
 // Opcodes: STOP
-// SourceMappings: 20:2:0:-:0
+// SourceMappings: 22:7:0:-:0
diff --git a/test/libyul/objectCompiler/namedObjectCode.yul b/test/libyul/objectCompiler/namedObjectCode.yul
index 5936aa7443..f18535d711 100644
--- a/test/libyul/objectCompiler/namedObjectCode.yul
+++ b/test/libyul/objectCompiler/namedObjectCode.yul
@@ -3,14 +3,14 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":32:33   */
+//     /* "source":36:37   */
 //   0x01
-//     /* "source":29:30   */
+//     /* "source":33:34   */
 //   0x00
-//     /* "source":22:34   */
+//     /* "source":26:38   */
 //   sstore
-//     /* "source":20:36   */
+//     /* "source":22:42   */
 //   stop
 // Bytecode: 60015f5500
 // Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
-// SourceMappings: 32:1:0:-:0;29;22:12;20:16
+// SourceMappings: 36:1:0:-:0;33;26:12;22:20
diff --git a/test/libyul/objectCompiler/nested_optimizer.yul b/test/libyul/objectCompiler/nested_optimizer.yul
index cde1210ff8..ae06509429 100644
--- a/test/libyul/objectCompiler/nested_optimizer.yul
+++ b/test/libyul/objectCompiler/nested_optimizer.yul
@@ -18,28 +18,28 @@ object "a" {
 // optimizationPreset: full
 // ----
 // Assembly:
-//     /* "source":48:49   */
+//     /* "source":58:59   */
 //   0x00
-//     /* "source":35:50   */
+//     /* "source":41:56   */
 //   dup1
 //   calldataload
-//     /* "source":107:127   */
+//     /* "source":34:60   */
 //   sstore
-//     /* "source":20:131   */
+//     /* "source":22:68   */
 //   stop
 // stop
 //
 // sub_0: assembly {
-//         /* "source":188:189   */
+//         /* "source":141:142   */
 //       0x00
-//         /* "source":175:190   */
+//         /* "source":124:139   */
 //       dup1
 //       calldataload
-//         /* "source":253:273   */
+//         /* "source":117:143   */
 //       sstore
-//         /* "source":158:279   */
+//         /* "source":101:155   */
 //       stop
 // }
 // Bytecode: 5f80355500fe
 // Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP INVALID
-// SourceMappings: 48:1:0:-:0;35:15;;107:20;20:111
+// SourceMappings: 58:1:0:-:0;41:15;;34:26;22:46
diff --git a/test/libyul/objectCompiler/simple.yul b/test/libyul/objectCompiler/simple.yul
index b84c49a5a4..fb2339cebb 100644
--- a/test/libyul/objectCompiler/simple.yul
+++ b/test/libyul/objectCompiler/simple.yul
@@ -3,14 +3,14 @@
 }
 // ----
 // Assembly:
-//     /* "source":14:15   */
+//     /* "source":41:42   */
 //   0x01
-//     /* "source":11:12   */
+//     /* "source":38:39   */
 //   0x00
-//     /* "source":4:16   */
+//     /* "source":31:43   */
 //   sstore
-//     /* "source":0:18   */
+//     /* "source":27:47   */
 //   stop
 // Bytecode: 60015f5500
 // Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
-// SourceMappings: 14:1:0:-:0;11;4:12;0:18
+// SourceMappings: 41:1:0:-:0;38;31:12;27:20
diff --git a/test/libyul/objectCompiler/simple_optimizer.yul b/test/libyul/objectCompiler/simple_optimizer.yul
index 3ce4b7a4bb..cc63075895 100644
--- a/test/libyul/objectCompiler/simple_optimizer.yul
+++ b/test/libyul/objectCompiler/simple_optimizer.yul
@@ -8,15 +8,15 @@
 // optimizationPreset: full
 // ----
 // Assembly:
-//     /* "source":26:27   */
+//     /* "source":63:64   */
 //   0x00
-//     /* "source":13:28   */
+//     /* "source":46:61   */
 //   dup1
 //   calldataload
-//     /* "source":79:99   */
+//     /* "source":39:65   */
 //   sstore
-//     /* "source":0:101   */
+//     /* "source":27:73   */
 //   stop
 // Bytecode: 5f80355500
 // Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP
-// SourceMappings: 26:1:0:-:0;13:15;;79:20;0:101
+// SourceMappings: 63:1:0:-:0;46:15;;39:26;27:46
diff --git a/test/libyul/objectCompiler/smoke.yul b/test/libyul/objectCompiler/smoke.yul
index 3f1079aa70..82aea42f52 100644
--- a/test/libyul/objectCompiler/smoke.yul
+++ b/test/libyul/objectCompiler/smoke.yul
@@ -2,8 +2,8 @@
 }
 // ----
 // Assembly:
-//     /* "source":0:3   */
+//     /* "source":27:34   */
 //   stop
 // Bytecode: 00
 // Opcodes: STOP
-// SourceMappings: 0:3:0:-:0
+// SourceMappings: 27:7:0:-:0
diff --git a/test/libyul/objectCompiler/subObject.yul b/test/libyul/objectCompiler/subObject.yul
index 46fc03f10e..a47c4feda2 100644
--- a/test/libyul/objectCompiler/subObject.yul
+++ b/test/libyul/objectCompiler/subObject.yul
@@ -6,21 +6,21 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":20:22   */
+//     /* "source":22:29   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 //
 // sub_0: assembly {
-//         /* "source":149:150   */
+//         /* "source":123:124   */
 //       0x01
-//         /* "source":146:147   */
+//         /* "source":120:121   */
 //       0x00
-//         /* "source":139:151   */
+//         /* "source":113:125   */
 //       sstore
-//         /* "source":137:153   */
+//         /* "source":109:129   */
 //       stop
 // }
 // Bytecode: 00fe
 // Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
+// SourceMappings: 22:7:0:-:0
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
index 291749220a..b18c902db6 100644
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ b/test/libyul/objectCompiler/subObjectAccess.yul
@@ -67,164 +67,164 @@ object "A" {
 }
 // ----
 // Assembly:
-//     /* "source":37:52   */
+//     /* "source":57:72   */
 //   0x00
-//     /* "source":68:81   */
+//     /* "source":96:109   */
 //   bytecodeSize
-//     /* "source":97:112   */
+//     /* "source":133:148   */
 //   dataOffset(sub_0)
-//     /* "source":128:141   */
+//     /* "source":172:185   */
 //   dataSize(sub_0)
-//     /* "source":158:175   */
+//     /* "source":210:227   */
 //   dataOffset(sub_0.sub_0)
-//     /* "source":192:207   */
+//     /* "source":252:267   */
 //   dataSize(sub_0.sub_0)
-//     /* "source":224:241   */
+//     /* "source":292:309   */
 //   swap1
 //   dataOffset(sub_0.sub_1)
-//     /* "source":258:273   */
+//     /* "source":334:349   */
 //   swap3
 //   dataSize(sub_0.sub_1)
-//     /* "source":291:310   */
+//     /* "source":375:394   */
 //   swap5
 //   dataOffset(sub_0.sub_0.sub_0)
-//     /* "source":328:345   */
+//     /* "source":420:437   */
 //   swap7
 //   dataSize(sub_0.sub_0.sub_0)
-//     /* "source":351:365   */
+//     /* "source":450:464   */
 //   swap9
-//     /* "source":358:359   */
+//     /* "source":457:458   */
 //   0x00
-//     /* "source":351:365   */
+//     /* "source":450:464   */
 //   sstore
-//     /* "source":377:379   */
+//     /* "source":484:486   */
 //   0x20
-//     /* "source":370:385   */
+//     /* "source":477:492   */
 //   sstore
-//     /* "source":397:399   */
+//     /* "source":512:514   */
 //   0x40
-//     /* "source":390:405   */
+//     /* "source":505:520   */
 //   sstore
-//     /* "source":417:419   */
+//     /* "source":540:542   */
 //   0x60
-//     /* "source":410:425   */
+//     /* "source":533:548   */
 //   sstore
-//     /* "source":437:440   */
+//     /* "source":568:571   */
 //   0x80
-//     /* "source":430:447   */
+//     /* "source":561:578   */
 //   sstore
-//     /* "source":459:462   */
+//     /* "source":598:601   */
 //   0xa0
-//     /* "source":452:469   */
+//     /* "source":591:608   */
 //   sstore
-//     /* "source":481:484   */
+//     /* "source":628:631   */
 //   0xc0
-//     /* "source":474:491   */
+//     /* "source":621:638   */
 //   sstore
-//     /* "source":503:506   */
+//     /* "source":658:661   */
 //   0xe0
-//     /* "source":496:513   */
+//     /* "source":651:668   */
 //   sstore
-//     /* "source":525:528   */
+//     /* "source":688:691   */
 //   0x0100
-//     /* "source":518:536   */
+//     /* "source":681:699   */
 //   sstore
-//     /* "source":548:551   */
+//     /* "source":719:722   */
 //   0x0120
-//     /* "source":541:559   */
+//     /* "source":712:730   */
 //   sstore
-//     /* "source":574:577   */
+//     /* "source":753:756   */
 //   0x0140
-//     /* "source":571:572   */
+//     /* "source":750:751   */
 //   0x00
-//     /* "source":564:578   */
+//     /* "source":743:757   */
 //   return
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 //
 // sub_0: assembly {
-//         /* "source":659:674   */
+//         /* "source":896:911   */
 //       dataOffset(sub_0)
-//         /* "source":692:705   */
+//         /* "source":939:952   */
 //       dataSize(sub_0)
-//         /* "source":723:738   */
+//         /* "source":980:995   */
 //       dataOffset(sub_1)
-//         /* "source":756:769   */
+//         /* "source":1023:1036   */
 //       dataSize(sub_1)
-//         /* "source":788:805   */
+//         /* "source":1065:1082   */
 //       swap1
 //       dataOffset(sub_0.sub_0)
-//         /* "source":824:839   */
+//         /* "source":1111:1126   */
 //       swap3
 //       dataSize(sub_0.sub_0)
-//         /* "source":847:861   */
+//         /* "source":1143:1157   */
 //       swap5
-//         /* "source":854:855   */
+//         /* "source":1150:1151   */
 //       0x00
-//         /* "source":847:861   */
+//         /* "source":1143:1157   */
 //       sstore
-//         /* "source":875:877   */
+//         /* "source":1181:1183   */
 //       0x20
-//         /* "source":868:883   */
+//         /* "source":1174:1189   */
 //       sstore
-//         /* "source":897:899   */
+//         /* "source":1213:1215   */
 //       0x40
-//         /* "source":890:905   */
+//         /* "source":1206:1221   */
 //       sstore
-//         /* "source":919:921   */
+//         /* "source":1245:1247   */
 //       0x60
-//         /* "source":912:927   */
+//         /* "source":1238:1253   */
 //       sstore
-//         /* "source":941:944   */
+//         /* "source":1277:1280   */
 //       0x80
-//         /* "source":934:951   */
+//         /* "source":1270:1287   */
 //       sstore
-//         /* "source":965:968   */
+//         /* "source":1311:1314   */
 //       0xa0
-//         /* "source":958:975   */
+//         /* "source":1304:1321   */
 //       sstore
-//         /* "source":992:995   */
+//         /* "source":1348:1351   */
 //       0xc0
-//         /* "source":989:990   */
+//         /* "source":1345:1346   */
 //       0x00
-//         /* "source":982:996   */
+//         /* "source":1338:1352   */
 //       return
 //     stop
 //
 //     sub_0: assembly {
-//             /* "source":1052:1067   */
+//             /* "source":1466:1481   */
 //           dataOffset(sub_0)
-//             /* "source":1087:1100   */
+//             /* "source":1513:1526   */
 //           dataSize(sub_0)
-//             /* "source":1110:1124   */
+//             /* "source":1547:1561   */
 //           swap1
-//             /* "source":1117:1118   */
+//             /* "source":1554:1555   */
 //           0x00
-//             /* "source":1110:1124   */
+//             /* "source":1547:1561   */
 //           sstore
-//             /* "source":1140:1142   */
+//             /* "source":1589:1591   */
 //           0x20
-//             /* "source":1133:1148   */
+//             /* "source":1582:1597   */
 //           sstore
-//             /* "source":1167:1169   */
+//             /* "source":1628:1630   */
 //           0x40
-//             /* "source":1164:1165   */
+//             /* "source":1625:1626   */
 //           0x00
-//             /* "source":1157:1170   */
+//             /* "source":1618:1631   */
 //           return
 //         stop
 //
 //         sub_0: assembly {
-//                 /* "source":1223:1232   */
+//                 /* "source":1714:1723   */
 //               invalid
 //         }
 //     }
 //
 //     sub_1: assembly {
-//             /* "source":1295:1304   */
+//             /* "source":1794:1803   */
 //           invalid
 //     }
 // }
 // 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
+// SourceMappings: 57:15:0:-:0;96:13;133:15;172:13;210:17;252:15;292:17;;334:15;;375:19;;420:17;;450:14;457:1;450:14;484:2;477:15;512:2;505:15;540:2;533:15;568:3;561:17;598:3;591:17;628:3;621:17;658:3;651:17;688:3;681:18;719:3;712:18;753:3;750:1;743:14
diff --git a/test/libyul/objectCompiler/subSubObject.yul b/test/libyul/objectCompiler/subSubObject.yul
index a9936d58fb..a4511324e9 100644
--- a/test/libyul/objectCompiler/subSubObject.yul
+++ b/test/libyul/objectCompiler/subSubObject.yul
@@ -12,30 +12,30 @@ object "a" {
 }
 // ----
 // Assembly:
-//     /* "source":20:22   */
+//     /* "source":22:29   */
 //   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 //
 // sub_0: assembly {
-//         /* "source":153:154   */
+//         /* "source":123:124   */
 //       0x01
-//         /* "source":150:151   */
+//         /* "source":120:121   */
 //       0x00
-//         /* "source":143:155   */
+//         /* "source":113:125   */
 //       sstore
-//         /* "source":141:157   */
+//         /* "source":109:129   */
 //       stop
 //     stop
 //
 //     sub_0: assembly {
-//             /* "source":203:204   */
+//             /* "source":187:188   */
 //           0x03
-//             /* "source":200:201   */
+//             /* "source":184:185   */
 //           0x02
-//             /* "source":193:205   */
+//             /* "source":177:189   */
 //           sstore
-//             /* "source":191:207   */
+//             /* "source":173:193   */
 //           stop
 //         stop
 //         data_6adf031833174bbe4c85eafe59ddb54e6584648c2c962c6f94791ab49caa0ad4 123456
@@ -43,4 +43,4 @@ object "a" {
 // }
 // Bytecode: 00fe
 // Opcodes: STOP INVALID
-// SourceMappings: 20:2:0:-:0
+// SourceMappings: 22:7:0:-:0
diff --git a/test/libyul/objectCompiler/verbatim_bug.yul b/test/libyul/objectCompiler/verbatim_bug.yul
index 778494f0b3..14a1c02b1f 100644
--- a/test/libyul/objectCompiler/verbatim_bug.yul
+++ b/test/libyul/objectCompiler/verbatim_bug.yul
@@ -26,99 +26,99 @@ object "a" {
 // optimizationPreset: full
 // ----
 // Assembly:
-//     /* "source":87:88   */
+//     /* "source":65:66   */
 //   0x00
-//     /* "source":81:89   */
+//     /* "source":59:67   */
 //   dup1
 //   sload
-//     /* "source":139:307   */
+//     /* "source":133:225   */
 //   dup1
 //   iszero
 //   tag_1
 //   jumpi
-//     /* "source":316:361   */
+//     /* "source":238:263   */
 //   dup1
-//     /* "source":321:325   */
+//     /* "source":243:247   */
 //   0x01
-//     /* "source":316:361   */
+//     /* "source":238:263   */
 //   eq
 //   tag_3
 //   jumpi
-//     /* "source":370:448   */
+//     /* "source":276:368   */
 //   dup1
-//     /* "source":375:379   */
+//     /* "source":281:285   */
 //   0x02
-//     /* "source":370:448   */
+//     /* "source":276:368   */
 //   eq
 //   tag_5
 //   jumpi
-//     /* "source":462:466   */
+//     /* "source":386:390   */
 //   0x03
-//     /* "source":457:502   */
+//     /* "source":381:406   */
 //   eq
 //   tag_7
 //   jumpi
-//     /* "source":87:88   */
+//     /* "source":426:427   */
 //   0x00
-//     /* "source":512:529   */
+//     /* "source":419:436   */
 //   sstore
-//     /* "source":118:502   */
+//     /* "source":108:406   */
 //   stop
-//     /* "source":467:502   */
+//     /* "source":391:406   */
 // tag_7:
-//     /* "source":481:492   */
+//     /* "source":393:404   */
 //   pop
-//     /* "source":491:492   */
+//     /* "source":403:404   */
 //   0x03
-//     /* "source":87:88   */
+//     /* "source":426:427   */
 //   0x00
-//     /* "source":512:529   */
+//     /* "source":419:436   */
 //   sstore
-//     /* "source":118:502   */
+//     /* "source":108:406   */
 //   stop
-//     /* "source":380:448   */
+//     /* "source":286:368   */
 // tag_5:
-//     /* "source":404:438   */
+//     /* "source":314:354   */
 //   pop
 //   pop
-//     /* "source":45:59   */
+//     /* "source":339:353   */
 //   0xaabbccddeeff
-//     /* "source":404:438   */
+//     /* "source":314:354   */
 //   verbatimbytecode_506002
-//     /* "source":87:88   */
+//     /* "source":426:427   */
 //   0x00
-//     /* "source":512:529   */
+//     /* "source":419:436   */
 //   sstore
-//     /* "source":118:502   */
+//     /* "source":108:406   */
 //   stop
-//     /* "source":326:361   */
+//     /* "source":248:263   */
 // tag_3:
-//     /* "source":340:351   */
+//     /* "source":250:261   */
 //   pop
 //   pop
-//     /* "source":350:351   */
+//     /* "source":260:261   */
 //   0x01
-//     /* "source":87:88   */
+//     /* "source":426:427   */
 //   0x00
-//     /* "source":512:529   */
+//     /* "source":419:436   */
 //   sstore
-//     /* "source":118:502   */
+//     /* "source":108:406   */
 //   stop
-//     /* "source":149:307   */
+//     /* "source":143:225   */
 // tag_1:
-//     /* "source":263:297   */
+//     /* "source":171:211   */
 //   pop
 //   pop
-//     /* "source":45:59   */
+//     /* "source":196:210   */
 //   0xaabbccddeeff
-//     /* "source":263:297   */
+//     /* "source":171:211   */
 //   verbatimbytecode_506000
-//     /* "source":87:88   */
+//     /* "source":426:427   */
 //   0x00
-//     /* "source":512:529   */
+//     /* "source":419:436   */
 //   sstore
-//     /* "source":118:502   */
+//     /* "source":108:406   */
 //   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
+// SourceMappings: 65:1:0:-:0;59:8;;133:92;;;;238:25;243:4;238:25;;;276:92;281:4;276:92;;;386:4;381:25;;;426:1;419:17;108:298;391:15;393:11;403:1;426;419:17;108:298;286:82;314:40;;339:14;314:40;426:1;419:17;108:298;248:15;250:11;;260:1;426;419:17;108:298;143:82;171:40;;196:14;171:40;426:1;419:17;108:298

From ea85a788255738d36c0d3f886b7f5919f293bc29 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:45:02 +0200
Subject: [PATCH 0983/1140] CLI: remove --yul flag

---
 Changelog.md                               |  1 +
 solc/CommandLineParser.cpp                 | 19 ++++++++-----
 test/cmdlineTests/yul_optimize_runs/args   |  2 +-
 test/cmdlineTests/~assembler_modes/test.sh | 21 ++++++++------
 test/solc/CommandLineInterface.cpp         |  9 +++---
 test/solc/CommandLineParser.cpp            | 32 ++++++++++------------
 6 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5e8a7bef84..71cff3e1f3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@ Compiler Features:
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Standard JSON Interface: Add ``transientStorageLayout`` output.
+ * Yul: Drop the deprecated typed Yul dialect that was only accessible via ``--yul`` in the CLI.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
  * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 97c6901400..19089d885a 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -618,6 +618,9 @@ General Information)").c_str(),
 				"Select desired EOF version. Currently the only valid value is 1. "
 				"If not specified, legacy non-EOF bytecode will be generated."
 			)
+			(
+				g_strYul.c_str(), "The typed Yul dialect is no longer supported. For regular Yul compilation use --strict-assembly instead."
+			)
 		;
 	outputOptions.add_options()
 		(
@@ -664,10 +667,6 @@ General Information)").c_str(),
 			g_strAssemble.c_str(),
 			"Switch to assembly mode and assume input is assembly."
 		)
-		(
-			g_strYul.c_str(),
-			"Switch to Yul mode and assume input is Yul."
-		)
 		(
 			g_strStrictAssembly.c_str(),
 			"Switch to strict assembly mode and assume input is strict assembly."
@@ -956,7 +955,6 @@ void CommandLineParser::processArgs()
 		g_strLink,
 		g_strAssemble,
 		g_strStrictAssembly,
-		g_strYul,
 		g_strImportAst,
 		g_strLSP,
 		g_strImportEvmAssemblerJson,
@@ -972,7 +970,7 @@ void CommandLineParser::processArgs()
 		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)
+	else if (m_args.count(g_strAssemble) > 0 || m_args.count(g_strStrictAssembly) > 0)
 		m_options.input.mode = InputMode::Assembler;
 	else if (m_args.count(g_strLink) > 0)
 		m_options.input.mode = InputMode::Linker;
@@ -990,6 +988,13 @@ void CommandLineParser::processArgs()
 	)
 		return;
 
+	if (m_args.count(g_strYul) > 0)
+		solThrow(
+			CommandLineValidationError,
+			"The typed Yul dialect formerly accessible via --yul is no longer supported, "
+			"please use --strict-assembly instead."
+		);
+
 	std::map<std::string, std::set<InputMode>> validOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1276,7 +1281,7 @@ void CommandLineParser::processArgs()
 		// switch to assembly mode
 		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);
+		m_options.assembly.inputLanguage = m_args.count(g_strStrictAssembly) ? Input::StrictAssembly : Input::Assembly;
 
 		if (m_args.count(g_strMachine))
 		{
diff --git a/test/cmdlineTests/yul_optimize_runs/args b/test/cmdlineTests/yul_optimize_runs/args
index 033abe3bbb..3a8567e924 100644
--- a/test/cmdlineTests/yul_optimize_runs/args
+++ b/test/cmdlineTests/yul_optimize_runs/args
@@ -1 +1 @@
---yul --yul-dialect evm --optimize --optimize-runs 10000
+--strict-assembly --yul-dialect evm --optimize --optimize-runs 10000
diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
index 5ca1bb40f8..708c763957 100755
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@@ -25,19 +25,24 @@ function test_solc_assembly_output
 }
 
 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.
+# Test 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
+# Test 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 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"
+
+# Test that --yul triggers an error
+set +e
+output=$(echo '{}' | "$SOLC" - --yul 2>&1)
+failed=$?
+expected="Error: The typed Yul dialect formerly accessible via --yul is no longer supported, please use --strict-assembly instead."
+set -e
+if [[ $output != "${expected}" ]] || (( failed == 0 ))
+then
+    fail "Incorrect error response to --yul flag: $output"
+fi
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index b3b93cb3aa..6d19df01b3 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(version)
 
 BOOST_AUTO_TEST_CASE(multiple_input_modes)
 {
-	std::array<std::string, 10> inputModeOptions = {
+	std::array inputModeOptions {
 		"--help",
 		"--license",
 		"--version",
@@ -156,17 +156,16 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 		"--link",
 		"--assemble",
 		"--strict-assembly",
-		"--yul",
 		"--import-ast",
 		"--import-asm-json",
 	};
 	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. "
+		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --import-ast, --lsp, --import-asm-json. "
 		"Select at most one.";
 
-	for (std::string const& mode1: inputModeOptions)
-		for (std::string const& mode2: inputModeOptions)
+	for (auto const& mode1: inputModeOptions)
+		for (auto const& mode2: inputModeOptions)
 			if (mode1 != mode2)
 				BOOST_CHECK_EXCEPTION(
 					parseCommandLineAndReadInputFiles({"solc", mode1, mode2}),
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 37c638a3bb..e0347a18c4 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -250,7 +250,6 @@ BOOST_AUTO_TEST_CASE(no_import_callback)
 		{"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)
@@ -271,13 +270,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 {
 	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},
 		{{"--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},
 	};
 
@@ -424,20 +420,20 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 {
 	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"}},
-		{"--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-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"}},
-		{"--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"}}
+		{"--experimental-via-ir", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--via-ir", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--metadata-literal", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--metadata-hash=swarm", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-proved-safe", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-unproved", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-unsupported", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-div-mod-no-slacks", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-engine=bmc", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-invariants=contract,reentrancy", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-solvers=z3,smtlib2", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-timeout=5", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-contracts=contract1.yul:A,contract2.yul:B", {"--assemble", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-targets=underflow,divByZero", {"--assemble", "--strict-assembly", "--standard-json", "--link"}}
 	};
 
 	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)

From 55a5fd9b8bdd2cdcbc4cafdad2c0e4189aaba607 Mon Sep 17 00:00:00 2001
From: pgebal <pawel.gebal@imapp.pl>
Date: Fri, 9 Aug 2024 14:47:53 +0200
Subject: [PATCH 0984/1140] Fix SMT logic error when assigning to an array of
 contracts or functions (#15322)

---
 Changelog.md                                    |  1 +
 libsolidity/formal/SymbolicTypes.cpp            |  8 ++++++++
 .../types/array_of_contracts.sol                | 17 +++++++++++++++++
 .../types/array_of_functions.sol                | 16 ++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/types/array_of_contracts.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/array_of_functions.sol

diff --git a/Changelog.md b/Changelog.md
index 71cff3e1f3..a3dfc541d1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,6 +28,7 @@ Bugfixes:
  * SMTChecker: Fix error that reports invalid number of verified checks for BMC and CHC engines.
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
+ * SMTChecker: Fix SMT logic error when assigning to an array of contracts or functions.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul AST: Fix ``nativeSrc`` attributes in optimized IR AST referring to locations in unoptimized IR.
  * Yul IR Code Generation: Deterministic order of Yul subobjects.
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 350e18bdcf..4a4ac8175f 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -110,6 +110,14 @@ SortPointer smtSort(frontend::Type const& _type)
 			// in the tuple's name.
 			if (auto tupleSort = std::dynamic_pointer_cast<TupleSort>(array->range))
 				tupleName = tupleSort->name;
+			else if (isContract(*baseType))
+				// use a common sort for contracts so inheriting contracts do not cause conflicting SMT types
+				// solc handles types mismtach
+				tupleName = "contract";
+			else if (isFunction(*baseType))
+				// use a common sort for functions so pure and view modifier do not cause conflicting SMT types
+				// solc handles types mismtach
+				tupleName = "function";
 			else if (
 				baseType->category() == frontend::Type::Category::Integer ||
 				baseType->category() == frontend::Type::Category::FixedPoint
diff --git a/test/libsolidity/smtCheckerTests/types/array_of_contracts.sol b/test/libsolidity/smtCheckerTests/types/array_of_contracts.sol
new file mode 100644
index 0000000000..89d2420323
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/array_of_contracts.sol
@@ -0,0 +1,17 @@
+contract A {}
+
+contract B is A {}
+
+contract C {
+	A[10] a;
+	B[10] b;
+
+	function f() public returns(address) {
+		a = b;
+		return address(a[0]);
+	}
+}
+// ====
+// 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/array_of_functions.sol b/test/libsolidity/smtCheckerTests/types/array_of_functions.sol
new file mode 100644
index 0000000000..58a73d4ced
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/array_of_functions.sol
@@ -0,0 +1,16 @@
+contract C {
+	function() external returns(uint)[1] a;
+
+	function b() external pure returns(uint) {
+		return 1;
+	}
+
+	function test() public returns(uint) {
+		a = [this.b];
+		return a[0]();
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From da68f49bc3a523f96c1e5aa525f80ee3e104bc4b Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 6 Aug 2024 14:47:28 -0300
Subject: [PATCH 0985/1140] Dont allow initialization of transient storage
 state variables

---
 libsolidity/analysis/DeclarationTypeChecker.cpp       |  8 ++++++++
 .../unsupported/transient_storage_state_variable.sol  |  4 ++--
 .../constants/constant_transient_state_variable.sol   |  1 +
 ...ransient_value_type_state_variables_assignment.sol |  9 ---------
 ...ient_value_type_state_variables_initialization.sol | 11 +++++++++++
 5 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 7e6ab98e1e..bdf023c5c0 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -469,6 +469,14 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 						_variable.location(),
 						"Transient cannot be used as data location for constant or immutable variables."
 					);
+
+				if (_variable.value())
+					m_errorReporter.declarationError(
+						9825_error,
+						_variable.location(),
+						"Initialization of transient storage state variables is not supported."
+					);
+
 				typeLoc = DataLocation::Transient;
 				break;
 			default:
diff --git a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
index b2dbc8efe5..c74eb24c3f 100644
--- a/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
+++ b/test/libsolidity/smtCheckerTests/unsupported/transient_storage_state_variable.sol
@@ -1,6 +1,6 @@
 contract C {
-    uint transient x = 42;
-    function test() public view { assert(x == 42); }
+    uint transient x;
+    function test() public view { assert(x == 0); }
 }
 // ====
 // SMTEngine: all
diff --git a/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
index f9a722a1b4..15913360c3 100644
--- a/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
@@ -3,3 +3,4 @@ contract C {
 }
 // ----
 // DeclarationError 2197: (17-52): Transient cannot be used as data location for constant or immutable variables.
+// DeclarationError 9825: (17-52): Initialization of transient storage state variables is not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
deleted file mode 100644
index 18e6a215dd..0000000000
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_assignment.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract D { }
-
-contract C {
-	int transient x = -99;
-	address transient a = address(0xABC);
-	bool transient b = x > 0 ? false : true;
-}
-// ----
-// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol
new file mode 100644
index 0000000000..570642485e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol
@@ -0,0 +1,11 @@
+contract D { }
+
+contract C {
+	int transient x = -99;
+	address transient a = address(0xABC);
+	bool transient b = x > 0 ? false : true;
+}
+// ----
+// DeclarationError 9825: (30-51): Initialization of transient storage state variables is not supported.
+// DeclarationError 9825: (54-90): Initialization of transient storage state variables is not supported.
+// DeclarationError 9825: (93-132): Initialization of transient storage state variables is not supported.

From 44e008bb5dc1599f649121da9eb159cf7050d234 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:15:34 +0200
Subject: [PATCH 0986/1140] Yul: remove deprecated dialect

---
 libyul/Dialect.cpp                            | 28 -------------------
 libyul/Dialect.h                              |  3 --
 libyul/YulStack.cpp                           |  4 +--
 test/libyul/Common.cpp                        | 11 ++------
 test/libyul/Parser.cpp                        |  4 +--
 .../add_correct_type.yul                      |  2 +-
 .../disambiguator/for_statement.yul           | 10 +++----
 .../disambiguator/funtion_call.yul            |  2 +-
 .../disambiguator/if_statement.yul            |  2 +-
 .../disambiguator/long_names.yul              |  2 +-
 .../{smoke_yul.yul => smoke_evmTyped.yul}     |  2 +-
 .../disambiguator/switch_statement.yul        |  2 +-
 .../disambiguator/variables.yul               |  2 +-
 .../disambiguator/variables_clash.yul         |  2 +-
 .../variables_inside_functions.yul            |  2 +-
 .../expressionInliner/simple.yul              |  2 +-
 .../expressionInliner/with_args.yul           |  2 +-
 .../functionGrouper/empty_block.yul           |  2 +-
 .../functionGrouper/multi_fun_mixed.yul       |  2 +-
 .../functionGrouper/nested_fun.yul            |  2 +-
 .../functionGrouper/single_fun.yul            |  2 +-
 .../functionHoister/empty_block.yul           |  2 +-
 .../functionHoister/multi_mixed.yul           |  2 +-
 .../functionHoister/nested.yul                |  2 +-
 .../functionHoister/single.yul                |  2 +-
 test/libyul/yulSyntaxTests/builtin_types.yul  | 13 ++-------
 .../yulSyntaxTests/for_visibility_9.yul       |  2 +-
 .../yulSyntaxTests/for_visibility_A.yul       |  2 +-
 .../yulSyntaxTests/if_statement_invalid_3.yul |  2 +-
 test/libyul/yulSyntaxTests/instructions.yul   |  2 +-
 test/libyul/yulSyntaxTests/optional_types.yul |  2 +-
 .../yulSyntaxTests/token_as_identifier.yul    |  5 +---
 test/libyul/yulSyntaxTests/vardecl.yul        |  2 +-
 .../variable_declaration_complex.yul          |  6 ++--
 34 files changed, 43 insertions(+), 91 deletions(-)
 rename test/libyul/yulOptimizerTests/disambiguator/{smoke_yul.yul => smoke_evmTyped.yul} (71%)

diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index f4f59ec26a..8afd99a228 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -48,31 +48,3 @@ bool Dialect::validTypeForLiteral(LiteralKind _kind, LiteralValue const&, YulNam
 	else
 		return true;
 }
-
-Dialect const& Dialect::yulDeprecated()
-{
-	static std::unique_ptr<Dialect> dialect;
-	static YulStringRepository::ResetCallback callback{[&] { dialect.reset(); }};
-
-	if (!dialect)
-	{
-		// TODO will probably change, especially the list of types.
-		dialect = std::make_unique<Dialect>();
-		dialect->defaultType = "u256"_yulname;
-		dialect->boolType = "bool"_yulname;
-		dialect->types = {
-			"bool"_yulname,
-			"u8"_yulname,
-			"s8"_yulname,
-			"u32"_yulname,
-			"s32"_yulname,
-			"u64"_yulname,
-			"s64"_yulname,
-			"u128"_yulname,
-			"s128"_yulname,
-			"u256"_yulname,
-			"s256"_yulname};
-	};
-
-	return *dialect;
-}
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
index 3362246a06..fcec5fe3f9 100644
--- a/libyul/Dialect.h
+++ b/libyul/Dialect.h
@@ -94,9 +94,6 @@ struct Dialect
 
 	Dialect() = default;
 	virtual ~Dialect() = default;
-
-	/// Old "yul" dialect. This is only used for testing.
-	static Dialect const& yulDeprecated();
 };
 
 }
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index dbe30bb136..385c527d2a 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -54,8 +54,8 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 	case YulStack::Language::Yul:
 		return EVMDialectTyped::instance(_version);
 	}
-	yulAssert(false, "");
-	return Dialect::yulDeprecated();
+	yulAssert(false);
+	util::unreachable();
 }
 
 }
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index d147e03d00..01956e7f58 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -44,9 +44,9 @@ using namespace solidity::langutil;
 
 namespace
 {
-Dialect const& defaultDialect(bool _yul)
+Dialect const& defaultDialect()
 {
-	return _yul ? yul::Dialect::yulDeprecated() : yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion());
+	return yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion());
 }
 }
 
@@ -91,7 +91,7 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::t
 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->root()));
+	return std::get<Block>(Disambiguator(defaultDialect(), *result.second, {})(result.first->root()));
 }
 
 std::string yul::test::format(std::string const& _source, bool _yul)
@@ -113,11 +113,6 @@ std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion)> const
 		"evmTyped",
 		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
 		{ return yul::EVMDialectTyped::instance(_evmVersion); }
-	},
-	{
-		"yul",
-		[](langutil::EVMVersion) -> yul::Dialect const&
-		{ return yul::Dialect::yulDeprecated(); }
 	}
 };
 
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 0ed09f6a90..5ce8b449b5 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -104,12 +104,12 @@ std::optional<Error> parseAndReturnFirstError(std::string const& _source, Dialec
 	return {};
 }
 
-bool successParse(std::string const& _source, Dialect const& _dialect = Dialect::yulDeprecated(), bool _allowWarningsAndInfos = true)
+bool successParse(std::string const& _source, Dialect const& _dialect, bool _allowWarningsAndInfos = true)
 {
 	return !parseAndReturnFirstError(_source, _dialect, _allowWarningsAndInfos);
 }
 
-Error expectError(std::string const& _source, Dialect const& _dialect = Dialect::yulDeprecated(), bool _allowWarningsAndInfos = false)
+Error expectError(std::string const& _source, Dialect const& _dialect, bool _allowWarningsAndInfos = false)
 {
 
 	auto error = parseAndReturnFirstError(_source, _dialect, _allowWarningsAndInfos);
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
index c7cc17fc8f..57785f0b3d 100644
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
+++ b/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
@@ -5,7 +5,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: conditionalSimplifier
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
index 30f2e54794..fcfbe3242e 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
@@ -1,23 +1,23 @@
 {
     { let a:u256, b:u256 }
     {
-        function eq(x: u256, y: u256) -> z: bool {}
-        for { let a:u256 } eq(a, a) { a := a } {
+        function eq_function(x: u256, y: u256) -> z: bool {}
+        for { let a:u256 } eq_function(a, a) { a := a } {
             let b:u256 := a
         }
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
 // {
 //     { let a, b }
 //     {
-//         function eq(x, y) -> z:bool
+//         function eq_function(x, y) -> z:bool
 //         { }
-//         for { let a_1 } eq(a_1, a_1) { a_1 := a_1 }
+//         for { let a_1 } eq_function(a_1, a_1) { a_1 := a_1 }
 //         { let b_2 := a_1 }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
index f99c4e4476..7fc51a5fa5 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
@@ -7,7 +7,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
index 6b6da1f189..512d7fc12b 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
@@ -6,7 +6,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
index d55afc4828..fbd95ef3a2 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
@@ -1,6 +1,6 @@
 { { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
similarity index 71%
rename from test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
rename to test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
index 6764164377..481cbb5883 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
@@ -1,6 +1,6 @@
 { }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
index 16ee5353f7..86ea9cba28 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
@@ -8,7 +8,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables.yul b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
index 65c93bbb9e..743eaf0de6 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
@@ -1,6 +1,6 @@
 { { let a:u256 } { let a:u256 } }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
index e2cf23756d..2a94e47697 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
@@ -1,6 +1,6 @@
 { { let a:u256 let a_1:u256 } { let a:u256 } }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
index a78af7dabc..f9e134aff5 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
@@ -6,7 +6,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
index 2b6dba2406..dbc80a8595 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
@@ -3,7 +3,7 @@
     let y:u256 := f()
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: expressionInliner
 //
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
index 0456654e3a..e142f59784 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
@@ -3,7 +3,7 @@
     let y:u256 := f(7:u256)
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: expressionInliner
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
index 7bfbb34012..05fa8d249a 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
@@ -1,6 +1,6 @@
 { let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
index 1aedecf6a3..5d4eaea5e0 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
@@ -5,7 +5,7 @@
     let e:u256
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
index 9193da739c..5b84365401 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
@@ -9,7 +9,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
index b007f1855a..a62b0ddeba 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
@@ -2,7 +2,7 @@
 	let a:u256 function f() {}
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
index bd66b3a2b1..5eed2d2bbe 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
@@ -8,7 +8,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
index 060fab314c..fc6168ce96 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
@@ -6,7 +6,7 @@
     let e:u256
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/nested.yul b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
index 05eb4803b0..65486dc6c5 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/nested.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
@@ -7,7 +7,7 @@
     }
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/single.yul b/test/libyul/yulOptimizerTests/functionHoister/single.yul
index 205626b57f..e939ecb855 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/single.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/single.yul
@@ -3,7 +3,7 @@
     function f() {}
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulSyntaxTests/builtin_types.yul b/test/libyul/yulSyntaxTests/builtin_types.yul
index becf342b8f..e4d961c300 100644
--- a/test/libyul/yulSyntaxTests/builtin_types.yul
+++ b/test/libyul/yulSyntaxTests/builtin_types.yul
@@ -1,16 +1,7 @@
 {
     let x1:bool := true:bool
-    let x2:u8 := 1:u8
-    let x3:s8 := 1:s8
-    let x4:u32 := 1:u32
-    let x5:s32 := 1:s32
-    let x6:u64 := 1:u64
-    let x7:s64 := 1:s64
-    let x8:u128 := 1:u128
-    let x9:s128 := 1:s128
-    let x10:u256 := 1:u256
-    let x11:s256 := 1:s256
+    let x2:u256 := 1:u256
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_visibility_9.yul b/test/libyul/yulSyntaxTests/for_visibility_9.yul
index 4cda1b165f..6922dc9617 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_9.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_9.yul
@@ -2,6 +2,6 @@
 	for { let x := 1 } 1 { let x := 1 } {}
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
 // DeclarationError 1395: (26-36): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_A.yul b/test/libyul/yulSyntaxTests/for_visibility_A.yul
index a5761f52a9..07766159d3 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_A.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_A.yul
@@ -2,6 +2,6 @@
 	for { let x := 1 } 1 {} { let x := 1 }
 }
 // ====
-// dialect: yul
+// dialect: evm
 // ----
 // DeclarationError 1395: (29-39): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
index fa396456fd..c99bcac14f 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
@@ -2,6 +2,6 @@
     if 32 let x := 3
 }
 // ====
-// dialect: yul
+// dialect: evm
 // ----
 // ParserError 2314: (12-15): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/instructions.yul b/test/libyul/yulSyntaxTests/instructions.yul
index 3d600812fb..64268bbb4e 100644
--- a/test/libyul/yulSyntaxTests/instructions.yul
+++ b/test/libyul/yulSyntaxTests/instructions.yul
@@ -1,5 +1,5 @@
 { pop }
 // ====
-// dialect: yul
+// dialect: evm
 // ----
 // ParserError 6913: (6-7): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/optional_types.yul b/test/libyul/yulSyntaxTests/optional_types.yul
index aa77ffca70..151edbf469 100644
--- a/test/libyul/yulSyntaxTests/optional_types.yul
+++ b/test/libyul/yulSyntaxTests/optional_types.yul
@@ -5,5 +5,5 @@
     function g(a:u256) -> b {}
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/token_as_identifier.yul b/test/libyul/yulSyntaxTests/token_as_identifier.yul
index eaeceb7c46..204b76e555 100644
--- a/test/libyul/yulSyntaxTests/token_as_identifier.yul
+++ b/test/libyul/yulSyntaxTests/token_as_identifier.yul
@@ -1,9 +1,6 @@
 {
-    let return:u256 := 1:u256
-    let byte:u256 := 1:u256
-    let address:u256 := 1:u256
     let bool:u256 := 1:u256
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/vardecl.yul b/test/libyul/yulSyntaxTests/vardecl.yul
index fd7d06bfbc..41b58cc2f2 100644
--- a/test/libyul/yulSyntaxTests/vardecl.yul
+++ b/test/libyul/yulSyntaxTests/vardecl.yul
@@ -2,5 +2,5 @@
     let x := 7
 }
 // ====
-// dialect: yul
+// dialect: evm
 // ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul b/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
index 4b93cdb04f..e7a428fc2c 100644
--- a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
+++ b/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
@@ -1,8 +1,8 @@
 {
-    function add(a:u256, b:u256) -> c:u256 {}
+    function add_fn(a:u256, b:u256) -> c:u256 {}
     let y:u256 := 2:u256
-    let x:u256 := add(7:u256, add(6:u256, y))
+    let x:u256 := add_fn(7:u256, add_fn(6:u256, y))
 }
 // ====
-// dialect: yul
+// dialect: evmTyped
 // ----

From 61d1d9ddbdda0532068299c651c4e6c102b6c287 Mon Sep 17 00:00:00 2001
From: Alireza Arjmand <alireza.shakouri@openzeppelin.com>
Date: Mon, 12 Aug 2024 11:28:02 -0400
Subject: [PATCH 0987/1140] fix typo in micropayment.rst

---
 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 c3aef0d653..9a3ad845ce 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -482,7 +482,7 @@ The full contract
 .. note::
   The function ``splitSignature`` does not use all security
   checks. A real implementation should use a more rigorously tested library,
-  such as openzepplin's `version  <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/ECDSA.sol>`_ of this code.
+  such as openzeppelin's `version  <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/ECDSA.sol>`_ of this code.
 
 Verifying Payments
 ------------------

From 1c0b2f5bb760f442c0d71ae37a41ea02f27464f4 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 13 Aug 2024 08:51:05 +0200
Subject: [PATCH 0988/1140] Yul: Remove EVMDialectTyped

---
 libyul/YulStack.cpp                |   5 --
 libyul/YulStack.h                  |   2 +-
 libyul/backends/evm/EVMDialect.cpp | 108 -----------------------------
 libyul/backends/evm/EVMDialect.h   |  22 ------
 4 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 933c3f75e6..8166ed3cfd 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -52,8 +52,6 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 	case YulStack::Language::Assembly:
 	case YulStack::Language::StrictAssembly:
 		return EVMDialect::strictAssemblyForEVMObjects(_version);
-	case YulStack::Language::Yul:
-		return EVMDialectTyped::instance(_version);
 	}
 	yulAssert(false);
 	util::unreachable();
@@ -180,9 +178,6 @@ void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 		case Language::StrictAssembly:
 			dialect = &EVMDialect::strictAssemblyForEVMObjects(m_evmVersion);
 			break;
-		case Language::Yul:
-			dialect = &EVMDialectTyped::instance(m_evmVersion);
-			break;
 		default:
 			yulAssert(false, "Invalid language.");
 			break;
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 4dc262a25c..b09fa79758 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -65,7 +65,7 @@ struct MachineAssemblyObject
 class YulStack: public langutil::CharStreamProvider
 {
 public:
-	enum class Language { Yul, Assembly, StrictAssembly };
+	enum class Language { Assembly, StrictAssembly };
 	enum class Machine { EVM };
 	enum State {
 		Empty,
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 50ede8c760..aeb8253040 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -23,19 +23,14 @@
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/SemanticInformation.h>
-#include <liblangutil/Exceptions.h>
 #include <libsolutil/StringUtils.h>
 #include <libyul/AST.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 <range/v3/view/reverse.hpp>
-#include <range/v3/view/tail.hpp>
-
 #include <regex>
 
 using namespace std::string_literals;
@@ -461,106 +456,3 @@ BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, siz
 	}
 	return function.get();
 }
-
-EVMDialectTyped::EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess):
-	EVMDialect(_evmVersion, _objectAccess)
-{
-	defaultType = "u256"_yulname;
-	boolType = "bool"_yulname;
-	types = {defaultType, boolType};
-
-	// Set all types to ``defaultType``
-	for (auto& fun: m_functions)
-	{
-		for (auto& p: fun.second.parameters)
-			p = defaultType;
-		for (auto& r: fun.second.returns)
-			r = defaultType;
-	}
-
-	m_functions["lt"_yulname].returns = {"bool"_yulname};
-	m_functions["gt"_yulname].returns = {"bool"_yulname};
-	m_functions["slt"_yulname].returns = {"bool"_yulname};
-	m_functions["sgt"_yulname].returns = {"bool"_yulname};
-	m_functions["eq"_yulname].returns = {"bool"_yulname};
-
-	// "not" and "bitnot" replace "iszero" and "not"
-	m_functions["bitnot"_yulname] = m_functions["not"_yulname];
-	m_functions["bitnot"_yulname].name = "bitnot"_yulname;
-	m_functions["not"_yulname] = m_functions["iszero"_yulname];
-	m_functions["not"_yulname].name = "not"_yulname;
-	m_functions["not"_yulname].returns = {"bool"_yulname};
-	m_functions["not"_yulname].parameters = {"bool"_yulname};
-	m_functions.erase("iszero"_yulname);
-
-	m_functions["bitand"_yulname] = m_functions["and"_yulname];
-	m_functions["bitand"_yulname].name = "bitand"_yulname;
-	m_functions["bitor"_yulname] = m_functions["or"_yulname];
-	m_functions["bitor"_yulname].name = "bitor"_yulname;
-	m_functions["bitxor"_yulname] = m_functions["xor"_yulname];
-	m_functions["bitxor"_yulname].name = "bitxor"_yulname;
-	m_functions["and"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
-	m_functions["and"_yulname].returns = {"bool"_yulname};
-	m_functions["or"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
-	m_functions["or"_yulname].returns = {"bool"_yulname};
-	m_functions["xor"_yulname].parameters = {"bool"_yulname, "bool"_yulname};
-	m_functions["xor"_yulname].returns = {"bool"_yulname};
-	m_functions["popbool"_yulname] = m_functions["pop"_yulname];
-	m_functions["popbool"_yulname].name = "popbool"_yulname;
-	m_functions["popbool"_yulname].parameters = {"bool"_yulname};
-	m_functions.insert(createFunction("bool_to_u256", 1, 1, {}, {}, [](
-		FunctionCall const&,
-		AbstractAssembly&,
-		BuiltinContext&
-	) {}));
-	m_functions["bool_to_u256"_yulname].parameters = {"bool"_yulname};
-	m_functions["bool_to_u256"_yulname].returns = {"u256"_yulname};
-	m_functions.insert(createFunction("u256_to_bool", 1, 1, {}, {}, [](
-		FunctionCall const&,
-		AbstractAssembly& _assembly,
-		BuiltinContext&
-	) {
-		// TODO this should use a Panic.
-		// A value larger than 1 causes an invalid instruction.
-		_assembly.appendConstant(2);
-		_assembly.appendInstruction(evmasm::Instruction::DUP2);
-		_assembly.appendInstruction(evmasm::Instruction::LT);
-		AbstractAssembly::LabelID inRange = _assembly.newLabelId();
-		_assembly.appendJumpToIf(inRange);
-		_assembly.appendInstruction(evmasm::Instruction::INVALID);
-		_assembly.appendLabel(inRange);
-	}));
-	m_functions["u256_to_bool"_yulname].parameters = {"u256"_yulname};
-	m_functions["u256_to_bool"_yulname].returns = {"bool"_yulname};
-}
-
-BuiltinFunctionForEVM const* EVMDialectTyped::discardFunction(YulName _type) const
-{
-	if (_type == "bool"_yulname)
-		return builtin("popbool"_yulname);
-	else
-	{
-		yulAssert(_type == defaultType, "");
-		return builtin("pop"_yulname);
-	}
-}
-
-BuiltinFunctionForEVM const* EVMDialectTyped::equalityFunction(YulName _type) const
-{
-	if (_type == "bool"_yulname)
-		return nullptr;
-	else
-	{
-		yulAssert(_type == defaultType, "");
-		return builtin("eq"_yulname);
-	}
-}
-
-EVMDialectTyped const& EVMDialectTyped::instance(langutil::EVMVersion _version)
-{
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialectTyped const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialectTyped>(_version, true);
-	return *dialects[_version];
-}
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 7db1ec09d3..89df944966 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -102,26 +102,4 @@ struct EVMDialect: public Dialect
 	std::set<YulName> m_reserved;
 };
 
-/**
- * EVM dialect with types u256 (default) and bool.
- * Difference to EVMDialect:
- *  - All comparison functions return type bool
- *  - bitwise operations are called bitor, bitand, bitxor and bitnot
- *  - and, or, xor take bool and return bool
- *  - iszero is replaced by not, which takes bool and returns bool
- *  - there are conversion functions bool_to_u256 and u256_to_bool.
- *  - there is popbool
- */
-struct EVMDialectTyped: public EVMDialect
-{
-	/// Constructor, should only be used internally. Use the factory function below.
-	EVMDialectTyped(langutil::EVMVersion _evmVersion, bool _objectAccess);
-
-	BuiltinFunctionForEVM const* discardFunction(YulName _type) const override;
-	BuiltinFunctionForEVM const* equalityFunction(YulName _type) const override;
-	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("not"_yulname); }
-
-	static EVMDialectTyped const& instance(langutil::EVMVersion _version);
-};
-
 }

From 65127220bfab7a6b1b185fa07abbc2f912ad8793 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 13 Aug 2024 08:51:59 +0200
Subject: [PATCH 0989/1140] Yul tests: Adapt or remove EVMDialectTyped tests

---
 test/libyul/Common.cpp                     |  19 +--
 test/libyul/Common.h                       |   6 +-
 test/libyul/CompilabilityChecker.cpp       |   2 +-
 test/libyul/ControlFlowSideEffectsTest.cpp |   2 +-
 test/libyul/FunctionSideEffects.cpp        |   2 +-
 test/libyul/Inliner.cpp                    |  36 +++--
 test/libyul/Metrics.cpp                    |   2 +-
 test/libyul/Parser.cpp                     | 157 ++++++++-------------
 8 files changed, 89 insertions(+), 137 deletions(-)

diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 01956e7f58..a0c00c90d7 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -50,12 +50,12 @@ Dialect const& defaultDialect()
 }
 }
 
-std::pair<std::shared_ptr<AST const>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
+std::pair<std::shared_ptr<AST const>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
 		solidity::test::CommonOptions::get().eofVersion(),
-		_yul ? YulStack::Language::Yul : YulStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::test::CommonOptions::get().optimize ?
 			solidity::frontend::OptimiserSettings::standard() :
 			solidity::frontend::OptimiserSettings::minimal(),
@@ -88,17 +88,17 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::t
 	return {std::move(parserResult), std::move(analysisInfo)};
 }
 
-yul::Block yul::test::disambiguate(std::string const& _source, bool _yul)
+yul::Block yul::test::disambiguate(std::string const& _source)
 {
-	auto result = parse(_source, _yul);
+	auto result = parse(_source);
 	return std::get<Block>(Disambiguator(defaultDialect(), *result.second, {})(result.first->root()));
 }
 
-std::string yul::test::format(std::string const& _source, bool _yul)
+std::string yul::test::format(std::string const& _source)
 {
 	auto const version = solidity::test::CommonOptions::get().evmVersion();
-	Dialect const& dialect = _yul ? EVMDialectTyped::instance(version) : EVMDialect::strictAssemblyForEVMObjects(version);
-	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(parse(_source, _yul).first->root());
+	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(version);
+	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(parse(_source).first->root());
 }
 
 namespace
@@ -108,11 +108,6 @@ std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion)> const
 		"evm",
 		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
 		{ return yul::EVMDialect::strictAssemblyForEVMObjects(_evmVersion); }
-	},
-	{
-		"evmTyped",
-		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
-		{ return yul::EVMDialectTyped::instance(_evmVersion); }
 	}
 };
 
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
index 14d73d77e1..c87f1c68be 100644
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@@ -46,13 +46,13 @@ namespace solidity::yul::test
 {
 
 std::pair<std::shared_ptr<AST const>, std::shared_ptr<AsmAnalysisInfo>>
-parse(std::string const& _source, bool _yul = true);
+parse(std::string const& _source);
 
 std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>>
 parse(std::string const& _source, Dialect const& _dialect, langutil::ErrorList& _errors);
 
-Block disambiguate(std::string const& _source, bool _yul = true);
-std::string format(std::string const& _source, bool _yul = true);
+Block disambiguate(std::string const& _source);
+std::string format(std::string const& _source);
 
 solidity::yul::Dialect const& dialect(std::string const& _name, langutil::EVMVersion _evmVersion);
 
diff --git a/test/libyul/CompilabilityChecker.cpp b/test/libyul/CompilabilityChecker.cpp
index 5b64b5e5d3..13788b75f8 100644
--- a/test/libyul/CompilabilityChecker.cpp
+++ b/test/libyul/CompilabilityChecker.cpp
@@ -35,7 +35,7 @@ namespace
 std::string check(std::string const& _input)
 {
 	Object obj;
-	auto parsingResult = yul::test::parse(_input, false);
+	auto parsingResult = yul::test::parse(_input);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	BOOST_REQUIRE(obj.hasCode());
 	auto functions = CompilabilityChecker(EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion()), obj, true).stackDeficit;
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index 20df176a39..3ad70f5a02 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -57,7 +57,7 @@ ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(std::string const& _filen
 TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	Object obj;
-	auto parsingResult = yul::test::parse(m_source, false);
+	auto parsingResult = yul::test::parse(m_source);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index a39024d278..9d6599f42b 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -83,7 +83,7 @@ FunctionSideEffects::FunctionSideEffects(std::string const& _filename):
 TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	Object obj;
-	auto parsingResult = yul::test::parse(m_source, false);
+	auto parsingResult = yul::test::parse(m_source);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
index 6f622b41a4..f6da0c95c2 100644
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -24,8 +24,6 @@
 
 #include <libyul/optimiser/ExpressionInliner.h>
 #include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
-#include <libyul/optimiser/FullInliner.h>
-#include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/AST.h>
 
@@ -65,44 +63,44 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 
 BOOST_AUTO_TEST_CASE(simple)
 {
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 } }"), "f");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x { x := 2 } }"), "f");
 	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"function g(a:u256) -> b:u256 { b := a }"
-		"function f() -> x:u256 { x := g(2:u256) }"
+		"function g(a) -> b { b := a }"
+		"function f() -> x { x := g(2) }"
 	"}"), "g,f");
 }
 
 BOOST_AUTO_TEST_CASE(simple_inside_structures)
 {
 	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"switch 2:u256 "
-		"case 2:u256 {"
-			"function g(a:u256) -> b:u256 { b := a }"
-			"function f() -> x:u256 { x := g(2:u256) }"
+		"switch 2 "
+		"case 2 {"
+			"function g(a) -> b { b := a }"
+			"function f() -> x { x := g(2) }"
 		"}"
 	"}"), "g,f");
 	BOOST_CHECK_EQUAL(inlinableFunctions("{"
-		"function g(a:u256) -> b:u256 { b := a }"
+		"function g(a) -> b { b := a }"
 		"for {"
 		"} true {"
-			"function f() -> x:u256 { x := g(2:u256) }"
+			"function f() -> x { x := g(2) }"
 		"}"
 		"{"
-			"function h() -> y:u256 { y := 2:u256 }"
+			"function h() -> y { y := 2 }"
 		"}"
 	"}"), "h,g,f");
 }
 
 BOOST_AUTO_TEST_CASE(negative)
 {
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 {} } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := f() } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := x } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256, y:u256 { x := 2:u256 } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x { } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x { x := 2 {} } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x { x := f() } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x { x := x } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x, y { x := 2 } }"), "");
   BOOST_CHECK_EQUAL(inlinableFunctions(
-    "{ function g() -> x:u256, y:u256 {} function f(y:u256) -> x:u256 { x,y := g() } }"), "");
-	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f(y:u256) -> x:u256 { y := 2:u256 } }"), "");
+    "{ function g() -> x, y {} function f(y) -> x { x,y := g() } }"), "");
+	BOOST_CHECK_EQUAL(inlinableFunctions("{ function f(y) -> x { y := 2 } }"), "");
 }
 
 
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
index bf09a1c2be..5c7b5fc34d 100644
--- a/test/libyul/Metrics.cpp
+++ b/test/libyul/Metrics.cpp
@@ -38,7 +38,7 @@ namespace
 
 size_t codeSize(std::string const& _source, CodeWeights const _weights = {})
 {
-	std::shared_ptr<AST const> ast = parse(_source, false).first;
+	std::shared_ptr<AST const> ast = parse(_source).first;
 	BOOST_REQUIRE(ast);
 	return CodeSize::codeSize(ast->root(), _weights);
 }
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 5ce8b449b5..2a2f280929 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -148,47 +148,6 @@ BOOST_AUTO_TEST_CASE(builtins_analysis)
 	CHECK_ERROR_DIALECT("{ let a, b := builtin(1, 2) }", DeclarationError, "Variable count mismatch for declaration of \"a, b\": 2 variables and 3 values.", dialect);
 }
 
-BOOST_AUTO_TEST_CASE(default_types_set)
-{
-	ErrorList errorList;
-	ErrorReporter reporter(errorList);
-	std::shared_ptr<AST> result = parse(
-		"{"
-			"let x:bool := true:bool "
-			"let z:bool := true "
-			"let y := add(1, 2) "
-			"switch y case 0 {} default {} "
-		"}",
-		EVMDialectTyped::instance(EVMVersion{}),
-		reporter
-	);
-	BOOST_REQUIRE(!!result && errorList.size() == 0);
-
-	// All types are printed.
-	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::Full, EVMDialectTyped::instance(EVMVersion()))(result->root()),
-		"{\n"
-		"    let x:bool := true:bool\n"
-		"    let z:bool := true:bool\n"
-		"    let y:u256 := add(1:u256, 2:u256)\n"
-		"    switch y\n"
-		"    case 0:u256 { }\n"
-		"    default { }\n"
-		"}"
-	);
-
-	// Now the default types should be omitted.
-	BOOST_CHECK_EQUAL(AsmPrinter(AsmPrinter::TypePrinting::OmitDefault, EVMDialectTyped::instance(EVMVersion()))(result->root()),
-		"{\n"
-		"    let x:bool := true\n"
-		"    let z:bool := true\n"
-		"    let y := add(1, 2)\n"
-		"    switch y\n"
-		"    case 0 { }\n"
-		"    default { }\n"
-		"}"
-	);
-}
-
 #define CHECK_LOCATION(_actual, _sourceName, _start, _end) \
 	do { \
 		BOOST_CHECK_EQUAL((_sourceName), ((_actual).sourceName ? *(_actual).sourceName : "")); \
@@ -203,7 +162,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
 	auto const sourceText =
 		"/// @src 0:234:543\n"
 		"{}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -216,12 +175,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
 	auto const sourceText =
 		"/// @src 0:234:543\n"
 		"{\n"
-			"let x:bool := true:bool\n"
+			"let x := true\n"
 			"/// @src 0:123:432\n"
-			"let z:bool := true\n"
+			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -239,12 +198,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
 	auto const sourceText =
 		"/// @src 0:234:543\n"
 		"{\n"
-			"let x:bool := true:bool\n"
+			"let x := true\n"
 			"/// @src 1:123:432\n"
-			"let z:bool := true\n"
+			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -266,7 +225,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
 			"/// @src 0:343:434\n"
 			"switch y case 0 {} default {}\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -290,7 +249,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
 			"    let z := add(3, 4)\n"
 			"}\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -317,12 +276,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 		"{\n"
 			"{\n"
 				"/// @src 0:123:432\n"
-				"let x:bool := true:bool\n"
+				"let x := true\n"
 			"}\n"
-			"let z:bool := true\n"
+			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -349,11 +308,11 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
 	auto const sourceText =
 		"{\n"
 			"/// @src 0:123:432\n"
-			"let a:bool\n"
+			"let a\n"
 			"/// @src 1:1:10\n"
-			"a := true:bool\n"
+			"a := true\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0); // should still parse
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -369,12 +328,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
 	auto const sourceText =
 		"{\n"
 			"/// @src 1:123:432\n"
-			"let a:bool := true:bool\n"
+			"let a := true\n"
 			"/// @src 2345:0:8\n"
-			"let b:bool := true:bool\n"
+			"let b := true\n"
 			"\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result); // should still parse
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -390,11 +349,11 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
 	auto const sourceText =
 		"{\n"
 			"/// @src 0:123:432\n"
-			"let x:bool \n"
+			"let x \n"
 			"/// @src 0:234:2026\n"
-			":= true:bool\n"
+			":= true\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -417,7 +376,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
 			2)
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -451,7 +410,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 			mstore(1, 2)                // FunctionCall
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -484,10 +443,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
 		{
 			/// @src 0:420:680
 			/// @invalid
-			let a:bool := true
+			let a := true
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -506,7 +465,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
 		/// @src 0:420:680foo
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -523,7 +482,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
 		/// abc@src 0:111:222
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -537,7 +496,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
 		/// @src -1:-1:-1
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -551,7 +510,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
 		/// @src a:b:c
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -568,7 +527,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
 		/// @src 111111111111111111111:222222222222222222222:333333333333333333333
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -586,10 +545,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
 		{
 			/// @src 1:10:20
 			/// @src 0:30:40
-			let x:bool := true
+			let x := true
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -607,7 +566,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
 		/// @src 0:111:222@src 1:333:444
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -624,7 +583,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_s
 		/// @src 0:111:222 @src 1:333:444
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -635,7 +594,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
 	ErrorList errorList;
 	ErrorReporter reporter(errorList);
 	auto const sourceText = "///     @src 0:111:222    \n{}";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -649,10 +608,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
 		/// @src 1:2:3
 		{
 			/// @src -1:10:20
-			let x:bool := true
+			let x := true
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -674,7 +633,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
 			let y := /** @src 1:96:165  "contract D {..." */ 128
 		}
 	)~~~";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -699,7 +658,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
 		/// @src 0:111:222 ""
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -713,7 +672,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_befo
 		/// @src 0:111:222"abc" def
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -730,7 +689,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_afte
 		/// @src 0:111:222 "abc"def
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -744,7 +703,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whites
 		/// @src 0:111:222 "abc"@src 1:333:444 "abc"
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -758,7 +717,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 		/// @src 0:111:222 " abc @src 1:333:444
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -776,7 +735,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
 		///
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -793,7 +752,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
 		/// @src 0:111:222 hex"abc"@src 1:333:444 "abc"
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	// the second source location is not parsed as such, as the hex string isn't interpreted as snippet but
@@ -809,7 +768,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
 		/// @src 0:111:222 "\n\\x\x\w\uö\xy\z\y\fq"
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -824,7 +783,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces
 		/// @src 1 :		222 : 333 '\x33\u1234\t\n'
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -839,7 +798,7 @@ BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_ar
 		/// @src 1:222:333
 		{{}}
 	)", invalid);
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -857,7 +816,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
 		/// " @src 0:333:444
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 333, 444);
@@ -875,7 +834,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locati
 			let y := /** @src 1:96:165  "function f() internal { \"\/** @src 0:6:7 *\/\"; }" */ 128
 		}
 	)~~~";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -904,7 +863,7 @@ BOOST_AUTO_TEST_CASE(astid)
 			mstore(1, 2)
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -926,7 +885,7 @@ BOOST_AUTO_TEST_CASE(astid_reset)
 			mstore(1, 2)
 		}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -944,7 +903,7 @@ BOOST_AUTO_TEST_CASE(astid_multi)
 		/// @src -1:-1:-1 @ast-id 7 @src 1:1:1 @ast-id 8
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(8));
@@ -958,7 +917,7 @@ BOOST_AUTO_TEST_CASE(astid_invalid)
 		/// @src -1:-1:-1 @ast-id abc @src 1:1:1
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -975,7 +934,7 @@ BOOST_AUTO_TEST_CASE(astid_too_large)
 		/// @ast-id 9223372036854775808
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -991,7 +950,7 @@ BOOST_AUTO_TEST_CASE(astid_way_too_large)
 		/// @ast-id 999999999999999999999999999999999999999
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -1007,7 +966,7 @@ BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
 		/// @ast-id 9x
 		{}
 	)";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -1029,7 +988,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
 		"\n"
 		"    let x := 123\n"
 		"}\n";
-	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 1);

From 40e05d6e209a6d03afe2085d26a322f6ac8fc56c Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 13 Aug 2024 08:54:30 +0200
Subject: [PATCH 0990/1140] Yul optimizer tests: Update test expectations to
 use evm instead of evmTyped

---
 .../add_correct_type.yul                      | 19 --------------
 .../disambiguator/for_statement.yul           | 12 ++++-----
 .../disambiguator/funtion_call.yul            |  8 +++---
 .../disambiguator/if_statement.yul            | 12 ++++-----
 .../disambiguator/long_names.yul              |  4 +--
 .../disambiguator/smoke_evmTyped.yul          |  7 -----
 .../disambiguator/switch_statement.yul        | 10 +++----
 .../disambiguator/variables.yul               |  4 +--
 .../disambiguator/variables_clash.yul         |  4 +--
 .../variables_inside_functions.yul            |  8 +++---
 .../expressionInliner/simple.yul              |  6 ++---
 .../expressionInliner/with_args.yul           |  6 ++---
 .../fullInliner/multi_return_typed.yul        | 23 ----------------
 .../functionGrouper/empty_block.yul           |  6 ++---
 .../functionGrouper/multi_fun_mixed.yul       | 10 +++----
 .../functionGrouper/nested_fun.yul            | 10 +++----
 .../functionGrouper/single_fun.yul            |  4 +--
 .../functionHoister/empty_block.yul           | 10 +++----
 .../functionHoister/multi_mixed.yul           | 12 ++++-----
 .../functionHoister/nested.yul                | 10 +++----
 .../functionHoister/single.yul                |  4 +--
 .../ssaTransform/for_simpler.yul              | 24 +++++++++++++++++
 .../ssaTransform/switch_no_default_case.yul   | 24 +++++++++++++++++
 .../yulOptimizerTests/ssaTransform/typed.yul  | 20 +++++++-------
 .../ssaTransform/typed_for.yul                | 26 -------------------
 .../ssaTransform/typed_switch.yul             | 26 -------------------
 .../varDeclInitializer/typed.yul              | 24 -----------------
 27 files changed, 109 insertions(+), 224 deletions(-)
 delete mode 100644 test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
 delete mode 100644 test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
 delete mode 100644 test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul
 create mode 100644 test/libyul/yulOptimizerTests/ssaTransform/for_simpler.yul
 create mode 100644 test/libyul/yulOptimizerTests/ssaTransform/switch_no_default_case.yul
 delete mode 100644 test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul
 delete mode 100644 test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul
 delete mode 100644 test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul

diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
deleted file mode 100644
index 57785f0b3d..0000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let y:bool := false
-    for {} true { } {
-        if y { break }
-    }
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let y:bool := false
-//     for { } true { }
-//     {
-//         if y { break }
-//         y := false
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
index fcfbe3242e..3a01e1ea5c 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
@@ -1,21 +1,19 @@
 {
-    { let a:u256, b:u256 }
+    { let a, b }
     {
-        function eq_function(x: u256, y: u256) -> z: bool {}
-        for { let a:u256 } eq_function(a, a) { a := a } {
-            let b:u256 := a
+        function eq_function(x, y) -> z {}
+        for { let a } eq_function(a, a) { a := a } {
+            let b := a
         }
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: disambiguator
 //
 // {
 //     { let a, b }
 //     {
-//         function eq_function(x, y) -> z:bool
+//         function eq_function(x, y) -> z
 //         { }
 //         for { let a_1 } eq_function(a_1, a_1) { a_1 := a_1 }
 //         { let b_2 := a_1 }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
index 7fc51a5fa5..0c25f3ee5c 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
@@ -1,13 +1,11 @@
 {
-    { let a:u256, b:u256, c:u256, d:u256, f:u256 }
+    { let a, b, c, d, f }
     {
-        function f(a:u256) -> c:u256, d:u256 {
-            let b:u256, c_1:u256 := f(a)
+        function f(a) -> c, d {
+            let b, c_1 := f(a)
         }
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
index 512d7fc12b..e68d9b581b 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
@@ -1,19 +1,17 @@
 {
-    { let a:u256, b:u256, c:u256 }
+    { let a, b, c }
     {
-        let a:bool
-        if a { let b:bool := a }
+        let a
+        if a { let b := a }
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: disambiguator
 //
 // {
 //     { let a, b, c }
 //     {
-//         let a_1:bool
-//         if a_1 { let b_2:bool := a_1 }
+//         let a_1
+//         if a_1 { let b_2 := a_1 }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
index fbd95ef3a2..1d0530f32a 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
@@ -1,6 +1,4 @@
-{ { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } }
-// ====
-// dialect: evmTyped
+{ { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh } { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh } }
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
deleted file mode 100644
index 481cbb5883..0000000000
--- a/test/libyul/yulOptimizerTests/disambiguator/smoke_evmTyped.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{ }
-// ====
-// dialect: evmTyped
-// ----
-// step: disambiguator
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
index 86ea9cba28..d70a805c3f 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
@@ -1,14 +1,12 @@
 {
-    { let a:u256, b:u256, c:u256 }
+    { let a, b, c }
     {
-        let a:u256
+        let a
         switch a
-        case 0:u256 { let b:u256 := a }
-        default { let c:u256 := a }
+        case 0 { let b := a }
+        default { let c := a }
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables.yul b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
index 743eaf0de6..9000903681 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
@@ -1,6 +1,4 @@
-{ { let a:u256 } { let a:u256 } }
-// ====
-// dialect: evmTyped
+{ { let a } { let a } }
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
index 2a94e47697..40ca2b2621 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
@@ -1,6 +1,4 @@
-{ { let a:u256 let a_1:u256 } { let a:u256 } }
-// ====
-// dialect: evmTyped
+{ { let a let a_1 } { let a } }
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
index f9e134aff5..f26aaced2e 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
@@ -1,12 +1,10 @@
 {
-    { let c:u256 let b:u256 }
-    function f(a:u256, c:u256) -> b:u256 { let x:u256 }
+    { let c let b }
+    function f(a, c) -> b { let x }
     {
-        let a:u256 let x:u256
+        let a let x
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: disambiguator
 //
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
index dbc80a8595..24508bb769 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
@@ -1,9 +1,7 @@
 {
-    function f() -> x:u256 { x := 2:u256 }
-    let y:u256 := f()
+    function f() -> x { x := 2 }
+    let y := f()
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: expressionInliner
 //
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
index e142f59784..caf4cc42ee 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
@@ -1,9 +1,7 @@
 {
-    function f(a:u256) -> x:u256 { x := a }
-    let y:u256 := f(7:u256)
+    function f(a) -> x { x := a }
+    let y := f(7)
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: expressionInliner
 //
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul
deleted file mode 100644
index 143ae35b27..0000000000
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_return_typed.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	function f(a: u256) -> x: bool, y:u256 {
-		y := mul(a, a)
-	}
-	let r: bool, s: u256 := f(mload(3))
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: fullInliner
-//
-// {
-//     {
-//         let a_3 := mload(3)
-//         let x_4:bool := false
-//         let y_5 := 0
-//         y_5 := mul(a_3, a_3)
-//         let r:bool := x_4
-//         let s := y_5
-//     }
-//     function f(a) -> x:bool, y
-//     { y := mul(a, a) }
-// }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
index 05fa8d249a..4d2d2c807f 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
@@ -1,6 +1,4 @@
-{ let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }
-// ====
-// dialect: evmTyped
+{ let a { } function f() -> x { let b := 4 {} for {} f() {} {} } }
 // ----
 // step: functionGrouper
 //
@@ -9,7 +7,7 @@
 //         let a
 //         { }
 //     }
-//     function f() -> x:bool
+//     function f() -> x
 //     {
 //         let b := 4
 //         { }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
index 5d4eaea5e0..9ac43aebde 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
@@ -1,11 +1,9 @@
 {
-    let a:u256
-    function f() { let b:u256 }
-    let c:u256 function g() { let d:u256 }
-    let e:u256
+    let a
+    function f() { let b }
+    let c function g() { let d }
+    let e
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
index 5b84365401..2c0ac24536 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
@@ -1,15 +1,13 @@
 {
-    let a:u256
+    let a
     function f() {
-        let b:u256
+        let b
         function g() {
-            let c:u256
+            let c
         }
-        let d:u256
+        let d
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
index a62b0ddeba..295ba1e429 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
@@ -1,8 +1,6 @@
 {
-	let a:u256 function f() {}
+	let a function f() {}
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionGrouper
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
index 5eed2d2bbe..a97027bfe8 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
@@ -1,20 +1,18 @@
 {
-    let a:u256
+    let a
     { }
-    function f() -> x:bool {
-        let b:u256 := 4:u256
+    function f() -> x {
+        let b := 4
         { }
         for {} f() {} {}
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionHoister
 //
 // {
 //     let a
-//     function f() -> x:bool
+//     function f() -> x
 //     {
 //         let b := 4
 //         for { } f() { }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
index fc6168ce96..22feac222f 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
@@ -1,12 +1,10 @@
 {
-    let a:u256
-    function f() { let b:u256 }
-    let c:u256
-    function g() { let d:u256 }
-    let e:u256
+    let a
+    function f() { let b }
+    let c
+    function g() { let d }
+    let e
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/nested.yul b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
index 65486dc6c5..c7182f6074 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/nested.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
@@ -1,13 +1,11 @@
 {
-    let a:u256
+    let a
     function f() {
-        let b:u256
-        function g() { let c:u256 }
-        let d:u256
+        let b
+        function g() { let c }
+        let d
     }
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/functionHoister/single.yul b/test/libyul/yulOptimizerTests/functionHoister/single.yul
index e939ecb855..e44b41ee2f 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/single.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/single.yul
@@ -1,9 +1,7 @@
 {
-    let a:u256
+    let a
     function f() {}
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: functionHoister
 //
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/for_simpler.yul b/test/libyul/yulOptimizerTests/ssaTransform/for_simpler.yul
new file mode 100644
index 0000000000..82ef5a16be
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/ssaTransform/for_simpler.yul
@@ -0,0 +1,24 @@
+{
+  let b := true
+  let c := false
+  for {} b {} {
+      c := true
+  }
+  let d := c
+}
+// ----
+// step: ssaTransform
+//
+// {
+//     let b := true
+//     let c_1 := false
+//     let c := c_1
+//     for { } b { }
+//     {
+//         let c_3 := c
+//         let c_2 := true
+//         c := c_2
+//     }
+//     let c_4 := c
+//     let d := c_4
+// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/switch_no_default_case.yul b/test/libyul/yulOptimizerTests/ssaTransform/switch_no_default_case.yul
new file mode 100644
index 0000000000..18168479b6
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/ssaTransform/switch_no_default_case.yul
@@ -0,0 +1,24 @@
+{
+  let b := true
+  let c := false
+  switch b
+  case true { c := true}
+  case false { }
+  let d := c
+}
+// ----
+// step: ssaTransform
+//
+// {
+//     let b := true
+//     let c_1 := false
+//     let c := c_1
+//     switch b
+//     case true {
+//         let c_2 := true
+//         c := c_2
+//     }
+//     case false { }
+//     let c_3 := c
+//     let d := c_3
+// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed.yul
index 4b1aa16437..4b722e25cc 100644
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed.yul
+++ b/test/libyul/yulOptimizerTests/ssaTransform/typed.yul
@@ -1,10 +1,10 @@
 {
-  let b:bool := true
-  let c:bool := false
+  let b := true
+  let c := false
   c := b
   b := false
 
-  let a:u256 := 1
+  let a := 1
   a := add(a, 1)
   if c {
     a := add(a, 1)
@@ -12,19 +12,17 @@
   a := add(a, 1)
   mstore(a, 1)
 }
-// ====
-// dialect: evmTyped
 // ----
 // step: ssaTransform
 //
 // {
-//     let b_1:bool := true
-//     let b:bool := b_1
-//     let c_2:bool := false
-//     let c:bool := c_2
-//     let c_3:bool := b_1
+//     let b_1 := true
+//     let b := b_1
+//     let c_2 := false
+//     let c := c_2
+//     let c_3 := b_1
 //     c := c_3
-//     let b_4:bool := false
+//     let b_4 := false
 //     b := b_4
 //     let a_5 := 1
 //     let a := a_5
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul
deleted file mode 100644
index 596f56cb03..0000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed_for.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let b:bool := true
-  let c:bool := false
-  for {} b {} {
-      c := true
-  }
-  let d: bool := c
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: ssaTransform
-//
-// {
-//     let b:bool := true
-//     let c_1:bool := false
-//     let c:bool := c_1
-//     for { } b { }
-//     {
-//         let c_3:bool := c
-//         let c_2:bool := true
-//         c := c_2
-//     }
-//     let c_4:bool := c
-//     let d:bool := c_4
-// }
diff --git a/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul b/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul
deleted file mode 100644
index b87b5dbbc3..0000000000
--- a/test/libyul/yulOptimizerTests/ssaTransform/typed_switch.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  let b:bool := true
-  let c:bool := false
-  switch b
-  case true { c := true}
-  case false { }
-  let d: bool := c
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: ssaTransform
-//
-// {
-//     let b:bool := true
-//     let c_1:bool := false
-//     let c:bool := c_1
-//     switch b
-//     case true {
-//         let c_2:bool := true
-//         c := c_2
-//     }
-//     case false { }
-//     let c_3:bool := c
-//     let d:bool := c_3
-// }
diff --git a/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul b/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul
deleted file mode 100644
index 069c68cab8..0000000000
--- a/test/libyul/yulOptimizerTests/varDeclInitializer/typed.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let a1
-    let a2: bool
-    let b1, b2: bool
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
-        let x1: bool, x2
-    }
-}
-// ====
-// dialect: evmTyped
-// ----
-// step: varDeclInitializer
-//
-// {
-//     let a1 := 0
-//     let a2:bool := false
-//     let b1 := 0
-//     let b2:bool := false
-//     function f(a, b, c:bool) -> r:bool, t
-//     {
-//         let x1:bool := false
-//         let x2 := 0
-//     }
-// }

From d7bfea0c7c8c08afc4d6b62deeae5a9b8ebf384d Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 13 Aug 2024 09:30:54 +0200
Subject: [PATCH 0991/1140] Yul syntax tests: Update test expectations to use
 evm instead of evmTyped

---
 test/libyul/SyntaxTest.cpp                           |  2 +-
 test/libyul/yulSyntaxTests/assign_from_stack.yul     |  2 +-
 test/libyul/yulSyntaxTests/assignment.yul            |  4 ++--
 test/libyul/yulSyntaxTests/assignment_fail.yul       | 12 ------------
 test/libyul/yulSyntaxTests/blocks.yul                |  6 +++---
 .../yulSyntaxTests/break_outside_of_for_loop.yul     |  6 ++----
 test/libyul/yulSyntaxTests/builtin_types.yul         |  6 ++----
 .../yulSyntaxTests/continue_outside_of_for_loop.yul  |  6 ++----
 test/libyul/yulSyntaxTests/for_loop_condition.yul    |  4 +---
 .../yulSyntaxTests/for_loop_condition_fail.yul       |  8 --------
 test/libyul/yulSyntaxTests/for_statement.yul         |  4 +---
 test/libyul/yulSyntaxTests/for_statement_break.yul   |  4 +---
 .../yulSyntaxTests/for_statement_break_init.yul      |  6 ++----
 .../for_statement_break_nested_body_in_init.yul      |  4 +---
 .../for_statement_break_nested_body_in_post.yul      |  4 +---
 .../yulSyntaxTests/for_statement_break_post.yul      |  6 ++----
 .../libyul/yulSyntaxTests/for_statement_continue.yul |  4 +---
 .../for_statement_continue_fail_init.yul             |  6 ++----
 .../for_statement_continue_fail_post.yul             |  6 ++----
 .../for_statement_continue_nested_body_in_init.yul   |  4 +---
 .../for_statement_continue_nested_body_in_post.yul   |  4 +---
 .../for_statement_continue_nested_init_in_body.yul   |  6 ++----
 .../yulSyntaxTests/for_statement_nested_break.yul    |  6 ++----
 .../yulSyntaxTests/for_statement_nested_continue.yul |  2 --
 test/libyul/yulSyntaxTests/for_visibility_9.yul      |  2 --
 test/libyul/yulSyntaxTests/function_calls.yul        |  6 +++---
 .../function_defined_in_init_block_1.yul             |  2 +-
 .../function_defined_in_init_block_2.yul             |  2 +-
 .../function_defined_in_init_block_3.yul             |  2 +-
 .../function_defined_in_init_nested_1.yul            |  4 ++--
 .../function_defined_in_init_nested_2.yul            |  2 +-
 .../function_defined_in_init_nested_3.yul            |  6 +++---
 test/libyul/yulSyntaxTests/function_definitions.yul  |  2 +-
 .../function_shadowing_outside_vars_1.yul            |  4 ++--
 .../function_shadowing_outside_vars_2.yul            |  6 +++---
 .../yulSyntaxTests/functions_multiple_args.yul       |  4 ++--
 test/libyul/yulSyntaxTests/if_statement_1.yul        |  4 +---
 test/libyul/yulSyntaxTests/if_statement_2.yul        |  6 ++----
 test/libyul/yulSyntaxTests/if_statement_3.yul        |  6 ++----
 test/libyul/yulSyntaxTests/if_statement_fail_1.yul   |  4 +---
 test/libyul/yulSyntaxTests/if_statement_fail_2.yul   |  6 ++----
 test/libyul/yulSyntaxTests/if_statement_fail_3.yul   |  5 -----
 test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul |  2 --
 test/libyul/yulSyntaxTests/invalid_type.yul          |  2 --
 test/libyul/yulSyntaxTests/invalid_type2.yul         |  4 +---
 test/libyul/yulSyntaxTests/invalid_type3.yul         |  2 --
 test/libyul/yulSyntaxTests/invalid_type4.yul         |  4 +---
 test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul |  8 --------
 .../linkersymbol_invalid_redefine_builtin.yul        |  6 ++++++
 test/libyul/yulSyntaxTests/literal_invalid_type.yul  |  8 ++++----
 test/libyul/yulSyntaxTests/multiple_assignment_1.yul | 10 ++++------
 test/libyul/yulSyntaxTests/multiple_assignment_2.yul | 10 ++++------
 test/libyul/yulSyntaxTests/multiple_assignment_3.yul | 10 ++++------
 test/libyul/yulSyntaxTests/number_literal_1.yul      |  2 +-
 test/libyul/yulSyntaxTests/number_literal_2.yul      |  4 ++--
 test/libyul/yulSyntaxTests/number_literal_3.yul      |  4 ++--
 test/libyul/yulSyntaxTests/number_literal_4.yul      |  4 ++--
 test/libyul/yulSyntaxTests/number_literal_5.yul      |  4 ++--
 test/libyul/yulSyntaxTests/optional_types.yul        |  8 +++-----
 test/libyul/yulSyntaxTests/period_in_identifier.yul  |  2 +-
 .../yulSyntaxTests/period_in_identifier_spaced_1.yul |  4 ++--
 .../yulSyntaxTests/period_in_identifier_spaced_2.yul |  2 +-
 .../yulSyntaxTests/period_in_identifier_spaced_3.yul |  2 +-
 .../yulSyntaxTests/period_in_identifier_start.yul    |  4 ++--
 .../period_in_identifier_start_with_comment.yul      |  2 +-
 .../period_not_as_identifier_start.yul               |  2 +-
 test/libyul/yulSyntaxTests/push.yul                  |  4 ++--
 test/libyul/yulSyntaxTests/recursion_depth.yul       |  4 +---
 test/libyul/yulSyntaxTests/switch_case.yul           |  8 +++-----
 .../yulSyntaxTests/switch_case_different_literal.yul |  8 +++-----
 .../switch_case_string_literal_too_long.yul          |  8 +++-----
 .../switch_case_string_literal_very_long.yul         |  6 ++----
 test/libyul/yulSyntaxTests/switch_duplicate_case.yul | 10 ++++------
 .../switch_duplicate_case_different_literal.yul      | 10 ++++------
 test/libyul/yulSyntaxTests/token_as_identifier.yul   |  4 +---
 test/libyul/yulSyntaxTests/tuple_assignment.yul      |  4 ++--
 .../type_check_cases_fail_evmtyped.yul               | 10 ----------
 .../yulSyntaxTests/user_defined_functions_fail.yul   | 11 ++++-------
 .../yulSyntaxTests/user_defined_functions_fine.yul   |  8 +++-----
 test/libyul/yulSyntaxTests/variable_declaration.yul  |  4 +---
 .../yulSyntaxTests/variable_declaration_bool.yul     |  6 ++----
 .../yulSyntaxTests/variable_declaration_complex.yul  |  8 +++-----
 .../yulSyntaxTests/variable_declaration_empty.yul    |  2 +-
 83 files changed, 145 insertions(+), 275 deletions(-)
 delete mode 100644 test/libyul/yulSyntaxTests/assignment_fail.yul
 delete mode 100644 test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
 delete mode 100644 test/libyul/yulSyntaxTests/if_statement_fail_3.yul
 delete mode 100644 test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
 create mode 100644 test/libyul/yulSyntaxTests/linkersymbol_invalid_redefine_builtin.yul
 delete mode 100644 test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul

diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index 0201e047d8..7ed87bee45 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -74,6 +74,6 @@ void SyntaxTest::parseAndAnalyze()
 SyntaxTest::SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion):
 	CommonSyntaxTest(_filename, _evmVersion)
 {
-	std::string dialectName = m_reader.stringSetting("dialect", "evmTyped");
+	std::string dialectName = m_reader.stringSetting("dialect", "evm");
 	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
 }
diff --git a/test/libyul/yulSyntaxTests/assign_from_stack.yul b/test/libyul/yulSyntaxTests/assign_from_stack.yul
index 44f50ab5e5..ce48abe99a 100644
--- a/test/libyul/yulSyntaxTests/assign_from_stack.yul
+++ b/test/libyul/yulSyntaxTests/assign_from_stack.yul
@@ -1,3 +1,3 @@
-{ =: x:u256 }
+{ =: x }
 // ----
 // ParserError 1856: (2-3): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/assignment.yul b/test/libyul/yulSyntaxTests/assignment.yul
index 6c2c0f5a4c..5ba2e34372 100644
--- a/test/libyul/yulSyntaxTests/assignment.yul
+++ b/test/libyul/yulSyntaxTests/assignment.yul
@@ -1,5 +1,5 @@
 {
-    let x:u256 := 2:u256
-    let y:u256 := x
+    let x := 2
+    let y := x
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/assignment_fail.yul b/test/libyul/yulSyntaxTests/assignment_fail.yul
deleted file mode 100644
index 1bcf3fbb3f..0000000000
--- a/test/libyul/yulSyntaxTests/assignment_fail.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    let x:u256
-    let y := x
-    let z:bool
-    z := y
-    y := z
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 9547: (51-52): Assigning a value of type "u256" to a variable of type "bool".
-// TypeError 9547: (62-63): Assigning a value of type "bool" to a variable of type "u256".
diff --git a/test/libyul/yulSyntaxTests/blocks.yul b/test/libyul/yulSyntaxTests/blocks.yul
index 8c2fdd9a91..16e52fe738 100644
--- a/test/libyul/yulSyntaxTests/blocks.yul
+++ b/test/libyul/yulSyntaxTests/blocks.yul
@@ -1,10 +1,10 @@
 {
-    let x:u256 := 7:u256
+    let x := 7
     {
-        let y:u256 := 3:u256
+        let y := 3
     }
     {
-        let z:u256 := 2:u256
+        let z := 2
     }
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
index 1d0f997e61..60329f46f0 100644
--- a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
+++ b/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
@@ -1,8 +1,6 @@
 {
-	let x:bool
+	let x
 	if x { break }
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 2592: (22-27): Keyword "break" needs to be inside a for-loop body.
+// SyntaxError 2592: (17-22): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/builtin_types.yul b/test/libyul/yulSyntaxTests/builtin_types.yul
index e4d961c300..275addf394 100644
--- a/test/libyul/yulSyntaxTests/builtin_types.yul
+++ b/test/libyul/yulSyntaxTests/builtin_types.yul
@@ -1,7 +1,5 @@
 {
-    let x1:bool := true:bool
-    let x2:u256 := 1:u256
+    let x1 := true
+    let x2 := 1
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
index c12f7945d4..741a4d5b6b 100644
--- a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
+++ b/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
@@ -1,8 +1,6 @@
 {
-	let x:bool
+	let x
 	if x { continue }
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 2592: (22-30): Keyword "continue" needs to be inside a for-loop body.
+// SyntaxError 2592: (17-25): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition.yul b/test/libyul/yulSyntaxTests/for_loop_condition.yul
index 72ed7b71f1..22db0ce75a 100644
--- a/test/libyul/yulSyntaxTests/for_loop_condition.yul
+++ b/test/libyul/yulSyntaxTests/for_loop_condition.yul
@@ -1,7 +1,5 @@
 {
-    let x:bool
+    let x
     for {} x {} {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul b/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
deleted file mode 100644
index 98a52bf247..0000000000
--- a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x
-    for {} x {} {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 1733: (23-24): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/for_statement.yul b/test/libyul/yulSyntaxTests/for_statement.yul
index 7f180ea8f5..6da73b3002 100644
--- a/test/libyul/yulSyntaxTests/for_statement.yul
+++ b/test/libyul/yulSyntaxTests/for_statement.yul
@@ -1,7 +1,5 @@
 {
-	let x:bool
+	let x
 	for {let i := 0} x {i := add(i, 1)} {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break.yul b/test/libyul/yulSyntaxTests/for_statement_break.yul
index 4e432557ba..258cb4c417 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break.yul
@@ -1,10 +1,8 @@
 {
-	let x:bool
+	let x
 	for {let i := 0} x {i := add(i, 1)}
 	{
 		break
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_init.yul b/test/libyul/yulSyntaxTests/for_statement_break_init.yul
index 7fb15faf00..bf00d0dfb5 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_init.yul
@@ -1,8 +1,6 @@
 {
-	let x:bool
+	let x
 	for {let i := 0 break} x {i := add(i, 1)} {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 9615: (31-36): Keyword "break" in for-loop init block is not allowed.
+// SyntaxError 9615: (26-31): Keyword "break" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul
index 9ffe751cc0..cc0fdd3410 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_init.yul
@@ -1,7 +1,5 @@
 {
-	for {let x:bool for {} x {} { break }} 1:bool {}
+	for {let x for {} x {} { break }} 1 {}
 	{}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul
index ab012a73fa..0127e178e2 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_nested_body_in_post.yul
@@ -1,7 +1,5 @@
 {
-	for {} 1:bool {let x:bool for {} x {} { break }}
+	for {} 1 {let x for {} x {} { break }}
 	{}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_post.yul b/test/libyul/yulSyntaxTests/for_statement_break_post.yul
index 93d1475d06..595ab60d2d 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_post.yul
@@ -1,8 +1,6 @@
 {
-	let x:bool
+	let x
 	for {let i := 0 } x {i := add(i, 1) break} {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 2461: (51-56): Keyword "break" in for-loop post block is not allowed.
+// SyntaxError 2461: (46-51): Keyword "break" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue.yul b/test/libyul/yulSyntaxTests/for_statement_continue.yul
index b7c2b02515..f9badaf555 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue.yul
@@ -1,10 +1,8 @@
 {
-	let x:bool
+	let x
 	for {let i := 0} x {i := add(i, 1)}
 	{
 		continue
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
index eca0d46928..00683f8532 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
@@ -1,10 +1,8 @@
 {
-	let x:bool
+	let x
 	for {let i := 0 continue} x {i := add(i, 1)}
 	{
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 9615: (31-39): Keyword "continue" in for-loop init block is not allowed.
+// SyntaxError 9615: (26-34): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
index 7362b38b28..d8c5faaa82 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
@@ -1,8 +1,6 @@
 {
-	let x:bool
+	let x
 	for {let i := 0} x {i := add(i, 1) continue} {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 2461: (50-58): Keyword "continue" in for-loop post block is not allowed.
+// SyntaxError 2461: (45-53): Keyword "continue" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul
index 305cdd36d4..565489a371 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_init.yul
@@ -1,8 +1,6 @@
 {
-	for {let x:bool for {} x {} { continue }} 1:bool {}
+	for {let x for {} x {} { continue }} 1 {}
 	{
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul
index e33bd2457b..dd7927a8f0 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_nested_body_in_post.yul
@@ -1,7 +1,5 @@
 {
-	for {} 1:bool {let x:bool for {} x {} { continue }}
+	for {} 1 {let x for {} x {} { continue }}
 	{}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
index 1ff20943fb..c6abf3b537 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
@@ -1,11 +1,9 @@
 {
 	for {} 1 {}
 	{
-		let x:bool
+		let x
 		for { continue } x {} {}
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 9615: (39-47): Keyword "continue" in for-loop init block is not allowed.
+// SyntaxError 9615: (34-42): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul b/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
index ae3fd9da47..3b29cd754a 100644
--- a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
@@ -1,11 +1,9 @@
 {
-	let x:bool
+	let x
 	for {let i := 0} x {}
 	{
 		function f() { break }
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
-// SyntaxError 2592: (57-62): Keyword "break" needs to be inside a for-loop body.
+// SyntaxError 2592: (52-57): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul b/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
index 8e7eca428e..6e32d19b7d 100644
--- a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
@@ -4,7 +4,5 @@
 		function f() { continue }
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
 // SyntaxError 2592: (61-69): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_9.yul b/test/libyul/yulSyntaxTests/for_visibility_9.yul
index 6922dc9617..d12524e882 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_9.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_9.yul
@@ -1,7 +1,5 @@
 {
 	for { let x := 1 } 1 { let x := 1 } {}
 }
-// ====
-// dialect: evmTyped
 // ----
 // DeclarationError 1395: (26-36): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/function_calls.yul b/test/libyul/yulSyntaxTests/function_calls.yul
index 777382b125..586e778d3d 100644
--- a/test/libyul/yulSyntaxTests/function_calls.yul
+++ b/test/libyul/yulSyntaxTests/function_calls.yul
@@ -1,8 +1,8 @@
 {
-    function f(a:u256) -> b:u256 {}
-    function g(a:u256, b:u256, c:u256) {}
+    function f(a) -> b {}
+    function g(a, b, c) {}
     function x() {
-        g(1:u256, 2:u256, f(3:u256))
+        g(1, 2, f(3))
         x()
     }
 }
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul
index 6f921a4ea8..165337bcb7 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_block_1.yul
@@ -1,4 +1,4 @@
 {
-	for { } 1:bool { function f() {} } {}
+	for { } 1 { function f() {} } {}
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul
index f6c92d92a4..61a8b1c560 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_block_2.yul
@@ -1,4 +1,4 @@
 {
-	for { } 1:bool {} { function f() {} }
+	for { } 1 {} { function f() {} }
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
index 6e616630a1..b9571cbe97 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
@@ -1,5 +1,5 @@
 {
-	for { function f() {} } 1:bool {} {}
+	for { function f() {} } 1 {} {}
 }
 // ----
 // SyntaxError 3441: (9-17): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul
index 766de17a95..e7dca97638 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_1.yul
@@ -1,8 +1,8 @@
 {
 	for {
-		for {} 1:bool { function f() {} }
+		for {} 1 { function f() {} }
 		{}
-	} 1:bool {}
+	} 1 {}
 	{}
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
index f5f3accd24..db9445d26b 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
@@ -1,5 +1,5 @@
 {
-	for { for {function foo() {}} 1:bool {} {} } 1:bool {} {}
+	for { for {function foo() {}} 1 {} {} } 1 {} {}
 }
 // ----
 // SyntaxError 3441: (14-22): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
index d3a794c0af..ebae8beabf 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
@@ -1,8 +1,8 @@
 {
 	for {}
-		1:bool
-		{for {function foo() {}} 1:bool {} {} }
+		1
+		{for {function foo() {}} 1 {} {} }
 	{}
 }
 // ----
-// SyntaxError 3441: (27-35): Functions cannot be defined inside a for-loop init block.
+// SyntaxError 3441: (22-30): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_definitions.yul b/test/libyul/yulSyntaxTests/function_definitions.yul
index 20dfbb1312..ec36b5b805 100644
--- a/test/libyul/yulSyntaxTests/function_definitions.yul
+++ b/test/libyul/yulSyntaxTests/function_definitions.yul
@@ -1,5 +1,5 @@
 {
     function f() { }
-    function g(a:u256) -> x:u256 { }
+    function g(a) -> x { }
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul
index 22c89e2b57..af1273669b 100644
--- a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul
+++ b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_1.yul
@@ -1,5 +1,5 @@
 {
-	{ let x:u256 }
-	function f() -> x:u256 {}
+	{ let x }
+	function f() -> x {}
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
index f7fb872785..724f31a3db 100644
--- a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
+++ b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
@@ -1,6 +1,6 @@
 {
-	let x:u256
-	function f() -> x:u256 {}
+	let x
+	function f() -> x {}
 }
 // ----
-// DeclarationError 1395: (15-40): Variable name x already taken in this scope.
+// DeclarationError 1395: (10-30): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/functions_multiple_args.yul b/test/libyul/yulSyntaxTests/functions_multiple_args.yul
index aa268dc108..45d4810421 100644
--- a/test/libyul/yulSyntaxTests/functions_multiple_args.yul
+++ b/test/libyul/yulSyntaxTests/functions_multiple_args.yul
@@ -1,5 +1,5 @@
 {
-    function f(a:u256, d:u256) { }
-    function g(a:u256, d:u256) -> x:u256, y:u256 { }
+    function f(a, d) { }
+    function g(a, d) -> x, y { }
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_1.yul b/test/libyul/yulSyntaxTests/if_statement_1.yul
index b631f8a953..7a5630f250 100644
--- a/test/libyul/yulSyntaxTests/if_statement_1.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_1.yul
@@ -1,6 +1,4 @@
 {
-	if true:bool {}
+	if true {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_2.yul b/test/libyul/yulSyntaxTests/if_statement_2.yul
index 20be9b525c..7d2ffa2253 100644
--- a/test/libyul/yulSyntaxTests/if_statement_2.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_2.yul
@@ -1,9 +1,7 @@
 {
-	if false:bool
+	if false
 	{
-		let x:u256 := 3:u256
+		let x := 3
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_3.yul b/test/libyul/yulSyntaxTests/if_statement_3.yul
index 2ba20d39b9..c80d8187d4 100644
--- a/test/libyul/yulSyntaxTests/if_statement_3.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_3.yul
@@ -1,11 +1,9 @@
 {
-	function f() -> x:bool {}
+	function f() -> x {}
 
 	if f()
 	{
-		let b:bool := f()
+		let b := f()
 	}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul b/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
index 6fc409ce38..8bf70df984 100644
--- a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
@@ -1,5 +1,3 @@
-{ if let x:u256 {} }
-// ====
-// dialect: evmTyped
+{ if let x {} }
 // ----
 // ParserError 1856: (5-8): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul b/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
index 97ce0e9f9f..8722a77416 100644
--- a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
@@ -1,5 +1,3 @@
-{ if true:bool let x:u256 := 3:u256 }
-// ====
-// dialect: evmTyped
+{ if true let x := 3 }
 // ----
-// ParserError 2314: (15-18): Expected '{' but got reserved keyword 'let'
+// ParserError 2314: (10-13): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul b/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
deleted file mode 100644
index 51e36790b6..0000000000
--- a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ if 42:u256 { } }
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 1733: (5-12): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
index e43d7a141b..d5b3847b17 100644
--- a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
@@ -1,7 +1,5 @@
 {
     pop(pc())
 }
-// ====
-// dialect: evmTyped
 // ----
 // SyntaxError 2450: (10-12): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libyul/yulSyntaxTests/invalid_type.yul b/test/libyul/yulSyntaxTests/invalid_type.yul
index 99ed4c43b4..f863816355 100644
--- a/test/libyul/yulSyntaxTests/invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type.yul
@@ -1,7 +1,5 @@
 {
     let x: invalidType
 }
-// ====
-// dialect: evmTyped
 // ----
 // TypeError 5473: (10-24): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type2.yul b/test/libyul/yulSyntaxTests/invalid_type2.yul
index 2ad035dcfc..af30bc2eb2 100644
--- a/test/libyul/yulSyntaxTests/invalid_type2.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type2.yul
@@ -1,8 +1,6 @@
 {
     let x := 1:invalidType
 }
-// ====
-// dialect: evmTyped
 // ----
 // TypeError 5473: (15-28): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 3947: (10-11): Assigning value of type "invalidType" to variable of type "u256".
+// TypeError 3947: (10-11): Assigning value of type "invalidType" to variable of type "".
diff --git a/test/libyul/yulSyntaxTests/invalid_type3.yul b/test/libyul/yulSyntaxTests/invalid_type3.yul
index 1ce7092fe8..6fc0e35e8c 100644
--- a/test/libyul/yulSyntaxTests/invalid_type3.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type3.yul
@@ -1,8 +1,6 @@
 {
     function f(a: invalidType) -> b: invalidType {}
 }
-// ====
-// dialect: evmTyped
 // ----
 // TypeError 5473: (17-31): "invalidType" is not a valid type (user defined types are not yet supported).
 // TypeError 5473: (36-50): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type4.yul b/test/libyul/yulSyntaxTests/invalid_type4.yul
index 8195fcf908..90f00ddaaf 100644
--- a/test/libyul/yulSyntaxTests/invalid_type4.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type4.yul
@@ -2,8 +2,6 @@
     switch 1
     case 8: invalidType {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// TypeError 3781: (24-38): Expected a value of type "u256" but got "invalidType".
+// TypeError 3781: (24-38): Expected a value of type "" but got "invalidType".
 // TypeError 5473: (24-38): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul b/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
deleted file mode 100644
index aa9cc3adbf..0000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let addr:u256 := linkersymbol("contract/library.sol:L")
-    function linkersymbol(x) {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// ParserError 5568: (75-87): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_invalid_redefine_builtin.yul b/test/libyul/yulSyntaxTests/linkersymbol_invalid_redefine_builtin.yul
new file mode 100644
index 0000000000..462886c877
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/linkersymbol_invalid_redefine_builtin.yul
@@ -0,0 +1,6 @@
+{
+    let addr := linkersymbol("contract/library.sol:L")
+    function linkersymbol(x) {}
+}
+// ----
+// ParserError 5568: (70-82): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
index 07a51eb887..fd612a0a5a 100644
--- a/test/libyul/yulSyntaxTests/literal_invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
@@ -1,7 +1,7 @@
 {
-    let x:bool := true:unhappy
+    let x := true:unhappy
 }
 // ----
-// TypeError 5473: (20-32): "unhappy" is not a valid type (user defined types are not yet supported).
-// TypeError 5170: (20-32): Invalid type "unhappy" for literal "true".
-// TypeError 3947: (10-16): Assigning value of type "unhappy" to variable of type "bool".
+// TypeError 5473: (15-27): "unhappy" is not a valid type (user defined types are not yet supported).
+// TypeError 5170: (15-27): Invalid type "unhappy" for literal "true".
+// TypeError 3947: (10-11): Assigning value of type "unhappy" to variable of type "".
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul b/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
index b619007a55..285374339e 100644
--- a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
+++ b/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
@@ -1,9 +1,7 @@
 {
-	let x:u256
-	function f() -> a:u256, b:u256 {}
-	123:u256, x := f()
+	let x
+	function f() -> a, b {}
+	123, x := f()
 }
-// ====
-// dialect: evmTyped
 // ----
-// ParserError 2856: (58-59): Variable name must precede "," in multiple assignment.
+// ParserError 2856: (38-39): Variable name must precede "," in multiple assignment.
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul b/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
index 852502447f..5aae7f6687 100644
--- a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
+++ b/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
@@ -1,9 +1,7 @@
 {
-	let x:u256
-	function f() -> a:u256, b:u256 {}
-	x, 123:u256 := f()
+	let x
+	function f() -> a, b {}
+	x, 123 := f()
 }
-// ====
-// dialect: evmTyped
 // ----
-// ParserError 2856: (62-64): Variable name must precede ":=" in assignment.
+// ParserError 2856: (42-44): Variable name must precede ":=" in assignment.
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_3.yul b/test/libyul/yulSyntaxTests/multiple_assignment_3.yul
index c7ac5eb8e5..7a6d8a1aea 100644
--- a/test/libyul/yulSyntaxTests/multiple_assignment_3.yul
+++ b/test/libyul/yulSyntaxTests/multiple_assignment_3.yul
@@ -1,12 +1,10 @@
 {
-	function f(a:u256) -> r1:u256, r2:u256 {
+	function f(a) -> r1, r2 {
 		r1 := a
-		r2 := 7:u256
+		r2 := 7
 	}
-	let x:u256 := 9:u256
-	let y:u256 := 2:u256
+	let x := 9
+	let y := 2
 	x, y := f(x)
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/number_literal_1.yul b/test/libyul/yulSyntaxTests/number_literal_1.yul
index 5d5bcd150c..f261e3157b 100644
--- a/test/libyul/yulSyntaxTests/number_literal_1.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_1.yul
@@ -1,2 +1,2 @@
-{ let x:u256 := 1:u256 }
+{ let x := 1 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/number_literal_2.yul b/test/libyul/yulSyntaxTests/number_literal_2.yul
index 94c5929b53..6941121460 100644
--- a/test/libyul/yulSyntaxTests/number_literal_2.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_2.yul
@@ -1,3 +1,3 @@
-{ let x:u256 := .1:u256 }
+{ let x := .1 }
 // ----
-// ParserError 4828: (16-18): Invalid number literal.
+// ParserError 4828: (11-13): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_3.yul b/test/libyul/yulSyntaxTests/number_literal_3.yul
index 4dbb6879a9..b1592adc17 100644
--- a/test/libyul/yulSyntaxTests/number_literal_3.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_3.yul
@@ -1,3 +1,3 @@
-{ let x:u256 := 1e5:u256 }
+{ let x := 1e5 }
 // ----
-// ParserError 4828: (16-19): Invalid number literal.
+// ParserError 4828: (11-14): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_4.yul b/test/libyul/yulSyntaxTests/number_literal_4.yul
index 7de784e88c..339d7802e0 100644
--- a/test/libyul/yulSyntaxTests/number_literal_4.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_4.yul
@@ -1,3 +1,3 @@
-{ let x:u256 := 67.235:u256 }
+{ let x := 67.235 }
 // ----
-// ParserError 4828: (16-22): Invalid number literal.
+// ParserError 4828: (11-17): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_5.yul b/test/libyul/yulSyntaxTests/number_literal_5.yul
index df41e69eca..327206e044 100644
--- a/test/libyul/yulSyntaxTests/number_literal_5.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_5.yul
@@ -1,3 +1,3 @@
-{ let x:u256 := 0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff:u256 }
+{ let x := 0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff }
 // ----
-// TypeError 6708: (16-88): Number literal too large (> 256 bits)
+// TypeError 6708: (11-78): Number literal too large (> 256 bits)
diff --git a/test/libyul/yulSyntaxTests/optional_types.yul b/test/libyul/yulSyntaxTests/optional_types.yul
index 151edbf469..121a7d495e 100644
--- a/test/libyul/yulSyntaxTests/optional_types.yul
+++ b/test/libyul/yulSyntaxTests/optional_types.yul
@@ -1,9 +1,7 @@
 {
-    let x := 1:u256
-    let y:u256 := 1
+    let x := 1
+    let y := 1
     function f(a) {}
-    function g(a:u256) -> b {}
+    function g(a) -> b {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier.yul b/test/libyul/yulSyntaxTests/period_in_identifier.yul
index 4ee80a3f4c..0fc75185e6 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier.yul
@@ -1,2 +1,2 @@
-{ let x.y:u256 := 2:u256 }
+{ let x.y := 2 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
index dc889a2fbc..e4ea959d6b 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
@@ -1,3 +1,3 @@
-{ let x. y:u256 }
+{ let x. y }
 // ----
-// ParserError 6913: (10-11): Call or assignment expected.
+// ParserError 6913: (11-12): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
index 5602cbcebc..290eb28a5a 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
@@ -1,3 +1,3 @@
-{ let x .y:u256 }
+{ let x .y }
 // ----
 // ParserError 1856: (8-9): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
index 003341b339..3e5ec22a46 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
@@ -1,3 +1,3 @@
-{ let x . y:u256 }
+{ let x . y }
 // ----
 // ParserError 1856: (8-9): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_start.yul b/test/libyul/yulSyntaxTests/period_in_identifier_start.yul
index 83da8389f1..cb2c661465 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_start.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_start.yul
@@ -1,5 +1,5 @@
 {
-    x.y(2:u256)
-    function x.y(a:u256) {}
+    x.y(2)
+    function x.y(a) {}
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul b/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul
index 51623599d6..47939019c0 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_start_with_comment.yul
@@ -1,3 +1,3 @@
 /// comment
-{ x.y(2:u256) function x.y(a:u256) {} }
+{ x.y(2) function x.y(a) {} }
 // ----
diff --git a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul b/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
index 0002b76fdb..cb47ffb2af 100644
--- a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
+++ b/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
@@ -1,3 +1,3 @@
-{ let .y:u256 }
+{ let .y }
 // ----
 // ParserError 2314: (6-7): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/push.yul b/test/libyul/yulSyntaxTests/push.yul
index f3dab144d5..beea98be99 100644
--- a/test/libyul/yulSyntaxTests/push.yul
+++ b/test/libyul/yulSyntaxTests/push.yul
@@ -1,3 +1,3 @@
-{ 0x42:u256 }
+{ 0x42 }
 // ----
-// ParserError 6913: (12-13): Call or assignment expected.
+// ParserError 6913: (7-8): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/recursion_depth.yul b/test/libyul/yulSyntaxTests/recursion_depth.yul
index 9c65013912..97dfd74295 100644
--- a/test/libyul/yulSyntaxTests/recursion_depth.yul
+++ b/test/libyul/yulSyntaxTests/recursion_depth.yul
@@ -1,7 +1,5 @@
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
-let x:u256 := 0:u256
+let x := 0
 }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// ====
-// dialect: evmTyped
 // ----
 // ParserError 7319: (600-601): Maximum recursion depth reached during parsing.
diff --git a/test/libyul/yulSyntaxTests/switch_case.yul b/test/libyul/yulSyntaxTests/switch_case.yul
index 88bda99294..aef17d570d 100644
--- a/test/libyul/yulSyntaxTests/switch_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_case.yul
@@ -1,8 +1,6 @@
 {
-	switch 0:u256
-	case 42:u256 {}
-	case 0x42:u256 {}
+	switch 0
+	case 42 {}
+	case 0x42 {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/switch_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_case_different_literal.yul
index 8514b835d2..36f8e0ffcf 100644
--- a/test/libyul/yulSyntaxTests/switch_case_different_literal.yul
+++ b/test/libyul/yulSyntaxTests/switch_case_different_literal.yul
@@ -1,8 +1,6 @@
 {
-	switch 1:u256
-	case "1":u256 {}
-	case "2":u256 {}
+	switch 1
+	case "1" {}
+	case "2" {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul b/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul
index dceb9db160..f8a5c46bcd 100644
--- a/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul
+++ b/test/libyul/yulSyntaxTests/switch_case_string_literal_too_long.yul
@@ -1,9 +1,7 @@
 {
-	let x:u256
+	let x
 	switch x
-	case "012345678901234567890123456789012":u256 {}
+	case "012345678901234567890123456789012" {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// TypeError 3069: (30-70): String literal too long (33 > 32)
+// TypeError 3069: (25-60): String literal too long (33 > 32)
diff --git a/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul b/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul
index 55f25124b2..94ca50336d 100644
--- a/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul
+++ b/test/libyul/yulSyntaxTests/switch_case_string_literal_very_long.yul
@@ -1,8 +1,6 @@
 {
-	let x:u256
+	let x
 	switch x
-	case "01234567890123456789012345678901":u256 {}
+	case "01234567890123456789012345678901" {}
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
index 7417f32d63..1dd5f60ebe 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
@@ -1,9 +1,7 @@
 {
-	switch 0:u256
-	case 0:u256 {}
-	case 0x0:u256 {}
+	switch 0
+	case 0 {}
+	case 0x0 {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-50): Duplicate case "0x0" defined.
+// DeclarationError 6792: (24-35): Duplicate case "0x0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
index 91f19efae1..e28ca3be0e 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
@@ -1,9 +1,7 @@
 {
-	switch 0:u256
-	case 0:u256 {}
-	case "":u256 {}
+	switch 0
+	case 0 {}
+	case "" {}
 }
-// ====
-// dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-49): Duplicate case "" defined.
+// DeclarationError 6792: (24-34): Duplicate case "" defined.
diff --git a/test/libyul/yulSyntaxTests/token_as_identifier.yul b/test/libyul/yulSyntaxTests/token_as_identifier.yul
index 204b76e555..ebb85bdb06 100644
--- a/test/libyul/yulSyntaxTests/token_as_identifier.yul
+++ b/test/libyul/yulSyntaxTests/token_as_identifier.yul
@@ -1,6 +1,4 @@
 {
-    let bool:u256 := 1:u256
+    let bool := 1
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/tuple_assignment.yul b/test/libyul/yulSyntaxTests/tuple_assignment.yul
index 4ac961c265..40c4416f02 100644
--- a/test/libyul/yulSyntaxTests/tuple_assignment.yul
+++ b/test/libyul/yulSyntaxTests/tuple_assignment.yul
@@ -1,5 +1,5 @@
 {
-    function f() -> a:u256, b:u256, c:u256 {}
-    let x:u256, y:u256, z:u256 := f()
+    function f() -> a, b, c {}
+    let x, y, z := f()
 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul b/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
deleted file mode 100644
index 35926ccb29..0000000000
--- a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    switch 7
-    case true:bool {}
-    case true:bool {}
-}
-// ====
-// dialect: evmTyped
-// ----
-// TypeError 3781: (24-33): Expected a value of type "u256" but got "bool".
-// TypeError 3781: (46-55): Expected a value of type "u256" but got "bool".
diff --git a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul b/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
index 7b8d012bb5..dc837eb431 100644
--- a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
+++ b/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
@@ -1,12 +1,9 @@
 {
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
+    function f(a, b, c) -> r, t {
         r := lt(a, b)
-        t := bool_to_u256(not(c))
+        t := not(c)
     }
-    let x, y: bool := f(1, 2: u256, true)
+    let x, y := f(1, 2, true, false)
 }
-// ====
-// dialect: evmTyped
 // ----
-// TypeError 3947: (126-127): Assigning value of type "bool" to variable of type "u256".
-// TypeError 3947: (129-136): Assigning value of type "u256" to variable of type "bool".
+// TypeError 7000: (100-101): Function "f" expects 3 arguments but got 4.
diff --git a/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul b/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul
index e24ea923ec..ce79a9b6e9 100644
--- a/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul
+++ b/test/libyul/yulSyntaxTests/user_defined_functions_fine.yul
@@ -1,10 +1,8 @@
 {
-    function f(a:u256, b:u256, c:bool) -> r:bool, t {
+    function f(a, b, c) -> r, t {
         r := lt(a, b)
-        t := bool_to_u256(not(c))
+        t := not(c)
     }
-    let x: bool, y: u256 := f(1, 2: u256, true)
+    let x, y := f(1, 2, true)
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration.yul b/test/libyul/yulSyntaxTests/variable_declaration.yul
index 3d7c9d595c..2bc22446a9 100644
--- a/test/libyul/yulSyntaxTests/variable_declaration.yul
+++ b/test/libyul/yulSyntaxTests/variable_declaration.yul
@@ -1,4 +1,2 @@
-{ let x:u256 := 7:u256 }
-// ====
-// dialect: evmTyped
+{ let x := 7 }
 // ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_bool.yul b/test/libyul/yulSyntaxTests/variable_declaration_bool.yul
index 3e97d5d4da..e49af9b910 100644
--- a/test/libyul/yulSyntaxTests/variable_declaration_bool.yul
+++ b/test/libyul/yulSyntaxTests/variable_declaration_bool.yul
@@ -1,7 +1,5 @@
 {
-    let x:bool := true:bool
-    let y:bool := false:bool
+    let x := true
+    let y := false
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul b/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
index e7a428fc2c..6e07849fca 100644
--- a/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
+++ b/test/libyul/yulSyntaxTests/variable_declaration_complex.yul
@@ -1,8 +1,6 @@
 {
-    function add_fn(a:u256, b:u256) -> c:u256 {}
-    let y:u256 := 2:u256
-    let x:u256 := add_fn(7:u256, add_fn(6:u256, y))
+    function add_fn(a, b) -> c {}
+    let y := 2
+    let x := add_fn(7, add_fn(6, y))
 }
-// ====
-// dialect: evmTyped
 // ----
diff --git a/test/libyul/yulSyntaxTests/variable_declaration_empty.yul b/test/libyul/yulSyntaxTests/variable_declaration_empty.yul
index afbccb293a..df81f297a7 100644
--- a/test/libyul/yulSyntaxTests/variable_declaration_empty.yul
+++ b/test/libyul/yulSyntaxTests/variable_declaration_empty.yul
@@ -1,2 +1,2 @@
-{ let x:u256 }
+{ let x }
 // ----

From 83895d0f7d7c5e40f138826f6ce75ec543d0f322 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:10:23 +0200
Subject: [PATCH 0992/1140] Error codes: Whitelist 1733 and 9547 as they rely
 on Yul types (which have been removed)

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

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index fcb6f0e7f5..813d08330e 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -205,6 +205,8 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "7053", # Unimplemented feature error (parsing stage), currently has no tests
         "2339", # SMTChecker, covered by CL tests
         "6240", # SMTChecker, covered by CL tests
+        "1733", # AsmAnalysis: expecting bool expression (everything is implicitly bool without types in Yul)
+        "9547", # AsmAnalysis: assigning incompatible types in Yul (whitelisted as there are currently no types)
     }
     assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
     test_ids |= white_ids

From 63d87a28684dda2323dbebd3cd62148ab4a548c2 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 12 Jun 2024 14:36:31 +0200
Subject: [PATCH 0993/1140] Use submodules for some dependencies.

---
 .circleci/config.yml                         |  4 +-
 .gitmodules                                  |  9 +++++
 Changelog.md                                 |  2 +
 cmake/fmtlib.cmake                           | 23 +++--------
 cmake/nlohmann-json.cmake                    | 24 +++---------
 cmake/range-v3.cmake                         | 41 ++++----------------
 cmake/submodules.cmake                       | 23 +++++++++++
 deps/fmtlib                                  |  1 +
 deps/nlohmann-json                           |  1 +
 deps/range-v3                                |  1 +
 libsolutil/CMakeLists.txt                    |  2 +-
 scripts/check_style.sh                       |  1 +
 scripts/chk_shellscripts/chk_shellscripts.sh |  2 +-
 scripts/create_source_tarball.sh             |  2 +
 scripts/install_evmone.ps1                   |  3 +-
 scripts/release_ppa.sh                       |  7 ----
 16 files changed, 64 insertions(+), 82 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 cmake/submodules.cmake
 create mode 160000 deps/fmtlib
 create mode 160000 deps/nlohmann-json
 create mode 160000 deps/range-v3

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3426db3293..343bb6d006 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -866,7 +866,7 @@ jobs:
           name: Check spelling
           command: |
             ~/.local/bin/codespell \
-              --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" \
+              --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt,deps" \
               --ignore-words scripts/codespell_whitelist.txt \
               --exclude-file scripts/codespell_ignored_lines.txt
       - matrix_notify_failure_unless_pr
@@ -1273,7 +1273,7 @@ jobs:
       - run:
           name: Install runtime dependencies
           command: |
-            pacman --noconfirm -Syu --noprogressbar --needed z3
+            pacman --noconfirm -Syu --noprogressbar --needed z3 git
       - soltest
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..47bcbb4fde
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "deps/nlohmann-json"]
+	path = deps/nlohmann-json
+	url = https://github.com/nlohmann/json.git
+[submodule "deps/range-v3"]
+	path = deps/range-v3
+	url = https://github.com/ericniebler/range-v3.git
+[submodule "deps/fmtlib"]
+	path = deps/fmtlib
+	url = https://github.com/fmtlib/fmt.git
diff --git a/Changelog.md b/Changelog.md
index 1aebcc05aa..2a1249c98a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -36,6 +36,8 @@ Bugfixes:
  * Yul Optimizer: Name simplification could lead to forbidden identifiers with a leading and/or trailing dot, e.g., ``x._`` would get simplified into ``x.``.
  * Yul Parser: Fix segfault when parsing very long location comments.
 
+Build System:
+ * Change build system to use git submodules for some dependencies (nlohmann-json, fmtlib & range-v3).
 
 ### 0.8.26 (2024-05-21)
 
diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
index 032a68cd52..f9522aaecd 100644
--- a/cmake/fmtlib.cmake
+++ b/cmake/fmtlib.cmake
@@ -1,20 +1,9 @@
-include(FetchContent)
+include(${CMAKE_SOURCE_DIR}/cmake/submodules.cmake)
+initialize_submodule(fmtlib)
 
-FetchContent_Declare(
-	fmtlib
-	PREFIX "${PROJECT_BINARY_DIR}/deps"
-	DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
-	DOWNLOAD_NAME fmt-9.1.0.tar.gz
-	URL https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
-	URL_HASH SHA256=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+set(FMT_SYSTEM_HEADERS ON)
+add_subdirectory(
+	${CMAKE_SOURCE_DIR}/deps/fmtlib
+	EXCLUDE_FROM_ALL
 )
 
-if (CMAKE_VERSION VERSION_LESS "3.14.0")
-	FetchContent_GetProperties(fmtlib)
-	if (NOT fmtlib_POPULATED)
-		FetchContent_Populate(fmtlib)
-		add_subdirectory(${fmtlib_SOURCE_DIR} ${fmtlib_BINARY_DIR})
-	endif()
-else()
-	FetchContent_MakeAvailable(fmtlib)
-endif()
diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake
index 02891e6a7b..638fcdd650 100644
--- a/cmake/nlohmann-json.cmake
+++ b/cmake/nlohmann-json.cmake
@@ -1,21 +1,9 @@
-include(ExternalProject)
+include(${CMAKE_SOURCE_DIR}/cmake/submodules.cmake)
+initialize_submodule(nlohmann-json)
 
-ExternalProject_Add(nlohmann-json-project
-        DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/nlohmann/nlohmann"
-        DOWNLOAD_NAME json.hpp
-        DOWNLOAD_NO_EXTRACT 1
-        URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp
-        URL_HASH SHA256=9bea4c8066ef4a1c206b2be5a36302f8926f7fdc6087af5d20b417d0cf103ea6
-        CMAKE_COMMAND true
-        BUILD_COMMAND true
-        INSTALL_COMMAND true
+set(JSON_Install OFF CACHE INTERNAL "")
+add_subdirectory(
+	${CMAKE_SOURCE_DIR}/deps/nlohmann-json
+	EXCLUDE_FROM_ALL
 )
 
-# Create nlohmann-json imported library
-add_library(nlohmann-json INTERFACE IMPORTED)
-file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/deps/nlohmann)  # Must exist.
-set_target_properties(nlohmann-json PROPERTIES
-        INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES  ${CMAKE_SOURCE_DIR}/deps/nlohmann
-        INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/deps/nlohmann)
-add_dependencies(nlohmann-json nlohmann-json-project)
\ No newline at end of file
diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
index d2f54452b3..eaab3b09e3 100644
--- a/cmake/range-v3.cmake
+++ b/cmake/range-v3.cmake
@@ -1,38 +1,11 @@
-include(ExternalProject)
+include(${CMAKE_SOURCE_DIR}/cmake/submodules.cmake)
+initialize_submodule(range-v3)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
-    set(RANGE_V3_CMAKE_COMMAND emcmake cmake)
-else()
-    set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND})
-endif()
-
-set(prefix "${PROJECT_BINARY_DIR}/deps")
-set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
-
-ExternalProject_Add(range-v3-project
-    PREFIX "${prefix}"
-    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
-    CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND}
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-               -DBUILD_TESTING=OFF
-               -DRANGES_CXX_STD=${CMAKE_CXX_STANDARD}
-               -DRANGE_V3_DOCS=OFF
-               -DRANGE_V3_EXAMPLES=OFF
-               -DRANGE_V3_TESTS=OFF
-               -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    BUILD_BYPRODUCTS "${RANGE_V3_INCLUDE_DIR}/range/v3/all.hpp"
-)
-
-# Create range-v3 imported library
 add_library(range-v3 INTERFACE IMPORTED)
-file(MAKE_DIRECTORY ${RANGE_V3_INCLUDE_DIR})  # Must exist.
 set_target_properties(range-v3 PROPERTIES
-    INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
-    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR}
-    INTERFACE_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR})
+	INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
+	INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/deps/range-v3/include
+	INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/deps/range-v3/include
+)
 add_dependencies(range-v3 range-v3-project)
+
diff --git a/cmake/submodules.cmake b/cmake/submodules.cmake
new file mode 100644
index 0000000000..099aceaa92
--- /dev/null
+++ b/cmake/submodules.cmake
@@ -0,0 +1,23 @@
+macro(initialize_submodule SUBMODULE_PATH)
+	if(NOT USE_SYSTEM_LIBRARIES)
+		file(GLOB submodule_contents "${CMAKE_SOURCE_DIR}/deps/${SUBMODULE_PATH}/*")
+
+		if(submodule_contents)
+			message(STATUS "git submodule '${SUBMODULE_PATH}' seem to be already initialized: nothing to do.")
+		else()
+			message(STATUS "git submodule '${SUBMODULE_PATH}' seem not to be initialized: implicitly executing 'git submodule update --init '${CMAKE_SOURCE_DIR}/deps/${SUBMODULE_PATH}'.")
+			find_package(Git)
+			if(NOT Git_FOUND)
+				message(FATAL_ERROR "Failed to initialize submodules: 'git' command not found.")
+			endif()
+			execute_process(
+					COMMAND git submodule update --init ${CMAKE_SOURCE_DIR}/deps/${SUBMODULE_PATH}
+					WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+					RESULT_VARIABLE result
+			)
+			if(NOT result EQUAL 0)
+				message(FATAL_ERROR "Failed to initialize submodules: 'git submodule update --init' failed.")
+			endif()
+		endif()
+	endif()
+endmacro()
diff --git a/deps/fmtlib b/deps/fmtlib
new file mode 160000
index 0000000000..a33701196a
--- /dev/null
+++ b/deps/fmtlib
@@ -0,0 +1 @@
+Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50
diff --git a/deps/nlohmann-json b/deps/nlohmann-json
new file mode 160000
index 0000000000..9cca280a4d
--- /dev/null
+++ b/deps/nlohmann-json
@@ -0,0 +1 @@
+Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
diff --git a/deps/range-v3 b/deps/range-v3
new file mode 160000
index 0000000000..a81477931a
--- /dev/null
+++ b/deps/range-v3
@@ -0,0 +1 @@
+Subproject commit a81477931a8aa2ad025c6bda0609f38e09e4d7ec
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 291c95c0d1..a1e9559ede 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -44,7 +44,7 @@ set(sources
 )
 
 add_library(solutil ${sources})
-target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only nlohmann-json)
+target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only nlohmann_json::nlohmann_json)
 target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index dbe470c1ae..d67f7b60ca 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -6,6 +6,7 @@ ERROR_LOG="$(mktemp -t check_style_XXXXXX.log)"
 
 EXCLUDE_FILES=(
     # The line below is left unquoted to allow the shell globbing path expansion
+    deps/*
     test/cmdlineTests/*/{err,output}
     "libsolutil/picosha2.h"
     "test/cmdlineTests/strict_asm_only_cr/input.yul"
diff --git a/scripts/chk_shellscripts/chk_shellscripts.sh b/scripts/chk_shellscripts/chk_shellscripts.sh
index f94d9f2da3..fff9d2662e 100755
--- a/scripts/chk_shellscripts/chk_shellscripts.sh
+++ b/scripts/chk_shellscripts/chk_shellscripts.sh
@@ -13,5 +13,5 @@ if [ ! -f "${SHELLCHECK}" ]; then
     exit 1
 fi
 
-mapfile -t FILES < <(find . -type f -name "*.sh")
+mapfile -t FILES < <(find . -type f -name "*.sh" -not -path "./deps/*")
 "${SHELLCHECK}" "${FILES[@]}"
diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh
index 4af1cf586a..37bee6df18 100755
--- a/scripts/create_source_tarball.sh
+++ b/scripts/create_source_tarball.sh
@@ -23,6 +23,8 @@ REPO_ROOT="$(dirname "$0")"/..
     mkdir "$SOLDIR"
     # Store the current source
     git checkout-index -a --prefix="$SOLDIR"
+    # shellcheck disable=SC2016
+    SOLDIR="$SOLDIR" git submodule foreach 'git checkout-index -a --prefix="$SOLDIR/$sm_path/"'
     # Store the commit hash
     echo "$commithash" > "$SOLDIR/commit_hash.txt"
     if [ -e prerelease.txt ] && [ ! -s prerelease.txt ]
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
index acbacdafbd..5864f24915 100644
--- a/scripts/install_evmone.ps1
+++ b/scripts/install_evmone.ps1
@@ -5,5 +5,4 @@ $progressPreference = "silentlyContinue"
 
 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
+mv bin/evmone.dll deps/
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 0e4eb7ed4d..3b7c8347c0 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -123,13 +123,6 @@ ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
 git clone --depth 2 --recursive https://github.com/ethereum/solidity.git -b "$branch"
 mv solidity solc
 
-# Fetch dependencies
-mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
-mkdir -p ./solc/deps/nlohmann/nlohmann/ 2>/dev/null || true
-wget -O ./solc/deps/nlohmann/nlohmann/json.hpp https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp
-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-9.1.0.tar.gz https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
-
 # Determine version
 cd solc
 version=$("$(dirname "$0")/get_version.sh")

From 3de3c7bd98b9da2ef48eaecb48ff6543fb1b398e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 9 Aug 2024 10:36:23 +0200
Subject: [PATCH 0994/1140] Bump evmone to v0.12.0 in CI

Bump clang to 15
---
 .../Dockerfile.ubuntu.clang.ossfuzz              | 16 ++++++----------
 .../docker/buildpack-deps/Dockerfile.ubuntu2004  |  6 +++---
 .../docker/buildpack-deps/Dockerfile.ubuntu2204  | 16 ++++++----------
 .../buildpack-deps/Dockerfile.ubuntu2204.clang   | 16 ++++++----------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index aae11521e5..46137b400d 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="7"
+LABEL version="8"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -140,15 +140,11 @@ RUN set -ex; \
 
 # EVMONE
 RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.11.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
-	cd evmone; \
-	mkdir build; \
-	cd build; \
-	CXX=clang++ cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -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.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /usr/src/evmone.tar.gz"; \
+	cd /usr; \
+	tar -xf /usr/src/evmone.tar.gz; \
+	rm -rf /usr/src/evmone.tar.gz
 
 # gmp
 RUN set -ex; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 8b94fe9dd9..723192e2d0 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="24"
+LABEL version="25"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -89,8 +89,8 @@ FROM base AS libraries
 
 # EVMONE
 RUN set -ex; \
-	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"; \
+	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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 90d5811c3b..add03bb003 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="9"
+LABEL version="10"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -88,15 +88,11 @@ FROM base AS libraries
 
 # EVMONE
 RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.11.0" --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.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index b2f75b0e43..b9c9158381 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="8"
+LABEL version="9"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -89,15 +89,11 @@ ENV CXX clang++
 
 # EVMONE
 RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.11.0" --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.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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

From 3d3b78e0a39163ef8449defdfa2b4659ded617e7 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:35:20 +0200
Subject: [PATCH 0995/1140] Fix UB introduced by casting difference of two
 unsigneds to signed

---
 liblangutil/SemVerHandler.cpp                     | 2 +-
 libsolidity/codegen/ExpressionCompiler.cpp        | 6 +++---
 libyul/backends/evm/EVMCodeTransform.cpp          | 2 +-
 libyul/backends/evm/NoOutputAssembly.cpp          | 2 +-
 libyul/backends/evm/OptimizedEVMCodeTransform.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/liblangutil/SemVerHandler.cpp b/liblangutil/SemVerHandler.cpp
index 2358eec5ef..e1a9556ca1 100644
--- a/liblangutil/SemVerHandler.cpp
+++ b/liblangutil/SemVerHandler.cpp
@@ -115,7 +115,7 @@ bool SemVerMatchExpression::MatchComponent::matches(SemVerVersion const& _versio
 			if (version.numbers[i] != std::numeric_limits<unsigned>::max())
 			{
 				didCompare = true;
-				cmp = static_cast<int>(_version.numbers[i] - version.numbers[i]);
+				cmp = static_cast<int>(_version.numbers[i]) - static_cast<int>(version.numbers[i]);
 			}
 
 		if (cmp == 0 && !_version.prerelease.empty() && didCompare)
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 368ee77a86..95b7435ed6 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -436,7 +436,7 @@ bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
 		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);
+		m_context.adjustStackOffset(static_cast<int>(returnParametersSize) - static_cast<int>(parameterSize) - 1);
 
 		return false;
 	}
@@ -564,7 +564,7 @@ bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
 		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);
+		m_context.adjustStackOffset(static_cast<int>(returnParametersSize) - static_cast<int>(parameterSize) - 1);
 		return false;
 	}
 
@@ -721,7 +721,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 
 			unsigned returnParametersSize = CompilerUtils::sizeOnStack(function.returnParameterTypes());
 			// callee adds return parameters, but removes arguments and return label
-			m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
+			m_context.adjustStackOffset(static_cast<int>(returnParametersSize) - static_cast<int>(parameterSize) - 1);
 			break;
 		}
 		case FunctionType::Kind::BareCall:
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 2112472300..71872a4e8c 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -255,7 +255,7 @@ void CodeTransform::operator()(FunctionCall const& _call)
 		m_assembly.setSourceLocation(originLocationOf(_call));
 		m_assembly.appendJumpTo(
 			functionEntryID(*function),
-			static_cast<int>(function->returns.size() - function->arguments.size()) - 1,
+			static_cast<int>(function->returns.size()) - static_cast<int>(function->arguments.size()) - 1,
 			AbstractAssembly::JumpType::IntoFunction
 		);
 		m_assembly.appendLabel(returnLabel);
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index 2a3cca52cc..71818d2482 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -71,7 +71,7 @@ void NoOutputAssembly::appendLinkerSymbol(std::string const&)
 
 void NoOutputAssembly::appendVerbatim(bytes, size_t _arguments, size_t _returnVariables)
 {
-	m_stackHeight += static_cast<int>(_returnVariables - _arguments);
+	m_stackHeight += static_cast<int>(_returnVariables) - static_cast<int>(_arguments);
 }
 
 void NoOutputAssembly::appendJump(int _stackDiffAfter, JumpType)
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index a6b867aba1..99f7114e9f 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -92,7 +92,7 @@ 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()) - (_call.canContinue ? 1 : 0),
+			static_cast<int>(_call.function.get().returns.size()) - static_cast<int>(_call.function.get().arguments.size()) - (_call.canContinue ? 1 : 0),
 			AbstractAssembly::JumpType::IntoFunction
 		);
 		if (_call.canContinue)

From da1bc0bc446d14ae48aca618d878ec3ff6a9d3a3 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Wed, 14 Aug 2024 19:53:09 +0200
Subject: [PATCH 0996/1140] SMTChecker: Add setup of z3 to SMTSolverCommand

This prepares SMTSolverCommand for invocation of Z3 as an external
solver.
Command line arguments enusure we match the way we set Z3 in our
current code.
---
 libsolidity/interface/SMTSolverCommand.cpp | 29 ++++++++++++++++++++++
 libsolidity/interface/SMTSolverCommand.h   |  1 +
 2 files changed, 30 insertions(+)

diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 8120e1f11a..66adfd0c5e 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -57,6 +57,35 @@ void SMTSolverCommand::setCvc5(std::optional<unsigned int> timeoutInMilliseconds
 	}
 }
 
+void SMTSolverCommand::setZ3(std::optional<unsigned int> timeoutInMilliseconds, bool _preprocessing, bool _computeInvariants)
+{
+	constexpr int Z3ResourceLimit = 2000000;
+	m_arguments.clear();
+	m_solverCmd = "z3";
+	m_arguments.emplace_back("-in"); // Read from standard input
+	m_arguments.emplace_back("-smt2"); // Expect input in SMT-LIB2 format
+	if (_computeInvariants)
+		m_arguments.emplace_back("-model"); // Output model automatically after check-sat
+	if (timeoutInMilliseconds)
+		m_arguments.emplace_back("-t:" + std::to_string(timeoutInMilliseconds.value()));
+	else
+		m_arguments.emplace_back("rlimit=" + std::to_string(Z3ResourceLimit));
+
+	// These options have been empirically established to be helpful
+	m_arguments.emplace_back("rewriter.pull_cheap_ite=true");
+	m_arguments.emplace_back("fp.spacer.q3.use_qgen=true");
+	m_arguments.emplace_back("fp.spacer.mbqi=false");
+	m_arguments.emplace_back("fp.spacer.ground_pobs=false");
+
+	// Spacer optimization should be
+	// - enabled for better solving (default)
+	// - disable for counterexample generation
+	std::string preprocessingArg = _preprocessing ? "true" : "false";
+	m_arguments.emplace_back("fp.xform.slice=" + preprocessingArg);
+	m_arguments.emplace_back("fp.xform.inline_linear=" + preprocessingArg);
+	m_arguments.emplace_back("fp.xform.inline_eager=" + preprocessingArg);
+}
+
 ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query) const
 {
 	try
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
index c948ec5d2d..13d79fe595 100644
--- a/libsolidity/interface/SMTSolverCommand.h
+++ b/libsolidity/interface/SMTSolverCommand.h
@@ -38,6 +38,7 @@ class SMTSolverCommand
 
 	void setEldarica(std::optional<unsigned int> timeoutInMilliseconds, bool computeInvariants);
 	void setCvc5(std::optional<unsigned int> timeoutInMilliseconds);
+	void setZ3(std::optional<unsigned int> timeoutInMilliseconds, bool _preprocessing, bool _computeInvariants);
 
 private:
 	/// The name of the solver's binary.

From 363274df8e113aec83f0b56c8bd612efda97ddb1 Mon Sep 17 00:00:00 2001
From: ljmanini <58728166+lmanini@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:26:19 +0200
Subject: [PATCH 0997/1140] Update ContractCompiler.cpp

Error msg fix
---
 libsolidity/codegen/ContractCompiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 9e0593cdfb..66cfe35c40 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -1396,7 +1396,7 @@ bool ContractCompiler::visit(PlaceholderStatement const& _placeholderStatement)
 {
 	StackHeightChecker checker(m_context);
 	CompilerContext::LocationSetter locationSetter(m_context, _placeholderStatement);
-	solAssert(m_context.arithmetic() == Arithmetic::Checked, "Placeholder cannot be used inside checked block.");
+	solAssert(m_context.arithmetic() == Arithmetic::Checked, "Placeholder cannot be used inside unchecked block.");
 	appendModifierOrFunctionCode();
 	solAssert(m_context.arithmetic() == Arithmetic::Checked, "Arithmetic not reset to 'checked'.");
 	checker.check();

From fa781b7c4a226340410ddc5a235fd7db7a22fd80 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 13 Aug 2024 13:44:04 +0200
Subject: [PATCH 0998/1140] Remove cmake dependency and bump boost in ossfuzz

---
 .../Dockerfile.ubuntu.clang.ossfuzz              | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index 46137b400d..aae11521e5 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="8"
+LABEL version="7"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -140,11 +140,15 @@ RUN set -ex; \
 
 # EVMONE
 RUN set -ex; \
-	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
-	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /usr/src/evmone.tar.gz"; \
-	cd /usr; \
-	tar -xf /usr/src/evmone.tar.gz; \
-	rm -rf /usr/src/evmone.tar.gz
+	cd /usr/src; \
+	git clone --branch="v0.11.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	cd evmone; \
+	mkdir build; \
+	cd build; \
+	CXX=clang++ cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	ninja; \
+	ninja install/strip; \
+	rm -rf /usr/src/evmone
 
 # gmp
 RUN set -ex; \

From 1c21f8311a742d47c7621de0c395c441136ac63c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 14 Aug 2024 11:34:28 +0200
Subject: [PATCH 0999/1140] Add ubuntu2404 docker image

---
 .github/workflows/buildpack-deps.yml          |   3 +-
 scripts/ci/buildpack-deps_test_ubuntu2404.sh  |   1 +
 .../buildpack-deps/Dockerfile.ubuntu2404      | 106 ++++++++++++++++++
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 120000 scripts/ci/buildpack-deps_test_ubuntu2404.sh
 create mode 100644 scripts/docker/buildpack-deps/Dockerfile.ubuntu2404

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 2cd6e5048c..5f66487e07 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -9,6 +9,7 @@ on:
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2404'
 
 jobs:
   buildpack-deps:
@@ -23,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
+        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204, ubuntu2404]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2404.sh b/scripts/ci/buildpack-deps_test_ubuntu2404.sh
new file mode 120000
index 0000000000..c07a74de4f
--- /dev/null
+++ b/scripts/ci/buildpack-deps_test_ubuntu2404.sh
@@ -0,0 +1 @@
+build.sh
\ No newline at end of file
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404
new file mode 100644
index 0000000000..c7ad4594aa
--- /dev/null
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404
@@ -0,0 +1,106 @@
+# 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-2024 solidity contributors.
+#------------------------------------------------------------------------------
+FROM buildpack-deps:noble AS base
+LABEL version="1"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
+# Since we're building this image from scratch, it's perfectly fine to use the below flag.
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
+
+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 \
+		cmake \
+		jq \
+		libboost-filesystem-dev \
+		libboost-program-options-dev \
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libz3-static-dev \
+		locales-all \
+		lsof \
+		ninja-build \
+		python3-pip \
+		python3-sphinx \
+		software-properties-common \
+		sudo \
+		unzip \
+		z3-static \
+		zip; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
+
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qqy \
+		openjdk-11-jre; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
+FROM base AS libraries
+
+# EVMONE
+RUN set -ex; \
+	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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
+COPY --from=libraries /usr/bin /usr/bin
+COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"

From b9b1d08eedf2716b3237d239c4e99715e668cd11 Mon Sep 17 00:00:00 2001
From: Zuri Obozuwa <zuriobozuwa@outlook.com>
Date: Wed, 3 Apr 2024 19:36:40 +0000
Subject: [PATCH 1000/1140] Pass vector of SMT expressions to
 SymbolicFunctionVariable function operator by const ref instead of by value

To avoid the cost of copying the vector
---
 libsolidity/formal/SymbolicVariables.cpp | 2 +-
 libsolidity/formal/SymbolicVariables.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolidity/formal/SymbolicVariables.cpp b/libsolidity/formal/SymbolicVariables.cpp
index 6d6dbee65d..f0cebc46c2 100644
--- a/libsolidity/formal/SymbolicVariables.cpp
+++ b/libsolidity/formal/SymbolicVariables.cpp
@@ -203,7 +203,7 @@ smtutil::Expression SymbolicFunctionVariable::increaseIndex()
 	return m_abstract.currentValue();
 }
 
-smtutil::Expression SymbolicFunctionVariable::operator()(std::vector<smtutil::Expression> _arguments) const
+smtutil::Expression SymbolicFunctionVariable::operator()(std::vector<smtutil::Expression> const& _arguments) const
 {
 	return m_declaration(_arguments);
 }
diff --git a/libsolidity/formal/SymbolicVariables.h b/libsolidity/formal/SymbolicVariables.h
index 9fd37fe2a1..7dbe41d945 100644
--- a/libsolidity/formal/SymbolicVariables.h
+++ b/libsolidity/formal/SymbolicVariables.h
@@ -62,7 +62,7 @@ class SymbolicVariable
 	virtual smtutil::Expression resetIndex();
 	virtual smtutil::Expression setIndex(unsigned _index);
 	virtual smtutil::Expression increaseIndex();
-	virtual smtutil::Expression operator()(std::vector<smtutil::Expression> /*_arguments*/) const
+	virtual smtutil::Expression operator()(std::vector<smtutil::Expression> const& /*_arguments*/) const
 	{
 		solAssert(false, "Function application to non-function.");
 	}
@@ -177,7 +177,7 @@ class SymbolicFunctionVariable: public SymbolicVariable
 	smtutil::Expression setIndex(unsigned _index) override;
 	smtutil::Expression increaseIndex() override;
 
-	smtutil::Expression operator()(std::vector<smtutil::Expression> _arguments) const override;
+	smtutil::Expression operator()(std::vector<smtutil::Expression> const& _arguments) const override;
 
 private:
 	/// Creates a new function declaration.

From a197cbe3ee6271479382ed6cd77aff024592006d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Sun, 18 Aug 2024 22:16:47 +0200
Subject: [PATCH 1001/1140] Add back CLion build directories to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index aafe93f97a..a9430fd982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ __pycache__/
 *.app
 
 # Build directory
+/cmake-build-*/
 /build*/
 emscripten_build/
 /docs/_build/

From b172de55e9de0f5058fec7e27e8e41c1e57d2174 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Thu, 15 Aug 2024 15:29:45 +0200
Subject: [PATCH 1002/1140] SMTChecker: Inline let expressions in solvers'
 models

Models computed by CHC solvers (especially Z3) can contain SMT-LIB's let
expressions. These are used to name a subterm and use the name instead
of repeating the subterm possibly many times.

The easiest (but not necessary the best) way to deal with let terms is
to inline (expand) them. In our current experiments inlining did not pose
any problem. If, in the future, this would turn out to cause problems,
we can devise a way to process let terms without expanding the term to
its full tree-like representation.

This is part of the preparation to use Z3 as an external solver.
It allows us to properly process models returned by Z3.
---
 libsmtutil/CHCSmtLib2Interface.cpp | 125 ++++++++++++++++++++++++++++-
 libsmtutil/CHCSmtLib2Interface.h   |   3 +
 2 files changed, 127 insertions(+), 1 deletion(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 8b795b9d5f..e173705629 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -407,7 +407,7 @@ std::optional<smtutil::Expression> CHCSmtLib2Interface::invariantsFromSolverResp
 		precondition(!isAtom(args[2]));
 		precondition(isAtom(args[3]) && asAtom(args[3]) == "Bool");
 		auto& interpretation = args[4];
-//		inlineLetExpressions(interpretation);
+		inlineLetExpressions(interpretation);
 		ScopedParser scopedParser(m_context);
 		auto const& formalArguments = asSubExpressions(args[2]);
 		std::vector<Expression> predicateArgs;
@@ -432,3 +432,126 @@ std::optional<smtutil::Expression> CHCSmtLib2Interface::invariantsFromSolverResp
 	return Expression::mkAnd(std::move(definitions));
 }
 #undef precondition
+
+namespace
+{
+
+struct LetBindings
+{
+	using BindingRecord = std::vector<SMTLib2Expression>;
+	std::unordered_map<std::string, BindingRecord> bindings;
+	std::vector<std::string> varNames;
+	std::vector<std::size_t> scopeBounds;
+
+	bool has(std::string const& varName) { return bindings.find(varName) != bindings.end(); }
+
+	SMTLib2Expression& operator[](std::string const& varName)
+	{
+		auto it = bindings.find(varName);
+		smtAssert(it != bindings.end());
+		smtAssert(!it->second.empty());
+		return it->second.back();
+	}
+
+	void pushScope() { scopeBounds.push_back(varNames.size()); }
+
+	void popScope()
+	{
+		smtAssert(!scopeBounds.empty());
+		auto bound = scopeBounds.back();
+		while (varNames.size() > bound)
+		{
+			auto const& varName = varNames.back();
+			auto it = bindings.find(varName);
+			smtAssert(it != bindings.end());
+			auto& record = it->second;
+			record.pop_back();
+			if (record.empty())
+				bindings.erase(it);
+			varNames.pop_back();
+		}
+		scopeBounds.pop_back();
+	}
+
+	void addBinding(std::string name, SMTLib2Expression expression)
+	{
+		auto it = bindings.find(name);
+		if (it == bindings.end())
+			bindings.insert({name, {std::move(expression)}});
+		else
+			it->second.push_back(std::move(expression));
+		varNames.push_back(std::move(name));
+	}
+};
+
+void inlineLetExpressions(SMTLib2Expression& _expr, LetBindings& _bindings)
+{
+	if (isAtom(_expr))
+	{
+		auto const& atom = asAtom(_expr);
+		if (_bindings.has(atom))
+			_expr = _bindings[atom];
+		return;
+	}
+	auto& subexprs = asSubExpressions(_expr);
+	smtAssert(!subexprs.empty());
+	auto const& first = subexprs.at(0);
+	if (isAtom(first) && asAtom(first) == "let")
+	{
+		smtAssert(subexprs.size() == 3);
+		smtAssert(!isAtom(subexprs[1]));
+		auto& bindingExpressions = asSubExpressions(subexprs[1]);
+		// process new bindings
+		std::vector<std::pair<std::string, SMTLib2Expression>> newBindings;
+		for (auto& binding: bindingExpressions)
+		{
+			smtAssert(!isAtom(binding));
+			auto& bindingPair = asSubExpressions(binding);
+			smtAssert(bindingPair.size() == 2);
+			smtAssert(isAtom(bindingPair.at(0)));
+			inlineLetExpressions(bindingPair.at(1), _bindings);
+			newBindings.emplace_back(asAtom(bindingPair.at(0)), bindingPair.at(1));
+		}
+		_bindings.pushScope();
+		for (auto&& [name, expr]: newBindings)
+			_bindings.addBinding(std::move(name), std::move(expr));
+
+		newBindings.clear();
+
+		// get new subexpression
+		inlineLetExpressions(subexprs.at(2), _bindings);
+		// remove the new bindings
+		_bindings.popScope();
+
+		// update the expression
+		auto tmp = std::move(subexprs.at(2));
+		_expr = std::move(tmp);
+		return;
+	}
+	else if (isAtom(first) && (asAtom(first) == "forall" || asAtom(first) == "exists"))
+	{
+		// A little hack to ensure quantified variables are not substituted because of some outer let definition:
+		// We define the current binding of the variable to itself, before we recurse in to subterm
+		smtAssert(subexprs.size() == 3);
+		_bindings.pushScope();
+		for (auto const& sortedVar: asSubExpressions(subexprs.at(1)))
+		{
+			auto const& varNameExpr = asSubExpressions(sortedVar).at(0);
+			_bindings.addBinding(asAtom(varNameExpr), varNameExpr);
+		}
+		inlineLetExpressions(subexprs.at(2), _bindings);
+		_bindings.popScope();
+		return;
+	}
+
+	// not a let expression, just process all arguments recursively
+	for (auto& subexpr: subexprs)
+		inlineLetExpressions(subexpr, _bindings);
+}
+}
+
+void CHCSmtLib2Interface::inlineLetExpressions(SMTLib2Expression& expr)
+{
+	LetBindings bindings;
+	::inlineLetExpressions(expr, bindings);
+}
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index 0b81b4541c..b5baba7d69 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -80,6 +80,9 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 		std::unordered_map<std::string, SortPointer> m_localVariables;
 	};
 
+	/* Modifies the passed expression by inlining all let subexpressions */
+	static void inlineLetExpressions(SMTLib2Expression& _expr);
+
 	std::string toSmtLibSort(SortPointer const& _sort);
 	std::vector<std::string> toSmtLibSort(std::vector<SortPointer> const& _sort);
 

From 3b532e468633e61e6d2660f6c07845dbbe78f31d Mon Sep 17 00:00:00 2001
From: Howe <69898694+DestinyWei@users.noreply.github.com>
Date: Sun, 22 Oct 2023 22:03:45 +0800
Subject: [PATCH 1003/1140] docs: add the onlyBuyer modifier in function
 confirmPurchase()

in the function confirmPurchase(), the annotation said 'Confirm the purchase as buyer.' but it doesn't add the `onlyBuyer` modifier
---
 docs/examples/safe-remote.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/examples/safe-remote.rst b/docs/examples/safe-remote.rst
index a2651af238..065aabdd9b 100644
--- a/docs/examples/safe-remote.rst
+++ b/docs/examples/safe-remote.rst
@@ -106,6 +106,7 @@ you can use state machine-like constructs inside a contract.
         /// is called.
         function confirmPurchase()
             external
+            onlyBuyer
             inState(State.Created)
             condition(msg.value == (2 * value))
             payable

From 91076d648de7829aa236670ac9a58aac47bb9ee8 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Mon, 19 Aug 2024 18:13:55 +0530
Subject: [PATCH 1004/1140] Update safe-remote.rst

Reverts the docs PR #14632. (see: https://github.com/ethereum/solidity/pull/14632#discussion_r1721715090)
---
 docs/examples/safe-remote.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/examples/safe-remote.rst b/docs/examples/safe-remote.rst
index 065aabdd9b..a2651af238 100644
--- a/docs/examples/safe-remote.rst
+++ b/docs/examples/safe-remote.rst
@@ -106,7 +106,6 @@ you can use state machine-like constructs inside a contract.
         /// is called.
         function confirmPurchase()
             external
-            onlyBuyer
             inState(State.Created)
             condition(msg.value == (2 * value))
             payable

From 020bde963a1b9e4d05d8e89df50e7216729e4b81 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Sat, 20 Jul 2024 10:23:01 +0200
Subject: [PATCH 1005/1140] SMTChecker: Translate bitvector constants properly

Bit-vector constants in solvers' output can be represented in binary
(starting with #b) or hexadecimal format (starting with #x).
Handling of these constants were previously missing in our translation
from SMT-LIB expressions.
---
 libsmtutil/CHCSmtLib2Interface.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index e173705629..6db1c6e876 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -200,6 +200,24 @@ bool isNumber(std::string const& _expr)
 {
 	return ranges::all_of(_expr, [](char c) { return isDigit(c) || c == '.'; });
 }
+
+bool isBitVectorHexConstant(std::string const& _string)
+{
+	if (_string.substr(0, 2) != "#x")
+		return false;
+	if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != std::string::npos)
+		return false;
+	return true;
+}
+
+bool isBitVectorConstant(std::string const& _string)
+{
+	if (_string.substr(0, 2) != "#b")
+		return false;
+	if (_string.find_first_not_of("01", 2) != std::string::npos)
+		return false;
+	return true;
+}
 }
 
 void CHCSmtLib2Interface::ScopedParser::addVariableDeclaration(std::string _name, solidity::smtutil::SortPointer _sort)
@@ -279,6 +297,10 @@ smtutil::Expression CHCSmtLib2Interface::ScopedParser::toSMTUtilExpression(SMTLi
 					return smtutil::Expression(_atom == "true");
 				else if (isNumber(_atom))
 					return smtutil::Expression(_atom, {}, SortProvider::sintSort);
+				else if (isBitVectorHexConstant(_atom))
+					return smtutil::Expression(_atom, {}, std::make_shared<BitVectorSort>((_atom.size() - 2) * 4));
+				else if (isBitVectorConstant(_atom))
+					return smtutil::Expression(_atom, {}, std::make_shared<BitVectorSort>(_atom.size() - 2));
 				else if (auto it = m_localVariables.find(_atom); it != m_localVariables.end())
 					return smtutil::Expression(_atom, {}, it->second);
 				else if (m_context.isDeclared(_atom))

From 06d2bdeb54a6205e7904471dbcd4d9299d2e403e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 22 Jul 2024 13:32:24 +0200
Subject: [PATCH 1006/1140] Object compiler tests for nested identical objects

---
 ...identical_subobjects_creation_deployed.yul | 107 +++++++++++
 .../identical_subobjects_full_debug_info.yul  | 114 ++++++++++++
 .../identical_subobjects_no_debug_info.yul    | 163 +++++++++++++++++
 ...dentical_subobjects_partial_debug_info.yul | 151 ++++++++++++++++
 ...bobjects_partial_debug_info_no_use_src.yul | 169 ++++++++++++++++++
 ...cal_subobjects_with_subject_references.yul | 166 +++++++++++++++++
 6 files changed, 870 insertions(+)
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
 create mode 100644 test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul

diff --git a/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul b/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
new file mode 100644
index 0000000000..5eb079db18
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
@@ -0,0 +1,107 @@
+// All objects have identical unoptimized code, but at 200 runs the creation objects will optimized
+// differently from deployed objects.
+
+/// @use-src 0:"A.sol"
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        let x := add(shl(255, 1), shl(127, not(0)))
+        sstore(load(x), load(1))
+    }
+
+    /// @use-src 0:"B.sol"
+    object "B_deployed" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            let x := add(shl(255, 1), shl(127, not(0)))
+            sstore(load(x), load(1))
+        }
+
+        /// @use-src 0:"A.sol"
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                let x := add(shl(255, 1), shl(127, not(0)))
+                sstore(load(x), load(1))
+            }
+
+            /// @use-src 0:"B.sol"
+            object "B_deployed" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    let x := add(shl(255, 1), shl(127, not(0)))
+                    sstore(load(x), load(1))
+                }
+            }
+
+            /// @use-src 0:"C.sol"
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    let x := add(shl(255, 1), shl(127, not(0)))
+                    sstore(load(x), load(1))
+                }
+            }
+        }
+    }
+
+    /// @use-src 0:"C.sol"
+    object "C_deployed" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            let x := add(shl(255, 1), shl(127, not(0)))
+            sstore(load(x), load(1))
+        }
+    }
+
+    /// @use-src 0:"D.sol"
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            let x := add(shl(255, 1), shl(127, not(0)))
+            sstore(load(x), load(1))
+        }
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//   sstore(calldataload(sub(shl(0xff, 0x01), shl(0x7f, 0x01))), calldataload(0x01))
+//   stop
+// stop
+//
+// sub_0: assembly {
+//       sstore(calldataload(shl(0x7f, 0xffffffffffffffffffffffffffffffff)), calldataload(0x01))
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//           sstore(calldataload(sub(shl(0xff, 0x01), shl(0x7f, 0x01))), calldataload(0x01))
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//               sstore(calldataload(shl(0x7f, 0xffffffffffffffffffffffffffffffff)), calldataload(0x01))
+//               stop
+//         }
+//
+//         sub_1: assembly {
+//               sstore(calldataload(sub(shl(0xff, 0x01), shl(0x7f, 0x01))), calldataload(0x01))
+//               stop
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//       sstore(calldataload(shl(0x7f, 0xffffffffffffffffffffffffffffffff)), calldataload(0x01))
+//       stop
+// }
+//
+// sub_2: assembly {
+//       sstore(calldataload(sub(shl(0xff, 0x01), shl(0x7f, 0x01))), calldataload(0x01))
+//       stop
+// }
+// Bytecode: 6001356001607f1b600160ff1b03355500fe
+// Opcodes: PUSH1 0x1 CALLDATALOAD PUSH1 0x1 PUSH1 0x7F SHL PUSH1 0x1 PUSH1 0xFF SHL SUB CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: :::-:0;;;;;;;;;;;
diff --git a/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
new file mode 100644
index 0000000000..74574be13c
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
@@ -0,0 +1,114 @@
+// All objects have identical unoptimized code, but with different debug annotations.
+// The optimized Yul will be identical only between objects that have identical debug info.
+
+/// @use-src 0:"A.sol"
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        /// @src 0:10:20
+        sstore(load(0), load(1))
+    }
+
+    /// @use-src 0:"B.sol"
+    object "B" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+
+        /// @use-src 0:"A.sol"
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                /// @src 0:10:20
+                sstore(load(0), load(1))
+            }
+
+            /// @use-src 0:"B.sol"
+            object "B" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    /// @src 0:10:20
+                    sstore(load(0), load(1))
+                }
+            }
+
+            /// @use-src 0:"C.sol"
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    /// @src 0:10:20
+                    sstore(load(0), load(1))
+                }
+            }
+        }
+    }
+
+    /// @use-src 0:"C.sol"
+    object "C" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+
+    /// @use-src 0:"D.sol"
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//     /* "A.sol":10:20   */
+//   sstore(calldataload(0x00), calldataload(0x01))
+//   stop
+// stop
+//
+// sub_0: assembly {
+//         /* "B.sol":10:20   */
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "A.sol":10:20   */
+//           sstore(calldataload(0x00), calldataload(0x01))
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//                 /* "B.sol":10:20   */
+//               sstore(calldataload(0x00), calldataload(0x01))
+//               stop
+//         }
+//
+//         sub_1: assembly {
+//                 /* "C.sol":10:20   */
+//               sstore(calldataload(0x00), calldataload(0x01))
+//               stop
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//         /* "C.sol":10:20   */
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+// }
+//
+// sub_2: assembly {
+//         /* "D.sol":10:20   */
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+// }
+// Bytecode: 6001355f355500fe
+// Opcodes: PUSH1 0x1 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: 10:10::-:0;-1:-1;10:10;-1:-1;10:10;-1:-1
diff --git a/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
new file mode 100644
index 0000000000..aa20ac6799
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
@@ -0,0 +1,163 @@
+// All objects have identical unoptimized code.
+// After optimizations we should end up with identical code for all of them.
+
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        sstore(load(0), load(1))
+    }
+
+    object "B" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(1))
+        }
+
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                sstore(load(0), load(1))
+            }
+
+            object "B" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(1))
+                }
+            }
+
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(1))
+                }
+            }
+        }
+    }
+
+    object "C" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(1))
+        }
+    }
+
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(1))
+        }
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//     /* "source":83:84   */
+//   0x01
+//     /* "source":70:85   */
+//   calldataload
+//     /* "source":66:67   */
+//   0x00
+//     /* "source":53:68   */
+//   calldataload
+//     /* "source":46:86   */
+//   sstore
+//     /* "source":22:102   */
+//   stop
+// stop
+//
+// sub_0: assembly {
+//         /* "source":202:203   */
+//       0x01
+//         /* "source":189:204   */
+//       calldataload
+//         /* "source":185:186   */
+//       0x00
+//         /* "source":172:187   */
+//       calldataload
+//         /* "source":165:205   */
+//       sstore
+//         /* "source":133:229   */
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "source":345:346   */
+//           0x01
+//             /* "source":332:347   */
+//           calldataload
+//             /* "source":328:329   */
+//           0x00
+//             /* "source":315:330   */
+//           calldataload
+//             /* "source":308:348   */
+//           sstore
+//             /* "source":268:380   */
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//                 /* "source":512:513   */
+//               0x01
+//                 /* "source":499:514   */
+//               calldataload
+//                 /* "source":495:496   */
+//               0x00
+//                 /* "source":482:497   */
+//               calldataload
+//                 /* "source":475:515   */
+//               sstore
+//                 /* "source":427:555   */
+//               stop
+//         }
+//
+//         sub_1: assembly {
+//                 /* "source":701:702   */
+//               0x01
+//                 /* "source":688:703   */
+//               calldataload
+//                 /* "source":684:685   */
+//               0x00
+//                 /* "source":671:686   */
+//               calldataload
+//                 /* "source":664:704   */
+//               sstore
+//                 /* "source":616:744   */
+//               stop
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//         /* "source":874:875   */
+//       0x01
+//         /* "source":861:876   */
+//       calldataload
+//         /* "source":857:858   */
+//       0x00
+//         /* "source":844:859   */
+//       calldataload
+//         /* "source":837:877   */
+//       sstore
+//         /* "source":805:901   */
+//       stop
+// }
+//
+// sub_2: assembly {
+//         /* "source":1007:1008   */
+//       0x01
+//         /* "source":994:1009   */
+//       calldataload
+//         /* "source":990:991   */
+//       0x00
+//         /* "source":977:992   */
+//       calldataload
+//         /* "source":970:1010   */
+//       sstore
+//         /* "source":938:1034   */
+//       stop
+// }
+// Bytecode: 6001355f355500fe
+// Opcodes: PUSH1 0x1 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: 83:1:0:-:0;70:15;66:1;53:15;46:40;22:80
diff --git a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
new file mode 100644
index 0000000000..9b63bdc1b1
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
@@ -0,0 +1,151 @@
+// All objects have identical unoptimized code, but don't necessarily contain the same location comments.
+// The optimized Yul will be identical only between objects that have identical debug info.
+// Note that when @use-src is missing, the parser ignores location comments, so they do not become
+// a part of the debug info.
+
+/// @use-src 0:"A.sol"
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        /// @src 0:10:20
+        sstore(load(0), load(1))
+    }
+
+    /// @use-src 0:"B.sol"
+    object "B" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                sstore(load(0), load(1))
+            }
+
+            object "B" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(1))
+                }
+            }
+
+            /// @use-src 0:"C.sol"
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    /// @src 0:10:20
+                    sstore(load(0), load(1))
+                }
+            }
+        }
+    }
+
+    /// @use-src 0:"C.sol"
+    object "C" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+
+    /// @use-src 0:"C.sol"
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(1))
+        }
+    }
+
+    object "E" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//     /* "A.sol":10:20   */
+//   sstore(calldataload(0x00), calldataload(0x01))
+//   stop
+// stop
+//
+// sub_0: assembly {
+//         /* "B.sol":10:20   */
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "source":621:622   */
+//           0x01
+//             /* "source":608:623   */
+//           calldataload
+//             /* "source":604:605   */
+//           0x00
+//             /* "source":591:606   */
+//           calldataload
+//             /* "source":584:624   */
+//           sstore
+//             /* "source":544:656   */
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//                 /* "source":788:789   */
+//               0x01
+//                 /* "source":775:790   */
+//               calldataload
+//                 /* "source":771:772   */
+//               0x00
+//                 /* "source":758:773   */
+//               calldataload
+//                 /* "source":751:791   */
+//               sstore
+//                 /* "source":703:831   */
+//               stop
+//         }
+//
+//         sub_1: assembly {
+//                 /* "C.sol":10:20   */
+//               sstore(calldataload(0x00), calldataload(0x01))
+//               stop
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//         /* "C.sol":10:20   */
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+// }
+//
+// sub_2: assembly {
+//       sstore(calldataload(0x00), calldataload(0x01))
+//       stop
+// }
+//
+// sub_3: assembly {
+//         /* "source":1743:1744   */
+//       0x01
+//         /* "source":1730:1745   */
+//       calldataload
+//         /* "source":1726:1727   */
+//       0x00
+//         /* "source":1713:1728   */
+//       calldataload
+//         /* "source":1706:1746   */
+//       sstore
+//         /* "source":1674:1770   */
+//       stop
+// }
+// Bytecode: 6001355f355500fe
+// Opcodes: PUSH1 0x1 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: 10:10::-:0;-1:-1;10:10;-1:-1;10:10;-1:-1
diff --git a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
new file mode 100644
index 0000000000..d288503bab
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
@@ -0,0 +1,169 @@
+// All objects have identical unoptimized code, but don't necessarily contain the same location comments.
+// After optimizations we should end up with identical code for all of them, because location
+// comments will be ignored due to missing @use-src annotations and won't end up in the AST.
+
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        /// @src 0:10:20
+        sstore(load(0), load(1))
+    }
+
+    object "B" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                sstore(load(0), load(1))
+            }
+
+            object "B" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(1))
+                }
+            }
+
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    /// @src 0:10:20
+                    sstore(load(0), load(1))
+                }
+            }
+        }
+    }
+
+    object "C" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            /// @src 0:10:20
+            sstore(load(0), load(1))
+        }
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//     /* "source":83:84   */
+//   0x01
+//     /* "source":70:85   */
+//   calldataload
+//     /* "source":66:67   */
+//   0x00
+//     /* "source":53:68   */
+//   calldataload
+//     /* "source":46:86   */
+//   sstore
+//     /* "source":22:102   */
+//   stop
+// stop
+//
+// sub_0: assembly {
+//         /* "source":202:203   */
+//       0x01
+//         /* "source":189:204   */
+//       calldataload
+//         /* "source":185:186   */
+//       0x00
+//         /* "source":172:187   */
+//       calldataload
+//         /* "source":165:205   */
+//       sstore
+//         /* "source":133:229   */
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "source":345:346   */
+//           0x01
+//             /* "source":332:347   */
+//           calldataload
+//             /* "source":328:329   */
+//           0x00
+//             /* "source":315:330   */
+//           calldataload
+//             /* "source":308:348   */
+//           sstore
+//             /* "source":268:380   */
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//                 /* "source":512:513   */
+//               0x01
+//                 /* "source":499:514   */
+//               calldataload
+//                 /* "source":495:496   */
+//               0x00
+//                 /* "source":482:497   */
+//               calldataload
+//                 /* "source":475:515   */
+//               sstore
+//                 /* "source":427:555   */
+//               stop
+//         }
+//
+//         sub_1: assembly {
+//                 /* "source":701:702   */
+//               0x01
+//                 /* "source":688:703   */
+//               calldataload
+//                 /* "source":684:685   */
+//               0x00
+//                 /* "source":671:686   */
+//               calldataload
+//                 /* "source":664:704   */
+//               sstore
+//                 /* "source":616:744   */
+//               stop
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//         /* "source":874:875   */
+//       0x01
+//         /* "source":861:876   */
+//       calldataload
+//         /* "source":857:858   */
+//       0x00
+//         /* "source":844:859   */
+//       calldataload
+//         /* "source":837:877   */
+//       sstore
+//         /* "source":805:901   */
+//       stop
+// }
+//
+// sub_2: assembly {
+//         /* "source":1007:1008   */
+//       0x01
+//         /* "source":994:1009   */
+//       calldataload
+//         /* "source":990:991   */
+//       0x00
+//         /* "source":977:992   */
+//       calldataload
+//         /* "source":970:1010   */
+//       sstore
+//         /* "source":938:1034   */
+//       stop
+// }
+// Bytecode: 6001355f355500fe
+// Opcodes: PUSH1 0x1 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: 83:1:0:-:0;70:15;66:1;53:15;46:40;22:80
diff --git a/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul b/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul
new file mode 100644
index 0000000000..e14b010083
--- /dev/null
+++ b/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul
@@ -0,0 +1,166 @@
+// All objects have unoptimized code that's identical except for subobject and data object naming.
+// The optimized Yul code does not depend on the content of subobjects and data objects,
+// only on their names. EVM assembly, on the other hand, is not affected by names - it uses indices
+// for subobjects and hashes for data objects.
+
+/// @use-src 0:"A.sol"
+object "A" {
+    code {
+        function load(i) -> r { r := calldataload(i) }
+        sstore(load(0), load(dataoffset("B")))
+    }
+
+    /// @use-src 0:"B.sol"
+    object "B" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(dataoffset("A")))
+        }
+
+        /// @use-src 0:"A.sol"
+        object "A" {
+            code {
+                function load(i) -> r { r := calldataload(i) }
+                sstore(load(0), load(dataoffset("B")))
+            }
+
+            /// @use-src 0:"B.sol"
+            object "B" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(dataoffset("A")))
+                }
+
+                /// @use-src 0:"A.sol"
+                object "A" {
+                    code {
+                        function load(i) -> r { r := calldataload(i) }
+                        sstore(load(0), load(dataoffset("B")))
+                    }
+
+                    data "B" "0xbb"
+                }
+            }
+
+            /// @use-src 0:"C.sol"
+            object "C" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(dataoffset("A")))
+                }
+
+                data "A" "0xaa"
+            }
+
+            /// @use-src 0:"D.sol"
+            object "D" {
+                code {
+                    function load(i) -> r { r := calldataload(i) }
+                    sstore(load(0), load(dataoffset("A")))
+                }
+
+                data "A" "0xaaaaaa"
+            }
+        }
+    }
+
+    /// @use-src 0:"C.sol"
+    object "C" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(dataoffset("A")))
+        }
+
+        data "A" "0xaaaa"
+    }
+
+    /// @use-src 0:"D.sol"
+    object "D" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(dataoffset("B")))
+        }
+
+        data "B" "0xbbbb"
+    }
+
+    /// @use-src 0:"E.sol"
+    object "E" {
+        code {
+            function load(i) -> r { r := calldataload(i) }
+            sstore(load(0), load(dataoffset("B")))
+        }
+
+        data "B" "0xbbbb"
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//   sstore(calldataload(0x00), calldataload(dataOffset(sub_0)))
+//   stop
+// stop
+//
+// sub_0: assembly {
+//       sstore(calldataload(0x00), calldataload(dataOffset(sub_0)))
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//           sstore(calldataload(0x00), calldataload(dataOffset(sub_0)))
+//           stop
+//         stop
+//
+//         sub_0: assembly {
+//               sstore(calldataload(0x00), calldataload(dataOffset(sub_0)))
+//               stop
+//             stop
+//
+//             sub_0: assembly {
+//                   sstore(calldataload(0x00), calldataload(data_736ddcdd19b41ff3aa09bd89628fc69562c2e39bdb07c1971217d2e374ce6e27))
+//                   stop
+//                 stop
+//                 data_736ddcdd19b41ff3aa09bd89628fc69562c2e39bdb07c1971217d2e374ce6e27 30786262
+//             }
+//         }
+//
+//         sub_1: assembly {
+//               sstore(calldataload(0x00), calldataload(data_89b1fd0f9a40d0a598af5f997daf99fc3d5b98ef4eb429e81755ae0ee49e194e))
+//               stop
+//             stop
+//             data_89b1fd0f9a40d0a598af5f997daf99fc3d5b98ef4eb429e81755ae0ee49e194e 30786161
+//         }
+//
+//         sub_2: assembly {
+//               sstore(calldataload(0x00), calldataload(data_d8bbdaa6a33092aa88c90c124bdeea5160229ede56dd7d897c2413f9ba7e4f85))
+//               stop
+//             stop
+//             data_d8bbdaa6a33092aa88c90c124bdeea5160229ede56dd7d897c2413f9ba7e4f85 3078616161616161
+//         }
+//     }
+// }
+//
+// sub_1: assembly {
+//       sstore(calldataload(0x00), calldataload(data_79f4f313d7d500fd317e5283225bdfe6ea44da3fb73f1fdbf19929f3164bfc1a))
+//       stop
+//     stop
+//     data_79f4f313d7d500fd317e5283225bdfe6ea44da3fb73f1fdbf19929f3164bfc1a 307861616161
+// }
+//
+// sub_2: assembly {
+//       sstore(calldataload(0x00), calldataload(data_257dd53638d790f0311f866044a2856def338f9a4d22fce0bdeed5b2d53851a9))
+//       stop
+//     stop
+//     data_257dd53638d790f0311f866044a2856def338f9a4d22fce0bdeed5b2d53851a9 307862626262
+// }
+//
+// sub_3: assembly {
+//       sstore(calldataload(0x00), calldataload(data_257dd53638d790f0311f866044a2856def338f9a4d22fce0bdeed5b2d53851a9))
+//       stop
+//     stop
+//     data_257dd53638d790f0311f866044a2856def338f9a4d22fce0bdeed5b2d53851a9 307862626262
+// }
+// Bytecode: 6008355f355500fe6008355f355500fe6008355f355500fe6008355f355500fe6008355f355500fe30786262
+// Opcodes: PUSH1 0x8 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID PUSH1 0x8 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID PUSH1 0x8 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID PUSH1 0x8 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID PUSH1 0x8 CALLDATALOAD PUSH0 CALLDATALOAD SSTORE STOP INVALID ADDRESS PUSH25 0x62620000000000000000000000000000000000000000000000
+// SourceMappings: :::-:0;;;;;

From 8f237deb99b2202672262d374259ce184ef648eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 12 Jun 2024 17:20:57 +0200
Subject: [PATCH 1007/1140] Object: Add missing `override` specifier to
 overridden methods

---
 libyul/Object.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libyul/Object.h b/libyul/Object.h
index 41ca74e9f3..fe946f1bd1 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -99,9 +99,9 @@ struct Object: public ObjectNode
 		AsmPrinter::TypePrinting printingMode = AsmPrinter::TypePrinting::Full,
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	) const;
+	) const override;
 	/// @returns a compact JSON representation of the AST.
-	Json toJson() const;
+	Json toJson() const override;
 	/// @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.

From 6654e87735d11c265de2e86553a96b865873a239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 12 Jun 2024 17:43:53 +0200
Subject: [PATCH 1008/1140] ObjectDebugData: Expose a helper for formatting the
 @use-src comment

---
 libyul/Object.cpp | 31 ++++++++++++++++++++-----------
 libyul/Object.h   |  2 ++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index c4e7971ab4..57c783b83f 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -53,16 +53,6 @@ std::string Object::toString(
 	yulAssert(hasCode(), "No code");
 	yulAssert(debugData, "No debug data");
 
-	std::string useSrcComment;
-
-	if (debugData->sourceNames)
-		useSrcComment =
-			"/// @use-src " +
-			joinHumanReadable(ranges::views::transform(*debugData->sourceNames, [](auto&& _pair) {
-				return std::to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
-			})) +
-			"\n";
-
 	std::string inner = "code " + AsmPrinter(
 		_printingMode,
 		_dialect,
@@ -74,7 +64,11 @@ std::string Object::toString(
 	for (auto const& obj: subObjects)
 		inner += "\n" + obj->toString(_dialect, _printingMode, _debugInfoSelection, _soliditySourceProvider);
 
-	return useSrcComment + "object \"" + name + "\" {\n" + indent(inner) + "\n}";
+	return
+		debugData->formatUseSrcComment() +
+		"object \"" + name + "\" {\n" +
+		indent(inner) + "\n" +
+		"}";
 }
 
 Json Data::toJson() const
@@ -85,6 +79,21 @@ Json Data::toJson() const
 	return ret;
 }
 
+std::string ObjectDebugData::formatUseSrcComment() const
+{
+	if (!sourceNames)
+		return "";
+
+	auto formatIdNamePair = [](auto&& _pair) {
+		return std::to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
+	};
+
+	std::string serializedSourceNames = joinHumanReadable(
+		ranges::views::transform(*sourceNames, formatIdNamePair)
+	);
+	return "/// @use-src " + serializedSourceNames + "\n";
+}
+
 Json Object::toJson() const
 {
 	yulAssert(hasCode(), "No code");
diff --git a/libyul/Object.h b/libyul/Object.h
index fe946f1bd1..fa9ef96eeb 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -84,6 +84,8 @@ struct Data: public ObjectNode
 struct ObjectDebugData
 {
 	std::optional<SourceNameMap> sourceNames = {};
+
+	std::string formatUseSrcComment() const;
 };
 
 

From 27daf268e1f680662910957dca3f3a31c88545ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 31 Jul 2024 20:31:29 +0200
Subject: [PATCH 1009/1140] Caching of optimized IR

---
 Changelog.md                            |   1 +
 libsolidity/interface/CompilerStack.cpp |   7 +-
 libsolidity/interface/CompilerStack.h   |   3 +
 libyul/CMakeLists.txt                   |   2 +
 libyul/ObjectOptimizer.cpp              | 167 ++++++++++++++++++++++++
 libyul/ObjectOptimizer.h                |  95 ++++++++++++++
 libyul/YulStack.cpp                     | 112 ++++++----------
 libyul/YulStack.h                       |  13 +-
 8 files changed, 319 insertions(+), 81 deletions(-)
 create mode 100644 libyul/ObjectOptimizer.cpp
 create mode 100644 libyul/ObjectOptimizer.h

diff --git a/Changelog.md b/Changelog.md
index 2a1249c98a..034be57733 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Compiler Features:
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Standard JSON Interface: Add ``transientStorageLayout`` output.
  * Yul: Drop the deprecated typed Yul dialect that was only accessible via ``--yul`` in the CLI.
+ * Yul Optimizer: Caching of optimized IR to speed up optimization of contracts with bytecode dependencies.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
  * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 0ea7131db1..1f432db40f 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -111,6 +111,7 @@ static int g_compilerStackCounts = 0;
 
 CompilerStack::CompilerStack(ReadCallback::Callback _readFile):
 	m_readFile{std::move(_readFile)},
+	m_objectOptimizer(std::make_shared<yul::ObjectOptimizer>()),
 	m_errorReporter{m_errorList}
 {
 	// Because TypeProvider is currently a singleton API, we must ensure that
@@ -1493,7 +1494,8 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 		m_eofVersion,
 		YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
-		m_debugInfoSelection
+		m_debugInfoSelection,
+		m_objectOptimizer
 	);
 	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
 	solAssert(
@@ -1530,7 +1532,8 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 		m_eofVersion,
 		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
-		m_debugInfoSelection
+		m_debugInfoSelection,
+		m_objectOptimizer
 	);
 	bool analysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIROptimized);
 	solAssert(analysisSuccessful);
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 159a14d8d8..6ca792296f 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -49,6 +49,8 @@
 #include <libsolutil/LazyInit.h>
 #include <libsolutil/JSON.h>
 
+#include <libyul/ObjectOptimizer.h>
+
 #include <functional>
 #include <memory>
 #include <ostream>
@@ -552,6 +554,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	std::shared_ptr<GlobalContext> m_globalContext;
 	std::vector<Source const*> m_sourceOrder;
 	std::map<std::string const, Contract> m_contracts;
+	std::shared_ptr<yul::ObjectOptimizer> m_objectOptimizer;
 
 	langutil::ErrorList m_errorList;
 	langutil::ErrorReporter m_errorReporter;
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index ee78d525df..dbf3bfdcd6 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -29,6 +29,8 @@ add_library(yul
 	FunctionReferenceResolver.h
 	Object.cpp
 	Object.h
+	ObjectOptimizer.cpp
+	ObjectOptimizer.h
 	ObjectParser.cpp
 	ObjectParser.h
 	Scope.cpp
diff --git a/libyul/ObjectOptimizer.cpp b/libyul/ObjectOptimizer.cpp
new file mode 100644
index 0000000000..eaaac97d56
--- /dev/null
+++ b/libyul/ObjectOptimizer.cpp
@@ -0,0 +1,167 @@
+/*
+	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/ObjectOptimizer.h>
+
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
+#include <libyul/Exceptions.h>
+#include <libyul/backends/evm/EVMDialect.h>
+#include <libyul/backends/evm/EVMMetrics.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/Suite.h>
+
+#include <liblangutil/DebugInfoSelection.h>
+
+#include <libsolutil/Keccak256.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <limits>
+#include <numeric>
+
+using namespace solidity;
+using namespace solidity::langutil;
+using namespace solidity::util;
+using namespace solidity::yul;
+
+
+Dialect const& yul::languageToDialect(Language _language, EVMVersion _version)
+{
+	switch (_language)
+	{
+	case Language::Assembly:
+	case Language::StrictAssembly:
+		return EVMDialect::strictAssemblyForEVMObjects(_version);
+	}
+	util::unreachable();
+}
+
+void ObjectOptimizer::optimize(Object& _object, Settings const& _settings)
+{
+	yulAssert(_object.subId == std::numeric_limits<size_t>::max(), "Not a top-level object.");
+
+	optimize(_object, _settings, true /* _isCreation */);
+}
+
+void ObjectOptimizer::optimize(Object& _object, Settings const& _settings, bool _isCreation)
+{
+	yulAssert(_object.code());
+	yulAssert(_object.debugData);
+
+	for (auto& subNode: _object.subObjects)
+		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
+		{
+			bool isCreation = !boost::ends_with(subObject->name, "_deployed");
+			optimize(
+				*subObject,
+				_settings,
+				isCreation
+			);
+		}
+
+	Dialect const& dialect = languageToDialect(_settings.language, _settings.evmVersion);
+	std::unique_ptr<GasMeter> meter;
+	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
+		meter = std::make_unique<GasMeter>(*evmDialect, _isCreation, _settings.expectedExecutionsPerDeployment);
+
+	std::optional<h256> cacheKey = calculateCacheKey(_object.code()->root(), *_object.debugData, _settings, _isCreation);
+	if (cacheKey.has_value() && m_cachedObjects.count(*cacheKey) != 0)
+	{
+		overwriteWithOptimizedObject(*cacheKey, _object);
+		return;
+	}
+
+	OptimiserSuite::run(
+		dialect,
+		meter.get(),
+		_object,
+		_settings.optimizeStackAllocation,
+		_settings.yulOptimiserSteps,
+		_settings.yulOptimiserCleanupSteps,
+		_isCreation ? std::nullopt : std::make_optional(_settings.expectedExecutionsPerDeployment),
+		{}
+	);
+
+	if (cacheKey.has_value())
+		storeOptimizedObject(*cacheKey, _object, dialect);
+}
+
+void ObjectOptimizer::storeOptimizedObject(util::h256 _cacheKey, Object const& _optimizedObject, Dialect const& _dialect)
+{
+	m_cachedObjects[_cacheKey] = CachedObject{
+		std::make_shared<Block>(ASTCopier{}.translate(_optimizedObject.code()->root())),
+		&_dialect,
+	};
+}
+
+void ObjectOptimizer::overwriteWithOptimizedObject(util::h256 _cacheKey, Object& _object) const
+{
+	yulAssert(m_cachedObjects.count(_cacheKey) != 0);
+	CachedObject const& cachedObject = m_cachedObjects.at(_cacheKey);
+
+	yulAssert(cachedObject.optimizedAST);
+	_object.setCode(std::make_shared<AST>(ASTCopier{}.translate(*cachedObject.optimizedAST)));
+	yulAssert(_object.code());
+
+	// There's no point in caching AnalysisInfo because it references AST nodes. It can't be shared
+	// by multiple ASTs and it's easier to recalculate it than properly clone it.
+	yulAssert(cachedObject.dialect);
+	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>(
+		AsmAnalyzer::analyzeStrictAssertCorrect(
+			*cachedObject.dialect,
+			_object
+		)
+	);
+
+	// NOTE: Source name index is included in the key so it must be identical. No need to store and restore it.
+}
+
+std::optional<h256> ObjectOptimizer::calculateCacheKey(
+	Block const& _ast,
+	ObjectDebugData const& _debugData,
+	Settings const& _settings,
+	bool _isCreation
+)
+{
+	AsmPrinter asmPrinter(
+		AsmPrinter::TypePrinting::OmitDefault,
+		languageToDialect(_settings.language, _settings.evmVersion),
+		_debugData.sourceNames,
+		DebugInfoSelection::All()
+	);
+
+	bytes rawKey;
+	// NOTE: AsmPrinter never prints nativeLocations included in debug data, so ASTs differing only
+	// in that regard are considered equal here.  This is fine because the optimizer does not keep
+	// them up to date across AST transformations anyway so in any use where they need to be reliable,
+	// we just regenerate them by reparsing the object.
+	rawKey += keccak256(asmPrinter(_ast)).asBytes();
+	rawKey += keccak256(_debugData.formatUseSrcComment()).asBytes();
+	rawKey += h256(u256(_settings.language)).asBytes();
+	rawKey += FixedHash<1>(uint8_t(_settings.optimizeStackAllocation ? 0 : 1)).asBytes();
+	rawKey += h256(u256(_settings.expectedExecutionsPerDeployment)).asBytes();
+	rawKey += FixedHash<1>(uint8_t(_isCreation ? 0 : 1)).asBytes();
+	rawKey += keccak256(_settings.evmVersion.name()).asBytes();
+	rawKey += keccak256(_settings.yulOptimiserSteps).asBytes();
+	rawKey += keccak256(_settings.yulOptimiserCleanupSteps).asBytes();
+
+	return h256(keccak256(rawKey));
+}
diff --git a/libyul/ObjectOptimizer.h b/libyul/ObjectOptimizer.h
new file mode 100644
index 0000000000..89e5739be7
--- /dev/null
+++ b/libyul/ObjectOptimizer.h
@@ -0,0 +1,95 @@
+/*
+	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/ASTForward.h>
+#include <libyul/Object.h>
+
+#include <liblangutil/EVMVersion.h>
+
+#include <libsolutil/FixedHash.h>
+
+#include <map>
+#include <memory>
+#include <optional>
+
+namespace solidity::yul
+{
+
+enum class Language
+{
+	Assembly,
+	StrictAssembly,
+};
+
+Dialect const& languageToDialect(Language _language, langutil::EVMVersion _version);
+
+/// Encapsulates logic for applying @a yul::OptimiserSuite to a whole hierarchy of Yul objects.
+/// Also, acts as a transparent cache for optimized objects.
+///
+/// The cache is designed to allow sharing its instances widely across the compiler, without the
+/// need to invalidate entries due to changing settings or context.
+/// Caching is performed at the granularity of individual ASTs rather than whole object trees,
+/// which means that reuse is possible even within a single hierarchy, e.g. when creation and
+/// deployed objects have common dependencies.
+class ObjectOptimizer
+{
+public:
+	/// Optimization settings and context information.
+	/// This information becomes a part of the cache key and, together with the object content,
+	/// must uniquely determine the result of optimization.
+	struct Settings
+	{
+		Language language;
+		langutil::EVMVersion evmVersion;
+		bool optimizeStackAllocation;
+		std::string yulOptimiserSteps;
+		std::string yulOptimiserCleanupSteps;
+		size_t expectedExecutionsPerDeployment;
+	};
+
+	/// Recursively optimizes a Yul object with given settings, reusing cached ASTs where possible
+	/// or caching the result otherwise. The object is modified in-place.
+	/// Automatically accounts for the difference between creation and deployed objects.
+	/// @warning Does not ensure that nativeLocations in the resulting AST match the optimized code.
+	void optimize(Object& _object, Settings const& _settings);
+
+private:
+	struct CachedObject
+	{
+		std::shared_ptr<Block const> optimizedAST;
+		Dialect const* dialect;
+	};
+
+	void optimize(Object& _object, Settings const& _settings, bool _isCreation);
+
+	void storeOptimizedObject(util::h256 _cacheKey, Object const& _optimizedObject, Dialect const& _dialect);
+	void overwriteWithOptimizedObject(util::h256 _cacheKey, Object& _object) const;
+
+	static std::optional<util::h256> calculateCacheKey(
+		Block const& _ast,
+		ObjectDebugData const& _debugData,
+		Settings const& _settings,
+		bool _isCreation
+	);
+
+	std::map<util::h256, CachedObject> m_cachedObjects;
+};
+
+}
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 8166ed3cfd..eac84ae3a1 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -24,14 +24,12 @@
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #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>
 #include <liblangutil/SourceReferenceFormatter.h>
-#include <libsolidity/interface/OptimiserSettings.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -43,22 +41,6 @@ using namespace solidity::yul;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
-namespace
-{
-Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _version)
-{
-	switch (_language)
-	{
-	case YulStack::Language::Assembly:
-	case YulStack::Language::StrictAssembly:
-		return EVMDialect::strictAssemblyForEVMObjects(_version);
-	}
-	yulAssert(false);
-	util::unreachable();
-}
-
-}
-
 CharStream const& YulStack::charStream(std::string const& _sourceName) const
 {
 	yulAssert(m_charStream, "");
@@ -114,8 +96,44 @@ void YulStack::optimize()
 		)
 			return;
 
+		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
+					);
+					// Defaults are the minimum necessary to avoid running into "Stack too deep" constantly.
+					return std::make_tuple(true, "u", "");
+				}
+			}
+			return std::make_tuple(
+				m_optimiserSettings.optimizeStackAllocation,
+				m_optimiserSettings.yulOptimiserSteps,
+				m_optimiserSettings.yulOptimiserCleanupSteps
+			);
+		}();
+
 		m_stackState = Parsed;
-		optimize(*m_parserResult, true);
+		solAssert(m_objectOptimizer);
+		m_objectOptimizer->optimize(
+			*m_parserResult,
+			ObjectOptimizer::Settings{
+				m_language,
+				m_evmVersion,
+				optimizeStackAllocation,
+				yulOptimiserSteps,
+				yulOptimiserCleanupSteps,
+				m_optimiserSettings.expectedExecutionsPerDeployment
+			}
+		);
 
 		// Optimizer does not maintain correct native source locations in the AST.
 		// We can work around it by regenerating the AST from scratch from optimized IR.
@@ -186,60 +204,6 @@ void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 	EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize, m_eofVersion);
 }
 
-void YulStack::optimize(Object& _object, bool _isCreation)
-{
-	yulAssert(_object.hasCode(), "");
-	yulAssert(_object.analysisInfo, "");
-	for (auto& subNode: _object.subObjects)
-		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
-		{
-			bool isCreation = !boost::ends_with(subObject->name, "_deployed");
-			optimize(*subObject, isCreation);
-		}
-
-	Dialect const& dialect = languageToDialect(m_language, m_evmVersion);
-	std::unique_ptr<GasMeter> meter;
-	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.
-		optimizeStackAllocation,
-		yulOptimiserSteps,
-		yulOptimiserCleanupSteps,
-		_isCreation ? std::nullopt : std::make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
-		{}
-	);
-}
-
 void YulStack::reparse()
 {
 	yulAssert(m_parserResult);
@@ -250,7 +214,7 @@ void YulStack::reparse()
 	// are not stored in the AST and the other info that is (location, AST ID, etc) will still be present.
 	std::string source = print(nullptr /* _soliditySourceProvider */);
 
-	YulStack cleanStack(m_evmVersion, m_eofVersion, m_language, m_optimiserSettings, m_debugInfoSelection);
+	YulStack cleanStack(m_evmVersion, m_eofVersion, m_language, m_optimiserSettings, m_debugInfoSelection, m_objectOptimizer);
 	bool reanalysisSuccessful = cleanStack.parseAndAnalyze(m_charStream->name(), source);
 	yulAssert(
 		reanalysisSuccessful,
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index b09fa79758..69c0f01656 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -28,6 +28,7 @@
 #include <libsolutil/JSON.h>
 
 #include <libyul/Object.h>
+#include <libyul/ObjectOptimizer.h>
 #include <libyul/ObjectParser.h>
 
 #include <libsolidity/interface/OptimiserSettings.h>
@@ -65,7 +66,7 @@ struct MachineAssemblyObject
 class YulStack: public langutil::CharStreamProvider
 {
 public:
-	enum class Language { Assembly, StrictAssembly };
+	using Language = yul::Language;
 	enum class Machine { EVM };
 	enum State {
 		Empty,
@@ -88,14 +89,16 @@ class YulStack: public langutil::CharStreamProvider
 		std::optional<uint8_t> _eofVersion,
 		Language _language,
 		solidity::frontend::OptimiserSettings _optimiserSettings,
-		langutil::DebugInfoSelection const& _debugInfoSelection
+		langutil::DebugInfoSelection const& _debugInfoSelection,
+		std::shared_ptr<ObjectOptimizer> _objectOptimizer = nullptr
 	):
 		m_language(_language),
 		m_evmVersion(_evmVersion),
 		m_eofVersion(_eofVersion),
 		m_optimiserSettings(std::move(_optimiserSettings)),
 		m_debugInfoSelection(_debugInfoSelection),
-		m_errorReporter(m_errors)
+		m_errorReporter(m_errors),
+		m_objectOptimizer(_objectOptimizer ? std::move(_objectOptimizer) : std::make_shared<ObjectOptimizer>())
 	{}
 
 	/// @returns the char stream used during parsing
@@ -150,8 +153,6 @@ class YulStack: public langutil::CharStreamProvider
 
 	void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize) const;
 
-	void optimize(yul::Object& _object, bool _isCreation);
-
 	/// Prints the Yul object stored internally and parses it again.
 	/// This ensures that the debug info in the AST matches the source that printing would produce
 	/// rather than the initial source.
@@ -173,6 +174,8 @@ class YulStack: public langutil::CharStreamProvider
 	std::shared_ptr<yul::Object> m_parserResult;
 	langutil::ErrorList m_errors;
 	langutil::ErrorReporter m_errorReporter;
+
+	std::shared_ptr<ObjectOptimizer> m_objectOptimizer;
 };
 
 }

From 5c7fc0409d3f7d579571eedc8af18945cd08312b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 30 Jul 2024 15:07:04 +0200
Subject: [PATCH 1010/1140] OptimizedIRCachingTest

---
 libsolidity/interface/CompilerStack.h         |  2 +
 libyul/ObjectOptimizer.h                      |  2 +
 test/CMakeLists.txt                           |  2 +
 test/InteractiveTests.h                       |  2 +
 test/libsolidity/OptimizedIRCachingTest.cpp   | 50 +++++++++++++++++
 test/libsolidity/OptimizedIRCachingTest.h     | 54 +++++++++++++++++++
 .../bytecode_dependency_creation.sol          |  7 +++
 ...tecode_dependency_creation_and_runtime.sol | 12 +++++
 ...dependency_creation_and_runtime_shared.sol | 11 ++++
 .../bytecode_dependency_runtime.sol           |  9 ++++
 ...ependency_shared_by_multiple_contracts.sol | 19 +++++++
 .../optimizedIRCaching/multiple_contracts.sol |  5 ++
 .../optimizedIRCaching/no_contracts.sol       |  2 +
 .../optimizedIRCaching/single_contract.sol    |  3 ++
 test/tools/CMakeLists.txt                     |  2 +
 15 files changed, 182 insertions(+)
 create mode 100644 test/libsolidity/OptimizedIRCachingTest.cpp
 create mode 100644 test/libsolidity/OptimizedIRCachingTest.h
 create mode 100644 test/libsolidity/optimizedIRCaching/bytecode_dependency_creation.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime_shared.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/bytecode_dependency_runtime.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/bytecode_dependency_shared_by_multiple_contracts.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/multiple_contracts.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/no_contracts.sol
 create mode 100644 test/libsolidity/optimizedIRCaching/single_contract.sol

diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 6ca792296f..25863b6d06 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -381,6 +381,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		return VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;
 	}
 
+	yul::ObjectOptimizer const& objectOptimizer() const { return *m_objectOptimizer; }
+
 private:
 	/// The state per source unit. Filled gradually during parsing.
 	struct Source
diff --git a/libyul/ObjectOptimizer.h b/libyul/ObjectOptimizer.h
index 89e5739be7..e570d69c4b 100644
--- a/libyul/ObjectOptimizer.h
+++ b/libyul/ObjectOptimizer.h
@@ -70,6 +70,8 @@ class ObjectOptimizer
 	/// @warning Does not ensure that nativeLocations in the resulting AST match the optimized code.
 	void optimize(Object& _object, Settings const& _settings);
 
+	size_t size() const { return m_cachedObjects.size(); }
+
 private:
 	struct CachedObject
 	{
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0d19d77960..5308a55f78 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -88,6 +88,8 @@ set(libsolidity_sources
     libsolidity/MemoryGuardTest.h
     libsolidity/NatspecJSONTest.cpp
     libsolidity/NatspecJSONTest.h
+    libsolidity/OptimizedIRCachingTest.cpp
+    libsolidity/OptimizedIRCachingTest.h
     libsolidity/SemanticTest.cpp
     libsolidity/SemanticTest.h
     libsolidity/SemVerMatcher.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 42e20d7e39..4c2077576c 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -26,6 +26,7 @@
 #include <test/libsolidity/GasTest.h>
 #include <test/libsolidity/MemoryGuardTest.h>
 #include <test/libsolidity/NatspecJSONTest.h>
+#include <test/libsolidity/OptimizedIRCachingTest.h>
 #include <test/libsolidity/SyntaxTest.h>
 #include <test/libsolidity/SemanticTest.h>
 #include <test/libsolidity/SMTCheckerTest.h>
@@ -82,6 +83,7 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"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},
+	{"Optimized IR Caching",        "libsolidity", "optimizedIRCaching",            false, false, &OptimizedIRCachingTest::create},
 };
 
 }
diff --git a/test/libsolidity/OptimizedIRCachingTest.cpp b/test/libsolidity/OptimizedIRCachingTest.cpp
new file mode 100644
index 0000000000..d1e735eeb7
--- /dev/null
+++ b/test/libsolidity/OptimizedIRCachingTest.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 <test/libsolidity/OptimizedIRCachingTest.h>
+#include <test/libsolidity/util/SoltestErrors.h>
+
+#include <liblangutil/Exceptions.h>
+
+#include <libsolutil/StringUtils.h>
+
+using namespace solidity::util;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::frontend::test;
+
+void OptimizedIRCachingTest::setupCompiler(CompilerStack& _compiler)
+{
+	AnalysisFramework::setupCompiler(_compiler);
+	_compiler.setOptimiserSettings(true);
+	_compiler.setViaIR(true);
+}
+
+TestCase::TestResult OptimizedIRCachingTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
+{
+	soltestAssert(compiler().objectOptimizer().size() == 0);
+
+	if (!runFramework(m_source, PipelineStage::Compilation))
+	{
+		printPrefixed(_stream, formatErrors(filteredErrors(), _formatted), _linePrefix);
+		return TestResult::FatalError;
+	}
+
+	m_obtainedResult = "cachedObjects: " + toString(compiler().objectOptimizer().size()) + "\n";
+	return checkResult(_stream, _linePrefix, _formatted);
+}
diff --git a/test/libsolidity/OptimizedIRCachingTest.h b/test/libsolidity/OptimizedIRCachingTest.h
new file mode 100644
index 0000000000..8681346ca8
--- /dev/null
+++ b/test/libsolidity/OptimizedIRCachingTest.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
+/**
+ * Unit tests for the optimized IR caching in CompilerStack.
+ */
+
+#pragma once
+
+#include <test/libsolidity/AnalysisFramework.h>
+#include <test/TestCase.h>
+
+#include <ostream>
+#include <string>
+
+namespace solidity::frontend::test
+{
+
+class OptimizedIRCachingTest: public AnalysisFramework, public EVMVersionRestrictedTestCase
+{
+public:
+	OptimizedIRCachingTest(std::string const& _filename):
+		EVMVersionRestrictedTestCase(_filename)
+	{
+		m_source = m_reader.source();
+		m_expectation = m_reader.simpleExpectations();
+	}
+
+	static std::unique_ptr<TestCase> create(Config const& _config)
+	{
+		return std::make_unique<OptimizedIRCachingTest>(_config.filename);
+	}
+
+	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
+
+protected:
+	void setupCompiler(CompilerStack& _compiler) override;
+};
+
+}
diff --git a/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation.sol b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation.sol
new file mode 100644
index 0000000000..6e603ee731
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation.sol
@@ -0,0 +1,7 @@
+contract A {}
+
+contract C {
+    A a = new A();
+}
+// ----
+// cachedObjects: 4
diff --git a/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime.sol b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime.sol
new file mode 100644
index 0000000000..40ab2993c5
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime.sol
@@ -0,0 +1,12 @@
+contract A {}
+contract B {}
+
+contract C {
+    A a = new A();
+
+    function f() public returns (B) {
+        return new B();
+    }
+}
+// ----
+// cachedObjects: 6
diff --git a/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime_shared.sol b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime_shared.sol
new file mode 100644
index 0000000000..86df1b37e0
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/bytecode_dependency_creation_and_runtime_shared.sol
@@ -0,0 +1,11 @@
+contract A {}
+
+contract C {
+    A a = new A();
+
+    function f() public returns (A) {
+        return new A();
+    }
+}
+// ----
+// cachedObjects: 4
diff --git a/test/libsolidity/optimizedIRCaching/bytecode_dependency_runtime.sol b/test/libsolidity/optimizedIRCaching/bytecode_dependency_runtime.sol
new file mode 100644
index 0000000000..6cc4d6bdec
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/bytecode_dependency_runtime.sol
@@ -0,0 +1,9 @@
+contract A {}
+
+contract C {
+    function f() public returns (A) {
+        return new A();
+    }
+}
+// ----
+// cachedObjects: 4
diff --git a/test/libsolidity/optimizedIRCaching/bytecode_dependency_shared_by_multiple_contracts.sol b/test/libsolidity/optimizedIRCaching/bytecode_dependency_shared_by_multiple_contracts.sol
new file mode 100644
index 0000000000..cd0f97f954
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/bytecode_dependency_shared_by_multiple_contracts.sol
@@ -0,0 +1,19 @@
+contract A {}
+
+contract C {
+    A a = new A();
+
+    function f() public returns (A) {
+        return new A();
+    }
+}
+
+contract D {
+    A a = new A();
+
+    function f() public returns (A) {
+        return new A();
+    }
+}
+// ----
+// cachedObjects: 6
diff --git a/test/libsolidity/optimizedIRCaching/multiple_contracts.sol b/test/libsolidity/optimizedIRCaching/multiple_contracts.sol
new file mode 100644
index 0000000000..b80c99b652
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/multiple_contracts.sol
@@ -0,0 +1,5 @@
+contract C {}
+contract D {}
+contract E {}
+// ----
+// cachedObjects: 6
diff --git a/test/libsolidity/optimizedIRCaching/no_contracts.sol b/test/libsolidity/optimizedIRCaching/no_contracts.sol
new file mode 100644
index 0000000000..c080768cdf
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/no_contracts.sol
@@ -0,0 +1,2 @@
+// ----
+// cachedObjects: 0
diff --git a/test/libsolidity/optimizedIRCaching/single_contract.sol b/test/libsolidity/optimizedIRCaching/single_contract.sol
new file mode 100644
index 0000000000..6f3ab6df88
--- /dev/null
+++ b/test/libsolidity/optimizedIRCaching/single_contract.sol
@@ -0,0 +1,3 @@
+contract C {}
+// ----
+// cachedObjects: 2
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 532a08d9fc..44a5e2aa70 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -26,6 +26,8 @@ add_executable(isoltest
 	../libsolidity/GasTest.cpp
 	../libsolidity/MemoryGuardTest.cpp
 	../libsolidity/NatspecJSONTest.cpp
+	../libsolidity/OptimizedIRCachingTest.cpp
+	../libsolidity/OptimizedIRCachingTest.h
 	../libsolidity/SyntaxTest.cpp
 	../libsolidity/SemanticTest.cpp
 	../libsolidity/AnalysisFramework.cpp

From f6aee354b3aa379539cd07577d1a61787ad47cd2 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 19 Aug 2024 17:12:54 +0200
Subject: [PATCH 1011/1140] Fix some submodule related problems.

---
 .dockerignore                    | 2 --
 scripts/create_source_tarball.sh | 2 ++
 scripts/docker_deploy_manual.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ab452ecf28..8d9330854d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,5 +2,3 @@
 # the build context to the docker image build server
 /build
 
-# in-tree builds
-/deps
diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh
index 37bee6df18..f5e2892aca 100755
--- a/scripts/create_source_tarball.sh
+++ b/scripts/create_source_tarball.sh
@@ -21,6 +21,8 @@ REPO_ROOT="$(dirname "$0")"/..
     TEMPDIR=$(mktemp -d)
     SOLDIR="$TEMPDIR/solidity_$versionstring/"
     mkdir "$SOLDIR"
+    # Ensure that submodules are initialized.
+    git submodule update --init --recursive
     # Store the current source
     git checkout-index -a --prefix="$SOLDIR"
     # shellcheck disable=SC2016
diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 12d3e5ff45..48d021ff0b 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -16,7 +16,7 @@ DIR=$(mktemp -d)
 (
 cd "$DIR"
 
-git clone --depth 2 https://github.com/ethereum/solidity.git -b "$branch"
+git clone --recursive --depth 2 https://github.com/ethereum/solidity.git -b "$branch"
 cd solidity
 commithash=$(git rev-parse --short=8 HEAD)
 echo -n "$commithash" > commit_hash.txt

From b6ab05419db0742296c0a35b47561cea8652d7a5 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 29 Jul 2024 13:43:09 +0200
Subject: [PATCH 1012/1140] Update fmtlib to v11.0.2.

---
 deps/fmtlib            |  2 +-
 libyul/AsmAnalysis.cpp |  4 ++--
 libyul/YulString.h     | 19 -------------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/deps/fmtlib b/deps/fmtlib
index a33701196a..0c9fce2ffe 160000
--- a/deps/fmtlib
+++ b/deps/fmtlib
@@ -1 +1 @@
-Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50
+Subproject commit 0c9fce2ffefecfdce794e1859584e25877b7b592
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 09be597424..22ec8c9944 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -694,7 +694,7 @@ void AsmAnalyzer::expectValidType(YulName _type, SourceLocation const& _location
 		m_errorReporter.typeError(
 			5473_error,
 			_location,
-			fmt::format("\"{}\" is not a valid type (user defined types are not yet supported).", _type)
+			fmt::format("\"{}\" is not a valid type (user defined types are not yet supported).", _type.str())
 		);
 }
 
@@ -704,7 +704,7 @@ void AsmAnalyzer::expectType(YulName _expectedType, YulName _givenType, SourceLo
 		m_errorReporter.typeError(
 			3781_error,
 			_location,
-			fmt::format("Expected a value of type \"{}\" but got \"{}\".", _expectedType, _givenType)
+			fmt::format("Expected a value of type \"{}\" but got \"{}\".", _expectedType.str(), _givenType.str())
 		);
 }
 
diff --git a/libyul/YulString.h b/libyul/YulString.h
index 89d35b123c..bd9438e5ab 100644
--- a/libyul/YulString.h
+++ b/libyul/YulString.h
@@ -169,25 +169,6 @@ inline YulString operator "" _yulname(char const* _string, std::size_t _size)
 
 }
 
-namespace fmt
-{
-template <>
-struct formatter<solidity::yul::YulString>
-{
-	template <typename ParseContext>
-	constexpr auto parse(ParseContext& _context)
-	{
-		return _context.begin();
-	}
-
-	template <typename FormatContext>
-	auto format(solidity::yul::YulString _value, FormatContext& _context)
-	{
-		return format_to(_context.out(), "{}", _value.str());
-	}
-};
-}
-
 namespace std
 {
 template<> struct hash<solidity::yul::YulString>

From 20fa893f7e6decb502a36fd9e9eee7e4e59b44e0 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 22 Aug 2024 23:32:51 -0300
Subject: [PATCH 1013/1140] More precise calculations when evaluating how many
 bytes immutables require

---
 Changelog.md                                  |  1 +
 libevmasm/Assembly.cpp                        |  2 +-
 .../immutable/immutable_tag_too_large_bug.sol | 48 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/semanticTests/immutable/immutable_tag_too_large_bug.sol

diff --git a/Changelog.md b/Changelog.md
index 034be57733..288136dd91 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -25,6 +25,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Assembler: Fix ICE caused by imprecise calculation of required size of tags in bytecode when code size is above 255.
  * Parser: Fix spuriously emitted parser error for unary plus operations when used as binary operator in some cases.
  * SMTChecker: Fix error that reports invalid number of verified checks for BMC and CHC engines.
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 91773a8e84..ab3879da48 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -74,7 +74,7 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 			ret += i.second.size();
 
 		for (AssemblyItem const& i: m_items)
-			ret += i.bytesRequired(tagSize, m_evmVersion, Precision::Approximate);
+			ret += i.bytesRequired(tagSize, m_evmVersion, Precision::Precise);
 		if (numberEncodingSize(ret) <= tagSize)
 			return static_cast<unsigned>(ret);
 	}
diff --git a/test/libsolidity/semanticTests/immutable/immutable_tag_too_large_bug.sol b/test/libsolidity/semanticTests/immutable/immutable_tag_too_large_bug.sol
new file mode 100644
index 0000000000..fed424628c
--- /dev/null
+++ b/test/libsolidity/semanticTests/immutable/immutable_tag_too_large_bug.sol
@@ -0,0 +1,48 @@
+contract C {
+  int immutable x = 1;
+  int immutable y = 3;
+
+  function f() public payable returns(int, int) {
+    uint a = uint(y / 1e8);
+    int256 b = x * y;
+    int24 c = int24(b * b >> 128);
+    int24 d = int24((100 * y + 1) >> 128);
+    int24 e = int24(x >> 128);
+    int256 f = x * 2;
+    if (c < 0) {
+      int256 g = (x * x * y) / x;
+      require((y >= 0 && g <= x) || (y < 0 && (x - y) > x));
+      if (b >= f) {
+        require(x <= int256(uint256(type(uint168).max)) && x >= 0, "");
+        b = (b * b) / f;
+        for (a = 0; a < a; a++) {
+          uint8 b;
+          assembly  {
+            b := and(mload(a), 0xFF)
+          }
+        }
+        b += f;
+      }
+      require(d % e != 0);
+      c = -c;
+    }
+    return (x, ((x * (x - y)) / (x + y)));
+  }
+
+  constructor () {
+    x--;
+    --x;
+    y++;
+    ++y;
+    --y;
+  }
+}
+// ====
+// compileViaYul: true
+// ----
+// constructor() ->
+// gas irOptimized: 73171
+// gas irOptimized code: 291200
+// gas legacy: 83499
+// gas legacy code: 408800
+// f() -> -1, 1

From 0e80fbf73b5067affaf22b76588320e649c14f96 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Mon, 22 Jul 2024 11:10:20 +0200
Subject: [PATCH 1014/1140] prep: Extend `StandardCompiler` settings with
 `eofVersion` flag. Fix typo in input parsing

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 libsolidity/interface/StandardCompiler.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index b209987ddd..0c1ccb6b76 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -426,7 +426,7 @@ std::optional<Json> checkAuxiliaryInputKeys(Json const& _input)
 
 std::optional<Json> checkSettingsKeys(Json const& _input)
 {
-	static std::set<std::string> keys{"debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
+	static std::set<std::string> keys{"debug", "evmVersion", "eofVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
 	return checkKeys(_input, keys, "settings");
 }
 
@@ -837,7 +837,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json> StandardCompiler::parseI
 	{
 		if (!settings["eofVersion"].is_number_unsigned())
 			return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
-		auto eofVersion = settings["evmVersion"].get<uint8_t>();
+		auto eofVersion = settings["eofVersion"].get<uint8_t>();
 		if (eofVersion != 1)
 			return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
 		ret.eofVersion = 1;
@@ -1308,6 +1308,7 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 		compilerStack.addSMTLib2Response(smtLib2Response.first, smtLib2Response.second);
 	compilerStack.setViaIR(_inputsAndSettings.viaIR);
 	compilerStack.setEVMVersion(_inputsAndSettings.evmVersion);
+	compilerStack.setEOFVersion(_inputsAndSettings.eofVersion);
 	compilerStack.setRemappings(std::move(_inputsAndSettings.remappings));
 	compilerStack.setOptimiserSettings(std::move(_inputsAndSettings.optimiserSettings));
 	compilerStack.setRevertStringBehaviour(_inputsAndSettings.revertStrings);

From 541452036dc5e17c1e1c973bd45ca3596f1106bc Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Mon, 22 Jul 2024 15:16:34 +0200
Subject: [PATCH 1015/1140] prep: Change `toBigEndian` interface to support
 rvalue ref.

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 libsolutil/Numeric.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h
index be9f0bea24..f4e88de3c1 100644
--- a/libsolutil/Numeric.h
+++ b/libsolutil/Numeric.h
@@ -96,13 +96,13 @@ bool fitsPrecisionBaseX(bigint const& _mantissa, double _log2OfBase, uint32_t _e
 /// @a Out will typically be either std::string or bytes.
 /// @a T will typically by unsigned, u160, u256 or bigint.
 template <class T, class Out>
-inline void toBigEndian(T _val, Out& o_out)
+inline void toBigEndian(T _val, Out&& o_out)
 {
 	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
-	for (auto i = o_out.size(); i != 0; _val >>= 8, i--)
+	for (auto i = o_out.size(); i != 0u; _val >>= 8u, i--)
 	{
-		T v = _val & (T)0xff;
-		o_out[i - 1] = (typename Out::value_type)(uint8_t)v;
+		T v = _val & (T)0xffu;
+		o_out[i - 1u] = (typename std::remove_reference_t<Out>::value_type)(uint8_t)v;
 	}
 }
 

From 9e752f5c1b0ceff75483518f8750eac4dec50392 Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Tue, 27 Aug 2024 00:08:37 +0900
Subject: [PATCH 1016/1140] chore: update array_storage_index_zeroed_test.sol

test_zeroed_indicies -> test_zeroed_indices
---
 .../array/array_storage_index_zeroed_test.sol        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 23feb0da11..cdd6b70f55 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -1,6 +1,6 @@
 contract C {
     uint[] storageArray;
-    function test_zeroed_indicies(uint256 len) public
+    function test_zeroed_indices(uint256 len) public
     {
         while(storageArray.length < len)
             storageArray.push();
@@ -50,20 +50,20 @@ contract C {
     }
 }
 // ----
-// test_zeroed_indicies(uint256): 1 ->
-// test_zeroed_indicies(uint256): 5 ->
+// test_zeroed_indices(uint256): 1 ->
+// test_zeroed_indices(uint256): 5 ->
 // gas irOptimized: 133763
 // gas legacy: 131664
 // gas legacyOptimized: 129990
-// test_zeroed_indicies(uint256): 10 ->
+// test_zeroed_indices(uint256): 10 ->
 // gas irOptimized: 228556
 // gas legacy: 225215
 // gas legacyOptimized: 222351
-// test_zeroed_indicies(uint256): 15 ->
+// test_zeroed_indices(uint256): 15 ->
 // gas irOptimized: 327360
 // gas legacy: 322899
 // gas legacyOptimized: 318907
-// test_zeroed_indicies(uint256): 0xFF ->
+// test_zeroed_indices(uint256): 0xFF ->
 // gas irOptimized: 5180120
 // gas legacy: 5093135
 // gas legacyOptimized: 5020523

From b8373e91297a54e56b4cea31f704a62b97316add Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:16:42 +0200
Subject: [PATCH 1017/1140] CI: explicitly add numpy to LSP test dependencies
 on windows

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 343bb6d006..b5d0b76d6e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1656,7 +1656,7 @@ jobs:
           shell: powershell.exe
       - run:
           name: Install LSP test dependencies
-          command: python -m pip install --user deepdiff colorama
+          command: python -m pip install --user numpy deepdiff colorama
       - run:
           name: Executing solc LSP test suite
           command: python test/lsp.py build\solc\Release\solc.exe --non-interactive

From 47a715ffa548ac0bcd7532defc76f21c3c68a5ed Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 14 Aug 2024 09:51:15 +0200
Subject: [PATCH 1018/1140] Yul: Remove boolType and defaultType from dialect

---
 libyul/AsmAnalysis.cpp                        | 27 +++++++++----------
 libyul/AsmParser.cpp                          |  4 +--
 libyul/AsmPrinter.cpp                         | 13 ++-------
 libyul/AsmPrinter.h                           |  2 +-
 libyul/Dialect.cpp                            | 23 ++--------------
 libyul/Dialect.h                              | 27 ++++++-------------
 .../backends/evm/ControlFlowGraphBuilder.cpp  |  2 +-
 libyul/backends/evm/EVMDialect.h              | 14 +++++-----
 libyul/optimiser/ConditionalSimplifier.cpp    |  2 +-
 libyul/optimiser/ControlFlowSimplifier.cpp    | 15 +++++------
 libyul/optimiser/DataFlowAnalyzer.cpp         | 10 +++----
 libyul/optimiser/ForLoopConditionIntoBody.cpp |  2 +-
 libyul/optimiser/FullInliner.cpp              |  2 +-
 libyul/optimiser/LoadResolver.cpp             |  4 +--
 libyul/optimiser/StackToMemoryMover.cpp       |  4 +--
 libyul/optimiser/UnusedPruner.cpp             |  4 +--
 libyul/optimiser/VarDeclInitializer.cpp       |  4 +--
 17 files changed, 59 insertions(+), 100 deletions(-)

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 22ec8c9944..908e30e629 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -128,14 +128,12 @@ std::vector<YulName> AsmAnalyzer::operator()(Literal const& _literal)
 		m_errorReporter.typeError(6708_error, nativeLocationOf(_literal), "Number literal too large (> 256 bits)");
 	}
 
-	if (!m_dialect.validTypeForLiteral(_literal.kind, _literal.value, _literal.type))
-	{
+	if (_literal.kind == LiteralKind::Boolean && !_literal.type.empty())
 		m_errorReporter.typeError(
 			5170_error,
 			nativeLocationOf(_literal),
 			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + formatLiteral(_literal) + "\"."
 		);
-	}
 
 	yulAssert(erroneousLiteralValue ^ validLiteral(_literal), "Invalid literal after validating it through AsmAnalyzer.");
 	return {_literal.type};
@@ -145,7 +143,7 @@ std::vector<YulName> AsmAnalyzer::operator()(Identifier const& _identifier)
 {
 	yulAssert(!_identifier.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	YulName type = m_dialect.defaultType;
+	YulName type{};
 
 	if (m_currentScope->lookup(_identifier.name, GenericVisitor{
 		[&](Scope::Variable const& _var)
@@ -284,7 +282,7 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 
 		for (size_t i = 0; i < _varDecl.variables.size(); ++i)
 		{
-			YulName givenType = m_dialect.defaultType;
+			YulName givenType{};
 			if (i < types.size())
 				givenType = types[i];
 			TypedName const& variable = _varDecl.variables[i];
@@ -474,7 +472,7 @@ std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 		return *returnTypes;
 	}
 	else if (returnTypes)
-		return std::vector<YulName>(returnTypes->size(), m_dialect.defaultType);
+		return std::vector<YulName>(returnTypes->size(), YulName{});
 	else
 		return {};
 }
@@ -573,13 +571,13 @@ YulName AsmAnalyzer::expectExpression(Expression const& _expr)
 			std::to_string(types.size()) +
 			" values instead."
 		);
-	return types.empty() ? m_dialect.defaultType : types.front();
+	return types.empty() ? YulName{} : types.front();
 }
 
 YulName AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 {
 	yulAssert(_literal.kind == LiteralKind::String);
-	yulAssert(m_dialect.validTypeForLiteral(LiteralKind::String, _literal.value, _literal.type));
+	yulAssert(_literal.type.empty());
 	yulAssert(_literal.value.unlimited());
 
 	return {_literal.type};
@@ -588,12 +586,13 @@ YulName AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 void AsmAnalyzer::expectBoolExpression(Expression const& _expr)
 {
 	YulName type = expectExpression(_expr);
-	if (type != m_dialect.boolType)
+	static YulName boolType = {};
+	if (type != boolType)
 		m_errorReporter.typeError(
 			1733_error,
 			nativeLocationOf(_expr),
 			"Expected a value of boolean type \"" +
-			m_dialect.boolType.str() +
+			boolType.str() +
 			"\" but got \"" +
 			type.str() +
 			"\""
@@ -604,7 +603,7 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueTyp
 {
 	yulAssert(!_variable.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	YulName const* variableType = nullptr;
+	std::optional<YulName> variableType = std::nullopt;
 	bool found = false;
 	if (Scope::Identifier const* var = m_currentScope->lookup(_variable.name))
 	{
@@ -625,7 +624,7 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueTyp
 				"Variable " + _variable.name.str() + " used before it was declared."
 			);
 		else
-			variableType = &std::get<Scope::Variable>(*var).type;
+			variableType = std::get<Scope::Variable>(*var).type;
 		found = true;
 	}
 	else if (m_resolver)
@@ -634,7 +633,7 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueTyp
 		if (m_resolver(_variable, yul::IdentifierContext::LValue, insideFunction))
 		{
 			found = true;
-			variableType = &m_dialect.defaultType;
+			variableType = YulName{};
 		}
 	}
 
@@ -690,7 +689,7 @@ void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation cons
 
 void AsmAnalyzer::expectValidType(YulName _type, SourceLocation const& _location)
 {
-	if (!m_dialect.types.count(_type))
+	if (!_type.empty())
 		m_errorReporter.typeError(
 			5473_error,
 			_location,
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 6223a1a8e1..a2a4c36dc0 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -571,7 +571,7 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimit
 			createDebugData(),
 			kind,
 			valueOfLiteral(currentLiteral(), kind, _unlimitedLiteralArgument && kind == LiteralKind::String),
-			kind == LiteralKind::Boolean ? m_dialect.boolType : m_dialect.defaultType
+			{}
 		};
 		advance();
 		if (currentToken() == Token::Colon)
@@ -707,7 +707,7 @@ TypedName Parser::parseTypedName()
 		typedName.type = expectAsmIdentifier();
 	}
 	else
-		typedName.type = m_dialect.defaultType;
+		typedName.type = {};
 
 	return typedName;
 }
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 6b840fcfea..a5ce47d125 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -53,9 +53,8 @@ std::string AsmPrinter::operator()(Literal const& _literal)
 	switch (_literal.kind)
 	{
 	case LiteralKind::Number:
-		return locationComment + formattedValue + appendTypeName(_literal.type);
 	case LiteralKind::Boolean:
-		return locationComment + formattedValue + appendTypeName(_literal.type, true);
+		return locationComment + formattedValue + appendTypeName(_literal.type);
 	case LiteralKind::String:
 		break;
 	}
@@ -243,20 +242,12 @@ std::string AsmPrinter::formatTypedName(TypedName _variable)
 	return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
 }
 
-std::string AsmPrinter::appendTypeName(YulName _type, bool _isBoolLiteral) const
+std::string AsmPrinter::appendTypeName(YulName _type) const
 {
 	yulAssert(
 		m_typePrintingMode == TypePrinting::OmitDefault || m_typePrintingMode == TypePrinting::Full,
 		"unhandled printing mode"
 	);
-	if (m_typePrintingMode == TypePrinting::OmitDefault && !_type.empty())
-	{
-		if (!_isBoolLiteral && _type == m_dialect.defaultType)
-			_type = {};
-		else if (_isBoolLiteral && _type == m_dialect.boolType && !m_dialect.defaultType.empty())
-			// Special case: If we have a bool type but empty default type, do not remove the type.
-			_type = {};
-	}
 	if (_type.empty())
 		return {};
 	else
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 684ddaacf0..90fa3a4b5a 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -93,7 +93,7 @@ class AsmPrinter
 
 private:
 	std::string formatTypedName(TypedName _variable);
-	std::string appendTypeName(YulName _type, bool _isBoolLiteral = false) const;
+	std::string appendTypeName(YulName _type) const;
 	std::string formatDebugData(langutil::DebugData::ConstPtr const& _debugData, bool _statement);
 	template <class T>
 	std::string formatDebugData(T const& _node)
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index 8afd99a228..be6c6705ee 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -25,26 +25,7 @@
 using namespace solidity::yul;
 using namespace solidity::langutil;
 
-Literal Dialect::zeroLiteralForType(solidity::yul::YulName _type) const
+Literal Dialect::zeroLiteral() const
 {
-	if (_type == boolType && _type != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, LiteralValue(false), _type};
-	return {DebugData::create(), LiteralKind::Number, LiteralValue(0, std::nullopt), _type};
-}
-
-
-Literal Dialect::trueLiteral() const
-{
-	if (boolType != defaultType)
-		return {DebugData::create(), LiteralKind::Boolean, LiteralValue(true), boolType};
-	else
-		return {DebugData::create(), LiteralKind::Number, LiteralValue(1), defaultType};
-}
-
-bool Dialect::validTypeForLiteral(LiteralKind _kind, LiteralValue const&, YulName _type) const
-{
-	if (_kind == LiteralKind::Boolean)
-		return _type == boolType;
-	else
-		return true;
+	return {DebugData::create(), LiteralKind::Number, LiteralValue(0, std::nullopt), {}};
 }
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
index fcec5fe3f9..f9ce014690 100644
--- a/libyul/Dialect.h
+++ b/libyul/Dialect.h
@@ -61,34 +61,23 @@ struct Dialect
 	Dialect(Dialect const&) = delete;
 	Dialect& operator=(Dialect const&) = delete;
 
-	/// Default type, can be omitted.
-	YulName defaultType;
-	/// Type used for the literals "true" and "false".
-	YulName boolType;
-	std::set<YulName> types = {{}};
-
 	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
 	virtual BuiltinFunction const* builtin(YulName /*_name*/) const { return nullptr; }
 
 	/// @returns true if the identifier is reserved. This includes the builtins too.
 	virtual bool reservedIdentifier(YulName _name) const { return builtin(_name) != nullptr; }
 
-	virtual BuiltinFunction const* discardFunction(YulName /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* equalityFunction(YulName /* _type */) const { return nullptr; }
+	virtual BuiltinFunction const* discardFunction() const { return nullptr; }
+	virtual BuiltinFunction const* equalityFunction() const { return nullptr; }
 	virtual BuiltinFunction const* booleanNegationFunction() const { return nullptr; }
 
-	virtual BuiltinFunction const* memoryStoreFunction(YulName /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* memoryLoadFunction(YulName /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageStoreFunction(YulName /* _type */) const { return nullptr; }
-	virtual BuiltinFunction const* storageLoadFunction(YulName /* _type */) const { return nullptr; }
-	virtual YulName hashFunction(YulName /* _type */ ) const { return YulName{}; }
-
-	/// Check whether the given type is legal for the given literal value.
-	/// Should only be called if the type exists in the dialect at all.
-	virtual bool validTypeForLiteral(LiteralKind _kind, LiteralValue const& _value, YulName _type) const;
+	virtual BuiltinFunction const* memoryStoreFunction() const { return nullptr; }
+	virtual BuiltinFunction const* memoryLoadFunction() const { return nullptr; }
+	virtual BuiltinFunction const* storageStoreFunction() const { return nullptr; }
+	virtual BuiltinFunction const* storageLoadFunction() const { return nullptr; }
+	virtual YulName hashFunction() const { return YulName{}; }
 
-	virtual Literal zeroLiteralForType(YulName _type) const;
-	virtual Literal trueLiteral() const;
+	Literal zeroLiteral() const;
 
 	virtual std::set<YulName> fixedFunctionNames() const { return {}; }
 
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index b4d1cdf15c..3007566dd5 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -349,7 +349,7 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 		CFG::Assignment{_switch.debugData, {ghostVarSlot}}
 	});
 
-	BuiltinFunction const* equalityBuiltin = m_dialect.equalityFunction({});
+	BuiltinFunction const* equalityBuiltin = m_dialect.equalityFunction();
 	yulAssert(equalityBuiltin, "");
 
 	// Artificially generate:
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 89df944966..3207b8fae0 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -74,14 +74,14 @@ struct EVMDialect: public Dialect
 	/// @returns true if the identifier is reserved. This includes the builtins too.
 	bool reservedIdentifier(YulName _name) const override;
 
-	BuiltinFunctionForEVM const* discardFunction(YulName /*_type*/) const override { return builtin("pop"_yulname); }
-	BuiltinFunctionForEVM const* equalityFunction(YulName /*_type*/) const override { return builtin("eq"_yulname); }
+	BuiltinFunctionForEVM const* discardFunction() const override { return builtin("pop"_yulname); }
+	BuiltinFunctionForEVM const* equalityFunction() const override { return builtin("eq"_yulname); }
 	BuiltinFunctionForEVM const* booleanNegationFunction() const override { return builtin("iszero"_yulname); }
-	BuiltinFunctionForEVM const* memoryStoreFunction(YulName /*_type*/) const override { return builtin("mstore"_yulname); }
-	BuiltinFunctionForEVM const* memoryLoadFunction(YulName /*_type*/) const override { return builtin("mload"_yulname); }
-	BuiltinFunctionForEVM const* storageStoreFunction(YulName /*_type*/) const override { return builtin("sstore"_yulname); }
-	BuiltinFunctionForEVM const* storageLoadFunction(YulName /*_type*/) const override { return builtin("sload"_yulname); }
-	YulName hashFunction(YulName /*_type*/) const override { return "keccak256"_yulname; }
+	BuiltinFunctionForEVM const* memoryStoreFunction() const override { return builtin("mstore"_yulname); }
+	BuiltinFunctionForEVM const* memoryLoadFunction() const override { return builtin("mload"_yulname); }
+	BuiltinFunctionForEVM const* storageStoreFunction() const override { return builtin("sstore"_yulname); }
+	BuiltinFunctionForEVM const* storageLoadFunction() const override { return builtin("sload"_yulname); }
+	YulName hashFunction() const override { return "keccak256"_yulname; }
 
 	static EVMDialect const& strictAssemblyForEVM(langutil::EVMVersion _version);
 	static EVMDialect const& strictAssemblyForEVMObjects(langutil::EVMVersion _version);
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index a2656fed39..f81933f41c 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -84,7 +84,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 						Assignment{
 							debugData,
 							{Identifier{debugData, condition}},
-							std::make_unique<Expression>(m_dialect.zeroLiteralForType(m_dialect.boolType))
+							std::make_unique<Expression>(m_dialect.zeroLiteral())
 						}
 					);
 				}
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 9d56583a06..2d0dbb4679 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -138,12 +138,12 @@ void ControlFlowSimplifier::simplify(std::vector<yul::Statement>& _statements)
 	GenericVisitor visitor{
 		VisitorFallback<OptionalStatements>{},
 		[&](If& _ifStmt) -> OptionalStatements {
-			if (_ifStmt.body.statements.empty() && m_dialect.discardFunction(m_dialect.boolType))
+			if (_ifStmt.body.statements.empty() && m_dialect.discardFunction())
 			{
 				OptionalStatements s = std::vector<Statement>{};
 				s->emplace_back(makeDiscardCall(
 					_ifStmt.debugData,
-					*m_dialect.discardFunction(m_dialect.boolType),
+					*m_dialect.discardFunction(),
 					std::move(*_ifStmt.condition)
 				));
 				return s;
@@ -180,7 +180,7 @@ OptionalStatements ControlFlowSimplifier::reduceNoCaseSwitch(Switch& _switchStmt
 {
 	yulAssert(_switchStmt.cases.empty(), "Expected no case!");
 	BuiltinFunction const* discardFunction =
-		m_dialect.discardFunction(m_typeInfo.typeOf(*_switchStmt.expression));
+		m_dialect.discardFunction();
 	if (!discardFunction)
 		return {};
 
@@ -197,16 +197,15 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 
 	auto& switchCase = _switchStmt.cases.front();
 	langutil::DebugData::ConstPtr debugData = debugDataOf(*_switchStmt.expression);
-	YulName type = m_typeInfo.typeOf(*_switchStmt.expression);
 	if (switchCase.value)
 	{
-		if (!m_dialect.equalityFunction(type))
+		if (!m_dialect.equalityFunction())
 			return {};
 		return make_vector<Statement>(If{
 			std::move(_switchStmt.debugData),
 			std::make_unique<Expression>(FunctionCall{
 				debugData,
-				Identifier{debugData, m_dialect.equalityFunction(type)->name},
+				Identifier{debugData, m_dialect.equalityFunction()->name},
 				{std::move(*switchCase.value), std::move(*_switchStmt.expression)}
 			}),
 			std::move(switchCase.body)
@@ -214,13 +213,13 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 	}
 	else
 	{
-		if (!m_dialect.discardFunction(type))
+		if (!m_dialect.discardFunction())
 			return {};
 
 		return make_vector<Statement>(
 			makeDiscardCall(
 				debugData,
-				*m_dialect.discardFunction(type),
+				*m_dialect.discardFunction(),
 				std::move(*_switchStmt.expression)
 			),
 			std::move(switchCase.body)
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index a51ca91239..bf8952355d 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -54,13 +54,13 @@ DataFlowAnalyzer::DataFlowAnalyzer(
 {
 	if (m_analyzeStores)
 	{
-		if (auto const* builtin = _dialect.memoryStoreFunction(YulName{}))
+		if (auto const* builtin = _dialect.memoryStoreFunction())
 			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.memoryLoadFunction(YulName{}))
+		if (auto const* builtin = _dialect.memoryLoadFunction())
 			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-		if (auto const* builtin = _dialect.storageStoreFunction(YulName{}))
+		if (auto const* builtin = _dialect.storageStoreFunction())
 			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
-		if (auto const* builtin = _dialect.storageLoadFunction(YulName{}))
+		if (auto const* builtin = _dialect.storageLoadFunction())
 			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
 	}
 }
@@ -446,7 +446,7 @@ std::optional<YulName> DataFlowAnalyzer::isSimpleLoad(
 std::optional<std::pair<YulName, YulName>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
 {
 	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
-		if (funCall->functionName.name == m_dialect.hashFunction({}))
+		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 std::make_pair(start->name, length->name);
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index df9847376a..cc3f936d94 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -59,7 +59,7 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 				debugData,
 				LiteralKind::Boolean,
 				LiteralValue{true},
-				m_dialect.boolType
+				{}
 			}
 		);
 	}
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 5cdde8f0fd..3daaea658b 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -305,7 +305,7 @@ std::vector<Statement> InlineModifier::performInline(Statement& _statement, Func
 		if (_value)
 			varDecl.value = std::make_unique<Expression>(std::move(*_value));
 		else
-			varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(varDecl.variables.front().type));
+			varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteral());
 		newStatements.emplace_back(std::move(varDecl));
 	};
 
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index a7ee5dd0b9..943860a0ad 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -62,7 +62,7 @@ void LoadResolver::visit(Expression& _e)
 			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({}))
+		else if (!m_containsMSize && funCall->functionName.name == m_dialect.hashFunction())
 		{
 			Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0));
 			Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1));
@@ -151,7 +151,7 @@ void LoadResolver::tryEvaluateKeccak(
 				debugDataOf(_e),
 				LiteralKind::Number,
 				LiteralValue{contentHash},
-				m_dialect.defaultType
+				{}
 			};
 		}
 	}
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index 7ec5790348..d5cb539af4 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -42,7 +42,7 @@ std::vector<Statement> generateMemoryStore(
 	Expression _value
 )
 {
-	BuiltinFunction const* memoryStoreFunction = _dialect.memoryStoreFunction(_dialect.defaultType);
+	BuiltinFunction const* memoryStoreFunction = _dialect.memoryStoreFunction();
 	yulAssert(memoryStoreFunction, "");
 	std::vector<Statement> result;
 	result.emplace_back(ExpressionStatement{_debugData, FunctionCall{
@@ -58,7 +58,7 @@ std::vector<Statement> generateMemoryStore(
 
 FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::ConstPtr const& _debugData, LiteralValue const& _mpos)
 {
-	BuiltinFunction const* memoryLoadFunction = _dialect.memoryLoadFunction(_dialect.defaultType);
+	BuiltinFunction const* memoryLoadFunction = _dialect.memoryLoadFunction();
 	yulAssert(memoryLoadFunction, "");
 	return FunctionCall{
 		_debugData,
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index 9df51cf7f0..c71e8077b6 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -105,10 +105,10 @@ void UnusedPruner::operator()(Block& _block)
 					subtractReferences(ReferencesCounter::countReferences(*varDecl.value));
 					statement = Block{std::move(varDecl.debugData), {}};
 				}
-				else if (varDecl.variables.size() == 1 && m_dialect.discardFunction(varDecl.variables.front().type))
+				else if (varDecl.variables.size() == 1 && m_dialect.discardFunction())
 					statement = ExpressionStatement{varDecl.debugData, FunctionCall{
 						varDecl.debugData,
-						{varDecl.debugData, m_dialect.discardFunction(varDecl.variables.front().type)->name},
+						{varDecl.debugData, m_dialect.discardFunction()->name},
 						{*std::move(varDecl.value)}
 					}};
 			}
diff --git a/libyul/optimiser/VarDeclInitializer.cpp b/libyul/optimiser/VarDeclInitializer.cpp
index 845c7cc41c..db6d0127e5 100644
--- a/libyul/optimiser/VarDeclInitializer.cpp
+++ b/libyul/optimiser/VarDeclInitializer.cpp
@@ -40,7 +40,7 @@ void VarDeclInitializer::operator()(Block& _block)
 
 			if (_varDecl.variables.size() == 1)
 			{
-				_varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(_varDecl.variables.front().type));
+				_varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteral());
 				return {};
 			}
 			else
@@ -48,7 +48,7 @@ void VarDeclInitializer::operator()(Block& _block)
 				OptionalStatements ret{std::vector<Statement>{}};
 				for (auto& var: _varDecl.variables)
 				{
-					std::unique_ptr<Expression> expr = std::make_unique<Expression >(m_dialect.zeroLiteralForType(var.type));
+					std::unique_ptr<Expression> expr = std::make_unique<Expression>(m_dialect.zeroLiteral());
 					ret->emplace_back(VariableDeclaration{std::move(_varDecl.debugData), {std::move(var)}, std::move(expr)});
 				}
 				return ret;

From f5174e767a01316cd56470de334c233b6dc66cda Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:28:28 +0200
Subject: [PATCH 1019/1140] Yul: Remove dialect and printing mode from
 AsmPrinter

---
 libsolidity/codegen/CompilerContext.cpp              |  4 ++--
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp  |  2 +-
 .../codegen/IRGeneratorForStatements.cpp             |  2 +-
 libyul/AsmPrinter.cpp                                |  4 ----
 libyul/AsmPrinter.h                                  | 12 ------------
 libyul/Object.cpp                                    |  8 ++------
 libyul/Object.h                                      |  6 ------
 libyul/ObjectOptimizer.cpp                           |  2 --
 libyul/YulStack.cpp                                  |  2 --
 libyul/optimiser/ControlFlowSimplifier.cpp           |  3 +--
 libyul/optimiser/ControlFlowSimplifier.h             |  6 ++----
 libyul/optimiser/Suite.cpp                           |  2 +-
 test/libyul/Common.cpp                               |  4 +---
 test/libyul/YulOptimizerTest.cpp                     |  4 ++--
 test/tools/yulopti.cpp                               |  4 ++--
 tools/yulPhaser/Program.cpp                          |  2 +-
 16 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index b1b76a97b8..2e94e9f0b8 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -491,8 +491,8 @@ void CompilerContext::appendInlineAssembly(
 		{
 			// Store as generated sources, but first re-parse to update the source references.
 			solAssert(m_generatedYulUtilityCode.empty(), "");
-			m_generatedYulUtilityCode = yul::AsmPrinter(yul::AsmPrinter::TypePrinting::OmitDefault, dialect)(obj.code()->root());
-			std::string code = yul::AsmPrinter{yul::AsmPrinter::TypePrinting::OmitDefault, dialect}(obj.code()->root());
+			m_generatedYulUtilityCode = yul::AsmPrinter()(obj.code()->root());
+			std::string code = yul::AsmPrinter{}(obj.code()->root());
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.setCode(yul::Parser(errorReporter, dialect).parse(charStream));
 			obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj));
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 4599596046..5fed99d21f 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2256,7 +2256,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 
 	solAssert(std::holds_alternative<yul::Block>(modified));
 
-	appendCode() << yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, _inlineAsm.dialect())(std::get<yul::Block>(modified)) << "\n";
+	appendCode() << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
index 3c8bcc9bbb..6925a434d0 100644
--- a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -132,7 +132,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _assembly)
 	CopyTranslate bodyCopier{m_context, _assembly.dialect(), _assembly.annotation().externalReferences};
 	yul::Statement modified = bodyCopier(_assembly.operations().root());
 	solAssert(std::holds_alternative<yul::Block>(modified));
-	m_code << yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, _assembly.dialect())(std::get<yul::Block>(modified)) << "\n";
+	m_code << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index a5ce47d125..612cb8ee0f 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -244,10 +244,6 @@ std::string AsmPrinter::formatTypedName(TypedName _variable)
 
 std::string AsmPrinter::appendTypeName(YulName _type) const
 {
-	yulAssert(
-		m_typePrintingMode == TypePrinting::OmitDefault || m_typePrintingMode == TypePrinting::Full,
-		"unhandled printing mode"
-	);
 	if (_type.empty())
 		return {};
 	else
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 90fa3a4b5a..05b6fb9d8f 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -46,21 +46,11 @@ struct Dialect;
 class AsmPrinter
 {
 public:
-	enum class TypePrinting
-	{
-		OmitDefault,
-		Full
-	};
-
 	explicit AsmPrinter(
-		TypePrinting const _typePrintingMode,
-		Dialect const& _dialect,
 		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	):
-		m_typePrintingMode(_typePrintingMode),
-		m_dialect(_dialect),
 		m_debugInfoSelection(_debugInfoSelection),
 		m_soliditySourceProvider(_soliditySourceProvider)
 	{
@@ -102,8 +92,6 @@ class AsmPrinter
 		return formatDebugData(_node.debugData, !isExpression);
 	}
 
-	TypePrinting const m_typePrintingMode{};
-	Dialect const& m_dialect;
 	std::map<std::string, unsigned> m_nameToSourceIndex;
 	langutil::SourceLocation m_lastLocation = {};
 	langutil::DebugInfoSelection m_debugInfoSelection = {};
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 57c783b83f..c6ba5311ad 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -38,14 +38,12 @@ using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-std::string Data::toString(Dialect const&, AsmPrinter::TypePrinting, DebugInfoSelection const&, CharStreamProvider const*) const
+std::string Data::toString(DebugInfoSelection const&, CharStreamProvider const*) const
 {
 	return "data \"" + name + "\" hex\"" + util::toHex(data) + "\"";
 }
 
 std::string Object::toString(
-	Dialect const& _dialect,
-	AsmPrinter::TypePrinting const _printingMode,
 	DebugInfoSelection const& _debugInfoSelection,
 	CharStreamProvider const* _soliditySourceProvider
 ) const
@@ -54,15 +52,13 @@ std::string Object::toString(
 	yulAssert(debugData, "No debug data");
 
 	std::string inner = "code " + AsmPrinter(
-		_printingMode,
-		_dialect,
 		debugData->sourceNames,
 		_debugInfoSelection,
 		_soliditySourceProvider
 	)(code()->root());
 
 	for (auto const& obj: subObjects)
-		inner += "\n" + obj->toString(_dialect, _printingMode, _debugInfoSelection, _soliditySourceProvider);
+		inner += "\n" + obj->toString(_debugInfoSelection, _soliditySourceProvider);
 
 	return
 		debugData->formatUseSrcComment() +
diff --git a/libyul/Object.h b/libyul/Object.h
index fa9ef96eeb..230f97866e 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -54,8 +54,6 @@ struct ObjectNode
 	/// Can be empty since .yul files can also just contain code, without explicitly placing it in an object.
 	std::string name;
 	virtual std::string toString(
-		Dialect const& _dialect,
-		AsmPrinter::TypePrinting printingMode,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const = 0;
@@ -72,8 +70,6 @@ struct Data: public ObjectNode
 	bytes data;
 
 	std::string toString(
-		Dialect const& _dialect,
-		AsmPrinter::TypePrinting printingMode,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const override;
@@ -97,8 +93,6 @@ struct Object: public ObjectNode
 public:
 	/// @returns a (parseable) string representation.
 	std::string toString(
-		Dialect const& _dialect,
-		AsmPrinter::TypePrinting printingMode = AsmPrinter::TypePrinting::Full,
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const override;
diff --git a/libyul/ObjectOptimizer.cpp b/libyul/ObjectOptimizer.cpp
index eaaac97d56..3694367c5e 100644
--- a/libyul/ObjectOptimizer.cpp
+++ b/libyul/ObjectOptimizer.cpp
@@ -142,8 +142,6 @@ std::optional<h256> ObjectOptimizer::calculateCacheKey(
 )
 {
 	AsmPrinter asmPrinter(
-		AsmPrinter::TypePrinting::OmitDefault,
-		languageToDialect(_settings.language, _settings.evmVersion),
 		_debugData.sourceNames,
 		DebugInfoSelection::All()
 	);
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index eac84ae3a1..1f57eda48c 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -351,8 +351,6 @@ std::string YulStack::print(
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->hasCode(), "");
 	return m_parserResult->toString(
-		languageToDialect(m_language, m_evmVersion),
-		AsmPrinter::TypePrinting::OmitDefault,
 		m_debugInfoSelection,
 		_soliditySourceProvider
 	) + "\n";
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 2d0dbb4679..2bd505a1c8 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -72,8 +72,7 @@ void removeEmptyCasesFromSwitch(Switch& _switchStmt)
 
 void ControlFlowSimplifier::run(OptimiserStepContext& _context, Block& _ast)
 {
-	TypeInfo typeInfo(_context.dialect, _ast);
-	ControlFlowSimplifier{_context.dialect, typeInfo}(_ast);
+	ControlFlowSimplifier{_context.dialect}(_ast);
 }
 
 void ControlFlowSimplifier::operator()(Block& _block)
diff --git a/libyul/optimiser/ControlFlowSimplifier.h b/libyul/optimiser/ControlFlowSimplifier.h
index 3ebbe7c9ae..0f0e725cd0 100644
--- a/libyul/optimiser/ControlFlowSimplifier.h
+++ b/libyul/optimiser/ControlFlowSimplifier.h
@@ -63,9 +63,8 @@ class ControlFlowSimplifier: public ASTModifier
 	void visit(Statement& _st) override;
 
 private:
-	ControlFlowSimplifier(Dialect const& _dialect, TypeInfo const& _typeInfo):
-		m_dialect(_dialect),
-		m_typeInfo(_typeInfo)
+	explicit ControlFlowSimplifier(Dialect const& _dialect):
+		m_dialect(_dialect)
 	{}
 
 	void simplify(std::vector<Statement>& _statements);
@@ -74,7 +73,6 @@ class ControlFlowSimplifier: public ASTModifier
 	std::optional<std::vector<Statement>> reduceSingleCaseSwitch(Switch& _switchStmt) const;
 
 	Dialect const& m_dialect;
-	TypeInfo const& m_typeInfo;
 	size_t m_numBreakStatements = 0;
 	size_t m_numContinueStatements = 0;
 };
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index a06f48a7f2..d7043e42f3 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -520,7 +520,7 @@ void OptimiserSuite::runSequence(std::vector<std::string> const& _steps, Block&
 			else
 			{
 				std::cout << "== Running " << step << " changed the AST." << std::endl;
-				std::cout << AsmPrinter{AsmPrinter::TypePrinting::Full, m_context.dialect}(_ast) << std::endl;
+				std::cout << AsmPrinter{}(_ast) << std::endl;
 				copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
 			}
 		}
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index a0c00c90d7..8980adcb18 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -96,9 +96,7 @@ yul::Block yul::test::disambiguate(std::string const& _source)
 
 std::string yul::test::format(std::string const& _source)
 {
-	auto const version = solidity::test::CommonOptions::get().evmVersion();
-	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(version);
-	return yul::AsmPrinter(yul::AsmPrinter::TypePrinting::Full, dialect)(parse(_source).first->root());
+	return yul::AsmPrinter()(parse(_source).first->root());
 }
 
 namespace
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 048eb7145d..7f2f5815a6 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -81,9 +81,9 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 	auto optimizedObject = tester.optimizedObject();
 	std::string printedOptimizedObject;
 	if (optimizedObject->subObjects.empty())
-		printedOptimizedObject = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, *m_dialect}(optimizedObject->code()->root());
+		printedOptimizedObject = AsmPrinter{}(optimizedObject->code()->root());
 	else
-		printedOptimizedObject = optimizedObject->toString(*m_dialect);
+		printedOptimizedObject = optimizedObject->toString();
 
 	// Re-parse new code for compilability
 	if (!std::get<0>(parse(_stream, _linePrefix, _formatted, printedOptimizedObject)))
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index faab89e792..891f39c433 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -180,7 +180,7 @@ class YulOpti
 		parse(_source);
 		disambiguate();
 		OptimiserSuite{m_context}.runSequence(_steps, *m_astRoot);
-		std::cout << AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_astRoot) << std::endl;
+		std::cout << AsmPrinter{}(*m_astRoot) << std::endl;
 	}
 
 	void runInteractive(std::string _source, bool _disambiguated = false)
@@ -228,7 +228,7 @@ class YulOpti
 							*m_astRoot
 						);
 				}
-				_source = AsmPrinter{AsmPrinter::TypePrinting::OmitDefault, m_dialect}(*m_astRoot);
+				_source = AsmPrinter{}(*m_astRoot);
 			}
 			catch (...)
 			{
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 14b6406493..bb9eebc4ba 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -105,7 +105,7 @@ void Program::optimise(std::vector<std::string> const& _optimisationSteps)
 
 std::ostream& phaser::operator<<(std::ostream& _stream, Program const& _program)
 {
-	return _stream << AsmPrinter(AsmPrinter::TypePrinting::Full, _program.m_dialect)(_program.m_ast->root());
+	return _stream << AsmPrinter()(_program.m_ast->root());
 }
 
 std::string Program::toJson() const

From 0d0f2771654b14ee0e8d317a5eb22dbff8eab332 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:19:02 +0200
Subject: [PATCH 1020/1140] Yul: Remove types from AST

---
 Changelog.md                                  |   1 +
 libsolidity/analysis/ReferencesResolver.cpp   |   2 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |   2 +-
 libyul/AST.h                                  |  12 +-
 libyul/ASTForward.h                           |   2 +-
 libyul/AsmAnalysis.cpp                        | 178 ++----
 libyul/AsmAnalysis.h                          |  20 +-
 libyul/AsmJsonConverter.cpp                   |   6 +-
 libyul/AsmJsonConverter.h                     |   2 +-
 libyul/AsmJsonImporter.cpp                    |  20 +-
 libyul/AsmJsonImporter.h                      |   2 +-
 libyul/AsmParser.cpp                          |  30 +-
 libyul/AsmParser.h                            |   3 +-
 libyul/AsmPrinter.cpp                         |  23 +-
 libyul/AsmPrinter.h                           |   5 +-
 libyul/CMakeLists.txt                         |   2 -
 libyul/Dialect.cpp                            |   2 +-
 libyul/Scope.cpp                              |   7 +-
 libyul/Scope.h                                |  13 +-
 libyul/ScopeFiller.cpp                        |  12 +-
 libyul/ScopeFiller.h                          |   4 +-
 libyul/Utilities.cpp                          |   4 +-
 libyul/backends/evm/ConstantOptimiser.cpp     |   2 +-
 .../backends/evm/ControlFlowGraphBuilder.cpp  |   6 +-
 libyul/backends/evm/EVMCodeTransform.cpp      |  14 +-
 libyul/backends/evm/EVMCodeTransform.h        |   4 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |  12 +-
 libyul/optimiser/ASTCopier.cpp                |   4 +-
 libyul/optimiser/ASTCopier.h                  |   2 +-
 libyul/optimiser/BlockHasher.cpp              |   1 -
 libyul/optimiser/ControlFlowSimplifier.cpp    |   1 -
 libyul/optimiser/ControlFlowSimplifier.h      |   1 -
 libyul/optimiser/DataFlowAnalyzer.h           |   2 +-
 libyul/optimiser/ExpressionSimplifier.cpp     |   2 +-
 libyul/optimiser/ExpressionSplitter.cpp       |   8 +-
 libyul/optimiser/ExpressionSplitter.h         |   8 +-
 libyul/optimiser/ForLoopConditionIntoBody.cpp |   3 +-
 libyul/optimiser/FullInliner.cpp              |   4 +-
 libyul/optimiser/FunctionSpecializer.cpp      |   2 +-
 libyul/optimiser/LoadResolver.cpp             |   6 +-
 libyul/optimiser/NameDisplacer.cpp            |   2 +-
 libyul/optimiser/NameSimplifier.cpp           |   4 +-
 libyul/optimiser/NameSimplifier.h             |   2 +-
 libyul/optimiser/SSATransform.cpp             |  36 +-
 libyul/optimiser/SSAValueTracker.h            |   2 +-
 libyul/optimiser/SimplificationRules.cpp      |   2 +-
 libyul/optimiser/StackLimitEvader.cpp         |   2 +-
 libyul/optimiser/StackToMemoryMover.cpp       |  31 +-
 libyul/optimiser/StackToMemoryMover.h         |   6 +-
 libyul/optimiser/SyntacticalEquality.cpp      |  11 +-
 libyul/optimiser/SyntacticalEquality.h        |   2 +-
 libyul/optimiser/TypeInfo.cpp                 | 103 ----
 libyul/optimiser/TypeInfo.h                   |  65 ---
 libyul/optimiser/UnusedFunctionsCommon.cpp    |   7 +-
 libyul/optimiser/UnusedPruner.cpp             |   2 +-
 libyul/optimiser/UnusedStoreEliminator.cpp    |   6 +-
 libyul/optimiser/VarNameCleaner.cpp           |  14 +-
 libyul/optimiser/VarNameCleaner.h             |   2 +-
 test/libyul/StackShufflingTest.cpp            |   4 +-
 test/libyul/YulOptimizerTestCommon.cpp        |   4 +-
 test/libyul/yulSyntaxTests/invalid_type.yul   |   2 +-
 test/libyul/yulSyntaxTests/invalid_type2.yul  |   3 +-
 test/libyul/yulSyntaxTests/invalid_type3.yul  |   4 +-
 test/libyul/yulSyntaxTests/invalid_type4.yul  |   3 +-
 .../yulSyntaxTests/literal_invalid_type.yul   |   4 +-
 .../more_than_256_analysis_errors.yul         | 512 +++++++++---------
 66 files changed, 481 insertions(+), 788 deletions(-)
 delete mode 100644 libyul/optimiser/TypeInfo.cpp
 delete mode 100644 libyul/optimiser/TypeInfo.h

diff --git a/Changelog.md b/Changelog.md
index 288136dd91..04bfa92953 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Compiler Features:
  * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Standard JSON Interface: Add ``transientStorageLayout`` output.
  * Yul: Drop the deprecated typed Yul dialect that was only accessible via ``--yul`` in the CLI.
+ * Yul: The presence of types in untyped Yul dialects is now a parser error.
  * Yul Optimizer: Caching of optimized IR to speed up optimization of contracts with bytecode dependencies.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
  * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index bb3b20e93a..079bbf33ce 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -272,7 +272,7 @@ void ReferencesResolver::operator()(yul::FunctionDefinition const& _function)
 {
 	solAssert(nativeLocationOf(_function) == originLocationOf(_function), "");
 	validateYulIdentifierName(_function.name, nativeLocationOf(_function));
-	for (yul::TypedName const& varName: _function.parameters + _function.returnVariables)
+	for (yul::NameWithDebugData const& varName: _function.parameters + _function.returnVariables)
 	{
 		solAssert(nativeLocationOf(varName) == originLocationOf(varName), "");
 		validateYulIdentifierName(varName.name, nativeLocationOf(varName));
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 5fed99d21f..c3cd69f43e 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -204,7 +204,7 @@ struct CopyTranslate: public yul::ASTCopier
 			solAssert(false);
 
 		if (isDigit(value.front()))
-			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::valueOfNumberLiteral(value), {}};
+			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::valueOfNumberLiteral(value)};
 		else
 			return yul::Identifier{_identifier.debugData, yul::YulName{value}};
 	}
diff --git a/libyul/AST.h b/libyul/AST.h
index 6b9682580c..f51846280a 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -36,10 +36,8 @@
 namespace solidity::yul
 {
 
-using Type = YulName;
-
-struct TypedName { langutil::DebugData::ConstPtr debugData; YulName name; Type type; };
-using TypedNameList = std::vector<TypedName>;
+struct NameWithDebugData { langutil::DebugData::ConstPtr debugData; YulName name; };
+using NameWithDebugDataList = std::vector<NameWithDebugData>;
 
 /// Literal number or string (up to 32 bytes)
 enum class LiteralKind { Number, Boolean, String };
@@ -68,7 +66,7 @@ class LiteralValue {
 	std::optional<Data> m_numericValue;
 	std::shared_ptr<std::string> m_stringValue;
 };
-struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; LiteralValue value; Type type; };
+struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; LiteralValue value; };
 /// External / internal identifier or label reference
 struct Identifier { langutil::DebugData::ConstPtr debugData; YulName name; };
 /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
@@ -82,11 +80,11 @@ struct FunctionCall { langutil::DebugData::ConstPtr debugData; Identifier functi
 /// Statement that contains only a single expression
 struct ExpressionStatement { langutil::DebugData::ConstPtr debugData; Expression expression; };
 /// Block-scope variable declaration ("let x:u256 := mload(20:u256)"), non-hoisted
-struct VariableDeclaration { langutil::DebugData::ConstPtr debugData; TypedNameList variables; std::unique_ptr<Expression> value; };
+struct VariableDeclaration { langutil::DebugData::ConstPtr debugData; NameWithDebugDataList variables; std::unique_ptr<Expression> value; };
 /// Block that creates a scope (frees declared stack variables)
 struct Block { langutil::DebugData::ConstPtr debugData; std::vector<Statement> statements; };
 /// Function definition ("function f(a, b) -> (d, e) { ... }")
-struct FunctionDefinition { langutil::DebugData::ConstPtr debugData; YulName name; TypedNameList parameters; TypedNameList returnVariables; Block body; };
+struct FunctionDefinition { langutil::DebugData::ConstPtr debugData; YulName name; NameWithDebugDataList parameters; NameWithDebugDataList returnVariables; Block body; };
 /// Conditional execution without "else" part.
 struct If { langutil::DebugData::ConstPtr debugData; std::unique_ptr<Expression> condition; Block body; };
 /// Switch case or default case
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
index f6fa093877..8aba4f248c 100644
--- a/libyul/ASTForward.h
+++ b/libyul/ASTForward.h
@@ -48,7 +48,7 @@ struct ExpressionStatement;
 struct Block;
 class AST;
 
-struct TypedName;
+struct NameWithDebugData;
 
 using Expression = std::variant<FunctionCall, Identifier, Literal>;
 using Statement = std::variant<ExpressionStatement, Assignment, VariableDeclaration, FunctionDefinition, If, Switch, ForLoop, Break, Continue, Leave, Block>;
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 908e30e629..d039b3b47c 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -109,9 +109,8 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(
 	return analysisInfo;
 }
 
-std::vector<YulName> AsmAnalyzer::operator()(Literal const& _literal)
+size_t AsmAnalyzer::operator()(Literal const& _literal)
 {
-	expectValidType(_literal.type, nativeLocationOf(_literal));
 	bool erroneousLiteralValue = false;
 	if (_literal.kind == LiteralKind::String && !_literal.value.unlimited() && _literal.value.hint() && _literal.value.hint()->size() > 32)
 	{
@@ -128,22 +127,14 @@ std::vector<YulName> AsmAnalyzer::operator()(Literal const& _literal)
 		m_errorReporter.typeError(6708_error, nativeLocationOf(_literal), "Number literal too large (> 256 bits)");
 	}
 
-	if (_literal.kind == LiteralKind::Boolean && !_literal.type.empty())
-		m_errorReporter.typeError(
-			5170_error,
-			nativeLocationOf(_literal),
-			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + formatLiteral(_literal) + "\"."
-		);
-
 	yulAssert(erroneousLiteralValue ^ validLiteral(_literal), "Invalid literal after validating it through AsmAnalyzer.");
-	return {_literal.type};
+	return 1;
 }
 
-std::vector<YulName> AsmAnalyzer::operator()(Identifier const& _identifier)
+size_t AsmAnalyzer::operator()(Identifier const& _identifier)
 {
 	yulAssert(!_identifier.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	YulName type{};
 
 	if (m_currentScope->lookup(_identifier.name, GenericVisitor{
 		[&](Scope::Variable const& _var)
@@ -154,7 +145,6 @@ std::vector<YulName> AsmAnalyzer::operator()(Identifier const& _identifier)
 					nativeLocationOf(_identifier),
 					"Variable " + _identifier.name.str() + " used before it was declared."
 				);
-			type = _var.type;
 		},
 		[&](Scope::Function const&)
 		{
@@ -191,21 +181,21 @@ std::vector<YulName> AsmAnalyzer::operator()(Identifier const& _identifier)
 
 	}
 
-	return {type};
+	return 1;
 }
 
 void AsmAnalyzer::operator()(ExpressionStatement const& _statement)
 {
 	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulName> types = std::visit(*this, _statement.expression);
-	if (watcher.ok() && !types.empty())
+	size_t numReturns = std::visit(*this, _statement.expression);
+	if (watcher.ok() && numReturns > 0)
 		m_errorReporter.typeError(
 			3083_error,
 			nativeLocationOf(_statement),
 			"Top-level expressions are not supposed to return values (this expression returns " +
-			std::to_string(types.size()) +
+			std::to_string(numReturns) +
 			" value" +
-			(types.size() == 1 ? "" : "s") +
+			(numReturns == 1 ? "" : "s") +
 			"). Use ``pop()`` or assign them."
 		);
 }
@@ -227,9 +217,9 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 				" occurs multiple times on the left-hand side of the assignment."
 			);
 
-	std::vector<YulName> types = std::visit(*this, *_assignment.value);
+	size_t numRhsValues = std::visit(*this, *_assignment.value);
 
-	if (types.size() != numVariables)
+	if (numRhsValues != numVariables)
 		m_errorReporter.declarationError(
 			8678_error,
 			nativeLocationOf(_assignment),
@@ -238,13 +228,12 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 			"\" does not match number of values (" +
 			std::to_string(numVariables) +
 			" vs. " +
-			std::to_string(types.size()) +
+			std::to_string(numRhsValues) +
 			")"
 		);
 
 	for (size_t i = 0; i < numVariables; ++i)
-		if (i < types.size())
-			checkAssignment(_assignment.variableNames[i], types[i]);
+		checkAssignment(_assignment.variableNames[i]);
 }
 
 void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
@@ -261,13 +250,12 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 	for (auto const& variable: _varDecl.variables)
 	{
 		expectValidIdentifier(variable.name, nativeLocationOf(variable));
-		expectValidType(variable.type, nativeLocationOf(variable));
 	}
 
 	if (_varDecl.value)
 	{
-		std::vector<YulName> types = std::visit(*this, *_varDecl.value);
-		if (types.size() != numVariables)
+		size_t numValues = std::visit(*this, *_varDecl.value);
+		if (numValues != numVariables)
 			m_errorReporter.declarationError(
 				3812_error,
 				nativeLocationOf(_varDecl),
@@ -276,26 +264,12 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 				+ "\": " +
 				std::to_string(numVariables) +
 				" variables and " +
-				std::to_string(types.size()) +
+				std::to_string(numValues) +
 				" values."
 			);
-
-		for (size_t i = 0; i < _varDecl.variables.size(); ++i)
-		{
-			YulName givenType{};
-			if (i < types.size())
-				givenType = types[i];
-			TypedName const& variable = _varDecl.variables[i];
-			if (variable.type != givenType)
-				m_errorReporter.typeError(
-					3947_error,
-					nativeLocationOf(variable),
-					"Assigning value of type \"" + givenType.str() + "\" to variable of type \"" + variable.type.str() + "\"."
-				);
-		}
 	}
 
-	for (TypedName const& variable: _varDecl.variables)
+	for (NameWithDebugData const& variable: _varDecl.variables)
 		m_activeVariables.insert(&std::get<Scope::Variable>(
 			m_currentScope->identifiers.at(variable.name))
 		);
@@ -311,19 +285,18 @@ void AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
 	for (auto const& var: _funDef.parameters + _funDef.returnVariables)
 	{
 		expectValidIdentifier(var.name, nativeLocationOf(var));
-		expectValidType(var.type, nativeLocationOf(var));
 		m_activeVariables.insert(&std::get<Scope::Variable>(varScope.identifiers.at(var.name)));
 	}
 
 	(*this)(_funDef.body);
 }
 
-std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
+size_t AsmAnalyzer::operator()(FunctionCall const& _funCall)
 {
 	yulAssert(!_funCall.functionName.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	std::vector<YulName> const* parameterTypes = nullptr;
-	std::vector<YulName> const* returnTypes = nullptr;
+	std::optional<size_t> numParameters;
+	std::optional<size_t> numReturns;
 	std::vector<std::optional<LiteralKind>> const* literalArguments = nullptr;
 
 	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
@@ -354,8 +327,8 @@ std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				"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;
+		numParameters = f->parameters.size();
+		numReturns = f->returns.size();
 		if (!f->literalArguments.empty())
 			literalArguments = &f->literalArguments;
 
@@ -373,8 +346,8 @@ std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 		},
 		[&](Scope::Function const& _fun)
 		{
-			parameterTypes = &_fun.arguments;
-			returnTypes = &_fun.returns;
+			numParameters = _fun.numArguments;
+			numReturns = _fun.numReturns;
 		}
 	}))
 	{
@@ -397,17 +370,17 @@ std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 		yulAssert(!watcher.ok(), "Expected a reported error.");
 	}
 
-	if (parameterTypes && _funCall.arguments.size() != parameterTypes->size())
+	if (numParameters && _funCall.arguments.size() != *numParameters)
 		m_errorReporter.typeError(
 			7000_error,
 			nativeLocationOf(_funCall.functionName),
 			"Function \"" + _funCall.functionName.name.str() + "\" expects " +
-			std::to_string(parameterTypes->size()) +
+			std::to_string(*numParameters) +
 			" arguments but got " +
 			std::to_string(_funCall.arguments.size()) + "."
 		);
 
-	std::vector<YulName> argTypes;
+	size_t numArgs{0};
 	for (size_t i = _funCall.arguments.size(); i > 0; i--)
 	{
 		Expression const& arg = _funCall.arguments[i - 1];
@@ -453,33 +426,30 @@ std::vector<YulName> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 							"The \"verbatim_*\" builtins cannot be used with empty bytecode."
 						);
 				}
-				argTypes.emplace_back(expectUnlimitedStringLiteral(std::get<Literal>(arg)));
+				expectUnlimitedStringLiteral(std::get<Literal>(arg));
+				++numArgs;
 				continue;
 			}
 		}
-		argTypes.emplace_back(expectExpression(arg));
+		expectExpression(arg);
+		++numArgs;
 	}
-	std::reverse(argTypes.begin(), argTypes.end());
-
-	if (parameterTypes && parameterTypes->size() == argTypes.size())
-		for (size_t i = 0; i < parameterTypes->size(); ++i)
-			expectType((*parameterTypes)[i], argTypes[i], nativeLocationOf(_funCall.arguments[i]));
 
 	if (watcher.ok())
 	{
-		yulAssert(parameterTypes && parameterTypes->size() == argTypes.size(), "");
-		yulAssert(returnTypes, "");
-		return *returnTypes;
+		yulAssert(numParameters && numParameters == numArgs, "");
+		yulAssert(numReturns, "");
+		return *numReturns;
 	}
-	else if (returnTypes)
-		return std::vector<YulName>(returnTypes->size(), YulName{});
+	else if (numReturns)
+		return *numReturns;
 	else
 		return {};
 }
 
 void AsmAnalyzer::operator()(If const& _if)
 {
-	expectBoolExpression(*_if.condition);
+	expectExpression(*_if.condition);
 
 	(*this)(_if.body);
 }
@@ -495,7 +465,7 @@ void AsmAnalyzer::operator()(Switch const& _switch)
 			"\"switch\" statement with only a default case."
 		);
 
-	YulName valueType = expectExpression(*_switch.expression);
+	expectExpression(*_switch.expression);
 
 	std::set<u256> cases;
 	for (auto const& _case: _switch.cases)
@@ -504,8 +474,6 @@ void AsmAnalyzer::operator()(Switch const& _switch)
 		{
 			auto watcher = m_errorReporter.errorWatcher();
 
-			expectType(valueType, _case.value->type, nativeLocationOf(*_case.value));
-
 			// We cannot use "expectExpression" here because *_case.value is not an
 			// Expression and would be converted to an Expression otherwise.
 			(*this)(*_case.value);
@@ -537,7 +505,7 @@ void AsmAnalyzer::operator()(ForLoop const& _for)
 	// condition, the body and the post part inside.
 	m_currentScope = &scope(&_for.pre);
 
-	expectBoolExpression(*_for.condition);
+	expectExpression(*_for.condition);
 	// backup outer for-loop & create new state
 	auto outerForLoop = m_currentForLoop;
 	m_currentForLoop = &_for;
@@ -560,50 +528,30 @@ void AsmAnalyzer::operator()(Block const& _block)
 	m_currentScope = previousScope;
 }
 
-YulName AsmAnalyzer::expectExpression(Expression const& _expr)
+void AsmAnalyzer::expectExpression(Expression const& _expr)
 {
-	std::vector<YulName> types = std::visit(*this, _expr);
-	if (types.size() != 1)
+	size_t numValues = std::visit(*this, _expr);
+	if (numValues != 1)
 		m_errorReporter.typeError(
 			3950_error,
 			nativeLocationOf(_expr),
 			"Expected expression to evaluate to one value, but got " +
-			std::to_string(types.size()) +
+			std::to_string(numValues) +
 			" values instead."
 		);
-	return types.empty() ? YulName{} : types.front();
 }
 
-YulName AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
+void AsmAnalyzer::expectUnlimitedStringLiteral(Literal const& _literal)
 {
 	yulAssert(_literal.kind == LiteralKind::String);
-	yulAssert(_literal.type.empty());
 	yulAssert(_literal.value.unlimited());
-
-	return {_literal.type};
-}
-
-void AsmAnalyzer::expectBoolExpression(Expression const& _expr)
-{
-	YulName type = expectExpression(_expr);
-	static YulName boolType = {};
-	if (type != boolType)
-		m_errorReporter.typeError(
-			1733_error,
-			nativeLocationOf(_expr),
-			"Expected a value of boolean type \"" +
-			boolType.str() +
-			"\" but got \"" +
-			type.str() +
-			"\""
-		);
 }
 
-void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueType)
+void AsmAnalyzer::checkAssignment(Identifier const& _variable)
 {
 	yulAssert(!_variable.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	std::optional<YulName> variableType = std::nullopt;
+	bool hasVariable = false;
 	bool found = false;
 	if (Scope::Identifier const* var = m_currentScope->lookup(_variable.name))
 	{
@@ -624,7 +572,7 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueTyp
 				"Variable " + _variable.name.str() + " used before it was declared."
 			);
 		else
-			variableType = std::get<Scope::Variable>(*var).type;
+			hasVariable = true;
 		found = true;
 	}
 	else if (m_resolver)
@@ -633,25 +581,15 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulName _valueTyp
 		if (m_resolver(_variable, yul::IdentifierContext::LValue, insideFunction))
 		{
 			found = true;
-			variableType = YulName{};
+			hasVariable = true;
 		}
 	}
 
 	if (!found && watcher.ok())
 		// Only add message if the callback did not.
 		m_errorReporter.declarationError(4634_error, nativeLocationOf(_variable), "Variable not found or variable not lvalue.");
-	if (variableType && *variableType != _valueType)
-		m_errorReporter.typeError(
-			9547_error,
-			nativeLocationOf(_variable),
-			"Assigning a value of type \"" +
-			_valueType.str() +
-			"\" to a variable of type \"" +
-			variableType->str() +
-			"\"."
-		);
 
-	yulAssert(!watcher.ok() || variableType, "");
+	yulAssert(!watcher.ok() || hasVariable, "");
 }
 
 Scope& AsmAnalyzer::scope(Block const* _block)
@@ -687,26 +625,6 @@ void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation cons
 		);
 }
 
-void AsmAnalyzer::expectValidType(YulName _type, SourceLocation const& _location)
-{
-	if (!_type.empty())
-		m_errorReporter.typeError(
-			5473_error,
-			_location,
-			fmt::format("\"{}\" is not a valid type (user defined types are not yet supported).", _type.str())
-		);
-}
-
-void AsmAnalyzer::expectType(YulName _expectedType, YulName _givenType, SourceLocation const& _location)
-{
-	if (_expectedType != _givenType)
-		m_errorReporter.typeError(
-			3781_error,
-			_location,
-			fmt::format("Expected a value of type \"{}\" but got \"{}\".", _expectedType.str(), _givenType.str())
-		);
-}
-
 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.
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index d479a9970d..d01ecc1901 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -84,13 +84,13 @@ class AsmAnalyzer
 		std::set<std::string> const& _qualifiedDataNames
 	);
 
-	std::vector<YulName> operator()(Literal const& _literal);
-	std::vector<YulName> operator()(Identifier const&);
+	size_t operator()(Literal const& _literal);
+	size_t operator()(Identifier const&);
 	void operator()(ExpressionStatement const&);
 	void operator()(Assignment const& _assignment);
 	void operator()(VariableDeclaration const& _variableDeclaration);
 	void operator()(FunctionDefinition const& _functionDefinition);
-	std::vector<YulName> operator()(FunctionCall const& _functionCall);
+	size_t operator()(FunctionCall const& _functionCall);
 	void operator()(If const& _if);
 	void operator()(Switch const& _switch);
 	void operator()(ForLoop const& _forLoop);
@@ -104,20 +104,14 @@ class AsmAnalyzer
 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.
-	YulName expectExpression(Expression const& _expr);
-	YulName expectUnlimitedStringLiteral(Literal const& _literal);
-	/// Visits the expression and expects it to return a single boolean value.
-	/// Reports an error otherwise.
-	void expectBoolExpression(Expression const& _expr);
+	void expectExpression(Expression const& _expr);
+	void expectUnlimitedStringLiteral(Literal const& _literal);
 
-	/// Verifies that a variable to be assigned to exists, can be assigned to
-	/// and has the same type as the value.
-	void checkAssignment(Identifier const& _variable, YulName _valueType);
+	/// Verifies that a variable to be assigned to exists and can be assigned to.
+	void checkAssignment(Identifier const& _variable);
 
 	Scope& scope(Block const* _block);
 	void expectValidIdentifier(YulName _identifier, langutil::SourceLocation const& _location);
-	void expectValidType(YulName _type, langutil::SourceLocation const& _location);
-	void expectType(YulName _expectedType, YulName _givenType, langutil::SourceLocation const& _location);
 
 	bool validateInstructions(evmasm::Instruction _instr, langutil::SourceLocation const& _location);
 	bool validateInstructions(std::string const& _instrIdentifier, langutil::SourceLocation const& _location);
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index 6047549754..d85b96f8f9 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -37,12 +37,12 @@ Json AsmJsonConverter::operator()(Block const& _node) const
 	return ret;
 }
 
-Json AsmJsonConverter::operator()(TypedName const& _node) const
+Json AsmJsonConverter::operator()(NameWithDebugData const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid variable name.");
 	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
 	ret["name"] = _node.name.str();
-	ret["type"] = _node.type.str();
+	ret["type"] = "";
 	return ret;
 }
 
@@ -63,7 +63,7 @@ Json AsmJsonConverter::operator()(Literal const& _node) const
 		ret["hexValue"] = util::toHex(util::asBytes(formatLiteral(_node)));
 		break;
 	}
-	ret["type"] = _node.type.str();
+	ret["type"] = "";
 	{
 		auto const formattedLiteral = formatLiteral(_node);
 		if (util::validateUTF8(formattedLiteral))
diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
index 9c4b5d5e8e..523825830f 100644
--- a/libyul/AsmJsonConverter.h
+++ b/libyul/AsmJsonConverter.h
@@ -44,7 +44,7 @@ class AsmJsonConverter: public boost::static_visitor<Json>
 	explicit AsmJsonConverter(std::optional<size_t> _sourceIndex): m_sourceIndex(_sourceIndex) {}
 
 	Json operator()(Block const& _node) const;
-	Json operator()(TypedName const& _node) const;
+	Json operator()(NameWithDebugData const& _node) const;
 	Json operator()(Literal const& _node) const;
 	Json operator()(Identifier const& _node) const;
 	Json operator()(Assignment const& _node) const;
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 65ff22999b..6de7bb6abc 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -74,12 +74,11 @@ Json AsmJsonImporter::member(Json const& _node, std::string const& _name)
 	return _node[_name];
 }
 
-TypedName AsmJsonImporter::createTypedName(Json const& _node)
+NameWithDebugData AsmJsonImporter::createNameWithDebugData(Json const& _node)
 {
-	auto typedName = createAsmNode<TypedName>(_node);
-	typedName.type = YulName{member(_node, "type").get<std::string>()};
-	typedName.name = YulName{member(_node, "name").get<std::string>()};
-	return typedName;
+	auto nameWithDebugData = createAsmNode<NameWithDebugData>(_node);
+	nameWithDebugData.name = YulName{member(_node, "name").get<std::string>()};
+	return nameWithDebugData;
 }
 
 Statement AsmJsonImporter::createStatement(Json const& _node)
@@ -176,7 +175,10 @@ Literal AsmJsonImporter::createLiteral(Json const& _node)
 		value = util::asString(util::fromHex(member(_node, "hexValue").get<std::string>()));
 	else
 		value = member(_node, "value").get<std::string>();
-	lit.type = YulName{member(_node, "type").get<std::string>()};
+	{
+		auto const typeNode = member(_node, "type");
+		yulAssert(typeNode.empty() || typeNode.get<std::string>().empty());
+	}
 	if (kind == "number")
 	{
 		langutil::CharStream charStream(value, "");
@@ -263,7 +265,7 @@ VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json const& _node
 {
 	auto varDec = createAsmNode<VariableDeclaration>(_node);
 	for (auto const& var: member(_node, "variables"))
-		varDec.variables.emplace_back(createTypedName(var));
+		varDec.variables.emplace_back(createNameWithDebugData(var));
 
 	if (_node.contains("value"))
 		varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
@@ -278,11 +280,11 @@ FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json const& _node)
 
 	if (_node.contains("parameters"))
 		for (auto const& var: member(_node, "parameters"))
-			funcDef.parameters.emplace_back(createTypedName(var));
+			funcDef.parameters.emplace_back(createNameWithDebugData(var));
 
 	if (_node.contains("returnVariables"))
 		for (auto const& var: member(_node, "returnVariables"))
-			funcDef.returnVariables.emplace_back(createTypedName(var));
+			funcDef.returnVariables.emplace_back(createNameWithDebugData(var));
 
 	funcDef.body = createBlock(member(_node, "body"));
 	return funcDef;
diff --git a/libyul/AsmJsonImporter.h b/libyul/AsmJsonImporter.h
index d835e99e39..f3df8c178e 100644
--- a/libyul/AsmJsonImporter.h
+++ b/libyul/AsmJsonImporter.h
@@ -57,7 +57,7 @@ class AsmJsonImporter
 	std::vector<yul::Statement> createStatementVector(Json const& _array);
 	std::vector<yul::Expression> createExpressionVector(Json const& _array);
 
-	yul::TypedName createTypedName(Json const& _node);
+	yul::NameWithDebugData createNameWithDebugData(Json const& _node);
 	yul::Literal createLiteral(Json const& _node);
 	yul::Leave createLeave(Json const& _node);
 	yul::Identifier createIdentifier(Json const& _node);
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index a2a4c36dc0..bd890c4aaa 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -567,18 +567,20 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimit
 			break;
 		}
 
+		auto const beginOfLiteralLoc = currentLocation();
 		Literal literal{
 			createDebugData(),
 			kind,
-			valueOfLiteral(currentLiteral(), kind, _unlimitedLiteralArgument && kind == LiteralKind::String),
-			{}
+			valueOfLiteral(currentLiteral(), kind, _unlimitedLiteralArgument && kind == LiteralKind::String)
 		};
 		advance();
 		if (currentToken() == Token::Colon)
 		{
 			expectToken(Token::Colon);
 			updateLocationEndFrom(literal.debugData, currentLocation());
-			literal.type = expectAsmIdentifier();
+			auto const loc = SourceLocation::smallestCovering(beginOfLiteralLoc, currentLocation());
+			std::ignore = expectAsmIdentifier();
+			expectUntyped(loc);
 		}
 
 		return literal;
@@ -599,7 +601,7 @@ VariableDeclaration Parser::parseVariableDeclaration()
 	expectToken(Token::Let);
 	while (true)
 	{
-		varDecl.variables.emplace_back(parseTypedName());
+		varDecl.variables.emplace_back(parseNameWithDebugData());
 		if (currentToken() == Token::Comma)
 			expectToken(Token::Comma);
 		else
@@ -637,7 +639,7 @@ FunctionDefinition Parser::parseFunctionDefinition()
 	expectToken(Token::LParen);
 	while (currentToken() != Token::RParen)
 	{
-		funDef.parameters.emplace_back(parseTypedName());
+		funDef.parameters.emplace_back(parseNameWithDebugData());
 		if (currentToken() == Token::RParen)
 			break;
 		expectToken(Token::Comma);
@@ -648,7 +650,7 @@ FunctionDefinition Parser::parseFunctionDefinition()
 		expectToken(Token::RightArrow);
 		while (true)
 		{
-			funDef.returnVariables.emplace_back(parseTypedName());
+			funDef.returnVariables.emplace_back(parseNameWithDebugData());
 			if (currentToken() == Token::LBrace)
 				break;
 			expectToken(Token::Comma);
@@ -695,19 +697,20 @@ FunctionCall Parser::parseCall(std::variant<Literal, Identifier>&& _initialOp)
 	return ret;
 }
 
-TypedName Parser::parseTypedName()
+NameWithDebugData Parser::parseNameWithDebugData()
 {
 	RecursionGuard recursionGuard(*this);
-	TypedName typedName = createWithDebugData<TypedName>();
+	NameWithDebugData typedName = createWithDebugData<NameWithDebugData>();
+	auto const locNameStart = currentLocation();
 	typedName.name = expectAsmIdentifier();
 	if (currentToken() == Token::Colon)
 	{
 		expectToken(Token::Colon);
 		updateLocationEndFrom(typedName.debugData, currentLocation());
-		typedName.type = expectAsmIdentifier();
+		auto const loc = SourceLocation::smallestCovering(locNameStart, currentLocation());
+		std::ignore = expectAsmIdentifier();
+		expectUntyped(loc);
 	}
-	else
-		typedName.type = {};
 
 	return typedName;
 }
@@ -756,3 +759,8 @@ bool Parser::isValidNumberLiteral(std::string const& _literal)
 	else
 		return _literal.find_first_not_of("0123456789") == std::string::npos;
 }
+
+void Parser::expectUntyped(SourceLocation const& loc)
+{
+	m_errorReporter.parserError(5473_error, loc, "Types are not valid in untyped Yul.");
+}
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index dd206b5b1e..42ed2ca84d 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -145,8 +145,9 @@ class Parser: public langutil::ParserBase
 	VariableDeclaration parseVariableDeclaration();
 	FunctionDefinition parseFunctionDefinition();
 	FunctionCall parseCall(std::variant<Literal, Identifier>&& _initialOp);
-	TypedName parseTypedName();
+	NameWithDebugData parseNameWithDebugData();
 	YulName expectAsmIdentifier();
+	void expectUntyped(langutil::SourceLocation const& loc);
 
 	/// Reports an error if we are currently not inside the body part of a for loop.
 	void checkBreakContinuePosition(std::string const& _which);
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 612cb8ee0f..5841fdfd32 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -24,7 +24,6 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
-#include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>
@@ -54,12 +53,12 @@ std::string AsmPrinter::operator()(Literal const& _literal)
 	{
 	case LiteralKind::Number:
 	case LiteralKind::Boolean:
-		return locationComment + formattedValue + appendTypeName(_literal.type);
+		return locationComment + formattedValue;
 	case LiteralKind::String:
 		break;
 	}
 
-	return locationComment + escapeAndQuoteString(formattedValue) + appendTypeName(_literal.type);
+	return locationComment + escapeAndQuoteString(formattedValue);
 }
 
 std::string AsmPrinter::operator()(Identifier const& _identifier)
@@ -94,7 +93,7 @@ std::string AsmPrinter::operator()(VariableDeclaration const& _variableDeclarati
 	out += "let ";
 	out += boost::algorithm::join(
 		_variableDeclaration.variables | ranges::views::transform(
-			[this](TypedName argument) { return formatTypedName(argument); }
+			[this](NameWithDebugData argument) { return formatNameWithDebugData(argument); }
 		),
 		", "
 	);
@@ -114,7 +113,7 @@ std::string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition
 	out += "function " + _functionDefinition.name.str() + "(";
 	out += boost::algorithm::join(
 		_functionDefinition.parameters | ranges::views::transform(
-			[this](TypedName argument) { return formatTypedName(argument); }
+			[this](NameWithDebugData argument) { return formatNameWithDebugData(argument); }
 		),
 		", "
 	);
@@ -124,7 +123,7 @@ std::string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition
 		out += " -> ";
 		out += boost::algorithm::join(
 			_functionDefinition.returnVariables | ranges::views::transform(
-				[this](TypedName argument) { return formatTypedName(argument); }
+				[this](NameWithDebugData argument) { return formatNameWithDebugData(argument); }
 			),
 			", "
 		);
@@ -236,18 +235,10 @@ std::string AsmPrinter::operator()(Block const& _block)
 	}
 }
 
-std::string AsmPrinter::formatTypedName(TypedName _variable)
+std::string AsmPrinter::formatNameWithDebugData(NameWithDebugData _variable)
 {
 	yulAssert(!_variable.name.empty(), "Invalid variable name.");
-	return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
-}
-
-std::string AsmPrinter::appendTypeName(YulName _type) const
-{
-	if (_type.empty())
-		return {};
-	else
-		return ":" + _type.str();
+	return formatDebugData(_variable) + _variable.name.str();
 }
 
 std::string AsmPrinter::formatSourceLocation(
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
index 05b6fb9d8f..cc17c6a04c 100644
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@@ -36,12 +36,10 @@
 
 namespace solidity::yul
 {
-struct Dialect;
 
 /**
  * Converts a parsed Yul AST into readable string representation.
  * Ignores source locations.
- * If a dialect is provided, the dialect's default type is omitted.
  */
 class AsmPrinter
 {
@@ -82,8 +80,7 @@ class AsmPrinter
 	);
 
 private:
-	std::string formatTypedName(TypedName _variable);
-	std::string appendTypeName(YulName _type) const;
+	std::string formatNameWithDebugData(NameWithDebugData _variable);
 	std::string formatDebugData(langutil::DebugData::ConstPtr const& _debugData, bool _statement);
 	template <class T>
 	std::string formatDebugData(T const& _node)
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index dbf3bfdcd6..d38d5f2700 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -177,8 +177,6 @@ add_library(yul
 	optimiser/Suite.h
 	optimiser/SyntacticalEquality.cpp
 	optimiser/SyntacticalEquality.h
-	optimiser/TypeInfo.cpp
-	optimiser/TypeInfo.h
 	optimiser/UnusedFunctionParameterPruner.cpp
 	optimiser/UnusedFunctionParameterPruner.h
 	optimiser/UnusedFunctionsCommon.h
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index be6c6705ee..06a53ea5f7 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -27,5 +27,5 @@ using namespace solidity::langutil;
 
 Literal Dialect::zeroLiteral() const
 {
-	return {DebugData::create(), LiteralKind::Number, LiteralValue(0, std::nullopt), {}};
+	return {DebugData::create(), LiteralKind::Number, LiteralValue(0, std::nullopt)};
 }
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
index 89bdfc674c..a73b2f9fd0 100644
--- a/libyul/Scope.cpp
+++ b/libyul/Scope.cpp
@@ -25,22 +25,21 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-bool Scope::registerVariable(YulName _name, YulType const& _type)
+bool Scope::registerVariable(YulName _name)
 {
 	if (exists(_name))
 		return false;
 	Variable variable;
-	variable.type = _type;
 	variable.name = _name;
 	identifiers[_name] = variable;
 	return true;
 }
 
-bool Scope::registerFunction(YulName _name, std::vector<YulType> _arguments, std::vector<YulType> _returns)
+bool Scope::registerFunction(YulName _name, size_t _numArguments, size_t _numReturns)
 {
 	if (exists(_name))
 		return false;
-	identifiers[_name] = Function{std::move(_arguments), std::move(_returns), _name};
+	identifiers[_name] = Function{_numArguments, _numReturns, _name};
 	return true;
 }
 
diff --git a/libyul/Scope.h b/libyul/Scope.h
index 0275972900..20850cc56f 100644
--- a/libyul/Scope.h
+++ b/libyul/Scope.h
@@ -35,27 +35,24 @@ namespace solidity::yul
 
 struct Scope
 {
-	using YulType = YulName;
-
 	struct Variable
 	{
-		YulType type;
 		YulName name;
 	};
 	struct Function
 	{
-		std::vector<YulType> arguments;
-		std::vector<YulType> returns;
+		size_t numArguments;
+		size_t numReturns;
 		YulName name;
 	};
 
 	using Identifier = std::variant<Variable, Function>;
 
-	bool registerVariable(YulName _name, YulType const& _type);
+	bool registerVariable(YulName _name);
 	bool registerFunction(
 		YulName _name,
-		std::vector<YulType> _arguments,
-		std::vector<YulType> _returns
+		size_t _numArguments,
+		size_t _numReturns
 	);
 
 	/// Looks up the identifier in this or super scopes and returns a valid pointer if found
diff --git a/libyul/ScopeFiller.cpp b/libyul/ScopeFiller.cpp
index 22c0d17e32..7d65a2e955 100644
--- a/libyul/ScopeFiller.cpp
+++ b/libyul/ScopeFiller.cpp
@@ -133,9 +133,9 @@ bool ScopeFiller::operator()(Block const& _block)
 	return success;
 }
 
-bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const& _location, Scope& _scope)
+bool ScopeFiller::registerVariable(NameWithDebugData const& _name, SourceLocation const& _location, Scope& _scope)
 {
-	if (!_scope.registerVariable(_name.name, _name.type))
+	if (!_scope.registerVariable(_name.name))
 	{
 		//@TODO secondary location
 		m_errorReporter.declarationError(
@@ -150,13 +150,7 @@ bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const&
 
 bool ScopeFiller::registerFunction(FunctionDefinition const& _funDef)
 {
-	std::vector<Scope::YulType> parameters;
-	for (auto const& parameter: _funDef.parameters)
-		parameters.emplace_back(parameter.type);
-	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)))
+	if (!m_currentScope->registerFunction(_funDef.name, _funDef.parameters.size(), _funDef.returnVariables.size()))
 	{
 		//@TODO secondary location
 		m_errorReporter.declarationError(
diff --git a/libyul/ScopeFiller.h b/libyul/ScopeFiller.h
index b439108743..7a4834a483 100644
--- a/libyul/ScopeFiller.h
+++ b/libyul/ScopeFiller.h
@@ -35,7 +35,7 @@ struct SourceLocation;
 namespace solidity::yul
 {
 
-struct TypedName;
+struct NameWithDebugData;
 struct Scope;
 struct AsmAnalysisInfo;
 
@@ -65,7 +65,7 @@ class ScopeFiller
 
 private:
 	bool registerVariable(
-		TypedName const& _name,
+		NameWithDebugData const& _name,
 		langutil::SourceLocation const& _location,
 		Scope& _scope
 	);
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index 6a78441cba..4bbfb42437 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -219,8 +219,8 @@ bool solidity::yul::validBoolLiteral(solidity::yul::Literal const& _literal)
 template<>
 bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const
 {
-	if (std::make_tuple(_lhs.kind, _lhs.type) != std::make_tuple(_rhs.kind, _rhs.type))
-		return std::make_tuple(_lhs.kind, _lhs.type) < std::make_tuple(_rhs.kind, _rhs.type);
+	if (_lhs.kind != _rhs.kind)
+		return _lhs.kind < _rhs.kind;
 
 	if (_lhs.value.unlimited() && _rhs.value.unlimited())
 		yulAssert(
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index 2ab77f84e9..1bb23cbc92 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -179,7 +179,7 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 Representation RepresentationFinder::represent(u256 const& _value) const
 {
 	Representation repr;
-	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, LiteralValue{_value, formatNumber(_value)}, {}});
+	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, LiteralValue{_value, formatNumber(_value)}});
 	repr.cost = m_meter.costs(*repr.expression);
 	return repr;
 }
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 3007566dd5..596c6c9619 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -268,7 +268,7 @@ StackSlot ControlFlowGraphBuilder::operator()(FunctionCall const& _call)
 void ControlFlowGraphBuilder::operator()(VariableDeclaration const& _varDecl)
 {
 	yulAssert(m_currentBlock, "");
-	auto declaredVariables = _varDecl.variables | ranges::views::transform([&](TypedName const& _var) {
+	auto declaredVariables = _varDecl.variables | ranges::views::transform([&](NameWithDebugData const& _var) {
 		return VariableSlot{lookupVariable(_var.name), _var.debugData};
 	}) | ranges::to<std::vector<VariableSlot>>;
 	Stack input;
@@ -337,7 +337,7 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 
 	auto ghostVariableId = m_graph.ghostVariables.size();
 	YulName ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
-	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{""_yulname, ghostVariableName});
+	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{ghostVariableName});
 
 	// Artificially generate:
 	// let <ghostVariable> := <switchExpression>
@@ -548,7 +548,7 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 			// input
 			std::move(inputs),
 			// output
-			ranges::views::iota(0u, function.returns.size()) | ranges::views::transform([&](size_t _i) {
+			ranges::views::iota(0u, function.numReturns) | ranges::views::transform([&](size_t _i) {
 				return TemporarySlot{_call, _i};
 			}) | ranges::to<Stack>,
 			// operation
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 71872a4e8c..6946395654 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -56,7 +56,7 @@ CodeTransform::CodeTransform(
 	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
 	UseNamedLabels _useNamedLabelsForFunctions,
 	std::shared_ptr<Context> _context,
-	std::vector<TypedName> _delayedReturnVariables,
+	std::vector<NameWithDebugData> _delayedReturnVariables,
 	std::optional<AbstractAssembly::LabelID> _functionExitLabel
 ):
 	m_assembly(_assembly),
@@ -249,13 +249,13 @@ void CodeTransform::operator()(FunctionCall const& _call)
 			[&](Scope::Function& _function) { function = &_function; }
 		}), "Function name not found.");
 		yulAssert(function, "");
-		yulAssert(function->arguments.size() == _call.arguments.size(), "");
+		yulAssert(function->numArguments == _call.arguments.size(), "");
 		for (auto const& arg: _call.arguments | ranges::views::reverse)
 			visitExpression(arg);
 		m_assembly.setSourceLocation(originLocationOf(_call));
 		m_assembly.appendJumpTo(
 			functionEntryID(*function),
-			static_cast<int>(function->returns.size()) - static_cast<int>(function->arguments.size()) - 1,
+			static_cast<int>(function->numReturns) - static_cast<int>(function->numArguments) - 1,
 			AbstractAssembly::JumpType::IntoFunction
 		);
 		m_assembly.appendLabel(returnLabel);
@@ -646,10 +646,10 @@ void CodeTransform::setupReturnVariablesAndFunctionExit()
 	}
 
 	// Allocate slots for return variables as if they were declared as variables in the virtual function scope.
-	for (TypedName const& var: m_delayedReturnVariables)
+	for (NameWithDebugData const& var: m_delayedReturnVariables)
 		(*this)(VariableDeclaration{var.debugData, {var}, {}});
 
-	m_functionExitStackHeight = ranges::max(m_delayedReturnVariables | ranges::views::transform([&](TypedName const& _name) {
+	m_functionExitStackHeight = ranges::max(m_delayedReturnVariables | ranges::views::transform([&](NameWithDebugData const& _name) {
 		return variableStackHeight(_name.name);
 	})) + 1;
 	m_delayedReturnVariables.clear();
@@ -658,7 +658,7 @@ void CodeTransform::setupReturnVariablesAndFunctionExit()
 namespace
 {
 
-bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<TypedName> const& _returnVariables)
+bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<NameWithDebugData> const& _returnVariables)
 {
 	if (std::holds_alternative<FunctionDefinition>(_statement))
 		return true;
@@ -668,7 +668,7 @@ bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<
 	)
 	{
 		std::map<YulName, size_t> references = VariableReferencesCounter::countReferences(_statement);
-		auto isReferenced = [&references](TypedName const& _returnVariable) {
+		auto isReferenced = [&references](NameWithDebugData const& _returnVariable) {
 			return references.count(_returnVariable.name);
 		};
 		if (ranges::none_of(_returnVariables, isReferenced))
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index 0e6a9d8be1..c0bbac81b3 100644
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -114,7 +114,7 @@ class CodeTransform
 		ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
 		UseNamedLabels _useNamedLabelsForFunctions,
 		std::shared_ptr<Context> _context,
-		std::vector<TypedName> _delayedReturnVariables,
+		std::vector<NameWithDebugData> _delayedReturnVariables,
 		std::optional<AbstractAssembly::LabelID> _functionExitLabel
 	);
 
@@ -209,7 +209,7 @@ class CodeTransform
 	std::set<int> m_unusedStackSlots;
 
 	/// A list of return variables for which no stack slots have been assigned yet.
-	std::vector<TypedName> m_delayedReturnVariables;
+	std::vector<NameWithDebugData> m_delayedReturnVariables;
 
 	/// Function exit label. Used as jump target for ``leave``.
 	std::optional<AbstractAssembly::LabelID> m_functionExitLabel;
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 7690cf27ca..6395ea64ae 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -70,7 +70,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() + (_call.canContinue ? 1 : 0), "");
+		yulAssert(m_stack.size() >= _call.function.get().numArguments + (_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,
@@ -92,7 +92,7 @@ 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()) - static_cast<int>(_call.function.get().arguments.size()) - (_call.canContinue ? 1 : 0),
+			static_cast<int>(_call.function.get().numReturns) - static_cast<int>(_call.function.get().numArguments) - (_call.canContinue ? 1 : 0),
 			AbstractAssembly::JumpType::IntoFunction
 		);
 		if (_call.canContinue)
@@ -102,10 +102,10 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
 	// Update stack.
 	{
 		// Remove arguments and return label from m_stack.
-		for (size_t i = 0; i < _call.function.get().arguments.size() + (_call.canContinue ? 1 : 0); ++i)
+		for (size_t i = 0; i < _call.function.get().numArguments + (_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()))
+		for (size_t index: ranges::views::iota(0u, _call.function.get().numReturns))
 			m_stack.emplace_back(TemporarySlot{_call.functionCall, index});
 		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
 	}
@@ -196,8 +196,8 @@ OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
 			functionLabels[&functionInfo] = useNamedLabel ?
 				m_assembly.namedLabel(
 					function->name.str(),
-					function->arguments.size(),
-					function->returns.size(),
+					function->numArguments,
+					function->numReturns,
 					functionInfo.debugData ? functionInfo.debugData->astID : std::nullopt
 				) :
 				m_assembly.newLabelId();
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index 8efe29613e..269c7adeed 100644
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -163,9 +163,9 @@ Literal ASTCopier::translate(Literal const& _literal)
 	return _literal;
 }
 
-TypedName ASTCopier::translate(TypedName const& _typedName)
+NameWithDebugData ASTCopier::translate(NameWithDebugData const& _typedName)
 {
-	return TypedName{_typedName.debugData, translateIdentifier(_typedName.name), _typedName.type};
+	return NameWithDebugData{_typedName.debugData, translateIdentifier(_typedName.name)};
 }
 
 YulName FunctionCopier::translateIdentifier(YulName _name)
diff --git a/libyul/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
index 88d2a34510..04b1c96cd2 100644
--- a/libyul/optimiser/ASTCopier.h
+++ b/libyul/optimiser/ASTCopier.h
@@ -100,7 +100,7 @@ class ASTCopier: public ExpressionCopier, public StatementCopier
 	Case translate(Case const& _case);
 	virtual Identifier translate(Identifier const& _identifier);
 	Literal translate(Literal const& _literal);
-	TypedName translate(TypedName const& _typedName);
+	NameWithDebugData translate(NameWithDebugData const& _typedName);
 
 	virtual void enterScope(Block const&) { }
 	virtual void leaveScope(Block const&) { }
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 9d6db20667..5470558ce9 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -48,7 +48,6 @@ void ASTHasherBase::hashLiteral(solidity::yul::Literal const& _literal)
 		hash64(std::hash<u256>{}(_literal.value.value()));
 	else
 		hash64(std::hash<std::string>{}(_literal.value.builtinStringLiteralValue()));
-	hash64(_literal.type.hash());
 	hash8(_literal.value.unlimited());
 }
 
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 2bd505a1c8..c078885e8b 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -18,7 +18,6 @@
 #include <libyul/optimiser/ControlFlowSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/TypeInfo.h>
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
diff --git a/libyul/optimiser/ControlFlowSimplifier.h b/libyul/optimiser/ControlFlowSimplifier.h
index 0f0e725cd0..86ebf296c2 100644
--- a/libyul/optimiser/ControlFlowSimplifier.h
+++ b/libyul/optimiser/ControlFlowSimplifier.h
@@ -24,7 +24,6 @@ namespace solidity::yul
 {
 struct Dialect;
 struct OptimiserStepContext;
-class TypeInfo;
 
 /**
  * Simplifies several control-flow structures:
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 6b23a86b9c..5a4b199cae 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -217,7 +217,7 @@ class DataFlowAnalyzer: public ASTModifier
 	};
 	/// Special expression whose address will be used in m_value.
 	/// YulName does not need to be reset because DataFlowAnalyzer is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue{0, "0"}, {}}};
+	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue{0, std::nullopt}}};
 	/// List of scopes.
 	std::vector<Scope> m_variableScopes;
 };
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 482ade8f87..598d2e9003 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -60,7 +60,7 @@ void ExpressionSimplifier::visit(Expression& _expression)
 						!knownToBeZero(startArgument) &&
 						!std::holds_alternative<FunctionCall>(startArgument)
 					)
-						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, LiteralValue{0, "0"}, {}};
+						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, LiteralValue{0, std::nullopt}};
 				}
 }
 
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index acaa40dbf0..9f9bf958f1 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -23,7 +23,6 @@
 #include <libyul/optimiser/ExpressionSplitter.h>
 
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/TypeInfo.h>
 
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
@@ -37,8 +36,7 @@ using namespace solidity::langutil;
 
 void ExpressionSplitter::run(OptimiserStepContext& _context, Block& _ast)
 {
-	TypeInfo typeInfo(_context.dialect, _ast);
-	ExpressionSplitter{_context.dialect, _context.dispenser, typeInfo}(_ast);
+	ExpressionSplitter{_context.dialect, _context.dispenser}(_ast);
 }
 
 void ExpressionSplitter::operator()(FunctionCall& _funCall)
@@ -100,13 +98,11 @@ void ExpressionSplitter::outlineExpression(Expression& _expr)
 
 	langutil::DebugData::ConstPtr debugData = debugDataOf(_expr);
 	YulName var = m_nameDispenser.newName({});
-	YulName type = m_typeInfo.typeOf(_expr);
 	m_statementsToPrefix.emplace_back(VariableDeclaration{
 		debugData,
-		{{TypedName{debugData, var, type}}},
+		{{NameWithDebugData{debugData, var}}},
 		std::make_unique<Expression>(std::move(_expr))
 	});
 	_expr = Identifier{debugData, var};
-	m_typeInfo.setVariableType(var, type);
 }
 
diff --git a/libyul/optimiser/ExpressionSplitter.h b/libyul/optimiser/ExpressionSplitter.h
index bbde8d6a2d..0b223e9859 100644
--- a/libyul/optimiser/ExpressionSplitter.h
+++ b/libyul/optimiser/ExpressionSplitter.h
@@ -33,7 +33,6 @@ namespace solidity::yul
 
 struct Dialect;
 struct OptimiserStepContext;
-class TypeInfo;
 
 /**
  * Optimiser component that modifies an AST in place, turning complex
@@ -71,12 +70,10 @@ class ExpressionSplitter: public ASTModifier
 private:
 	explicit ExpressionSplitter(
 		Dialect const& _dialect,
-		NameDispenser& _nameDispenser,
-		TypeInfo& _typeInfo
+		NameDispenser& _nameDispenser
 	):
 		m_dialect(_dialect),
-		m_nameDispenser(_nameDispenser),
-		m_typeInfo(_typeInfo)
+		m_nameDispenser(_nameDispenser)
 	{ }
 
 	/// Replaces the expression by a variable if it is a function call or functional
@@ -89,7 +86,6 @@ class ExpressionSplitter: public ASTModifier
 	std::vector<Statement> m_statementsToPrefix;
 	Dialect const& m_dialect;
 	NameDispenser& m_nameDispenser;
-	TypeInfo& m_typeInfo;
 };
 
 }
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index cc3f936d94..d0839e765e 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -58,8 +58,7 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 			Literal {
 				debugData,
 				LiteralKind::Boolean,
-				LiteralValue{true},
-				{}
+				LiteralValue{true}
 			}
 		);
 	}
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 3daaea658b..2f138761fc 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -298,10 +298,10 @@ std::vector<Statement> InlineModifier::performInline(Statement& _statement, Func
 
 	// helper function to create a new variable that is supposed to model
 	// an existing variable.
-	auto newVariable = [&](TypedName const& _existingVariable, Expression* _value) {
+	auto newVariable = [&](NameWithDebugData const& _existingVariable, Expression* _value) {
 		YulName newName = m_nameDispenser.newName(_existingVariable.name);
 		variableReplacements[_existingVariable.name] = newName;
-		VariableDeclaration varDecl{_funCall.debugData, {{_funCall.debugData, newName, _existingVariable.type}}, {}};
+		VariableDeclaration varDecl{_funCall.debugData, {{_funCall.debugData, newName}}, {}};
 		if (_value)
 			varDecl.value = std::make_unique<Expression>(std::move(*_value));
 		else
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
index 49da50032d..cb7cd4164b 100644
--- a/libyul/optimiser/FunctionSpecializer.cpp
+++ b/libyul/optimiser/FunctionSpecializer.cpp
@@ -104,7 +104,7 @@ FunctionDefinition FunctionSpecializer::specialize(
 			missingVariableDeclarations.emplace_back(
 				VariableDeclaration{
 					_f.debugData,
-					std::vector<TypedName>{newFunction.parameters[index]},
+					std::vector<NameWithDebugData>{newFunction.parameters[index]},
 					std::make_unique<Expression>(std::move(*argument))
 				}
 			);
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index 943860a0ad..98d938a362 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -125,8 +125,7 @@ void LoadResolver::tryEvaluateKeccak(
 			{},
 			LiteralKind::Number,
 			// a dummy 256-bit number to represent the Keccak256 hash.
-			LiteralValue{std::numeric_limits<u256>::max()},
-			{}
+			LiteralValue{std::numeric_limits<u256>::max()}
 		}
 	);
 
@@ -150,8 +149,7 @@ void LoadResolver::tryEvaluateKeccak(
 			_e = Literal{
 				debugDataOf(_e),
 				LiteralKind::Number,
-				LiteralValue{contentHash},
-				{}
+				LiteralValue{contentHash}
 			};
 		}
 	}
diff --git a/libyul/optimiser/NameDisplacer.cpp b/libyul/optimiser/NameDisplacer.cpp
index fd813fbfc2..c68d52f9a7 100644
--- a/libyul/optimiser/NameDisplacer.cpp
+++ b/libyul/optimiser/NameDisplacer.cpp
@@ -33,7 +33,7 @@ void NameDisplacer::operator()(Identifier& _identifier)
 
 void NameDisplacer::operator()(VariableDeclaration& _varDecl)
 {
-	for (TypedName& var: _varDecl.variables)
+	for (NameWithDebugData& var: _varDecl.variables)
 		checkAndReplaceNew(var.name);
 
 	ASTModifier::operator()(_varDecl);
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
index f03a448f0d..d57a61332e 100644
--- a/libyul/optimiser/NameSimplifier.cpp
+++ b/libyul/optimiser/NameSimplifier.cpp
@@ -53,9 +53,9 @@ void NameSimplifier::operator()(VariableDeclaration& _varDecl)
 	ASTModifier::operator()(_varDecl);
 }
 
-void NameSimplifier::renameVariables(std::vector<TypedName>& _variables)
+void NameSimplifier::renameVariables(std::vector<NameWithDebugData>& _variables)
 {
-	for (TypedName& typedName: _variables)
+	for (NameWithDebugData& typedName: _variables)
 		translate(typedName.name);
 }
 
diff --git a/libyul/optimiser/NameSimplifier.h b/libyul/optimiser/NameSimplifier.h
index 848e61f567..0ff5077cc6 100644
--- a/libyul/optimiser/NameSimplifier.h
+++ b/libyul/optimiser/NameSimplifier.h
@@ -60,7 +60,7 @@ class NameSimplifier: public ASTModifier
 	NameSimplifier(OptimiserStepContext& _context, Block const& _ast);
 
 	/// Tries to rename a list of variables.
-	void renameVariables(std::vector<TypedName>& _variables);
+	void renameVariables(std::vector<NameWithDebugData>& _variables);
 
 	void findSimplification(YulName const& _name);
 	void translate(YulName& _name);
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index 80abdf7e65..1d5270f8f4 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -28,8 +28,6 @@
 
 #include <libsolutil/CommonData.h>
 
-#include <libyul/optimiser/TypeInfo.h>
-
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::langutil;
@@ -46,12 +44,10 @@ class IntroduceSSA: public ASTModifier
 public:
 	explicit IntroduceSSA(
 		NameDispenser& _nameDispenser,
-		std::set<YulName> const& _variablesToReplace,
-		TypeInfo& _typeInfo
+		std::set<YulName> const& _variablesToReplace
 	):
 		m_nameDispenser(_nameDispenser),
-		m_variablesToReplace(_variablesToReplace),
-		m_typeInfo(_typeInfo)
+		m_variablesToReplace(_variablesToReplace)
 	{ }
 
 	void operator()(Block& _block) override;
@@ -59,7 +55,6 @@ class IntroduceSSA: public ASTModifier
 private:
 	NameDispenser& m_nameDispenser;
 	std::set<YulName> const& m_variablesToReplace;
-	TypeInfo const& m_typeInfo;
 };
 
 
@@ -87,15 +82,15 @@ void IntroduceSSA::operator()(Block& _block)
 				langutil::DebugData::ConstPtr debugData = varDecl.debugData;
 				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(varDecl.value)});
-				TypedNameList newVariables;
+				NameWithDebugDataList newVariables;
 				for (auto const& var: varDecl.variables)
 				{
 					YulName oldName = var.name;
 					YulName newName = m_nameDispenser.newName(oldName);
-					newVariables.emplace_back(TypedName{debugData, newName, var.type});
+					newVariables.emplace_back(NameWithDebugData{debugData, newName});
 					statements.emplace_back(VariableDeclaration{
 						debugData,
-						{TypedName{debugData, oldName, var.type}},
+						{NameWithDebugData{debugData, oldName}},
 						std::make_unique<Expression>(Identifier{debugData, newName})
 					});
 				}
@@ -114,15 +109,12 @@ void IntroduceSSA::operator()(Block& _block)
 				langutil::DebugData::ConstPtr debugData = assignment.debugData;
 				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(assignment.value)});
-				TypedNameList newVariables;
+				NameWithDebugDataList newVariables;
 				for (auto const& var: assignment.variableNames)
 				{
 					YulName oldName = var.name;
 					YulName newName = m_nameDispenser.newName(oldName);
-					newVariables.emplace_back(TypedName{debugData,
-						newName,
-						m_typeInfo.typeOfVariable(oldName)
-					});
+					newVariables.emplace_back(NameWithDebugData{debugData, newName});
 					statements.emplace_back(Assignment{
 						debugData,
 						{Identifier{debugData, oldName}},
@@ -148,12 +140,10 @@ class IntroduceControlFlowSSA: public ASTModifier
 public:
 	explicit IntroduceControlFlowSSA(
 		NameDispenser& _nameDispenser,
-		std::set<YulName> const& _variablesToReplace,
-		TypeInfo const& _typeInfo
+		std::set<YulName> const& _variablesToReplace
 	):
 		m_nameDispenser(_nameDispenser),
-		m_variablesToReplace(_variablesToReplace),
-		m_typeInfo(_typeInfo)
+		m_variablesToReplace(_variablesToReplace)
 	{ }
 
 	void operator()(FunctionDefinition& _function) override;
@@ -168,7 +158,6 @@ class IntroduceControlFlowSSA: public ASTModifier
 	std::set<YulName> m_variablesInScope;
 	/// Variables that do not have a specific value.
 	util::UniqueVector<YulName> m_variablesToReassign;
-	TypeInfo const& m_typeInfo;
 };
 
 void IntroduceControlFlowSSA::operator()(FunctionDefinition& _function)
@@ -232,7 +221,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 				YulName newName = m_nameDispenser.newName(toReassign);
 				toPrepend.emplace_back(VariableDeclaration{
 					debugDataOf(_s),
-					{TypedName{debugDataOf(_s), newName, m_typeInfo.typeOfVariable(toReassign)}},
+					{NameWithDebugData{debugDataOf(_s), newName}},
 					std::make_unique<Expression>(Identifier{debugDataOf(_s), toReassign})
 				});
 				assignedVariables.pushBack(toReassign);
@@ -379,10 +368,9 @@ void PropagateValues::operator()(Block& _block)
 
 void SSATransform::run(OptimiserStepContext& _context, Block& _ast)
 {
-	TypeInfo typeInfo(_context.dialect, _ast);
 	std::set<YulName> assignedVariables = assignedVariableNames(_ast);
-	IntroduceSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
-	IntroduceControlFlowSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
+	IntroduceSSA{_context.dispenser, assignedVariables}(_ast);
+	IntroduceControlFlowSSA{_context.dispenser, assignedVariables}(_ast);
 	PropagateValues{assignedVariables}(_ast);
 }
 
diff --git a/libyul/optimiser/SSAValueTracker.h b/libyul/optimiser/SSAValueTracker.h
index 0196ecc40e..2448f99a84 100644
--- a/libyul/optimiser/SSAValueTracker.h
+++ b/libyul/optimiser/SSAValueTracker.h
@@ -57,7 +57,7 @@ class SSAValueTracker: public ASTWalker
 
 	/// Special expression whose address will be used in m_values.
 	/// YulName does not need to be reset because SSAValueTracker is short-lived.
-	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
+	Expression const m_zero{Literal{{}, LiteralKind::Number, LiteralValue(u256{0})}};
 	std::map<YulName, Expression const*> m_values;
 };
 
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 03e4ccdd0e..72c0f70ca2 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -241,7 +241,7 @@ Expression Pattern::toExpression(langutil::DebugData::ConstPtr const& _debugData
 	if (m_kind == PatternKind::Constant)
 	{
 		assertThrow(m_data, OptimizerException, "No match group and no constant value given.");
-		return Literal{_debugData, LiteralKind::Number, LiteralValue{*m_data, formatNumber(*m_data)}, {}};
+		return Literal{_debugData, LiteralKind::Number, LiteralValue{*m_data, formatNumber(*m_data)}};
 	}
 	else if (m_kind == PatternKind::Operation)
 	{
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 6e6da63e60..d3cb6418fd 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -77,7 +77,7 @@ struct MemoryOffsetAllocator
 					size_t totalArgCount = functionDefinition->returnVariables.size() + functionDefinition->parameters.size();
 					totalArgCount > 16
 				)
-					for (TypedName const& var: ranges::concat_view(
+					for (NameWithDebugData const& var: ranges::concat_view(
 						functionDefinition->parameters,
 						functionDefinition->returnVariables
 					) | ranges::views::take(totalArgCount - 16))
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index d5cb539af4..7e3f93475f 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -49,7 +49,7 @@ std::vector<Statement> generateMemoryStore(
 		_debugData,
 		Identifier{_debugData, memoryStoreFunction->name},
 		{
-			Literal{_debugData, LiteralKind::Number, _mpos, {}},
+			Literal{_debugData, LiteralKind::Number, _mpos},
 			std::move(_value)
 		}
 	}});
@@ -66,8 +66,7 @@ FunctionCall generateMemoryLoad(Dialect const& _dialect, langutil::DebugData::Co
 			Literal{
 				_debugData,
 				LiteralKind::Number,
-				_mpos,
-				{}
+				_mpos
 			}
 		}
 	};
@@ -91,7 +90,7 @@ void StackToMemoryMover::run(
 			util::mapTuple([](YulName _name, FunctionDefinition const* _funDef) {
 				return make_pair(_name, _funDef->returnVariables);
 			}),
-			std::map<YulName, TypedNameList>{}
+			std::map<YulName, NameWithDebugDataList>{}
 		)
 	);
 	stackToMemoryMover(_block);
@@ -101,7 +100,7 @@ void StackToMemoryMover::run(
 StackToMemoryMover::StackToMemoryMover(
 	OptimiserStepContext& _context,
 	VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-	std::map<YulName, TypedNameList> _functionReturnVariables
+	std::map<YulName, NameWithDebugDataList> _functionReturnVariables
 ):
 m_context(_context),
 m_memoryOffsetTracker(_memoryOffsetTracker),
@@ -124,7 +123,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 	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)
+	for (NameWithDebugData const& param: _functionDefinition.parameters)
 		if (auto slot = m_memoryOffsetTracker(param.name))
 			memoryVariableInits += generateMemoryStore(
 				m_context.dialect,
@@ -134,21 +133,21 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 			);
 
 	// All memory return variables have to be initialized to zero in memory.
-	for (TypedName const& returnVariable: _functionDefinition.returnVariables)
+	for (NameWithDebugData const& returnVariable: _functionDefinition.returnVariables)
 		if (auto slot = m_memoryOffsetTracker(returnVariable.name))
 			memoryVariableInits += generateMemoryStore(
 				m_context.dialect,
 				returnVariable.debugData,
 				*slot,
-				Literal{returnVariable.debugData, LiteralKind::Number, LiteralValue(u256{0}), {}}
+				Literal{returnVariable.debugData, LiteralKind::Number, LiteralValue(u256{0})}
 			);
 
 	// Special case of a function with a single return argument that needs to move to memory.
 	if (_functionDefinition.returnVariables.size() == 1 && m_memoryOffsetTracker(_functionDefinition.returnVariables.front().name))
 	{
-		TypedNameList stackParameters = _functionDefinition.parameters | ranges::views::filter(
+		NameWithDebugDataList stackParameters = _functionDefinition.parameters | ranges::views::filter(
 			std::not_fn(m_memoryOffsetTracker)
-		) | ranges::to<TypedNameList>;
+		) | ranges::to<NameWithDebugDataList>;
 		// Generate new function without return variable and with only the non-moved parameters.
 		YulName newFunctionName = m_context.dispenser.newName(_functionDefinition.name);
 		m_newFunctionDefinitions.emplace_back(FunctionDefinition{
@@ -160,7 +159,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 		});
 		// Generate new names for the arguments to maintain disambiguation.
 		std::map<YulName, YulName> newArgumentNames;
-		for (TypedName const& _var: stackParameters)
+		for (NameWithDebugData const& _var: stackParameters)
 			newArgumentNames[_var.name] = m_context.dispenser.newName(_var.name);
 		for (auto& parameter: _functionDefinition.parameters)
 			parameter.name = util::valueOrDefault(newArgumentNames, parameter.name, parameter.name);
@@ -171,7 +170,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 			FunctionCall{
 				_functionDefinition.debugData,
 				Identifier{_functionDefinition.debugData, newFunctionName},
-				stackParameters | ranges::views::transform([&](TypedName const& _arg) {
+				stackParameters | ranges::views::transform([&](NameWithDebugData const& _arg) {
 					return Expression{Identifier{_arg.debugData, newArgumentNames.at(_arg.name)}};
 				}) | ranges::to<std::vector<Expression>>
 			}
@@ -193,7 +192,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 
 	_functionDefinition.returnVariables = _functionDefinition.returnVariables | ranges::views::filter(
 		std::not_fn(m_memoryOffsetTracker)
-	) | ranges::to<TypedNameList>;
+	) | ranges::to<NameWithDebugDataList>;
 }
 
 void StackToMemoryMover::operator()(Block& _block)
@@ -214,7 +213,7 @@ void StackToMemoryMover::operator()(Block& _block)
 					m_context.dialect,
 					debugData,
 					*offset,
-					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, LiteralValue(u256{0}), {}}
+					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, LiteralValue(u256{0})}
 				);
 			else
 				return {};
@@ -256,7 +255,7 @@ void StackToMemoryMover::operator()(Block& _block)
 			else
 			{
 				YulName tempVarName = m_nameDispenser.newName(lhsVar.name);
-				tempDecl.variables.emplace_back(TypedName{lhsVar.debugData, tempVarName, {}});
+				tempDecl.variables.emplace_back(NameWithDebugData{lhsVar.debugData, tempVarName});
 				rhs = std::make_unique<Expression>(Identifier{debugData, tempVarName});
 			}
 
@@ -322,7 +321,7 @@ std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::ope
 		return std::nullopt;
 }
 
-std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
+std::optional<LiteralValue> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(NameWithDebugData const& _variable) const
 {
 	return (*this)(_variable.name);
 }
diff --git a/libyul/optimiser/StackToMemoryMover.h b/libyul/optimiser/StackToMemoryMover.h
index 7392660311..89f11c1fe4 100644
--- a/libyul/optimiser/StackToMemoryMover.h
+++ b/libyul/optimiser/StackToMemoryMover.h
@@ -169,7 +169,7 @@ class StackToMemoryMover: ASTModifier
 		std::optional<LiteralValue> operator()(YulName const& _variable) const;
 		/// @returns a YulName containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
-		std::optional<LiteralValue> operator()(TypedName const& _variable) const;
+		std::optional<LiteralValue> operator()(NameWithDebugData const& _variable) const;
 		/// @returns a YulName containing the memory offset to be assigned to @a _variable as number literal
 		/// or std::nullopt if the variable should not be moved.
 		std::optional<LiteralValue> operator()(Identifier const& _variable) const;
@@ -187,14 +187,14 @@ class StackToMemoryMover: ASTModifier
 	StackToMemoryMover(
 		OptimiserStepContext& _context,
 		VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-		std::map<YulName, std::vector<TypedName>> _functionReturnVariables
+		std::map<YulName, std::vector<NameWithDebugData>> _functionReturnVariables
 	);
 
 	OptimiserStepContext& m_context;
 	VariableMemoryOffsetTracker const& m_memoryOffsetTracker;
 	NameDispenser& m_nameDispenser;
 	/// Map from function names to the return variables of the function with that name.
-	std::map<YulName, std::vector<TypedName>> m_functionReturnVariables;
+	std::map<YulName, std::vector<NameWithDebugData>> m_functionReturnVariables;
 	/// List of functions generated while running this step that are to be appended to the code in the end.
 	std::list<Statement> m_newFunctionDefinitions;
 };
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index db562716a2..0f4aa6e337 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -67,9 +67,6 @@ bool SyntacticallyEqual::expressionEqual(Literal const& _lhs, Literal const& _rh
 	yulAssert(validLiteral(_lhs), "Invalid lhs literal during syntactical equality check");
 	yulAssert(validLiteral(_rhs), "Invalid rhs literal during syntactical equality check");
 
-	if (_lhs.type != _rhs.type)
-		return false;
-
 	return _lhs.value == _rhs.value;
 }
 
@@ -93,14 +90,14 @@ bool SyntacticallyEqual::statementEqual(VariableDeclaration const& _lhs, Variabl
 	// first visit expression, then variable declarations
 	if (!compareUniquePtr<Expression, &SyntacticallyEqual::operator()>(_lhs.value, _rhs.value))
 		return false;
-	return util::containerEqual(_lhs.variables, _rhs.variables, [this](TypedName const& _lhsVarName, TypedName const& _rhsVarName) -> bool {
+	return util::containerEqual(_lhs.variables, _rhs.variables, [this](NameWithDebugData const& _lhsVarName, NameWithDebugData const& _rhsVarName) -> bool {
 		return this->visitDeclaration(_lhsVarName, _rhsVarName);
 	});
 }
 
 bool SyntacticallyEqual::statementEqual(FunctionDefinition const& _lhs, FunctionDefinition const& _rhs)
 {
-	auto compare = [this](TypedName const& _lhsVarName, TypedName const& _rhsVarName) -> bool {
+	auto compare = [this](NameWithDebugData const& _lhsVarName, NameWithDebugData const& _rhsVarName) -> bool {
 		return this->visitDeclaration(_lhsVarName, _rhsVarName);
 	};
 	// first visit parameter declarations, then body
@@ -157,10 +154,8 @@ bool SyntacticallyEqual::statementEqual(Block const& _lhs, Block const& _rhs)
 	});
 }
 
-bool SyntacticallyEqual::visitDeclaration(TypedName const& _lhs, TypedName const& _rhs)
+bool SyntacticallyEqual::visitDeclaration(NameWithDebugData const& _lhs, NameWithDebugData const& _rhs)
 {
-	if (_lhs.type != _rhs.type)
-		return false;
 	std::size_t id = m_idsUsed++;
 	m_identifiersLHS[_lhs.name] = id;
 	m_identifiersRHS[_rhs.name] = id;
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index 0665a5efbe..1fd888f7af 100644
--- a/libyul/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -63,7 +63,7 @@ class SyntacticallyEqual
 	bool statementEqual(Leave const&, Leave const&) { return true; }
 	bool statementEqual(Block const& _lhs, Block const& _rhs);
 private:
-	bool visitDeclaration(TypedName const& _lhs, TypedName const& _rhs);
+	bool visitDeclaration(NameWithDebugData const& _lhs, NameWithDebugData const& _rhs);
 
 	template<typename U, typename V>
 	bool expressionEqual(U const&, V const&, std::enable_if_t<!std::is_same<U, V>::value>* = nullptr)
diff --git a/libyul/optimiser/TypeInfo.cpp b/libyul/optimiser/TypeInfo.cpp
deleted file mode 100644
index 754c0bad08..0000000000
--- a/libyul/optimiser/TypeInfo.cpp
+++ /dev/null
@@ -1,103 +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
-/**
- * Helper class that keeps track of the types while performing optimizations.
- */
-
-#include <libyul/optimiser/TypeInfo.h>
-
-#include <libyul/optimiser/NameCollector.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libsolutil/Visitor.h>
-
-using namespace solidity::yul;
-using namespace solidity::util;
-
-class TypeInfo::TypeCollector: public ASTWalker
-{
-public:
-	explicit TypeCollector(Block const& _block)
-	{
-		(*this)(_block);
-	}
-
-	using ASTWalker::operator();
-	void operator()(VariableDeclaration const& _varDecl) override
-	{
-		for (auto const& var: _varDecl.variables)
-			variableTypes[var.name] = var.type;
-	}
-	void operator()(FunctionDefinition const& _funDef) override
-	{
-		ASTWalker::operator()(_funDef);
-
-		auto& funType = functionTypes[_funDef.name];
-		for (auto const& arg: _funDef.parameters)
-		{
-			funType.parameters.emplace_back(arg.type);
-			variableTypes[arg.name] = arg.type;
-		}
-		for (auto const& ret: _funDef.returnVariables)
-		{
-			funType.returns.emplace_back(ret.type);
-			variableTypes[ret.name] = ret.type;
-		}
-	}
-
-	std::map<YulName, YulName> variableTypes;
-	std::map<YulName, FunctionType> functionTypes;
-};
-
-
-TypeInfo::TypeInfo(Dialect const& _dialect, Block const& _ast):
-	m_dialect(_dialect)
-{
-	TypeCollector types(_ast);
-	m_functionTypes = std::move(types.functionTypes);
-	m_variableTypes = std::move(types.variableTypes);
-}
-
-YulName TypeInfo::typeOf(Expression const& _expression) const
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionCall const& _funCall) {
-			YulName name = _funCall.functionName.name;
-			std::vector<YulName> const* retTypes = nullptr;
-			if (BuiltinFunction const* fun = m_dialect.builtin(name))
-				retTypes = &fun->returns;
-			else
-				retTypes = &m_functionTypes.at(name).returns;
-			yulAssert(retTypes && retTypes->size() == 1, "Call to typeOf for non-single-value expression.");
-			return retTypes->front();
-		},
-		[&](Identifier const& _identifier) {
-			return m_variableTypes.at(_identifier.name);
-		},
-		[&](Literal const& _literal) {
-			return _literal.type;
-		}
-	}, _expression);
-}
-
-YulName TypeInfo::typeOfVariable(YulName _name) const
-{
-	return m_variableTypes.at(_name);
-}
diff --git a/libyul/optimiser/TypeInfo.h b/libyul/optimiser/TypeInfo.h
deleted file mode 100644
index 96c43875a6..0000000000
--- a/libyul/optimiser/TypeInfo.h
+++ /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
-/**
- * Helper class that keeps track of the types while performing optimizations.
- */
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
-
-#include <vector>
-#include <map>
-
-namespace solidity::yul
-{
-struct Dialect;
-
-/**
- * Helper class that keeps track of the types while performing optimizations.
- *
- * Only works on disambiguated sources!
- */
-class TypeInfo
-{
-public:
-	TypeInfo(Dialect const& _dialect, Block const& _ast);
-
-	void setVariableType(YulName _name, YulName _type) { m_variableTypes[_name] = _type; }
-
-	/// @returns the type of an expression that is assumed to return exactly one value.
-	YulName typeOf(Expression const& _expression) const;
-
-	/// \returns the type of variable
-	YulName typeOfVariable(YulName _name) const;
-
-private:
-	class TypeCollector;
-
-	struct FunctionType
-	{
-		std::vector<YulName> parameters;
-		std::vector<YulName> returns;
-	};
-
-	Dialect const& m_dialect;
-	std::map<YulName, YulName> m_variableTypes;
-	std::map<YulName, FunctionType> m_functionTypes;
-};
-
-}
diff --git a/libyul/optimiser/UnusedFunctionsCommon.cpp b/libyul/optimiser/UnusedFunctionsCommon.cpp
index bd38b33caf..a6333a786a 100644
--- a/libyul/optimiser/UnusedFunctionsCommon.cpp
+++ b/libyul/optimiser/UnusedFunctionsCommon.cpp
@@ -35,12 +35,11 @@ FunctionDefinition unusedFunctionsCommon::createLinkingFunction(
 	NameDispenser& _nameDispenser
 )
 {
-	auto generateTypedName = [&](TypedName t)
+	auto generateTypedName = [&](NameWithDebugData t)
 	{
-		return TypedName{
+		return NameWithDebugData{
 			t.debugData,
-			_nameDispenser.newName(t.name),
-			t.type
+			_nameDispenser.newName(t.name)
 		};
 	};
 
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index c71e8077b6..a3b6c0708b 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -92,7 +92,7 @@ void UnusedPruner::operator()(Block& _block)
 			if (std::none_of(
 				varDecl.variables.begin(),
 				varDecl.variables.end(),
-				[&](TypedName const& _typedName) { return used(_typedName.name); }
+				[&](NameWithDebugData const& _typedName) { return used(_typedName.name); }
 			))
 			{
 				if (!varDecl.value)
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index d049f59a02..c50ddac144 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -61,9 +61,9 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 	std::map<YulName, AssignedValue> values;
 	for (auto const& [name, expression]: ssaValues.values())
 		values[name] = AssignedValue{expression, {}};
-	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{0}), {}}};
-	Expression const oneLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{1}), {}}};
-	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{32}), {}}};
+	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{0})}};
+	Expression const oneLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{1})}};
+	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, LiteralValue(u256{32})}};
 	values[YulName{zero}] = AssignedValue{&zeroLiteral, {}};
 	values[YulName{one}] = AssignedValue{&oneLiteral, {}};
 	values[YulName{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
index 041ebdeaab..b3a34d283e 100644
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ b/libyul/optimiser/VarNameCleaner.cpp
@@ -72,17 +72,17 @@ void VarNameCleaner::operator()(VariableDeclaration& _varDecl)
 	ASTModifier::operator()(_varDecl);
 }
 
-void VarNameCleaner::renameVariables(std::vector<TypedName>& _variables)
+void VarNameCleaner::renameVariables(std::vector<NameWithDebugData>& _variables)
 {
-	for (TypedName& typedName: _variables)
+	for (NameWithDebugData& variable: _variables)
 	{
-		auto newName = findCleanName(typedName.name);
-		if (newName != typedName.name)
+		auto newName = findCleanName(variable.name);
+		if (newName != variable.name)
 		{
-			m_translatedNames[typedName.name] = newName;
-			typedName.name = newName;
+			m_translatedNames[variable.name] = newName;
+			variable.name = newName;
 		}
-		m_usedNames.insert(typedName.name);
+		m_usedNames.insert(variable.name);
 	}
 }
 
diff --git a/libyul/optimiser/VarNameCleaner.h b/libyul/optimiser/VarNameCleaner.h
index bfb6cfb533..7f8bb842e9 100644
--- a/libyul/optimiser/VarNameCleaner.h
+++ b/libyul/optimiser/VarNameCleaner.h
@@ -68,7 +68,7 @@ class VarNameCleaner: public ASTModifier
 	);
 
 	/// Tries to rename a list of variables.
-	void renameVariables(std::vector<TypedName>& _variables);
+	void renameVariables(std::vector<NameWithDebugData>& _variables);
 
 	/// @returns suffix-stripped name, if a suffix was detected, none otherwise.
 	YulName stripSuffix(YulName const& _name) const;
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
index 2da445dd45..40fdcc5b15 100644
--- a/test/libyul/StackShufflingTest.cpp
+++ b/test/libyul/StackShufflingTest.cpp
@@ -102,7 +102,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 				expectToken(Token::LBrack);
 				scanner.next(); // read number of ghost variables as ghostVariableId
 				std::string ghostVariableId = scanner.currentLiteral();
-				Scope::Variable ghostVar = Scope::Variable{""_yulname, YulName(literal + "[" + ghostVariableId + "]")};
+				Scope::Variable ghostVar = Scope::Variable{YulName(literal + "[" + ghostVariableId + "]")};
 				stack.emplace_back(VariableSlot{
 					m_variables.insert(std::make_pair(ghostVar.name, ghostVar)).first->second
 				});
@@ -110,7 +110,7 @@ bool StackShufflingTest::parse(std::string const& _source)
 			}
 			else
 			{
-				Scope::Variable var = Scope::Variable{""_yulname, YulName(literal)};
+				Scope::Variable var = Scope::Variable{YulName(literal)};
 				stack.emplace_back(VariableSlot{
 					m_variables.insert(
 						make_pair(literal, var)
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index bf374c21fc..0f94f309dc 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -454,9 +454,9 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 				{
 					YulName originalFunctionName = m_currentFunction;
 					m_currentFunction = _function.name;
-					for (TypedName const& _argument: _function.parameters)
+					for (NameWithDebugData const& _argument: _function.parameters)
 						visitVariableName(_argument.name);
-					for (TypedName const& _argument: _function.returnVariables)
+					for (NameWithDebugData const& _argument: _function.returnVariables)
 						visitVariableName(_argument.name);
 					ASTWalker::operator()(_function);
 					m_currentFunction = originalFunctionName;
diff --git a/test/libyul/yulSyntaxTests/invalid_type.yul b/test/libyul/yulSyntaxTests/invalid_type.yul
index f863816355..e9a4e30c95 100644
--- a/test/libyul/yulSyntaxTests/invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type.yul
@@ -2,4 +2,4 @@
     let x: invalidType
 }
 // ----
-// TypeError 5473: (10-24): "invalidType" is not a valid type (user defined types are not yet supported).
+// ParserError 5473: (10-24): Types are not valid in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type2.yul b/test/libyul/yulSyntaxTests/invalid_type2.yul
index af30bc2eb2..5eb514866f 100644
--- a/test/libyul/yulSyntaxTests/invalid_type2.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type2.yul
@@ -2,5 +2,4 @@
     let x := 1:invalidType
 }
 // ----
-// TypeError 5473: (15-28): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 3947: (10-11): Assigning value of type "invalidType" to variable of type "".
+// ParserError 5473: (15-28): Types are not valid in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type3.yul b/test/libyul/yulSyntaxTests/invalid_type3.yul
index 6fc0e35e8c..9814527b0c 100644
--- a/test/libyul/yulSyntaxTests/invalid_type3.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type3.yul
@@ -2,5 +2,5 @@
     function f(a: invalidType) -> b: invalidType {}
 }
 // ----
-// TypeError 5473: (17-31): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (36-50): "invalidType" is not a valid type (user defined types are not yet supported).
+// ParserError 5473: (17-31): Types are not valid in untyped Yul.
+// ParserError 5473: (36-50): Types are not valid in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type4.yul b/test/libyul/yulSyntaxTests/invalid_type4.yul
index 90f00ddaaf..4924a592a7 100644
--- a/test/libyul/yulSyntaxTests/invalid_type4.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type4.yul
@@ -3,5 +3,4 @@
     case 8: invalidType {}
 }
 // ----
-// TypeError 3781: (24-38): Expected a value of type "" but got "invalidType".
-// TypeError 5473: (24-38): "invalidType" is not a valid type (user defined types are not yet supported).
+// ParserError 5473: (24-38): Types are not valid in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
index fd612a0a5a..10a280120e 100644
--- a/test/libyul/yulSyntaxTests/literal_invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
@@ -2,6 +2,4 @@
     let x := true:unhappy
 }
 // ----
-// TypeError 5473: (15-27): "unhappy" is not a valid type (user defined types are not yet supported).
-// TypeError 5170: (15-27): Invalid type "unhappy" for literal "true".
-// TypeError 3947: (10-11): Assigning value of type "unhappy" to variable of type "".
+// ParserError 5473: (15-27): Types are not valid in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
index 0ae2fb15a7..edd7871a7e 100644
--- a/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
+++ b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
@@ -20,260 +20,260 @@
     let $100:x
 }
 // ----
-// TypeError 5473: (200-205): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (210-215): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (220-225): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (230-235): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (240-245): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (250-255): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (260-265): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (270-275): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (280-285): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (290-295): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (300-305): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (310-315): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (320-325): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (330-335): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (340-345): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (350-355): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (364-369): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (374-379): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (384-389): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (394-399): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (404-409): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (414-419): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (424-429): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (434-439): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (444-449): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (454-459): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (464-469): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (474-479): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (484-489): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (494-499): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (504-509): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (514-519): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (528-533): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (538-543): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (548-553): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (558-563): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (568-573): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (578-583): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (588-593): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (598-603): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (608-613): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (618-623): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (628-633): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (638-643): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (648-653): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (658-663): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (668-673): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (678-683): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (692-697): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (702-707): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (712-717): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (722-727): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (732-737): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (742-747): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (752-757): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (762-767): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (772-777): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (782-787): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (792-797): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (802-807): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (812-817): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (822-827): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (832-837): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (842-847): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (856-861): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (866-871): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (876-881): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (886-891): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (896-901): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (906-911): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (916-921): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (926-931): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (936-941): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (946-951): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (956-961): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (966-971): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (976-981): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (986-991): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (996-1001): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1006-1011): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1020-1025): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1030-1035): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1040-1045): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1050-1055): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1060-1065): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1070-1075): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1080-1085): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1090-1095): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1100-1105): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1110-1115): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1120-1125): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1130-1135): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1140-1145): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1150-1155): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1160-1165): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1170-1175): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1184-1189): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1194-1199): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1204-1209): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1214-1219): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1224-1229): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1234-1239): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1244-1249): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1254-1259): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1264-1269): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1274-1279): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1284-1289): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1294-1299): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1304-1309): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1314-1319): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1324-1329): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1334-1339): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1348-1353): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1358-1363): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1368-1373): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1378-1383): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1388-1393): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1398-1403): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1408-1413): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1418-1423): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1428-1433): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1438-1443): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1448-1453): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1458-1463): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1468-1473): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1478-1483): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1488-1493): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1498-1503): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1512-1517): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1522-1527): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1532-1537): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1542-1547): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1552-1557): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1562-1567): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1572-1577): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1582-1587): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1592-1597): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1602-1607): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1612-1617): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1622-1627): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1632-1637): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1642-1647): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1652-1657): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1662-1667): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1676-1681): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1686-1691): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1696-1701): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1706-1711): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1716-1721): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1726-1731): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1736-1741): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1746-1751): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1756-1761): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1766-1771): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1776-1781): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1786-1791): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1796-1801): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1806-1811): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1816-1821): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1826-1831): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1840-1845): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1850-1855): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1860-1865): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1870-1875): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1880-1885): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1890-1895): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1900-1905): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1910-1915): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1920-1925): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1930-1935): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1940-1945): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1950-1955): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1960-1965): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1970-1975): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1980-1985): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (1990-1995): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2004-2009): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2014-2019): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2024-2029): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2034-2039): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2044-2049): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2054-2059): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2064-2069): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2074-2079): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2084-2089): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2094-2099): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2104-2109): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2114-2119): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2124-2129): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2134-2139): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2144-2149): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2154-2159): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2168-2173): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2178-2183): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2188-2193): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2198-2203): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2208-2213): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2218-2223): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2228-2233): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2238-2243): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2248-2253): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2258-2263): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2268-2273): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2278-2283): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2288-2293): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2298-2303): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2308-2313): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2318-2323): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2332-2337): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2342-2347): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2352-2357): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2362-2367): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2372-2377): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2382-2387): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2392-2397): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2402-2407): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2412-2417): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2422-2427): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2432-2437): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2442-2447): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2452-2457): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2462-2467): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2472-2477): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2482-2487): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2496-2501): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2506-2511): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2516-2521): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2526-2531): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2536-2541): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2546-2551): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2556-2561): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2566-2571): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2576-2581): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2586-2591): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2596-2601): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2606-2611): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2616-2621): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2626-2631): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2636-2641): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2646-2651): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2660-2665): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2670-2675): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2680-2685): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2690-2695): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2700-2705): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2710-2715): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2720-2725): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2730-2735): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2740-2745): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2750-2755): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2760-2765): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2770-2775): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2780-2785): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2790-2795): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2800-2805): "x" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (2810-2815): "x" is not a valid type (user defined types are not yet supported).
+// ParserError 5473: (200-205): Types are not valid in untyped Yul.
+// ParserError 5473: (210-215): Types are not valid in untyped Yul.
+// ParserError 5473: (220-225): Types are not valid in untyped Yul.
+// ParserError 5473: (230-235): Types are not valid in untyped Yul.
+// ParserError 5473: (240-245): Types are not valid in untyped Yul.
+// ParserError 5473: (250-255): Types are not valid in untyped Yul.
+// ParserError 5473: (260-265): Types are not valid in untyped Yul.
+// ParserError 5473: (270-275): Types are not valid in untyped Yul.
+// ParserError 5473: (280-285): Types are not valid in untyped Yul.
+// ParserError 5473: (290-295): Types are not valid in untyped Yul.
+// ParserError 5473: (300-305): Types are not valid in untyped Yul.
+// ParserError 5473: (310-315): Types are not valid in untyped Yul.
+// ParserError 5473: (320-325): Types are not valid in untyped Yul.
+// ParserError 5473: (330-335): Types are not valid in untyped Yul.
+// ParserError 5473: (340-345): Types are not valid in untyped Yul.
+// ParserError 5473: (350-355): Types are not valid in untyped Yul.
+// ParserError 5473: (364-369): Types are not valid in untyped Yul.
+// ParserError 5473: (374-379): Types are not valid in untyped Yul.
+// ParserError 5473: (384-389): Types are not valid in untyped Yul.
+// ParserError 5473: (394-399): Types are not valid in untyped Yul.
+// ParserError 5473: (404-409): Types are not valid in untyped Yul.
+// ParserError 5473: (414-419): Types are not valid in untyped Yul.
+// ParserError 5473: (424-429): Types are not valid in untyped Yul.
+// ParserError 5473: (434-439): Types are not valid in untyped Yul.
+// ParserError 5473: (444-449): Types are not valid in untyped Yul.
+// ParserError 5473: (454-459): Types are not valid in untyped Yul.
+// ParserError 5473: (464-469): Types are not valid in untyped Yul.
+// ParserError 5473: (474-479): Types are not valid in untyped Yul.
+// ParserError 5473: (484-489): Types are not valid in untyped Yul.
+// ParserError 5473: (494-499): Types are not valid in untyped Yul.
+// ParserError 5473: (504-509): Types are not valid in untyped Yul.
+// ParserError 5473: (514-519): Types are not valid in untyped Yul.
+// ParserError 5473: (528-533): Types are not valid in untyped Yul.
+// ParserError 5473: (538-543): Types are not valid in untyped Yul.
+// ParserError 5473: (548-553): Types are not valid in untyped Yul.
+// ParserError 5473: (558-563): Types are not valid in untyped Yul.
+// ParserError 5473: (568-573): Types are not valid in untyped Yul.
+// ParserError 5473: (578-583): Types are not valid in untyped Yul.
+// ParserError 5473: (588-593): Types are not valid in untyped Yul.
+// ParserError 5473: (598-603): Types are not valid in untyped Yul.
+// ParserError 5473: (608-613): Types are not valid in untyped Yul.
+// ParserError 5473: (618-623): Types are not valid in untyped Yul.
+// ParserError 5473: (628-633): Types are not valid in untyped Yul.
+// ParserError 5473: (638-643): Types are not valid in untyped Yul.
+// ParserError 5473: (648-653): Types are not valid in untyped Yul.
+// ParserError 5473: (658-663): Types are not valid in untyped Yul.
+// ParserError 5473: (668-673): Types are not valid in untyped Yul.
+// ParserError 5473: (678-683): Types are not valid in untyped Yul.
+// ParserError 5473: (692-697): Types are not valid in untyped Yul.
+// ParserError 5473: (702-707): Types are not valid in untyped Yul.
+// ParserError 5473: (712-717): Types are not valid in untyped Yul.
+// ParserError 5473: (722-727): Types are not valid in untyped Yul.
+// ParserError 5473: (732-737): Types are not valid in untyped Yul.
+// ParserError 5473: (742-747): Types are not valid in untyped Yul.
+// ParserError 5473: (752-757): Types are not valid in untyped Yul.
+// ParserError 5473: (762-767): Types are not valid in untyped Yul.
+// ParserError 5473: (772-777): Types are not valid in untyped Yul.
+// ParserError 5473: (782-787): Types are not valid in untyped Yul.
+// ParserError 5473: (792-797): Types are not valid in untyped Yul.
+// ParserError 5473: (802-807): Types are not valid in untyped Yul.
+// ParserError 5473: (812-817): Types are not valid in untyped Yul.
+// ParserError 5473: (822-827): Types are not valid in untyped Yul.
+// ParserError 5473: (832-837): Types are not valid in untyped Yul.
+// ParserError 5473: (842-847): Types are not valid in untyped Yul.
+// ParserError 5473: (856-861): Types are not valid in untyped Yul.
+// ParserError 5473: (866-871): Types are not valid in untyped Yul.
+// ParserError 5473: (876-881): Types are not valid in untyped Yul.
+// ParserError 5473: (886-891): Types are not valid in untyped Yul.
+// ParserError 5473: (896-901): Types are not valid in untyped Yul.
+// ParserError 5473: (906-911): Types are not valid in untyped Yul.
+// ParserError 5473: (916-921): Types are not valid in untyped Yul.
+// ParserError 5473: (926-931): Types are not valid in untyped Yul.
+// ParserError 5473: (936-941): Types are not valid in untyped Yul.
+// ParserError 5473: (946-951): Types are not valid in untyped Yul.
+// ParserError 5473: (956-961): Types are not valid in untyped Yul.
+// ParserError 5473: (966-971): Types are not valid in untyped Yul.
+// ParserError 5473: (976-981): Types are not valid in untyped Yul.
+// ParserError 5473: (986-991): Types are not valid in untyped Yul.
+// ParserError 5473: (996-1001): Types are not valid in untyped Yul.
+// ParserError 5473: (1006-1011): Types are not valid in untyped Yul.
+// ParserError 5473: (1020-1025): Types are not valid in untyped Yul.
+// ParserError 5473: (1030-1035): Types are not valid in untyped Yul.
+// ParserError 5473: (1040-1045): Types are not valid in untyped Yul.
+// ParserError 5473: (1050-1055): Types are not valid in untyped Yul.
+// ParserError 5473: (1060-1065): Types are not valid in untyped Yul.
+// ParserError 5473: (1070-1075): Types are not valid in untyped Yul.
+// ParserError 5473: (1080-1085): Types are not valid in untyped Yul.
+// ParserError 5473: (1090-1095): Types are not valid in untyped Yul.
+// ParserError 5473: (1100-1105): Types are not valid in untyped Yul.
+// ParserError 5473: (1110-1115): Types are not valid in untyped Yul.
+// ParserError 5473: (1120-1125): Types are not valid in untyped Yul.
+// ParserError 5473: (1130-1135): Types are not valid in untyped Yul.
+// ParserError 5473: (1140-1145): Types are not valid in untyped Yul.
+// ParserError 5473: (1150-1155): Types are not valid in untyped Yul.
+// ParserError 5473: (1160-1165): Types are not valid in untyped Yul.
+// ParserError 5473: (1170-1175): Types are not valid in untyped Yul.
+// ParserError 5473: (1184-1189): Types are not valid in untyped Yul.
+// ParserError 5473: (1194-1199): Types are not valid in untyped Yul.
+// ParserError 5473: (1204-1209): Types are not valid in untyped Yul.
+// ParserError 5473: (1214-1219): Types are not valid in untyped Yul.
+// ParserError 5473: (1224-1229): Types are not valid in untyped Yul.
+// ParserError 5473: (1234-1239): Types are not valid in untyped Yul.
+// ParserError 5473: (1244-1249): Types are not valid in untyped Yul.
+// ParserError 5473: (1254-1259): Types are not valid in untyped Yul.
+// ParserError 5473: (1264-1269): Types are not valid in untyped Yul.
+// ParserError 5473: (1274-1279): Types are not valid in untyped Yul.
+// ParserError 5473: (1284-1289): Types are not valid in untyped Yul.
+// ParserError 5473: (1294-1299): Types are not valid in untyped Yul.
+// ParserError 5473: (1304-1309): Types are not valid in untyped Yul.
+// ParserError 5473: (1314-1319): Types are not valid in untyped Yul.
+// ParserError 5473: (1324-1329): Types are not valid in untyped Yul.
+// ParserError 5473: (1334-1339): Types are not valid in untyped Yul.
+// ParserError 5473: (1348-1353): Types are not valid in untyped Yul.
+// ParserError 5473: (1358-1363): Types are not valid in untyped Yul.
+// ParserError 5473: (1368-1373): Types are not valid in untyped Yul.
+// ParserError 5473: (1378-1383): Types are not valid in untyped Yul.
+// ParserError 5473: (1388-1393): Types are not valid in untyped Yul.
+// ParserError 5473: (1398-1403): Types are not valid in untyped Yul.
+// ParserError 5473: (1408-1413): Types are not valid in untyped Yul.
+// ParserError 5473: (1418-1423): Types are not valid in untyped Yul.
+// ParserError 5473: (1428-1433): Types are not valid in untyped Yul.
+// ParserError 5473: (1438-1443): Types are not valid in untyped Yul.
+// ParserError 5473: (1448-1453): Types are not valid in untyped Yul.
+// ParserError 5473: (1458-1463): Types are not valid in untyped Yul.
+// ParserError 5473: (1468-1473): Types are not valid in untyped Yul.
+// ParserError 5473: (1478-1483): Types are not valid in untyped Yul.
+// ParserError 5473: (1488-1493): Types are not valid in untyped Yul.
+// ParserError 5473: (1498-1503): Types are not valid in untyped Yul.
+// ParserError 5473: (1512-1517): Types are not valid in untyped Yul.
+// ParserError 5473: (1522-1527): Types are not valid in untyped Yul.
+// ParserError 5473: (1532-1537): Types are not valid in untyped Yul.
+// ParserError 5473: (1542-1547): Types are not valid in untyped Yul.
+// ParserError 5473: (1552-1557): Types are not valid in untyped Yul.
+// ParserError 5473: (1562-1567): Types are not valid in untyped Yul.
+// ParserError 5473: (1572-1577): Types are not valid in untyped Yul.
+// ParserError 5473: (1582-1587): Types are not valid in untyped Yul.
+// ParserError 5473: (1592-1597): Types are not valid in untyped Yul.
+// ParserError 5473: (1602-1607): Types are not valid in untyped Yul.
+// ParserError 5473: (1612-1617): Types are not valid in untyped Yul.
+// ParserError 5473: (1622-1627): Types are not valid in untyped Yul.
+// ParserError 5473: (1632-1637): Types are not valid in untyped Yul.
+// ParserError 5473: (1642-1647): Types are not valid in untyped Yul.
+// ParserError 5473: (1652-1657): Types are not valid in untyped Yul.
+// ParserError 5473: (1662-1667): Types are not valid in untyped Yul.
+// ParserError 5473: (1676-1681): Types are not valid in untyped Yul.
+// ParserError 5473: (1686-1691): Types are not valid in untyped Yul.
+// ParserError 5473: (1696-1701): Types are not valid in untyped Yul.
+// ParserError 5473: (1706-1711): Types are not valid in untyped Yul.
+// ParserError 5473: (1716-1721): Types are not valid in untyped Yul.
+// ParserError 5473: (1726-1731): Types are not valid in untyped Yul.
+// ParserError 5473: (1736-1741): Types are not valid in untyped Yul.
+// ParserError 5473: (1746-1751): Types are not valid in untyped Yul.
+// ParserError 5473: (1756-1761): Types are not valid in untyped Yul.
+// ParserError 5473: (1766-1771): Types are not valid in untyped Yul.
+// ParserError 5473: (1776-1781): Types are not valid in untyped Yul.
+// ParserError 5473: (1786-1791): Types are not valid in untyped Yul.
+// ParserError 5473: (1796-1801): Types are not valid in untyped Yul.
+// ParserError 5473: (1806-1811): Types are not valid in untyped Yul.
+// ParserError 5473: (1816-1821): Types are not valid in untyped Yul.
+// ParserError 5473: (1826-1831): Types are not valid in untyped Yul.
+// ParserError 5473: (1840-1845): Types are not valid in untyped Yul.
+// ParserError 5473: (1850-1855): Types are not valid in untyped Yul.
+// ParserError 5473: (1860-1865): Types are not valid in untyped Yul.
+// ParserError 5473: (1870-1875): Types are not valid in untyped Yul.
+// ParserError 5473: (1880-1885): Types are not valid in untyped Yul.
+// ParserError 5473: (1890-1895): Types are not valid in untyped Yul.
+// ParserError 5473: (1900-1905): Types are not valid in untyped Yul.
+// ParserError 5473: (1910-1915): Types are not valid in untyped Yul.
+// ParserError 5473: (1920-1925): Types are not valid in untyped Yul.
+// ParserError 5473: (1930-1935): Types are not valid in untyped Yul.
+// ParserError 5473: (1940-1945): Types are not valid in untyped Yul.
+// ParserError 5473: (1950-1955): Types are not valid in untyped Yul.
+// ParserError 5473: (1960-1965): Types are not valid in untyped Yul.
+// ParserError 5473: (1970-1975): Types are not valid in untyped Yul.
+// ParserError 5473: (1980-1985): Types are not valid in untyped Yul.
+// ParserError 5473: (1990-1995): Types are not valid in untyped Yul.
+// ParserError 5473: (2004-2009): Types are not valid in untyped Yul.
+// ParserError 5473: (2014-2019): Types are not valid in untyped Yul.
+// ParserError 5473: (2024-2029): Types are not valid in untyped Yul.
+// ParserError 5473: (2034-2039): Types are not valid in untyped Yul.
+// ParserError 5473: (2044-2049): Types are not valid in untyped Yul.
+// ParserError 5473: (2054-2059): Types are not valid in untyped Yul.
+// ParserError 5473: (2064-2069): Types are not valid in untyped Yul.
+// ParserError 5473: (2074-2079): Types are not valid in untyped Yul.
+// ParserError 5473: (2084-2089): Types are not valid in untyped Yul.
+// ParserError 5473: (2094-2099): Types are not valid in untyped Yul.
+// ParserError 5473: (2104-2109): Types are not valid in untyped Yul.
+// ParserError 5473: (2114-2119): Types are not valid in untyped Yul.
+// ParserError 5473: (2124-2129): Types are not valid in untyped Yul.
+// ParserError 5473: (2134-2139): Types are not valid in untyped Yul.
+// ParserError 5473: (2144-2149): Types are not valid in untyped Yul.
+// ParserError 5473: (2154-2159): Types are not valid in untyped Yul.
+// ParserError 5473: (2168-2173): Types are not valid in untyped Yul.
+// ParserError 5473: (2178-2183): Types are not valid in untyped Yul.
+// ParserError 5473: (2188-2193): Types are not valid in untyped Yul.
+// ParserError 5473: (2198-2203): Types are not valid in untyped Yul.
+// ParserError 5473: (2208-2213): Types are not valid in untyped Yul.
+// ParserError 5473: (2218-2223): Types are not valid in untyped Yul.
+// ParserError 5473: (2228-2233): Types are not valid in untyped Yul.
+// ParserError 5473: (2238-2243): Types are not valid in untyped Yul.
+// ParserError 5473: (2248-2253): Types are not valid in untyped Yul.
+// ParserError 5473: (2258-2263): Types are not valid in untyped Yul.
+// ParserError 5473: (2268-2273): Types are not valid in untyped Yul.
+// ParserError 5473: (2278-2283): Types are not valid in untyped Yul.
+// ParserError 5473: (2288-2293): Types are not valid in untyped Yul.
+// ParserError 5473: (2298-2303): Types are not valid in untyped Yul.
+// ParserError 5473: (2308-2313): Types are not valid in untyped Yul.
+// ParserError 5473: (2318-2323): Types are not valid in untyped Yul.
+// ParserError 5473: (2332-2337): Types are not valid in untyped Yul.
+// ParserError 5473: (2342-2347): Types are not valid in untyped Yul.
+// ParserError 5473: (2352-2357): Types are not valid in untyped Yul.
+// ParserError 5473: (2362-2367): Types are not valid in untyped Yul.
+// ParserError 5473: (2372-2377): Types are not valid in untyped Yul.
+// ParserError 5473: (2382-2387): Types are not valid in untyped Yul.
+// ParserError 5473: (2392-2397): Types are not valid in untyped Yul.
+// ParserError 5473: (2402-2407): Types are not valid in untyped Yul.
+// ParserError 5473: (2412-2417): Types are not valid in untyped Yul.
+// ParserError 5473: (2422-2427): Types are not valid in untyped Yul.
+// ParserError 5473: (2432-2437): Types are not valid in untyped Yul.
+// ParserError 5473: (2442-2447): Types are not valid in untyped Yul.
+// ParserError 5473: (2452-2457): Types are not valid in untyped Yul.
+// ParserError 5473: (2462-2467): Types are not valid in untyped Yul.
+// ParserError 5473: (2472-2477): Types are not valid in untyped Yul.
+// ParserError 5473: (2482-2487): Types are not valid in untyped Yul.
+// ParserError 5473: (2496-2501): Types are not valid in untyped Yul.
+// ParserError 5473: (2506-2511): Types are not valid in untyped Yul.
+// ParserError 5473: (2516-2521): Types are not valid in untyped Yul.
+// ParserError 5473: (2526-2531): Types are not valid in untyped Yul.
+// ParserError 5473: (2536-2541): Types are not valid in untyped Yul.
+// ParserError 5473: (2546-2551): Types are not valid in untyped Yul.
+// ParserError 5473: (2556-2561): Types are not valid in untyped Yul.
+// ParserError 5473: (2566-2571): Types are not valid in untyped Yul.
+// ParserError 5473: (2576-2581): Types are not valid in untyped Yul.
+// ParserError 5473: (2586-2591): Types are not valid in untyped Yul.
+// ParserError 5473: (2596-2601): Types are not valid in untyped Yul.
+// ParserError 5473: (2606-2611): Types are not valid in untyped Yul.
+// ParserError 5473: (2616-2621): Types are not valid in untyped Yul.
+// ParserError 5473: (2626-2631): Types are not valid in untyped Yul.
+// ParserError 5473: (2636-2641): Types are not valid in untyped Yul.
+// ParserError 5473: (2646-2651): Types are not valid in untyped Yul.
+// ParserError 5473: (2660-2665): Types are not valid in untyped Yul.
+// ParserError 5473: (2670-2675): Types are not valid in untyped Yul.
+// ParserError 5473: (2680-2685): Types are not valid in untyped Yul.
+// ParserError 5473: (2690-2695): Types are not valid in untyped Yul.
+// ParserError 5473: (2700-2705): Types are not valid in untyped Yul.
+// ParserError 5473: (2710-2715): Types are not valid in untyped Yul.
+// ParserError 5473: (2720-2725): Types are not valid in untyped Yul.
+// ParserError 5473: (2730-2735): Types are not valid in untyped Yul.
+// ParserError 5473: (2740-2745): Types are not valid in untyped Yul.
+// ParserError 5473: (2750-2755): Types are not valid in untyped Yul.
+// ParserError 5473: (2760-2765): Types are not valid in untyped Yul.
+// ParserError 5473: (2770-2775): Types are not valid in untyped Yul.
+// ParserError 5473: (2780-2785): Types are not valid in untyped Yul.
+// ParserError 5473: (2790-2795): Types are not valid in untyped Yul.
+// ParserError 5473: (2800-2805): Types are not valid in untyped Yul.
+// ParserError 5473: (2810-2815): Types are not valid in untyped Yul.
 // Warning 4013: There are more than 256 errors. Aborting.

From fbaa505de5356aed03979b0bbc3395bbbfcd3a9e Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Fri, 16 Aug 2024 12:05:56 +0200
Subject: [PATCH 1021/1140] Yul: Builtins now record number of args and rets
 instead of respective vectors of types

---
 libyul/AsmAnalysis.cpp                            | 4 ++--
 libyul/Dialect.h                                  | 5 ++---
 libyul/backends/evm/ControlFlowGraphBuilder.cpp   | 2 +-
 libyul/backends/evm/EVMDialect.cpp                | 8 ++++----
 libyul/backends/evm/EVMDialect.h                  | 1 -
 libyul/backends/evm/NoOutputAssembly.cpp          | 2 +-
 libyul/backends/evm/OptimizedEVMCodeTransform.cpp | 2 +-
 test/libyul/Parser.cpp                            | 2 +-
 8 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index d039b3b47c..faa849fe18 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -327,8 +327,8 @@ size_t AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				"The use of transient storage for reentrancy guards that are cleared at the end of the call is safe."
 			);
 
-		numParameters = f->parameters.size();
-		numReturns = f->returns.size();
+		numParameters = f->numParameters;
+		numReturns = f->numReturns;
 		if (!f->literalArguments.empty())
 			literalArguments = &f->literalArguments;
 
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
index f9ce014690..3589e953f6 100644
--- a/libyul/Dialect.h
+++ b/libyul/Dialect.h
@@ -32,7 +32,6 @@
 namespace solidity::yul
 {
 
-using Type = YulName;
 enum class LiteralKind;
 class LiteralValue;
 struct Literal;
@@ -40,8 +39,8 @@ struct Literal;
 struct BuiltinFunction
 {
 	YulName name;
-	std::vector<Type> parameters;
-	std::vector<Type> returns;
+	size_t numParameters;
+	size_t numReturns;
 	SideEffects sideEffects;
 	ControlFlowSideEffects controlFlowSideEffects;
 	/// If true, this is the msize instruction or might contain it.
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 596c6c9619..46ef933ba2 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -527,7 +527,7 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 			// input
 			std::move(inputs),
 			// output
-			ranges::views::iota(0u, builtin->returns.size()) | ranges::views::transform([&](size_t _i) {
+			ranges::views::iota(0u, builtin->numReturns) | ranges::views::transform([&](size_t _i) {
 				return TemporarySlot{_call, _i};
 			}) | ranges::to<Stack>,
 			// operation
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index aeb8253040..dd5cad1dd7 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -50,8 +50,8 @@ std::pair<YulName, BuiltinFunctionForEVM> createEVMFunction(
 	evmasm::InstructionInfo info = evmasm::instructionInfo(_instruction, _evmVersion);
 	BuiltinFunctionForEVM f;
 	f.name = YulName{_name};
-	f.parameters.resize(static_cast<size_t>(info.args));
-	f.returns.resize(static_cast<size_t>(info.ret));
+	f.numParameters = static_cast<size_t>(info.args);
+	f.numReturns = static_cast<size_t>(info.ret);
 	f.sideEffects = EVMDialect::sideEffectsOfInstruction(_instruction);
 	if (evmasm::SemanticInformation::terminatesControlFlow(_instruction))
 	{
@@ -96,8 +96,8 @@ std::pair<YulName, BuiltinFunctionForEVM> createFunction(
 	YulName name{std::move(_name)};
 	BuiltinFunctionForEVM f;
 	f.name = name;
-	f.parameters.resize(_params);
-	f.returns.resize(_returns);
+	f.numParameters = _params;
+	f.numReturns = _returns;
 	f.sideEffects = std::move(_sideEffects);
 	f.literalArguments = std::move(_literalArguments);
 	f.isMSize = false;
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 3207b8fae0..3627a7fea9 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -33,7 +33,6 @@
 namespace solidity::yul
 {
 
-using Type = YulName;
 struct FunctionCall;
 struct Object;
 
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index 71818d2482..04324fa062 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -134,7 +134,7 @@ NoOutputEVMDialect::NoOutputEVMDialect(EVMDialect const& _copyFrom):
 {
 	for (auto& fun: m_functions)
 	{
-		size_t returns = fun.second.returns.size();
+		size_t returns = fun.second.numReturns;
 		fun.second.generateCode = [=](FunctionCall const& _call, AbstractAssembly& _assembly, BuiltinContext&)
 		{
 			for (size_t i: ranges::views::iota(0u, _call.arguments.size()))
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 6395ea64ae..8ef01f0b6a 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -147,7 +147,7 @@ void OptimizedEVMCodeTransform::operator()(CFG::BuiltinCall const& _call)
 		for (size_t i = 0; i < _call.arguments; ++i)
 			m_stack.pop_back();
 		// Push return values to m_stack.
-		for (size_t index: ranges::views::iota(0u, _call.builtin.get().returns.size()))
+		for (size_t index: ranges::views::iota(0u, _call.builtin.get().numReturns))
 			m_stack.emplace_back(TemporarySlot{_call.functionCall, index});
 		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
 	}
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 2a2f280929..9b8ce42921 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(builtins_analysis)
 		{
 			return _name == "builtin"_yulname ? &f : nullptr;
 		}
-		BuiltinFunction f{"builtin"_yulname, std::vector<Type>(2), std::vector<Type>(3), {}, {}, false, {}};
+		BuiltinFunction f{"builtin"_yulname, 2, 3, {}, {}, false, {}};
 	};
 
 	SimpleDialect dialect;

From 4938075b94089fd4fedb15177f984512f7efd5c6 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 27 Aug 2024 10:35:59 +0200
Subject: [PATCH 1022/1140] Yul: Improve variable naming and type error message
 wording, update tests.

---
 libyul/AsmAnalysis.cpp                        |   7 +-
 libyul/AsmAnalysis.h                          |   4 +-
 libyul/AsmJsonConverter.cpp                   |   3 +
 libyul/AsmJsonImporter.cpp                    |   8 +-
 libyul/AsmParser.cpp                          |  16 +-
 libyul/AsmParser.h                            |   2 +-
 test/libyul/yulSyntaxTests/invalid_type.yul   |   2 +-
 test/libyul/yulSyntaxTests/invalid_type2.yul  |   2 +-
 test/libyul/yulSyntaxTests/invalid_type3.yul  |   4 +-
 test/libyul/yulSyntaxTests/invalid_type4.yul  |   2 +-
 .../yulSyntaxTests/literal_invalid_type.yul   |   2 +-
 .../more_than_256_analysis_errors.yul         | 565 +++++++++---------
 12 files changed, 320 insertions(+), 297 deletions(-)

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index faa849fe18..64630fa2be 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -380,7 +380,6 @@ size_t AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			std::to_string(_funCall.arguments.size()) + "."
 		);
 
-	size_t numArgs{0};
 	for (size_t i = _funCall.arguments.size(); i > 0; i--)
 	{
 		Expression const& arg = _funCall.arguments[i - 1];
@@ -427,18 +426,16 @@ size_t AsmAnalyzer::operator()(FunctionCall const& _funCall)
 						);
 				}
 				expectUnlimitedStringLiteral(std::get<Literal>(arg));
-				++numArgs;
 				continue;
 			}
 		}
 		expectExpression(arg);
-		++numArgs;
 	}
 
 	if (watcher.ok())
 	{
-		yulAssert(numParameters && numParameters == numArgs, "");
-		yulAssert(numReturns, "");
+		yulAssert(numParameters && numParameters == _funCall.arguments.size());
+		yulAssert(numReturns);
 		return *numReturns;
 	}
 	else if (numReturns)
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index d01ecc1901..64cab51f54 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -102,8 +102,8 @@ class AsmAnalyzer
 	/// @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.
+	/// Visits the expression, expects that it evaluates to exactly one value.
+	/// Reports errors otherwise.
 	void expectExpression(Expression const& _expr);
 	void expectUnlimitedStringLiteral(Literal const& _literal);
 
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index d85b96f8f9..226ac52a5a 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -42,6 +42,9 @@ Json AsmJsonConverter::operator()(NameWithDebugData const& _node) const
 	yulAssert(!_node.name.empty(), "Invalid variable name.");
 	Json ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
 	ret["name"] = _node.name.str();
+	// even though types are removed from Yul, we keep this field in the Json interface to not introduce
+	// a breaking change
+	// can be removed with the next breaking version
 	ret["type"] = "";
 	return ret;
 }
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 6de7bb6abc..459d9d9bec 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -177,7 +177,13 @@ Literal AsmJsonImporter::createLiteral(Json const& _node)
 		value = member(_node, "value").get<std::string>();
 	{
 		auto const typeNode = member(_node, "type");
-		yulAssert(typeNode.empty() || typeNode.get<std::string>().empty());
+		yulAssert(
+			typeNode.empty() || typeNode.get<std::string>().empty(),
+			fmt::format(
+				"Expected literal types to be either empty or absent in the JSON. Got \"{}\".",
+				typeNode.get<std::string>()
+			)
+		);
 	}
 	if (kind == "number")
 	{
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index bd890c4aaa..d41b41a36a 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -567,7 +567,7 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimit
 			break;
 		}
 
-		auto const beginOfLiteralLoc = currentLocation();
+		auto const literalLocation = currentLocation();
 		Literal literal{
 			createDebugData(),
 			kind,
@@ -578,9 +578,9 @@ std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier(bool _unlimit
 		{
 			expectToken(Token::Colon);
 			updateLocationEndFrom(literal.debugData, currentLocation());
-			auto const loc = SourceLocation::smallestCovering(beginOfLiteralLoc, currentLocation());
+			auto const typedLiteralLocation = SourceLocation::smallestCovering(literalLocation, currentLocation());
 			std::ignore = expectAsmIdentifier();
-			expectUntyped(loc);
+			raiseUnsupportedTypesError(typedLiteralLocation);
 		}
 
 		return literal;
@@ -701,15 +701,15 @@ NameWithDebugData Parser::parseNameWithDebugData()
 {
 	RecursionGuard recursionGuard(*this);
 	NameWithDebugData typedName = createWithDebugData<NameWithDebugData>();
-	auto const locNameStart = currentLocation();
+	auto const nameLocation = currentLocation();
 	typedName.name = expectAsmIdentifier();
 	if (currentToken() == Token::Colon)
 	{
 		expectToken(Token::Colon);
 		updateLocationEndFrom(typedName.debugData, currentLocation());
-		auto const loc = SourceLocation::smallestCovering(locNameStart, currentLocation());
+		auto const typedNameLocation = SourceLocation::smallestCovering(nameLocation, currentLocation());
 		std::ignore = expectAsmIdentifier();
-		expectUntyped(loc);
+		raiseUnsupportedTypesError(typedNameLocation);
 	}
 
 	return typedName;
@@ -760,7 +760,7 @@ bool Parser::isValidNumberLiteral(std::string const& _literal)
 		return _literal.find_first_not_of("0123456789") == std::string::npos;
 }
 
-void Parser::expectUntyped(SourceLocation const& loc)
+void Parser::raiseUnsupportedTypesError(SourceLocation const& _location) const
 {
-	m_errorReporter.parserError(5473_error, loc, "Types are not valid in untyped Yul.");
+	m_errorReporter.parserError(5473_error, _location, "Types are not supported in untyped Yul.");
 }
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index 42ed2ca84d..d4616a2a95 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -147,7 +147,7 @@ class Parser: public langutil::ParserBase
 	FunctionCall parseCall(std::variant<Literal, Identifier>&& _initialOp);
 	NameWithDebugData parseNameWithDebugData();
 	YulName expectAsmIdentifier();
-	void expectUntyped(langutil::SourceLocation const& loc);
+	void raiseUnsupportedTypesError(langutil::SourceLocation const& _location) const;
 
 	/// Reports an error if we are currently not inside the body part of a for loop.
 	void checkBreakContinuePosition(std::string const& _which);
diff --git a/test/libyul/yulSyntaxTests/invalid_type.yul b/test/libyul/yulSyntaxTests/invalid_type.yul
index e9a4e30c95..69f20b7053 100644
--- a/test/libyul/yulSyntaxTests/invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type.yul
@@ -2,4 +2,4 @@
     let x: invalidType
 }
 // ----
-// ParserError 5473: (10-24): Types are not valid in untyped Yul.
+// ParserError 5473: (10-24): Types are not supported in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type2.yul b/test/libyul/yulSyntaxTests/invalid_type2.yul
index 5eb514866f..ab26f6925e 100644
--- a/test/libyul/yulSyntaxTests/invalid_type2.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type2.yul
@@ -2,4 +2,4 @@
     let x := 1:invalidType
 }
 // ----
-// ParserError 5473: (15-28): Types are not valid in untyped Yul.
+// ParserError 5473: (15-28): Types are not supported in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type3.yul b/test/libyul/yulSyntaxTests/invalid_type3.yul
index 9814527b0c..866d855adb 100644
--- a/test/libyul/yulSyntaxTests/invalid_type3.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type3.yul
@@ -2,5 +2,5 @@
     function f(a: invalidType) -> b: invalidType {}
 }
 // ----
-// ParserError 5473: (17-31): Types are not valid in untyped Yul.
-// ParserError 5473: (36-50): Types are not valid in untyped Yul.
+// ParserError 5473: (17-31): Types are not supported in untyped Yul.
+// ParserError 5473: (36-50): Types are not supported in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/invalid_type4.yul b/test/libyul/yulSyntaxTests/invalid_type4.yul
index 4924a592a7..e6ec73b7a1 100644
--- a/test/libyul/yulSyntaxTests/invalid_type4.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type4.yul
@@ -3,4 +3,4 @@
     case 8: invalidType {}
 }
 // ----
-// ParserError 5473: (24-38): Types are not valid in untyped Yul.
+// ParserError 5473: (24-38): Types are not supported in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
index 10a280120e..c0e6dccdf6 100644
--- a/test/libyul/yulSyntaxTests/literal_invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
@@ -2,4 +2,4 @@
     let x := true:unhappy
 }
 // ----
-// ParserError 5473: (15-27): Types are not valid in untyped Yul.
+// ParserError 5473: (15-27): Types are not supported in untyped Yul.
diff --git a/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
index edd7871a7e..031944953e 100644
--- a/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
+++ b/test/libyul/yulSyntaxTests/more_than_256_analysis_errors.yul
@@ -1,279 +1,296 @@
 {
-    // There's no type called 'x' so every declaration here should trigger an error.
+    // Using a variable to initialize itself should trigger a "variable is used before declared" error.
     // It's only detected during analysis and is not fatal. Any other non-fatal analysis error would do.
-    let $00:x let $10:x let $20:x let $30:x let $40:x let $50:x let $60:x let $70:x let $80:x let $90:x let $a0:x let $b0:x let $c0:x let $d0:x let $e0:x let $f0:x
-    let $01:x let $11:x let $21:x let $31:x let $41:x let $51:x let $61:x let $71:x let $81:x let $91:x let $a1:x let $b1:x let $c1:x let $d1:x let $e1:x let $f1:x
-    let $02:x let $12:x let $22:x let $32:x let $42:x let $52:x let $62:x let $72:x let $82:x let $92:x let $a2:x let $b2:x let $c2:x let $d2:x let $e2:x let $f2:x
-    let $03:x let $13:x let $23:x let $33:x let $43:x let $53:x let $63:x let $73:x let $83:x let $93:x let $a3:x let $b3:x let $c3:x let $d3:x let $e3:x let $f3:x
-    let $04:x let $14:x let $24:x let $34:x let $44:x let $54:x let $64:x let $74:x let $84:x let $94:x let $a4:x let $b4:x let $c4:x let $d4:x let $e4:x let $f4:x
-    let $05:x let $15:x let $25:x let $35:x let $45:x let $55:x let $65:x let $75:x let $85:x let $95:x let $a5:x let $b5:x let $c5:x let $d5:x let $e5:x let $f5:x
-    let $06:x let $16:x let $26:x let $36:x let $46:x let $56:x let $66:x let $76:x let $86:x let $96:x let $a6:x let $b6:x let $c6:x let $d6:x let $e6:x let $f6:x
-    let $07:x let $17:x let $27:x let $37:x let $47:x let $57:x let $67:x let $77:x let $87:x let $97:x let $a7:x let $b7:x let $c7:x let $d7:x let $e7:x let $f7:x
-    let $08:x let $18:x let $28:x let $38:x let $48:x let $58:x let $68:x let $78:x let $88:x let $98:x let $a8:x let $b8:x let $c8:x let $d8:x let $e8:x let $f8:x
-    let $09:x let $19:x let $29:x let $39:x let $49:x let $59:x let $69:x let $79:x let $89:x let $99:x let $a9:x let $b9:x let $c9:x let $d9:x let $e9:x let $f9:x
-    let $0a:x let $1a:x let $2a:x let $3a:x let $4a:x let $5a:x let $6a:x let $7a:x let $8a:x let $9a:x let $aa:x let $ba:x let $ca:x let $da:x let $ea:x let $fa:x
-    let $0b:x let $1b:x let $2b:x let $3b:x let $4b:x let $5b:x let $6b:x let $7b:x let $8b:x let $9b:x let $ab:x let $bb:x let $cb:x let $db:x let $eb:x let $fb:x
-    let $0c:x let $1c:x let $2c:x let $3c:x let $4c:x let $5c:x let $6c:x let $7c:x let $8c:x let $9c:x let $ac:x let $bc:x let $cc:x let $dc:x let $ec:x let $fc:x
-    let $0d:x let $1d:x let $2d:x let $3d:x let $4d:x let $5d:x let $6d:x let $7d:x let $8d:x let $9d:x let $ad:x let $bd:x let $cd:x let $dd:x let $ed:x let $fd:x
-    let $0e:x let $1e:x let $2e:x let $3e:x let $4e:x let $5e:x let $6e:x let $7e:x let $8e:x let $9e:x let $ae:x let $be:x let $ce:x let $de:x let $ee:x let $fe:x
-    let $0f:x let $1f:x let $2f:x let $3f:x let $4f:x let $5f:x let $6f:x let $7f:x let $8f:x let $9f:x let $af:x let $bf:x let $cf:x let $df:x let $ef:x let $ff:x
-    let $100:x
+    let x00:=x00 let x01:=x01 let x02:=x02 let x03:=x03 let x04:=x04 let x05:=x05 let x06:=x06 let x07:=x07
+    let x08:=x08 let x09:=x09 let x0a:=x0a let x0b:=x0b let x0c:=x0c let x0d:=x0d let x0e:=x0e let x0f:=x0f
+    let x10:=x10 let x11:=x11 let x12:=x12 let x13:=x13 let x14:=x14 let x15:=x15 let x16:=x16 let x17:=x17
+    let x18:=x18 let x19:=x19 let x1a:=x1a let x1b:=x1b let x1c:=x1c let x1d:=x1d let x1e:=x1e let x1f:=x1f
+    let x20:=x20 let x21:=x21 let x22:=x22 let x23:=x23 let x24:=x24 let x25:=x25 let x26:=x26 let x27:=x27
+    let x28:=x28 let x29:=x29 let x2a:=x2a let x2b:=x2b let x2c:=x2c let x2d:=x2d let x2e:=x2e let x2f:=x2f
+    let x30:=x30 let x31:=x31 let x32:=x32 let x33:=x33 let x34:=x34 let x35:=x35 let x36:=x36 let x37:=x37
+    let x38:=x38 let x39:=x39 let x3a:=x3a let x3b:=x3b let x3c:=x3c let x3d:=x3d let x3e:=x3e let x3f:=x3f
+    let x40:=x40 let x41:=x41 let x42:=x42 let x43:=x43 let x44:=x44 let x45:=x45 let x46:=x46 let x47:=x47
+    let x48:=x48 let x49:=x49 let x4a:=x4a let x4b:=x4b let x4c:=x4c let x4d:=x4d let x4e:=x4e let x4f:=x4f
+    let x50:=x50 let x51:=x51 let x52:=x52 let x53:=x53 let x54:=x54 let x55:=x55 let x56:=x56 let x57:=x57
+    let x58:=x58 let x59:=x59 let x5a:=x5a let x5b:=x5b let x5c:=x5c let x5d:=x5d let x5e:=x5e let x5f:=x5f
+    let x60:=x60 let x61:=x61 let x62:=x62 let x63:=x63 let x64:=x64 let x65:=x65 let x66:=x66 let x67:=x67
+    let x68:=x68 let x69:=x69 let x6a:=x6a let x6b:=x6b let x6c:=x6c let x6d:=x6d let x6e:=x6e let x6f:=x6f
+    let x70:=x70 let x71:=x71 let x72:=x72 let x73:=x73 let x74:=x74 let x75:=x75 let x76:=x76 let x77:=x77
+    let x78:=x78 let x79:=x79 let x7a:=x7a let x7b:=x7b let x7c:=x7c let x7d:=x7d let x7e:=x7e let x7f:=x7f
+    let x80:=x80 let x81:=x81 let x82:=x82 let x83:=x83 let x84:=x84 let x85:=x85 let x86:=x86 let x87:=x87
+    let x88:=x88 let x89:=x89 let x8a:=x8a let x8b:=x8b let x8c:=x8c let x8d:=x8d let x8e:=x8e let x8f:=x8f
+    let x90:=x90 let x91:=x91 let x92:=x92 let x93:=x93 let x94:=x94 let x95:=x95 let x96:=x96 let x97:=x97
+    let x98:=x98 let x99:=x99 let x9a:=x9a let x9b:=x9b let x9c:=x9c let x9d:=x9d let x9e:=x9e let x9f:=x9f
+    let xa0:=xa0 let xa1:=xa1 let xa2:=xa2 let xa3:=xa3 let xa4:=xa4 let xa5:=xa5 let xa6:=xa6 let xa7:=xa7
+    let xa8:=xa8 let xa9:=xa9 let xaa:=xaa let xab:=xab let xac:=xac let xad:=xad let xae:=xae let xaf:=xaf
+    let xb0:=xb0 let xb1:=xb1 let xb2:=xb2 let xb3:=xb3 let xb4:=xb4 let xb5:=xb5 let xb6:=xb6 let xb7:=xb7
+    let xb8:=xb8 let xb9:=xb9 let xba:=xba let xbb:=xbb let xbc:=xbc let xbd:=xbd let xbe:=xbe let xbf:=xbf
+    let xc0:=xc0 let xc1:=xc1 let xc2:=xc2 let xc3:=xc3 let xc4:=xc4 let xc5:=xc5 let xc6:=xc6 let xc7:=xc7
+    let xc8:=xc8 let xc9:=xc9 let xca:=xca let xcb:=xcb let xcc:=xcc let xcd:=xcd let xce:=xce let xcf:=xcf
+    let xd0:=xd0 let xd1:=xd1 let xd2:=xd2 let xd3:=xd3 let xd4:=xd4 let xd5:=xd5 let xd6:=xd6 let xd7:=xd7
+    let xd8:=xd8 let xd9:=xd9 let xda:=xda let xdb:=xdb let xdc:=xdc let xdd:=xdd let xde:=xde let xdf:=xdf
+    let xe0:=xe0 let xe1:=xe1 let xe2:=xe2 let xe3:=xe3 let xe4:=xe4 let xe5:=xe5 let xe6:=xe6 let xe7:=xe7
+    let xe8:=xe8 let xe9:=xe9 let xea:=xea let xeb:=xeb let xec:=xec let xed:=xed let xee:=xee let xef:=xef
+    let xf0:=xf0 let xf1:=xf1 let xf2:=xf2 let xf3:=xf3 let xf4:=xf4 let xf5:=xf5 let xf6:=xf6 let xf7:=xf7
+    let xf8:=xf8 let xf9:=xf9 let xfa:=xfa let xfb:=xfb let xfc:=xfc let xfd:=xfd let xfe:=xfe let xff:=xff
+    let x100:=x100
+
 }
 // ----
-// ParserError 5473: (200-205): Types are not valid in untyped Yul.
-// ParserError 5473: (210-215): Types are not valid in untyped Yul.
-// ParserError 5473: (220-225): Types are not valid in untyped Yul.
-// ParserError 5473: (230-235): Types are not valid in untyped Yul.
-// ParserError 5473: (240-245): Types are not valid in untyped Yul.
-// ParserError 5473: (250-255): Types are not valid in untyped Yul.
-// ParserError 5473: (260-265): Types are not valid in untyped Yul.
-// ParserError 5473: (270-275): Types are not valid in untyped Yul.
-// ParserError 5473: (280-285): Types are not valid in untyped Yul.
-// ParserError 5473: (290-295): Types are not valid in untyped Yul.
-// ParserError 5473: (300-305): Types are not valid in untyped Yul.
-// ParserError 5473: (310-315): Types are not valid in untyped Yul.
-// ParserError 5473: (320-325): Types are not valid in untyped Yul.
-// ParserError 5473: (330-335): Types are not valid in untyped Yul.
-// ParserError 5473: (340-345): Types are not valid in untyped Yul.
-// ParserError 5473: (350-355): Types are not valid in untyped Yul.
-// ParserError 5473: (364-369): Types are not valid in untyped Yul.
-// ParserError 5473: (374-379): Types are not valid in untyped Yul.
-// ParserError 5473: (384-389): Types are not valid in untyped Yul.
-// ParserError 5473: (394-399): Types are not valid in untyped Yul.
-// ParserError 5473: (404-409): Types are not valid in untyped Yul.
-// ParserError 5473: (414-419): Types are not valid in untyped Yul.
-// ParserError 5473: (424-429): Types are not valid in untyped Yul.
-// ParserError 5473: (434-439): Types are not valid in untyped Yul.
-// ParserError 5473: (444-449): Types are not valid in untyped Yul.
-// ParserError 5473: (454-459): Types are not valid in untyped Yul.
-// ParserError 5473: (464-469): Types are not valid in untyped Yul.
-// ParserError 5473: (474-479): Types are not valid in untyped Yul.
-// ParserError 5473: (484-489): Types are not valid in untyped Yul.
-// ParserError 5473: (494-499): Types are not valid in untyped Yul.
-// ParserError 5473: (504-509): Types are not valid in untyped Yul.
-// ParserError 5473: (514-519): Types are not valid in untyped Yul.
-// ParserError 5473: (528-533): Types are not valid in untyped Yul.
-// ParserError 5473: (538-543): Types are not valid in untyped Yul.
-// ParserError 5473: (548-553): Types are not valid in untyped Yul.
-// ParserError 5473: (558-563): Types are not valid in untyped Yul.
-// ParserError 5473: (568-573): Types are not valid in untyped Yul.
-// ParserError 5473: (578-583): Types are not valid in untyped Yul.
-// ParserError 5473: (588-593): Types are not valid in untyped Yul.
-// ParserError 5473: (598-603): Types are not valid in untyped Yul.
-// ParserError 5473: (608-613): Types are not valid in untyped Yul.
-// ParserError 5473: (618-623): Types are not valid in untyped Yul.
-// ParserError 5473: (628-633): Types are not valid in untyped Yul.
-// ParserError 5473: (638-643): Types are not valid in untyped Yul.
-// ParserError 5473: (648-653): Types are not valid in untyped Yul.
-// ParserError 5473: (658-663): Types are not valid in untyped Yul.
-// ParserError 5473: (668-673): Types are not valid in untyped Yul.
-// ParserError 5473: (678-683): Types are not valid in untyped Yul.
-// ParserError 5473: (692-697): Types are not valid in untyped Yul.
-// ParserError 5473: (702-707): Types are not valid in untyped Yul.
-// ParserError 5473: (712-717): Types are not valid in untyped Yul.
-// ParserError 5473: (722-727): Types are not valid in untyped Yul.
-// ParserError 5473: (732-737): Types are not valid in untyped Yul.
-// ParserError 5473: (742-747): Types are not valid in untyped Yul.
-// ParserError 5473: (752-757): Types are not valid in untyped Yul.
-// ParserError 5473: (762-767): Types are not valid in untyped Yul.
-// ParserError 5473: (772-777): Types are not valid in untyped Yul.
-// ParserError 5473: (782-787): Types are not valid in untyped Yul.
-// ParserError 5473: (792-797): Types are not valid in untyped Yul.
-// ParserError 5473: (802-807): Types are not valid in untyped Yul.
-// ParserError 5473: (812-817): Types are not valid in untyped Yul.
-// ParserError 5473: (822-827): Types are not valid in untyped Yul.
-// ParserError 5473: (832-837): Types are not valid in untyped Yul.
-// ParserError 5473: (842-847): Types are not valid in untyped Yul.
-// ParserError 5473: (856-861): Types are not valid in untyped Yul.
-// ParserError 5473: (866-871): Types are not valid in untyped Yul.
-// ParserError 5473: (876-881): Types are not valid in untyped Yul.
-// ParserError 5473: (886-891): Types are not valid in untyped Yul.
-// ParserError 5473: (896-901): Types are not valid in untyped Yul.
-// ParserError 5473: (906-911): Types are not valid in untyped Yul.
-// ParserError 5473: (916-921): Types are not valid in untyped Yul.
-// ParserError 5473: (926-931): Types are not valid in untyped Yul.
-// ParserError 5473: (936-941): Types are not valid in untyped Yul.
-// ParserError 5473: (946-951): Types are not valid in untyped Yul.
-// ParserError 5473: (956-961): Types are not valid in untyped Yul.
-// ParserError 5473: (966-971): Types are not valid in untyped Yul.
-// ParserError 5473: (976-981): Types are not valid in untyped Yul.
-// ParserError 5473: (986-991): Types are not valid in untyped Yul.
-// ParserError 5473: (996-1001): Types are not valid in untyped Yul.
-// ParserError 5473: (1006-1011): Types are not valid in untyped Yul.
-// ParserError 5473: (1020-1025): Types are not valid in untyped Yul.
-// ParserError 5473: (1030-1035): Types are not valid in untyped Yul.
-// ParserError 5473: (1040-1045): Types are not valid in untyped Yul.
-// ParserError 5473: (1050-1055): Types are not valid in untyped Yul.
-// ParserError 5473: (1060-1065): Types are not valid in untyped Yul.
-// ParserError 5473: (1070-1075): Types are not valid in untyped Yul.
-// ParserError 5473: (1080-1085): Types are not valid in untyped Yul.
-// ParserError 5473: (1090-1095): Types are not valid in untyped Yul.
-// ParserError 5473: (1100-1105): Types are not valid in untyped Yul.
-// ParserError 5473: (1110-1115): Types are not valid in untyped Yul.
-// ParserError 5473: (1120-1125): Types are not valid in untyped Yul.
-// ParserError 5473: (1130-1135): Types are not valid in untyped Yul.
-// ParserError 5473: (1140-1145): Types are not valid in untyped Yul.
-// ParserError 5473: (1150-1155): Types are not valid in untyped Yul.
-// ParserError 5473: (1160-1165): Types are not valid in untyped Yul.
-// ParserError 5473: (1170-1175): Types are not valid in untyped Yul.
-// ParserError 5473: (1184-1189): Types are not valid in untyped Yul.
-// ParserError 5473: (1194-1199): Types are not valid in untyped Yul.
-// ParserError 5473: (1204-1209): Types are not valid in untyped Yul.
-// ParserError 5473: (1214-1219): Types are not valid in untyped Yul.
-// ParserError 5473: (1224-1229): Types are not valid in untyped Yul.
-// ParserError 5473: (1234-1239): Types are not valid in untyped Yul.
-// ParserError 5473: (1244-1249): Types are not valid in untyped Yul.
-// ParserError 5473: (1254-1259): Types are not valid in untyped Yul.
-// ParserError 5473: (1264-1269): Types are not valid in untyped Yul.
-// ParserError 5473: (1274-1279): Types are not valid in untyped Yul.
-// ParserError 5473: (1284-1289): Types are not valid in untyped Yul.
-// ParserError 5473: (1294-1299): Types are not valid in untyped Yul.
-// ParserError 5473: (1304-1309): Types are not valid in untyped Yul.
-// ParserError 5473: (1314-1319): Types are not valid in untyped Yul.
-// ParserError 5473: (1324-1329): Types are not valid in untyped Yul.
-// ParserError 5473: (1334-1339): Types are not valid in untyped Yul.
-// ParserError 5473: (1348-1353): Types are not valid in untyped Yul.
-// ParserError 5473: (1358-1363): Types are not valid in untyped Yul.
-// ParserError 5473: (1368-1373): Types are not valid in untyped Yul.
-// ParserError 5473: (1378-1383): Types are not valid in untyped Yul.
-// ParserError 5473: (1388-1393): Types are not valid in untyped Yul.
-// ParserError 5473: (1398-1403): Types are not valid in untyped Yul.
-// ParserError 5473: (1408-1413): Types are not valid in untyped Yul.
-// ParserError 5473: (1418-1423): Types are not valid in untyped Yul.
-// ParserError 5473: (1428-1433): Types are not valid in untyped Yul.
-// ParserError 5473: (1438-1443): Types are not valid in untyped Yul.
-// ParserError 5473: (1448-1453): Types are not valid in untyped Yul.
-// ParserError 5473: (1458-1463): Types are not valid in untyped Yul.
-// ParserError 5473: (1468-1473): Types are not valid in untyped Yul.
-// ParserError 5473: (1478-1483): Types are not valid in untyped Yul.
-// ParserError 5473: (1488-1493): Types are not valid in untyped Yul.
-// ParserError 5473: (1498-1503): Types are not valid in untyped Yul.
-// ParserError 5473: (1512-1517): Types are not valid in untyped Yul.
-// ParserError 5473: (1522-1527): Types are not valid in untyped Yul.
-// ParserError 5473: (1532-1537): Types are not valid in untyped Yul.
-// ParserError 5473: (1542-1547): Types are not valid in untyped Yul.
-// ParserError 5473: (1552-1557): Types are not valid in untyped Yul.
-// ParserError 5473: (1562-1567): Types are not valid in untyped Yul.
-// ParserError 5473: (1572-1577): Types are not valid in untyped Yul.
-// ParserError 5473: (1582-1587): Types are not valid in untyped Yul.
-// ParserError 5473: (1592-1597): Types are not valid in untyped Yul.
-// ParserError 5473: (1602-1607): Types are not valid in untyped Yul.
-// ParserError 5473: (1612-1617): Types are not valid in untyped Yul.
-// ParserError 5473: (1622-1627): Types are not valid in untyped Yul.
-// ParserError 5473: (1632-1637): Types are not valid in untyped Yul.
-// ParserError 5473: (1642-1647): Types are not valid in untyped Yul.
-// ParserError 5473: (1652-1657): Types are not valid in untyped Yul.
-// ParserError 5473: (1662-1667): Types are not valid in untyped Yul.
-// ParserError 5473: (1676-1681): Types are not valid in untyped Yul.
-// ParserError 5473: (1686-1691): Types are not valid in untyped Yul.
-// ParserError 5473: (1696-1701): Types are not valid in untyped Yul.
-// ParserError 5473: (1706-1711): Types are not valid in untyped Yul.
-// ParserError 5473: (1716-1721): Types are not valid in untyped Yul.
-// ParserError 5473: (1726-1731): Types are not valid in untyped Yul.
-// ParserError 5473: (1736-1741): Types are not valid in untyped Yul.
-// ParserError 5473: (1746-1751): Types are not valid in untyped Yul.
-// ParserError 5473: (1756-1761): Types are not valid in untyped Yul.
-// ParserError 5473: (1766-1771): Types are not valid in untyped Yul.
-// ParserError 5473: (1776-1781): Types are not valid in untyped Yul.
-// ParserError 5473: (1786-1791): Types are not valid in untyped Yul.
-// ParserError 5473: (1796-1801): Types are not valid in untyped Yul.
-// ParserError 5473: (1806-1811): Types are not valid in untyped Yul.
-// ParserError 5473: (1816-1821): Types are not valid in untyped Yul.
-// ParserError 5473: (1826-1831): Types are not valid in untyped Yul.
-// ParserError 5473: (1840-1845): Types are not valid in untyped Yul.
-// ParserError 5473: (1850-1855): Types are not valid in untyped Yul.
-// ParserError 5473: (1860-1865): Types are not valid in untyped Yul.
-// ParserError 5473: (1870-1875): Types are not valid in untyped Yul.
-// ParserError 5473: (1880-1885): Types are not valid in untyped Yul.
-// ParserError 5473: (1890-1895): Types are not valid in untyped Yul.
-// ParserError 5473: (1900-1905): Types are not valid in untyped Yul.
-// ParserError 5473: (1910-1915): Types are not valid in untyped Yul.
-// ParserError 5473: (1920-1925): Types are not valid in untyped Yul.
-// ParserError 5473: (1930-1935): Types are not valid in untyped Yul.
-// ParserError 5473: (1940-1945): Types are not valid in untyped Yul.
-// ParserError 5473: (1950-1955): Types are not valid in untyped Yul.
-// ParserError 5473: (1960-1965): Types are not valid in untyped Yul.
-// ParserError 5473: (1970-1975): Types are not valid in untyped Yul.
-// ParserError 5473: (1980-1985): Types are not valid in untyped Yul.
-// ParserError 5473: (1990-1995): Types are not valid in untyped Yul.
-// ParserError 5473: (2004-2009): Types are not valid in untyped Yul.
-// ParserError 5473: (2014-2019): Types are not valid in untyped Yul.
-// ParserError 5473: (2024-2029): Types are not valid in untyped Yul.
-// ParserError 5473: (2034-2039): Types are not valid in untyped Yul.
-// ParserError 5473: (2044-2049): Types are not valid in untyped Yul.
-// ParserError 5473: (2054-2059): Types are not valid in untyped Yul.
-// ParserError 5473: (2064-2069): Types are not valid in untyped Yul.
-// ParserError 5473: (2074-2079): Types are not valid in untyped Yul.
-// ParserError 5473: (2084-2089): Types are not valid in untyped Yul.
-// ParserError 5473: (2094-2099): Types are not valid in untyped Yul.
-// ParserError 5473: (2104-2109): Types are not valid in untyped Yul.
-// ParserError 5473: (2114-2119): Types are not valid in untyped Yul.
-// ParserError 5473: (2124-2129): Types are not valid in untyped Yul.
-// ParserError 5473: (2134-2139): Types are not valid in untyped Yul.
-// ParserError 5473: (2144-2149): Types are not valid in untyped Yul.
-// ParserError 5473: (2154-2159): Types are not valid in untyped Yul.
-// ParserError 5473: (2168-2173): Types are not valid in untyped Yul.
-// ParserError 5473: (2178-2183): Types are not valid in untyped Yul.
-// ParserError 5473: (2188-2193): Types are not valid in untyped Yul.
-// ParserError 5473: (2198-2203): Types are not valid in untyped Yul.
-// ParserError 5473: (2208-2213): Types are not valid in untyped Yul.
-// ParserError 5473: (2218-2223): Types are not valid in untyped Yul.
-// ParserError 5473: (2228-2233): Types are not valid in untyped Yul.
-// ParserError 5473: (2238-2243): Types are not valid in untyped Yul.
-// ParserError 5473: (2248-2253): Types are not valid in untyped Yul.
-// ParserError 5473: (2258-2263): Types are not valid in untyped Yul.
-// ParserError 5473: (2268-2273): Types are not valid in untyped Yul.
-// ParserError 5473: (2278-2283): Types are not valid in untyped Yul.
-// ParserError 5473: (2288-2293): Types are not valid in untyped Yul.
-// ParserError 5473: (2298-2303): Types are not valid in untyped Yul.
-// ParserError 5473: (2308-2313): Types are not valid in untyped Yul.
-// ParserError 5473: (2318-2323): Types are not valid in untyped Yul.
-// ParserError 5473: (2332-2337): Types are not valid in untyped Yul.
-// ParserError 5473: (2342-2347): Types are not valid in untyped Yul.
-// ParserError 5473: (2352-2357): Types are not valid in untyped Yul.
-// ParserError 5473: (2362-2367): Types are not valid in untyped Yul.
-// ParserError 5473: (2372-2377): Types are not valid in untyped Yul.
-// ParserError 5473: (2382-2387): Types are not valid in untyped Yul.
-// ParserError 5473: (2392-2397): Types are not valid in untyped Yul.
-// ParserError 5473: (2402-2407): Types are not valid in untyped Yul.
-// ParserError 5473: (2412-2417): Types are not valid in untyped Yul.
-// ParserError 5473: (2422-2427): Types are not valid in untyped Yul.
-// ParserError 5473: (2432-2437): Types are not valid in untyped Yul.
-// ParserError 5473: (2442-2447): Types are not valid in untyped Yul.
-// ParserError 5473: (2452-2457): Types are not valid in untyped Yul.
-// ParserError 5473: (2462-2467): Types are not valid in untyped Yul.
-// ParserError 5473: (2472-2477): Types are not valid in untyped Yul.
-// ParserError 5473: (2482-2487): Types are not valid in untyped Yul.
-// ParserError 5473: (2496-2501): Types are not valid in untyped Yul.
-// ParserError 5473: (2506-2511): Types are not valid in untyped Yul.
-// ParserError 5473: (2516-2521): Types are not valid in untyped Yul.
-// ParserError 5473: (2526-2531): Types are not valid in untyped Yul.
-// ParserError 5473: (2536-2541): Types are not valid in untyped Yul.
-// ParserError 5473: (2546-2551): Types are not valid in untyped Yul.
-// ParserError 5473: (2556-2561): Types are not valid in untyped Yul.
-// ParserError 5473: (2566-2571): Types are not valid in untyped Yul.
-// ParserError 5473: (2576-2581): Types are not valid in untyped Yul.
-// ParserError 5473: (2586-2591): Types are not valid in untyped Yul.
-// ParserError 5473: (2596-2601): Types are not valid in untyped Yul.
-// ParserError 5473: (2606-2611): Types are not valid in untyped Yul.
-// ParserError 5473: (2616-2621): Types are not valid in untyped Yul.
-// ParserError 5473: (2626-2631): Types are not valid in untyped Yul.
-// ParserError 5473: (2636-2641): Types are not valid in untyped Yul.
-// ParserError 5473: (2646-2651): Types are not valid in untyped Yul.
-// ParserError 5473: (2660-2665): Types are not valid in untyped Yul.
-// ParserError 5473: (2670-2675): Types are not valid in untyped Yul.
-// ParserError 5473: (2680-2685): Types are not valid in untyped Yul.
-// ParserError 5473: (2690-2695): Types are not valid in untyped Yul.
-// ParserError 5473: (2700-2705): Types are not valid in untyped Yul.
-// ParserError 5473: (2710-2715): Types are not valid in untyped Yul.
-// ParserError 5473: (2720-2725): Types are not valid in untyped Yul.
-// ParserError 5473: (2730-2735): Types are not valid in untyped Yul.
-// ParserError 5473: (2740-2745): Types are not valid in untyped Yul.
-// ParserError 5473: (2750-2755): Types are not valid in untyped Yul.
-// ParserError 5473: (2760-2765): Types are not valid in untyped Yul.
-// ParserError 5473: (2770-2775): Types are not valid in untyped Yul.
-// ParserError 5473: (2780-2785): Types are not valid in untyped Yul.
-// ParserError 5473: (2790-2795): Types are not valid in untyped Yul.
-// ParserError 5473: (2800-2805): Types are not valid in untyped Yul.
-// ParserError 5473: (2810-2815): Types are not valid in untyped Yul.
+// DeclarationError 4990: (224-227): Variable x00 used before it was declared.
+// DeclarationError 4990: (237-240): Variable x01 used before it was declared.
+// DeclarationError 4990: (250-253): Variable x02 used before it was declared.
+// DeclarationError 4990: (263-266): Variable x03 used before it was declared.
+// DeclarationError 4990: (276-279): Variable x04 used before it was declared.
+// DeclarationError 4990: (289-292): Variable x05 used before it was declared.
+// DeclarationError 4990: (302-305): Variable x06 used before it was declared.
+// DeclarationError 4990: (315-318): Variable x07 used before it was declared.
+// DeclarationError 4990: (332-335): Variable x08 used before it was declared.
+// DeclarationError 4990: (345-348): Variable x09 used before it was declared.
+// DeclarationError 4990: (358-361): Variable x0a used before it was declared.
+// DeclarationError 4990: (371-374): Variable x0b used before it was declared.
+// DeclarationError 4990: (384-387): Variable x0c used before it was declared.
+// DeclarationError 4990: (397-400): Variable x0d used before it was declared.
+// DeclarationError 4990: (410-413): Variable x0e used before it was declared.
+// DeclarationError 4990: (423-426): Variable x0f used before it was declared.
+// DeclarationError 4990: (440-443): Variable x10 used before it was declared.
+// DeclarationError 4990: (453-456): Variable x11 used before it was declared.
+// DeclarationError 4990: (466-469): Variable x12 used before it was declared.
+// DeclarationError 4990: (479-482): Variable x13 used before it was declared.
+// DeclarationError 4990: (492-495): Variable x14 used before it was declared.
+// DeclarationError 4990: (505-508): Variable x15 used before it was declared.
+// DeclarationError 4990: (518-521): Variable x16 used before it was declared.
+// DeclarationError 4990: (531-534): Variable x17 used before it was declared.
+// DeclarationError 4990: (548-551): Variable x18 used before it was declared.
+// DeclarationError 4990: (561-564): Variable x19 used before it was declared.
+// DeclarationError 4990: (574-577): Variable x1a used before it was declared.
+// DeclarationError 4990: (587-590): Variable x1b used before it was declared.
+// DeclarationError 4990: (600-603): Variable x1c used before it was declared.
+// DeclarationError 4990: (613-616): Variable x1d used before it was declared.
+// DeclarationError 4990: (626-629): Variable x1e used before it was declared.
+// DeclarationError 4990: (639-642): Variable x1f used before it was declared.
+// DeclarationError 4990: (656-659): Variable x20 used before it was declared.
+// DeclarationError 4990: (669-672): Variable x21 used before it was declared.
+// DeclarationError 4990: (682-685): Variable x22 used before it was declared.
+// DeclarationError 4990: (695-698): Variable x23 used before it was declared.
+// DeclarationError 4990: (708-711): Variable x24 used before it was declared.
+// DeclarationError 4990: (721-724): Variable x25 used before it was declared.
+// DeclarationError 4990: (734-737): Variable x26 used before it was declared.
+// DeclarationError 4990: (747-750): Variable x27 used before it was declared.
+// DeclarationError 4990: (764-767): Variable x28 used before it was declared.
+// DeclarationError 4990: (777-780): Variable x29 used before it was declared.
+// DeclarationError 4990: (790-793): Variable x2a used before it was declared.
+// DeclarationError 4990: (803-806): Variable x2b used before it was declared.
+// DeclarationError 4990: (816-819): Variable x2c used before it was declared.
+// DeclarationError 4990: (829-832): Variable x2d used before it was declared.
+// DeclarationError 4990: (842-845): Variable x2e used before it was declared.
+// DeclarationError 4990: (855-858): Variable x2f used before it was declared.
+// DeclarationError 4990: (872-875): Variable x30 used before it was declared.
+// DeclarationError 4990: (885-888): Variable x31 used before it was declared.
+// DeclarationError 4990: (898-901): Variable x32 used before it was declared.
+// DeclarationError 4990: (911-914): Variable x33 used before it was declared.
+// DeclarationError 4990: (924-927): Variable x34 used before it was declared.
+// DeclarationError 4990: (937-940): Variable x35 used before it was declared.
+// DeclarationError 4990: (950-953): Variable x36 used before it was declared.
+// DeclarationError 4990: (963-966): Variable x37 used before it was declared.
+// DeclarationError 4990: (980-983): Variable x38 used before it was declared.
+// DeclarationError 4990: (993-996): Variable x39 used before it was declared.
+// DeclarationError 4990: (1006-1009): Variable x3a used before it was declared.
+// DeclarationError 4990: (1019-1022): Variable x3b used before it was declared.
+// DeclarationError 4990: (1032-1035): Variable x3c used before it was declared.
+// DeclarationError 4990: (1045-1048): Variable x3d used before it was declared.
+// DeclarationError 4990: (1058-1061): Variable x3e used before it was declared.
+// DeclarationError 4990: (1071-1074): Variable x3f used before it was declared.
+// DeclarationError 4990: (1088-1091): Variable x40 used before it was declared.
+// DeclarationError 4990: (1101-1104): Variable x41 used before it was declared.
+// DeclarationError 4990: (1114-1117): Variable x42 used before it was declared.
+// DeclarationError 4990: (1127-1130): Variable x43 used before it was declared.
+// DeclarationError 4990: (1140-1143): Variable x44 used before it was declared.
+// DeclarationError 4990: (1153-1156): Variable x45 used before it was declared.
+// DeclarationError 4990: (1166-1169): Variable x46 used before it was declared.
+// DeclarationError 4990: (1179-1182): Variable x47 used before it was declared.
+// DeclarationError 4990: (1196-1199): Variable x48 used before it was declared.
+// DeclarationError 4990: (1209-1212): Variable x49 used before it was declared.
+// DeclarationError 4990: (1222-1225): Variable x4a used before it was declared.
+// DeclarationError 4990: (1235-1238): Variable x4b used before it was declared.
+// DeclarationError 4990: (1248-1251): Variable x4c used before it was declared.
+// DeclarationError 4990: (1261-1264): Variable x4d used before it was declared.
+// DeclarationError 4990: (1274-1277): Variable x4e used before it was declared.
+// DeclarationError 4990: (1287-1290): Variable x4f used before it was declared.
+// DeclarationError 4990: (1304-1307): Variable x50 used before it was declared.
+// DeclarationError 4990: (1317-1320): Variable x51 used before it was declared.
+// DeclarationError 4990: (1330-1333): Variable x52 used before it was declared.
+// DeclarationError 4990: (1343-1346): Variable x53 used before it was declared.
+// DeclarationError 4990: (1356-1359): Variable x54 used before it was declared.
+// DeclarationError 4990: (1369-1372): Variable x55 used before it was declared.
+// DeclarationError 4990: (1382-1385): Variable x56 used before it was declared.
+// DeclarationError 4990: (1395-1398): Variable x57 used before it was declared.
+// DeclarationError 4990: (1412-1415): Variable x58 used before it was declared.
+// DeclarationError 4990: (1425-1428): Variable x59 used before it was declared.
+// DeclarationError 4990: (1438-1441): Variable x5a used before it was declared.
+// DeclarationError 4990: (1451-1454): Variable x5b used before it was declared.
+// DeclarationError 4990: (1464-1467): Variable x5c used before it was declared.
+// DeclarationError 4990: (1477-1480): Variable x5d used before it was declared.
+// DeclarationError 4990: (1490-1493): Variable x5e used before it was declared.
+// DeclarationError 4990: (1503-1506): Variable x5f used before it was declared.
+// DeclarationError 4990: (1520-1523): Variable x60 used before it was declared.
+// DeclarationError 4990: (1533-1536): Variable x61 used before it was declared.
+// DeclarationError 4990: (1546-1549): Variable x62 used before it was declared.
+// DeclarationError 4990: (1559-1562): Variable x63 used before it was declared.
+// DeclarationError 4990: (1572-1575): Variable x64 used before it was declared.
+// DeclarationError 4990: (1585-1588): Variable x65 used before it was declared.
+// DeclarationError 4990: (1598-1601): Variable x66 used before it was declared.
+// DeclarationError 4990: (1611-1614): Variable x67 used before it was declared.
+// DeclarationError 4990: (1628-1631): Variable x68 used before it was declared.
+// DeclarationError 4990: (1641-1644): Variable x69 used before it was declared.
+// DeclarationError 4990: (1654-1657): Variable x6a used before it was declared.
+// DeclarationError 4990: (1667-1670): Variable x6b used before it was declared.
+// DeclarationError 4990: (1680-1683): Variable x6c used before it was declared.
+// DeclarationError 4990: (1693-1696): Variable x6d used before it was declared.
+// DeclarationError 4990: (1706-1709): Variable x6e used before it was declared.
+// DeclarationError 4990: (1719-1722): Variable x6f used before it was declared.
+// DeclarationError 4990: (1736-1739): Variable x70 used before it was declared.
+// DeclarationError 4990: (1749-1752): Variable x71 used before it was declared.
+// DeclarationError 4990: (1762-1765): Variable x72 used before it was declared.
+// DeclarationError 4990: (1775-1778): Variable x73 used before it was declared.
+// DeclarationError 4990: (1788-1791): Variable x74 used before it was declared.
+// DeclarationError 4990: (1801-1804): Variable x75 used before it was declared.
+// DeclarationError 4990: (1814-1817): Variable x76 used before it was declared.
+// DeclarationError 4990: (1827-1830): Variable x77 used before it was declared.
+// DeclarationError 4990: (1844-1847): Variable x78 used before it was declared.
+// DeclarationError 4990: (1857-1860): Variable x79 used before it was declared.
+// DeclarationError 4990: (1870-1873): Variable x7a used before it was declared.
+// DeclarationError 4990: (1883-1886): Variable x7b used before it was declared.
+// DeclarationError 4990: (1896-1899): Variable x7c used before it was declared.
+// DeclarationError 4990: (1909-1912): Variable x7d used before it was declared.
+// DeclarationError 4990: (1922-1925): Variable x7e used before it was declared.
+// DeclarationError 4990: (1935-1938): Variable x7f used before it was declared.
+// DeclarationError 4990: (1952-1955): Variable x80 used before it was declared.
+// DeclarationError 4990: (1965-1968): Variable x81 used before it was declared.
+// DeclarationError 4990: (1978-1981): Variable x82 used before it was declared.
+// DeclarationError 4990: (1991-1994): Variable x83 used before it was declared.
+// DeclarationError 4990: (2004-2007): Variable x84 used before it was declared.
+// DeclarationError 4990: (2017-2020): Variable x85 used before it was declared.
+// DeclarationError 4990: (2030-2033): Variable x86 used before it was declared.
+// DeclarationError 4990: (2043-2046): Variable x87 used before it was declared.
+// DeclarationError 4990: (2060-2063): Variable x88 used before it was declared.
+// DeclarationError 4990: (2073-2076): Variable x89 used before it was declared.
+// DeclarationError 4990: (2086-2089): Variable x8a used before it was declared.
+// DeclarationError 4990: (2099-2102): Variable x8b used before it was declared.
+// DeclarationError 4990: (2112-2115): Variable x8c used before it was declared.
+// DeclarationError 4990: (2125-2128): Variable x8d used before it was declared.
+// DeclarationError 4990: (2138-2141): Variable x8e used before it was declared.
+// DeclarationError 4990: (2151-2154): Variable x8f used before it was declared.
+// DeclarationError 4990: (2168-2171): Variable x90 used before it was declared.
+// DeclarationError 4990: (2181-2184): Variable x91 used before it was declared.
+// DeclarationError 4990: (2194-2197): Variable x92 used before it was declared.
+// DeclarationError 4990: (2207-2210): Variable x93 used before it was declared.
+// DeclarationError 4990: (2220-2223): Variable x94 used before it was declared.
+// DeclarationError 4990: (2233-2236): Variable x95 used before it was declared.
+// DeclarationError 4990: (2246-2249): Variable x96 used before it was declared.
+// DeclarationError 4990: (2259-2262): Variable x97 used before it was declared.
+// DeclarationError 4990: (2276-2279): Variable x98 used before it was declared.
+// DeclarationError 4990: (2289-2292): Variable x99 used before it was declared.
+// DeclarationError 4990: (2302-2305): Variable x9a used before it was declared.
+// DeclarationError 4990: (2315-2318): Variable x9b used before it was declared.
+// DeclarationError 4990: (2328-2331): Variable x9c used before it was declared.
+// DeclarationError 4990: (2341-2344): Variable x9d used before it was declared.
+// DeclarationError 4990: (2354-2357): Variable x9e used before it was declared.
+// DeclarationError 4990: (2367-2370): Variable x9f used before it was declared.
+// DeclarationError 4990: (2384-2387): Variable xa0 used before it was declared.
+// DeclarationError 4990: (2397-2400): Variable xa1 used before it was declared.
+// DeclarationError 4990: (2410-2413): Variable xa2 used before it was declared.
+// DeclarationError 4990: (2423-2426): Variable xa3 used before it was declared.
+// DeclarationError 4990: (2436-2439): Variable xa4 used before it was declared.
+// DeclarationError 4990: (2449-2452): Variable xa5 used before it was declared.
+// DeclarationError 4990: (2462-2465): Variable xa6 used before it was declared.
+// DeclarationError 4990: (2475-2478): Variable xa7 used before it was declared.
+// DeclarationError 4990: (2492-2495): Variable xa8 used before it was declared.
+// DeclarationError 4990: (2505-2508): Variable xa9 used before it was declared.
+// DeclarationError 4990: (2518-2521): Variable xaa used before it was declared.
+// DeclarationError 4990: (2531-2534): Variable xab used before it was declared.
+// DeclarationError 4990: (2544-2547): Variable xac used before it was declared.
+// DeclarationError 4990: (2557-2560): Variable xad used before it was declared.
+// DeclarationError 4990: (2570-2573): Variable xae used before it was declared.
+// DeclarationError 4990: (2583-2586): Variable xaf used before it was declared.
+// DeclarationError 4990: (2600-2603): Variable xb0 used before it was declared.
+// DeclarationError 4990: (2613-2616): Variable xb1 used before it was declared.
+// DeclarationError 4990: (2626-2629): Variable xb2 used before it was declared.
+// DeclarationError 4990: (2639-2642): Variable xb3 used before it was declared.
+// DeclarationError 4990: (2652-2655): Variable xb4 used before it was declared.
+// DeclarationError 4990: (2665-2668): Variable xb5 used before it was declared.
+// DeclarationError 4990: (2678-2681): Variable xb6 used before it was declared.
+// DeclarationError 4990: (2691-2694): Variable xb7 used before it was declared.
+// DeclarationError 4990: (2708-2711): Variable xb8 used before it was declared.
+// DeclarationError 4990: (2721-2724): Variable xb9 used before it was declared.
+// DeclarationError 4990: (2734-2737): Variable xba used before it was declared.
+// DeclarationError 4990: (2747-2750): Variable xbb used before it was declared.
+// DeclarationError 4990: (2760-2763): Variable xbc used before it was declared.
+// DeclarationError 4990: (2773-2776): Variable xbd used before it was declared.
+// DeclarationError 4990: (2786-2789): Variable xbe used before it was declared.
+// DeclarationError 4990: (2799-2802): Variable xbf used before it was declared.
+// DeclarationError 4990: (2816-2819): Variable xc0 used before it was declared.
+// DeclarationError 4990: (2829-2832): Variable xc1 used before it was declared.
+// DeclarationError 4990: (2842-2845): Variable xc2 used before it was declared.
+// DeclarationError 4990: (2855-2858): Variable xc3 used before it was declared.
+// DeclarationError 4990: (2868-2871): Variable xc4 used before it was declared.
+// DeclarationError 4990: (2881-2884): Variable xc5 used before it was declared.
+// DeclarationError 4990: (2894-2897): Variable xc6 used before it was declared.
+// DeclarationError 4990: (2907-2910): Variable xc7 used before it was declared.
+// DeclarationError 4990: (2924-2927): Variable xc8 used before it was declared.
+// DeclarationError 4990: (2937-2940): Variable xc9 used before it was declared.
+// DeclarationError 4990: (2950-2953): Variable xca used before it was declared.
+// DeclarationError 4990: (2963-2966): Variable xcb used before it was declared.
+// DeclarationError 4990: (2976-2979): Variable xcc used before it was declared.
+// DeclarationError 4990: (2989-2992): Variable xcd used before it was declared.
+// DeclarationError 4990: (3002-3005): Variable xce used before it was declared.
+// DeclarationError 4990: (3015-3018): Variable xcf used before it was declared.
+// DeclarationError 4990: (3032-3035): Variable xd0 used before it was declared.
+// DeclarationError 4990: (3045-3048): Variable xd1 used before it was declared.
+// DeclarationError 4990: (3058-3061): Variable xd2 used before it was declared.
+// DeclarationError 4990: (3071-3074): Variable xd3 used before it was declared.
+// DeclarationError 4990: (3084-3087): Variable xd4 used before it was declared.
+// DeclarationError 4990: (3097-3100): Variable xd5 used before it was declared.
+// DeclarationError 4990: (3110-3113): Variable xd6 used before it was declared.
+// DeclarationError 4990: (3123-3126): Variable xd7 used before it was declared.
+// DeclarationError 4990: (3140-3143): Variable xd8 used before it was declared.
+// DeclarationError 4990: (3153-3156): Variable xd9 used before it was declared.
+// DeclarationError 4990: (3166-3169): Variable xda used before it was declared.
+// DeclarationError 4990: (3179-3182): Variable xdb used before it was declared.
+// DeclarationError 4990: (3192-3195): Variable xdc used before it was declared.
+// DeclarationError 4990: (3205-3208): Variable xdd used before it was declared.
+// DeclarationError 4990: (3218-3221): Variable xde used before it was declared.
+// DeclarationError 4990: (3231-3234): Variable xdf used before it was declared.
+// DeclarationError 4990: (3248-3251): Variable xe0 used before it was declared.
+// DeclarationError 4990: (3261-3264): Variable xe1 used before it was declared.
+// DeclarationError 4990: (3274-3277): Variable xe2 used before it was declared.
+// DeclarationError 4990: (3287-3290): Variable xe3 used before it was declared.
+// DeclarationError 4990: (3300-3303): Variable xe4 used before it was declared.
+// DeclarationError 4990: (3313-3316): Variable xe5 used before it was declared.
+// DeclarationError 4990: (3326-3329): Variable xe6 used before it was declared.
+// DeclarationError 4990: (3339-3342): Variable xe7 used before it was declared.
+// DeclarationError 4990: (3356-3359): Variable xe8 used before it was declared.
+// DeclarationError 4990: (3369-3372): Variable xe9 used before it was declared.
+// DeclarationError 4990: (3382-3385): Variable xea used before it was declared.
+// DeclarationError 4990: (3395-3398): Variable xeb used before it was declared.
+// DeclarationError 4990: (3408-3411): Variable xec used before it was declared.
+// DeclarationError 4990: (3421-3424): Variable xed used before it was declared.
+// DeclarationError 4990: (3434-3437): Variable xee used before it was declared.
+// DeclarationError 4990: (3447-3450): Variable xef used before it was declared.
+// DeclarationError 4990: (3464-3467): Variable xf0 used before it was declared.
+// DeclarationError 4990: (3477-3480): Variable xf1 used before it was declared.
+// DeclarationError 4990: (3490-3493): Variable xf2 used before it was declared.
+// DeclarationError 4990: (3503-3506): Variable xf3 used before it was declared.
+// DeclarationError 4990: (3516-3519): Variable xf4 used before it was declared.
+// DeclarationError 4990: (3529-3532): Variable xf5 used before it was declared.
+// DeclarationError 4990: (3542-3545): Variable xf6 used before it was declared.
+// DeclarationError 4990: (3555-3558): Variable xf7 used before it was declared.
+// DeclarationError 4990: (3572-3575): Variable xf8 used before it was declared.
+// DeclarationError 4990: (3585-3588): Variable xf9 used before it was declared.
+// DeclarationError 4990: (3598-3601): Variable xfa used before it was declared.
+// DeclarationError 4990: (3611-3614): Variable xfb used before it was declared.
+// DeclarationError 4990: (3624-3627): Variable xfc used before it was declared.
+// DeclarationError 4990: (3637-3640): Variable xfd used before it was declared.
+// DeclarationError 4990: (3650-3653): Variable xfe used before it was declared.
+// DeclarationError 4990: (3663-3666): Variable xff used before it was declared.
 // Warning 4013: There are more than 256 errors. Aborting.

From c5b1ac3532958eed2288e17860171d5e0eb46ee3 Mon Sep 17 00:00:00 2001
From: Ardis Lu <ardisglu@gmail.com>
Date: Fri, 26 Jul 2024 20:50:59 -0700
Subject: [PATCH 1023/1140] Fix showProvedSafe flag and JSON key name

Extend title underline
---
 docs/smtchecker.rst         | 4 ++--
 docs/using-the-compiler.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index fc7978256a..92aaa847c9 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -488,8 +488,8 @@ 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.
+proved targets, the CLI option ``--model-checker-show-proved-safe`` and
+the JSON option ``settings.modelChecker.showProvedSafe = true`` can be used.
 
 Unproved Targets
 ================
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 97994e1326..004bb4a614 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -481,7 +481,7 @@ Input Description
           // 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,
+          "showProvedSafe": 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`.

From 82a3071b854a7051899e2fc09cc7aa29439f4e70 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Mon, 19 Aug 2024 21:59:09 +0200
Subject: [PATCH 1024/1140] SMTChecker: Introduce first draft of
 Z3CHCSmtlib2Interface

This commit introduces the interface class without actually using it.
The actual switch will be done later, after all things are set up.
---
 libsmtutil/CHCSmtLib2Interface.cpp           |   4 +-
 libsolidity/formal/Z3CHCSmtLib2Interface.cpp | 222 +++++++++++++++++++
 libsolidity/formal/Z3CHCSmtLib2Interface.h   |  50 +++++
 3 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 libsolidity/formal/Z3CHCSmtLib2Interface.cpp
 create mode 100644 libsolidity/formal/Z3CHCSmtLib2Interface.h

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 6db1c6e876..6e535f0993 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -96,7 +96,9 @@ std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Inte
 	std::string response = querySolver(query);
 
 	CheckResult result;
-	// TODO proper parsing
+	// NOTE: Our internal semantics is UNSAT -> SAFE and SAT -> UNSAFE, which corresponds to usual SMT-based model checking
+	// However, with CHC solvers, the meaning is flipped, UNSAT -> UNSAFE and SAT -> SAFE.
+	// So we have to flip the answer.
 	if (boost::starts_with(response, "sat"))
 	{
 		auto maybeInvariants = invariantsFromSolverResponse(response);
diff --git a/libsolidity/formal/Z3CHCSmtLib2Interface.cpp b/libsolidity/formal/Z3CHCSmtLib2Interface.cpp
new file mode 100644
index 0000000000..cd06a9d331
--- /dev/null
+++ b/libsolidity/formal/Z3CHCSmtLib2Interface.cpp
@@ -0,0 +1,222 @@
+/*
+	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/Z3CHCSmtLib2Interface.h>
+
+#include <libsolidity/interface/UniversalCallback.h>
+
+#include <libsmtutil/SMTLib2Parser.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <stack>
+
+using namespace solidity::frontend::smt;
+using namespace solidity::smtutil;
+
+Z3CHCSmtLib2Interface::Z3CHCSmtLib2Interface(
+	frontend::ReadCallback::Callback _smtCallback,
+	std::optional<unsigned int> _queryTimeout,
+	bool _computeInvariants
+): CHCSmtLib2Interface({}, std::move(_smtCallback), _queryTimeout), m_computeInvariants(_computeInvariants)
+{
+}
+
+void Z3CHCSmtLib2Interface::setupSmtCallback(bool _enablePreprocessing)
+{
+	if (auto* universalCallback = m_smtCallback.target<frontend::UniversalCallback>())
+		universalCallback->smtCommand().setZ3(m_queryTimeout, _enablePreprocessing, m_computeInvariants);
+}
+
+std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCSmtLib2Interface::query(smtutil::Expression const& _block)
+{
+	setupSmtCallback(true);
+	std::string query = dumpQuery(_block);
+	std::string response = querySolver(query);
+	// NOTE: Our internal semantics is UNSAT -> SAFE and SAT -> UNSAFE, which corresponds to usual SMT-based model checking
+	// However, with CHC solvers, the meaning is flipped, UNSAT -> UNSAFE and SAT -> SAFE.
+	// So we have to flip the answer.
+	if (boost::starts_with(response, "unsat"))
+	{
+		// Repeat the query with preprocessing disabled, to get the full proof
+		setupSmtCallback(false);
+		query = "(set-option :produce-proofs true)" + query + "\n(get-proof)";
+		response = querySolver(query);
+		setupSmtCallback(true);
+		if (!boost::starts_with(response, "unsat"))
+			return {CheckResult::SATISFIABLE, Expression(true), {}};
+		return {CheckResult::SATISFIABLE, Expression(true), graphFromZ3Answer(response)};
+	}
+
+	CheckResult result;
+	if (boost::starts_with(response, "sat"))
+	{
+		auto maybeInvariants = invariantsFromSolverResponse(response);
+		return {CheckResult::UNSATISFIABLE, maybeInvariants.value_or(Expression(true)), {}};
+	}
+	else if (boost::starts_with(response, "unknown"))
+		result = CheckResult::UNKNOWN;
+	else
+		result = CheckResult::ERROR;
+
+	return {result, Expression(true), {}};
+}
+
+
+CHCSolverInterface::CexGraph Z3CHCSmtLib2Interface::graphFromZ3Answer(std::string const& _proof) const
+{
+	std::stringstream ss(_proof);
+	std::string answer;
+	ss >> answer;
+	smtAssert(answer == "unsat");
+
+	SMTLib2Parser parser(ss);
+	if (parser.isEOF()) // No proof from Z3
+		return {};
+	// For some reason Z3 outputs everything as a single s-expression
+	SMTLib2Expression parsedOutput;
+	try
+	{
+		parsedOutput = parser.parseExpression();
+	}
+	catch (SMTLib2Parser::ParsingException&)
+	{
+		return {};
+	}
+	solAssert(parser.isEOF());
+	solAssert(!isAtom(parsedOutput));
+	auto& commands = asSubExpressions(parsedOutput);
+	ScopedParser expressionParser(m_context);
+	for (auto& command: commands)
+	{
+		if (isAtom(command))
+			continue;
+
+		auto const& args = asSubExpressions(command);
+		solAssert(args.size() > 0);
+		auto const& head = args[0];
+		if (!isAtom(head))
+			continue;
+
+		// Z3 can introduce new helper predicates to be used in the proof
+		// e.g., "(declare-fun query!0 (Bool Bool Bool Int Int Bool Bool Bool Bool Bool Bool Bool Int) Bool)"
+		if (asAtom(head) == "declare-fun")
+		{
+			solAssert(args.size() == 4);
+			auto const& name = args[1];
+			auto const& domainSorts = args[2];
+			auto const& codomainSort = args[3];
+			solAssert(isAtom(name));
+			solAssert(!isAtom(domainSorts));
+			expressionParser.addVariableDeclaration(asAtom(name), expressionParser.toSort(codomainSort));
+		}
+		// The subexpression starting with "proof" contains the whole proof, which we need to transform to our internal
+		// representation
+		else if (asAtom(head) == "proof")
+		{
+			inlineLetExpressions(command);
+			return graphFromSMTLib2Expression(command, expressionParser);
+		}
+	}
+	return {};
+}
+
+CHCSolverInterface::CexGraph Z3CHCSmtLib2Interface::graphFromSMTLib2Expression(
+	SMTLib2Expression const& _proof,
+	ScopedParser& _context
+)
+{
+	auto fact = [](SMTLib2Expression const& _node) -> SMTLib2Expression const& {
+		if (isAtom(_node))
+			return _node;
+		smtAssert(!asSubExpressions(_node).empty());
+		return asSubExpressions(_node).back();
+	};
+	smtAssert(!isAtom(_proof));
+	auto const& proofArgs = asSubExpressions(_proof);
+	smtAssert(proofArgs.size() == 2);
+	smtAssert(isAtom(proofArgs.at(0)) && asAtom(proofArgs.at(0)) == "proof");
+	auto const& proofNode = proofArgs.at(1);
+	auto const& derivedFact = fact(proofNode);
+	if (isAtom(proofNode) || !isAtom(derivedFact) || asAtom(derivedFact) != "false")
+		return {};
+
+	CHCSolverInterface::CexGraph graph;
+
+	std::stack<SMTLib2Expression const*> proofStack;
+	proofStack.push(&asSubExpressions(proofNode).at(1));
+
+	std::map<SMTLib2Expression const*, unsigned> visitedIds;
+	unsigned nextId = 0;
+
+	auto const* root = proofStack.top();
+	auto const& derivedRootFact = fact(*root);
+	visitedIds.emplace(root, nextId++);
+	graph.nodes.emplace(visitedIds.at(root), _context.toSMTUtilExpression(derivedRootFact));
+
+	auto isHyperRes = [](SMTLib2Expression const& expr) {
+		if (isAtom(expr)) return false;
+		auto const& subExprs = asSubExpressions(expr);
+		smtAssert(!subExprs.empty());
+		auto const& op = subExprs.at(0);
+		if (isAtom(op)) return false;
+		auto const& opExprs = asSubExpressions(op);
+		if (opExprs.size() < 2) return false;
+		auto const& ruleName = opExprs.at(1);
+		return isAtom(ruleName) && asAtom(ruleName) == "hyper-res";
+	};
+
+	while (!proofStack.empty())
+	{
+		auto const* currentNode = proofStack.top();
+		smtAssert(visitedIds.find(currentNode) != visitedIds.end());
+		auto id = visitedIds.at(currentNode);
+		smtAssert(graph.nodes.count(id));
+		proofStack.pop();
+
+		if (isHyperRes(*currentNode))
+		{
+			auto const& args = asSubExpressions(*currentNode);
+			smtAssert(args.size() > 1);
+			// args[0] is the name of the rule
+			// args[1] is the clause used
+			// last argument is the derived fact
+			// the arguments in the middle are the facts where we need to recurse
+			for (unsigned i = 2; i < args.size() - 1; ++i)
+			{
+				auto const* child = &args[i];
+				if (!visitedIds.count(child))
+				{
+					visitedIds.emplace(child, nextId++);
+					proofStack.push(child);
+				}
+
+				auto childId = visitedIds.at(child);
+				if (!graph.nodes.count(childId))
+				{
+					graph.nodes.emplace(childId, _context.toSMTUtilExpression(fact(*child)));
+					graph.edges[childId] = {};
+				}
+
+				graph.edges[id].push_back(childId);
+			}
+		}
+	}
+	return graph;
+}
+
diff --git a/libsolidity/formal/Z3CHCSmtLib2Interface.h b/libsolidity/formal/Z3CHCSmtLib2Interface.h
new file mode 100644
index 0000000000..39456cde0c
--- /dev/null
+++ b/libsolidity/formal/Z3CHCSmtLib2Interface.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 <libsmtutil/CHCSmtLib2Interface.h>
+
+namespace solidity::frontend::smt
+{
+
+class Z3CHCSmtLib2Interface: public smtutil::CHCSmtLib2Interface
+{
+public:
+	Z3CHCSmtLib2Interface(
+		frontend::ReadCallback::Callback _smtCallback,
+		std::optional<unsigned int> _queryTimeout,
+		bool _computeInvariants
+	);
+
+private:
+	void setupSmtCallback(bool _disablePreprocessing);
+
+	std::tuple<smtutil::CheckResult, smtutil::Expression, CexGraph> query(smtutil::Expression const& _expr) override;
+
+	CHCSolverInterface::CexGraph graphFromZ3Answer(std::string const& _proof) const;
+
+	static CHCSolverInterface::CexGraph graphFromSMTLib2Expression(
+		smtutil::SMTLib2Expression const& _proof,
+		ScopedParser& _context
+	);
+
+	bool m_computeInvariants;
+};
+
+}

From 4aff9978a95f2cb6017c6d6df9b1c4e671abf175 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@ekpyron.org>
Date: Tue, 20 Aug 2024 13:07:57 +0200
Subject: [PATCH 1025/1140] Implementation of direct SSA CFG generation.

---
 libyul/CMakeLists.txt                         |   3 +
 libyul/backends/evm/SSAControlFlowGraph.h     | 226 +++++
 .../evm/SSAControlFlowGraphBuilder.cpp        | 850 ++++++++++++++++++
 .../backends/evm/SSAControlFlowGraphBuilder.h | 137 +++
 4 files changed, 1216 insertions(+)
 create mode 100644 libyul/backends/evm/SSAControlFlowGraph.h
 create mode 100644 libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
 create mode 100644 libyul/backends/evm/SSAControlFlowGraphBuilder.h

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index d38d5f2700..c54513d9ab 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -63,6 +63,9 @@ add_library(yul
 	backends/evm/NoOutputAssembly.cpp
 	backends/evm/OptimizedEVMCodeTransform.cpp
 	backends/evm/OptimizedEVMCodeTransform.h
+	backends/evm/SSAControlFlowGraph.h
+	backends/evm/SSAControlFlowGraphBuilder.cpp
+	backends/evm/SSAControlFlowGraphBuilder.h
 	backends/evm/StackHelpers.h
 	backends/evm/StackLayoutGenerator.cpp
 	backends/evm/StackLayoutGenerator.h
diff --git a/libyul/backends/evm/SSAControlFlowGraph.h b/libyul/backends/evm/SSAControlFlowGraph.h
new file mode 100644
index 0000000000..f24b2779f0
--- /dev/null
+++ b/libyul/backends/evm/SSAControlFlowGraph.h
@@ -0,0 +1,226 @@
+/*
+	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
+/**
+ * Control flow graph and stack layout structures used during code generation.
+ */
+
+#pragma once
+
+#include <libyul/AST.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/Dialect.h>
+#include <libyul/Exceptions.h>
+#include <libyul/Scope.h>
+
+#include <libsolutil/Numeric.h>
+
+#include <deque>
+#include <functional>
+#include <list>
+#include <range/v3/view/map.hpp>
+#include <vector>
+
+namespace solidity::yul
+{
+
+class SSACFG
+{
+public:
+	SSACFG() {}
+	SSACFG(SSACFG const&) = delete;
+	SSACFG(SSACFG&&) = delete;
+	SSACFG& operator=(SSACFG const&) = delete;
+	SSACFG& operator=(SSACFG&&) = delete;
+	~SSACFG() = default;
+
+	struct BlockId
+	{
+		size_t value = std::numeric_limits<size_t>::max();
+		operator bool() const { return value != std::numeric_limits<size_t>::max(); }
+		bool operator<(BlockId const& _rhs) const { return value < _rhs.value; }
+		bool operator==(BlockId const& _rhs) const { return value == _rhs.value; }
+		bool operator!=(BlockId const& _rhs) const { return value != _rhs.value; }
+	};
+	struct ValueId
+	{
+		size_t value = std::numeric_limits<size_t>::max();
+		operator bool() const { return value != std::numeric_limits<size_t>::max(); }
+		bool operator<(ValueId const& _rhs) const { return value < _rhs.value; }
+		bool operator==(ValueId const& _rhs) const { return value == _rhs.value; }
+		bool operator!=(ValueId const& _rhs) const { return value != _rhs.value; }
+	};
+	struct BuiltinCall
+	{
+		langutil::DebugData::ConstPtr debugData;
+		std::reference_wrapper<BuiltinFunction const> builtin;
+		std::reference_wrapper<FunctionCall const> call;
+	};
+	struct Call
+	{
+		langutil::DebugData::ConstPtr debugData;
+		std::reference_wrapper<Scope::Function const> function;
+		std::reference_wrapper<FunctionCall const> call;
+		bool const canContinue = true;
+	};
+
+	struct Operation {
+		std::vector<ValueId> outputs{};
+		std::variant<BuiltinCall, Call> kind;
+		std::vector<ValueId> inputs{};
+	};
+	struct BasicBlock
+	{
+		struct MainExit {};
+		struct ConditionalJump
+		{
+			langutil::DebugData::ConstPtr debugData;
+			ValueId condition;
+			BlockId nonZero;
+			BlockId zero;
+		};
+		struct Jump
+		{
+			langutil::DebugData::ConstPtr debugData;
+			BlockId target;
+		};
+		struct JumpTable
+		{
+			langutil::DebugData::ConstPtr debugData;
+			ValueId value;
+			std::map<u256, BlockId> cases;
+			BlockId defaultCase;
+
+		};
+		struct FunctionReturn
+		{
+			langutil::DebugData::ConstPtr debugData;
+			std::vector<ValueId> returnValues;
+		};
+		struct Terminated {};
+		langutil::DebugData::ConstPtr debugData;
+		std::set<BlockId> entries;
+		std::set<ValueId> phis;
+		std::list<Operation> operations;
+		std::variant<MainExit, Jump, ConditionalJump, JumpTable, FunctionReturn, Terminated> exit = MainExit{};
+		template<typename Callable>
+		void forEachExit(Callable&& _callable)
+		{
+			if (auto* jump = std::get_if<Jump>(&exit))
+				_callable(jump->target);
+			else if (auto* conditionalJump = std::get_if<ConditionalJump>(&exit))
+			{
+				_callable(conditionalJump->nonZero);
+				_callable(conditionalJump->zero);
+			}
+			else if (auto* jumpTable = std::get_if<JumpTable>(&exit))
+			{
+				for (auto _case: jumpTable->cases | ranges::views::values)
+					_callable(_case);
+				_callable(jumpTable->defaultCase);
+			}
+		}
+	};
+	BlockId makeBlock(langutil::DebugData::ConstPtr _debugData)
+	{
+		BlockId blockId { m_blocks.size() };
+		m_blocks.emplace_back(BasicBlock{std::move(_debugData), {}, {}, {}, BasicBlock::Terminated{}});
+		return blockId;
+	}
+	BasicBlock& block(BlockId _id) { return m_blocks.at(_id.value); }
+	BasicBlock const& block(BlockId _id) const { return m_blocks.at(_id.value); }
+	size_t numBlocks() const { return m_blocks.size(); }
+private:
+	std::vector<BasicBlock> m_blocks;
+public:
+	struct LiteralValue { u256 value; };
+	struct VariableValue { SSACFG::BlockId definingBlock; };
+	struct PhiValue {
+		BlockId block;
+		std::vector<ValueId> arguments;
+	};
+	struct UnreachableValue {};
+	using ValueInfo = std::variant<UnreachableValue, VariableValue, LiteralValue, PhiValue>;
+	ValueInfo& valueInfo(SSACFG::ValueId _var)
+	{
+		yulAssert(_var.value < m_valueInfos.size());
+		return m_valueInfos.at(_var.value);
+	}
+	ValueInfo const& valueInfo(SSACFG::ValueId _var) const
+	{
+		yulAssert(_var.value < m_valueInfos.size());
+		return m_valueInfos.at(_var.value);
+	}
+	ValueId newPhi(SSACFG::BlockId _definingBlock)
+	{
+		SSACFG::ValueId id { m_valueInfos.size() };
+		m_valueInfos.emplace_back(PhiValue{_definingBlock, {}});
+		return id;
+	}
+	ValueId newVariable(SSACFG::BlockId _definingBlock)
+	{
+		SSACFG::ValueId id { m_valueInfos.size() };
+		m_valueInfos.emplace_back(VariableValue{_definingBlock});
+		return id;
+	}
+	ValueId unreachableValue()
+	{
+		if (!m_unreachableValue)
+		{
+			m_unreachableValue = SSACFG::ValueId { m_valueInfos.size() };
+			m_valueInfos.emplace_back(UnreachableValue{});
+		}
+		return *m_unreachableValue;
+	}
+	ValueId newLiteral(u256 _value)
+	{
+		auto [it, inserted] = m_literals.emplace(std::make_pair(_value, SSACFG::ValueId{m_valueInfos.size()}));
+		if (inserted)
+			m_valueInfos.emplace_back(LiteralValue{_value});
+		else
+		{
+			yulAssert(_value == it->first);
+			yulAssert(std::holds_alternative<LiteralValue>(m_valueInfos.at(it->second.value)));
+			yulAssert(std::get<LiteralValue>(m_valueInfos.at(it->second.value)).value == _value);
+		}
+		yulAssert(it->second.value < m_valueInfos.size());
+		return it->second;
+	}
+private:
+	std::deque<ValueInfo> m_valueInfos;
+	std::map<u256, ValueId> m_literals;
+	std::optional<ValueId> m_unreachableValue;
+public:
+	// TODO: the interface for function infos and functions here still sucks.
+	// Maybe we should split the graphs entirely and just have one SSACFG per function instead.
+	struct FunctionInfo {
+		langutil::DebugData::ConstPtr debugData;
+		std::reference_wrapper<Scope::Function const> function;
+		BlockId entry;
+		std::set<BlockId> exits;
+		bool canContinue = true;
+		std::vector<std::tuple<std::reference_wrapper<Scope::Variable const>, ValueId>> arguments;
+		std::vector<std::reference_wrapper<Scope::Variable const>> returns;
+	};
+	std::vector<std::reference_wrapper<Scope::Function const>> functions;
+	/// Container for artificial calls generated for switch statements.
+	/// Ghost calls are used for the equality comparisons of the switch condition ghost variable with
+	/// the switch case literals when transforming the control flow of a switch to a sequence of conditional jumps.
+	std::list<FunctionCall> ghostCalls;
+};
+
+}
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
new file mode 100644
index 0000000000..8648baa176
--- /dev/null
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -0,0 +1,850 @@
+/*
+	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
+/**
+ * Transformation of a Yul AST into a control flow graph.
+ */
+
+#include <libyul/backends/evm/SSAControlFlowGraphBuilder.h>
+#include <libyul/AST.h>
+#include <libyul/Exceptions.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
+
+#include <libsolutil/Algorithms.h>
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/cxx20.h>
+
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/iota.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <range/v3/view/transform.hpp>
+#include <range/v3/view/zip.hpp>
+#include <range/v3/view/drop_last.hpp>
+
+using namespace solidity;
+using namespace solidity::yul;
+
+namespace
+{
+SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
+{
+	// TODO: double-check if this is sane
+	auto* phiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(_phi));
+	yulAssert(phiInfo);
+
+	SSACFG::ValueId same;
+	for (SSACFG::ValueId arg: phiInfo->arguments)
+	{
+		if (arg == same || arg == _phi)
+			continue;
+		if (same)
+			return _phi;
+		same = arg;
+	}
+
+	struct Use {
+		std::reference_wrapper<SSACFG::Operation> operation;
+		size_t inputIndex = std::numeric_limits<size_t>::max();
+	};
+	std::vector<Use> uses;
+	std::vector<bool> visited;
+	std::vector<SSACFG::ValueId> phiUses;
+	auto isVisited = [&](SSACFG::BlockId _block) -> bool {
+		if (_block.value < visited.size())
+			return visited.at(_block.value);
+		else
+			return false;
+	};
+	auto markVisited = [&](SSACFG::BlockId _block) {
+		if (visited.size() <= _block.value)
+			visited.resize(_block.value + 1);
+		visited[_block.value] = true;
+	};
+	// does this even need to be recursive? or can uses only be in the same or neighbouring blocks?
+	auto findUses = [&](SSACFG::BlockId _blockId, auto _recurse) -> void {
+		if (isVisited(_blockId))
+			return;
+		markVisited(_blockId);
+		auto& block = _cfg.block(_blockId);
+		for (auto blockPhi: block.phis)
+		{
+			if (blockPhi == _phi)
+				continue;
+			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(blockPhi));
+			yulAssert(blockPhiInfo);
+			bool usedInPhi = false;
+			for (auto input: blockPhiInfo->arguments)
+			{
+				if (input == _phi)
+					usedInPhi = true;
+			}
+			if (usedInPhi)
+				phiUses.emplace_back(blockPhi);
+		}
+		for (auto& op: block.operations)
+		{
+			// TODO: double check when phiVar occurs in outputs here and what to do about it.
+			if (op.outputs.size() == 1 && op.outputs.front() == _phi)
+				continue;
+			// TODO: check if this always hold - and if so if the assertion is really valuable.
+			for (auto& output: op.outputs)
+				yulAssert(output != _phi);
+
+			for (auto&& [n, input]: op.inputs | ranges::views::enumerate)
+				if (input == _phi)
+					uses.emplace_back(Use{std::ref(op), n});
+		}
+		block.forEachExit([&](SSACFG::BlockId _block) {
+			_recurse(_block, _recurse);
+		});
+	};
+	auto phiBlock = phiInfo->block;
+	_cfg.block(phiBlock).phis.erase(_phi);
+	findUses(phiBlock, findUses);
+
+	if (!same)
+	{
+		// This will happen for unreachable paths.
+		// TODO: check how best to deal with this
+		same = _cfg.unreachableValue();
+	}
+
+	for (auto& use: uses)
+		use.operation.get().inputs.at(use.inputIndex) = same;
+	for (auto phiUse: phiUses)
+	{
+		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phiUse));
+		yulAssert(blockPhiInfo);
+		for (auto& arg: blockPhiInfo->arguments)
+			if (arg == _phi)
+				arg = same;
+	}
+
+	for (auto phiUse: phiUses)
+		tryRemoveTrivialPhi(_cfg, phiUse);
+
+	return same;
+}
+
+/// Removes edges to blocks that are not reachable.
+void cleanUnreachable(SSACFG& _cfg)
+{
+	// Determine which blocks are reachable from the entry.
+	util::BreadthFirstSearch<SSACFG::BlockId> reachabilityCheck{{SSACFG::BlockId{0}}};
+	for (auto const& functionInfo: _cfg.functionInfos | ranges::views::values)
+		reachabilityCheck.verticesToTraverse.emplace_back(functionInfo.entry);
+
+	reachabilityCheck.run([&](SSACFG::BlockId _blockId, auto&& _addChild) {
+		auto const& block = _cfg.block(_blockId);
+		visit(util::GenericVisitor{
+				[&](SSACFG::BasicBlock::Jump const& _jump) {
+					_addChild(_jump.target);
+				},
+				[&](SSACFG::BasicBlock::ConditionalJump const& _jump) {
+					_addChild(_jump.zero);
+					_addChild(_jump.nonZero);
+				},
+				[](SSACFG::BasicBlock::JumpTable const&) { yulAssert(false); },
+				[](SSACFG::BasicBlock::FunctionReturn const&) {},
+				[](SSACFG::BasicBlock::Terminated const&) {},
+				[](SSACFG::BasicBlock::MainExit const&) {}
+			}, block.exit);
+	});
+
+	auto isUnreachableValue = [&](SSACFG::ValueId const& _value) -> bool {
+		auto* valueInfo = std::get_if<SSACFG::UnreachableValue>(&_cfg.valueInfo(_value));
+		return (valueInfo) ? true : false;
+	};
+
+	// Remove all entries from unreachable nodes from the graph.
+	for (SSACFG::BlockId blockId: reachabilityCheck.visited)
+	{
+		auto& block = _cfg.block(blockId);
+
+		for (auto phi: block.phis)
+		{
+			auto& phiValue = std::get<SSACFG::PhiValue>(_cfg.valueInfo(phi));
+			yulAssert(block.entries.size() == phiValue.arguments.size());
+			for (auto&& [entry, arg]: ranges::zip_view(block.entries, phiValue.arguments))
+				yulAssert((reachabilityCheck.visited.count(entry) == 0) == isUnreachableValue(arg));
+		}
+
+		std::set<SSACFG::ValueId> maybeTrivialPhi;
+		for (auto it = block.entries.begin(); it != block.entries.end();)
+			if (reachabilityCheck.visited.count(*it))
+				it++;
+			else
+				it = block.entries.erase(it);
+		for (auto phi: block.phis)
+			if (auto* phiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi)))
+				cxx20::erase_if(phiInfo->arguments, [&](SSACFG::ValueId _arg) {
+					if (isUnreachableValue(_arg))
+					{
+						maybeTrivialPhi.insert(phi);
+						return true;
+					}
+					return false;
+				});
+
+		// After removing a phi argument, we might end up with a trivial phi that can be removed.
+		for (auto phi: maybeTrivialPhi)
+			tryRemoveTrivialPhi(_cfg, phi);
+	}
+}
+
+}
+
+namespace solidity::yul
+{
+
+SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
+	SSACFG& _graph,
+	AsmAnalysisInfo const& _analysisInfo,
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
+	Dialect const& _dialect
+):
+	m_graph(_graph),
+	m_info(_analysisInfo),
+	m_functionSideEffects(_functionSideEffects),
+	m_dialect(_dialect)
+{
+}
+
+std::unique_ptr<SSACFG> SSAControlFlowGraphBuilder::build(
+	AsmAnalysisInfo const& _analysisInfo,
+	Dialect const& _dialect,
+	Block const& _block
+)
+{
+	auto result = std::make_unique<SSACFG>();
+
+	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
+	SSAControlFlowGraphBuilder builder(*result, _analysisInfo, sideEffects.functionSideEffects(), _dialect);
+	builder.m_currentBlock = result->makeBlock(debugDataOf(_block));
+	builder.sealBlock(builder.m_currentBlock);
+	builder(_block);
+	if (!builder.blockInfo(builder.m_currentBlock).sealed)
+		builder.sealBlock(builder.m_currentBlock);
+	result->block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
+
+	cleanUnreachable(*result);
+	return result;
+}
+
+void SSAControlFlowGraphBuilder::operator()(ExpressionStatement const& _expressionStatement)
+{
+	auto const* functionCall = std::get_if<FunctionCall>(&_expressionStatement.expression);
+	yulAssert(functionCall);
+	auto results = visitFunctionCall(*functionCall);
+	yulAssert(results.empty());
+}
+
+void SSAControlFlowGraphBuilder::operator()(Assignment const& _assignment)
+{
+	assign(
+		_assignment.variableNames | ranges::views::transform([&](auto& _var) { return std::ref(lookupVariable(_var.name)); }) | ranges::to<std::vector>,
+		_assignment.value.get()
+	);
+}
+
+void SSAControlFlowGraphBuilder::operator()(VariableDeclaration const& _variableDeclaration)
+{
+	assign(
+		_variableDeclaration.variables | ranges::views::transform([&](auto& _var) { return std::ref(lookupVariable(_var.name)); }) | ranges::to<std::vector>,
+		_variableDeclaration.value.get()
+	);
+}
+
+void SSAControlFlowGraphBuilder::operator()(FunctionDefinition const& _functionDefinition)
+{
+	yulAssert(m_scope, "");
+	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
+	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
+	m_graph.functions.emplace_back(function);
+
+	SSACFG::FunctionInfo& functionInfo = m_graph.functionInfos.at(&function);
+
+	SSAControlFlowGraphBuilder builder{m_graph, m_info, m_functionSideEffects, m_dialect};
+	builder.m_currentFunction = &functionInfo;
+	builder.m_currentBlock = functionInfo.entry;
+	for (auto&& [var, varId]: functionInfo.arguments)
+		builder.currentDef(var, functionInfo.entry) = varId;
+	builder.sealBlock(functionInfo.entry);
+	builder(_functionDefinition.body);
+	functionInfo.exits.insert(builder.m_currentBlock);
+	// Artificial explicit function exit (`leave`) at the end of the body.
+	builder(Leave{debugDataOf(_functionDefinition)});
+}
+
+void SSAControlFlowGraphBuilder::operator()(If const& _if)
+{
+	auto condition = std::visit(*this, *_if.condition);
+	auto ifBranch = m_graph.makeBlock(debugDataOf(_if.body));
+	auto afterIf = m_graph.makeBlock(debugDataOf(currentBlock()));
+	conditionalJump(
+		debugDataOf(_if),
+		condition,
+		ifBranch,
+		afterIf
+	);
+	sealBlock(ifBranch);
+	m_currentBlock = ifBranch;
+	(*this)(_if.body);
+	jump(debugDataOf(_if.body), afterIf);
+	sealBlock(afterIf);
+}
+
+void SSAControlFlowGraphBuilder::operator()(Switch const& _switch)
+{
+	auto expression = std::visit(*this, *_switch.expression);
+
+	auto useJumpTableForSwitch = [](Switch const&) {
+		// TODO: check for EOF support & tight switch values.
+		return false;
+	};
+	if (useJumpTableForSwitch(_switch))
+	{
+		// TODO: also generate a subtraction to shift tight, but non-zero switch cases - or, alternative,
+		// transform to zero-based tight switches on Yul if possible.
+		std::map<u256, SSACFG::BlockId> cases;
+		std::optional<SSACFG::BlockId> defaultCase;
+		std::vector<std::tuple<SSACFG::BlockId, std::reference_wrapper<Block const>>> children;
+		for (auto const& _case: _switch.cases)
+		{
+			auto blockId = m_graph.makeBlock(debugDataOf(_case.body));
+			if (_case.value)
+				cases[_case.value->value.value()] = blockId;
+			children.emplace_back(std::make_tuple(blockId, std::ref(_case.body)));
+		}
+		auto afterSwitch = m_graph.makeBlock(debugDataOf(currentBlock()));
+
+		tableJump(debugDataOf(_switch), expression, cases, defaultCase ? *defaultCase : afterSwitch);
+		for (auto [blockId, block]: children)
+		{
+			sealBlock(blockId);
+			m_currentBlock = blockId;
+			(*this)(block);
+			jump(debugDataOf(currentBlock()), afterSwitch);
+		}
+		sealBlock(afterSwitch);
+		m_currentBlock = afterSwitch;
+	}
+	else
+	{
+		auto makeValueCompare = [&](Case const& _case) {
+			yul::FunctionCall const& ghostCall = m_graph.ghostCalls.emplace_back(yul::FunctionCall{
+				debugDataOf(_case),
+				yul::Identifier{{}, "eq"_yulname},
+				{*_case.value /* skip second argument */ }
+			});
+			auto outputValue = m_graph.newVariable(m_currentBlock);
+			BuiltinFunction const* builtin = m_dialect.builtin(ghostCall.functionName.name);
+			currentBlock().operations.emplace_back(SSACFG::Operation{
+				{outputValue},
+				SSACFG::BuiltinCall{
+					debugDataOf(_case),
+					*builtin,
+					ghostCall
+				},
+				{m_graph.newLiteral(_case.value->value.value()), expression}
+			});
+			return outputValue;
+		};
+
+		auto afterSwitch = m_graph.makeBlock(debugDataOf(currentBlock()));
+		yulAssert(!_switch.cases.empty(), "");
+		for (auto const& switchCase: _switch.cases | ranges::views::drop_last(1))
+		{
+			yulAssert(switchCase.value, "");
+			auto caseBranch = m_graph.makeBlock(debugDataOf(switchCase.body));
+			auto elseBranch = m_graph.makeBlock(debugDataOf(_switch));
+
+			conditionalJump(debugDataOf(switchCase), makeValueCompare(switchCase), caseBranch, elseBranch);
+			sealBlock(caseBranch);
+			sealBlock(elseBranch);
+			m_currentBlock = caseBranch;
+			(*this)(switchCase.body);
+			jump(debugDataOf(switchCase.body), afterSwitch);
+			m_currentBlock = elseBranch;
+		}
+		Case const& switchCase = _switch.cases.back();
+		if (switchCase.value)
+		{
+			auto caseBranch = m_graph.makeBlock(debugDataOf(switchCase.body));
+			conditionalJump(debugDataOf(switchCase), makeValueCompare(switchCase), caseBranch, afterSwitch);
+			sealBlock(caseBranch);
+			m_currentBlock = caseBranch;
+		}
+		(*this)(switchCase.body);
+		jump(debugDataOf(switchCase.body), afterSwitch);
+		sealBlock(afterSwitch);
+	}
+}
+void SSAControlFlowGraphBuilder::operator()(ForLoop const& _loop)
+{
+	ScopedSaveAndRestore scopeRestore(m_scope, m_info.scopes.at(&_loop.pre).get());
+	(*this)(_loop.pre);
+	auto preLoopDebugData = debugDataOf(currentBlock());
+
+	std::optional<bool> constantCondition;
+	if (auto const* literalCondition = std::get_if<yul::Literal>(_loop.condition.get()))
+		constantCondition = literalCondition->value.value() != 0;
+
+	SSACFG::BlockId loopCondition = m_graph.makeBlock(debugDataOf(*_loop.condition));
+	SSACFG::BlockId loopBody = m_graph.makeBlock(debugDataOf(_loop.body));
+	SSACFG::BlockId post = m_graph.makeBlock(debugDataOf(_loop.post));
+	SSACFG::BlockId afterLoop = m_graph.makeBlock(preLoopDebugData);
+
+	class ForLoopInfoScope {
+	public:
+		ForLoopInfoScope(std::stack<ForLoopInfo>& _info, SSACFG::BlockId _breakBlock, SSACFG::BlockId _continueBlock): m_info(_info)
+		{
+			m_info.push(ForLoopInfo{_breakBlock, _continueBlock});
+		}
+		~ForLoopInfoScope() {
+			m_info.pop();
+		}
+	private:
+		std::stack<ForLoopInfo>& m_info;
+	} forLoopInfoScope(m_forLoopInfo, afterLoop, post);
+
+	if (constantCondition.has_value())
+	{
+		if (*constantCondition)
+		{
+			jump(debugDataOf(*_loop.condition), loopBody);
+			(*this)(_loop.body);
+			jump(debugDataOf(_loop.body), post);
+			sealBlock(post);
+			(*this)(_loop.post);
+			jump(debugDataOf(_loop.post), loopBody);
+			sealBlock(loopBody);
+		}
+		else
+			jump(debugDataOf(*_loop.condition), afterLoop);
+	}
+	else
+	{
+		jump(debugDataOf(_loop.pre), loopCondition);
+		auto condition = std::visit(*this, *_loop.condition);
+		conditionalJump(debugDataOf(*_loop.condition), condition, loopBody, afterLoop);
+		sealBlock(loopBody);
+		m_currentBlock = loopBody;
+		(*this)(_loop.body);
+		jump(debugDataOf(_loop.body), post);
+		sealBlock(post);
+		(*this)(_loop.post);
+		jump(debugDataOf(_loop.post), loopCondition);
+		sealBlock(loopCondition);
+	}
+
+	sealBlock(afterLoop);
+	m_currentBlock = afterLoop;
+}
+
+void SSAControlFlowGraphBuilder::operator()(Break const& _break)
+{
+	yulAssert(!m_forLoopInfo.empty());
+	auto currentBlockDebugData = debugDataOf(currentBlock());
+	jump(debugDataOf(_break), m_forLoopInfo.top().breakBlock);
+	m_currentBlock = m_graph.makeBlock(currentBlockDebugData);
+	sealBlock(m_currentBlock);
+}
+
+void SSAControlFlowGraphBuilder::operator()(Continue const& _continue)
+{
+	yulAssert(!m_forLoopInfo.empty());
+	auto currentBlockDebugData = debugDataOf(currentBlock());
+	jump(debugDataOf(_continue), m_forLoopInfo.top().continueBlock);
+	m_currentBlock = m_graph.makeBlock(currentBlockDebugData);
+	sealBlock(m_currentBlock);
+}
+
+void SSAControlFlowGraphBuilder::operator()(Leave const& _leave)
+{
+	yulAssert(m_currentFunction);
+	auto currentBlockDebugData = debugDataOf(currentBlock());
+	currentBlock().exit = SSACFG::BasicBlock::FunctionReturn{
+		debugDataOf(_leave),
+		m_currentFunction->returns | ranges::views::transform([&](auto _var) {
+			return readVariable(_var, m_currentBlock);
+		}) | ranges::to<std::vector>
+	};
+	m_currentBlock = m_graph.makeBlock(currentBlockDebugData);
+	sealBlock(m_currentBlock);
+}
+
+void SSAControlFlowGraphBuilder::operator()(Block const& _block)
+{
+	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
+	for (auto const& statement: _block.statements)
+		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
+			registerFunction(*function);
+	for (auto const& statement: _block.statements)
+		std::visit(*this, statement);
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(FunctionCall const& _call)
+{
+	auto results = visitFunctionCall(_call);
+	yulAssert(results.size() == 1);
+	return results.front();
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(Identifier const& _identifier)
+{
+	auto const& var = lookupVariable(_identifier.name);
+	return readVariable(var, m_currentBlock);
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(Literal const& _literal)
+{
+	return m_graph.newLiteral(_literal.value.value());
+}
+
+void SSAControlFlowGraphBuilder::assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression)
+{
+	auto rhs = [&]() -> std::vector<SSACFG::ValueId> {
+		if (auto const* functionCall = std::get_if<FunctionCall>(_expression))
+			return visitFunctionCall(*functionCall);
+		else if (_expression)
+			return {std::visit(*this, *_expression)};
+		else
+			return {_variables.size(), zero()};
+	}();
+	yulAssert(rhs.size() == _variables.size());
+
+	for (auto const& [var, value]: ranges::zip_view(_variables, rhs))
+		writeVariable(var, m_currentBlock, value);
+
+}
+
+void SSAControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functionDefinition)
+{
+	yulAssert(m_scope, "");
+	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(&_functionDefinition.body), "");
+	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_functionDefinition).get()).get();
+	yulAssert(virtualFunctionScope, "");
+
+	// TODO: think about using another root node before the function body here (in particular as defining block for the
+	// arguments below)
+	SSACFG::BlockId entryBlock = m_graph.makeBlock(debugDataOf(_functionDefinition.body));
+
+	auto arguments = _functionDefinition.parameters | ranges::views::transform([&](auto const& _param) {
+		auto const& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name));
+		// Note: cannot use std::make_tuple since it unwraps reference wrappers.
+		return std::tuple{std::cref(var), m_graph.newVariable(entryBlock)};
+	}) | ranges::to<std::vector>;
+	auto returns = _functionDefinition.returnVariables | ranges::views::transform([&](auto const& _param) {
+		return std::cref(std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)));
+	}) | ranges::to<std::vector>;
+	auto [it, inserted] = m_graph.functionInfos.emplace(std::make_pair(&function, SSACFG::FunctionInfo{
+		_functionDefinition.debugData,
+		function,
+		entryBlock,
+		{},
+		m_functionSideEffects.at(&_functionDefinition).canContinue,
+		arguments,
+		returns
+	}));
+	yulAssert(inserted);
+}
+
+std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
+{
+	bool canContinue = true;
+	SSACFG::Operation operation = [&](){
+		if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name))
+		{
+			SSACFG::Operation result{{}, SSACFG::BuiltinCall{_call.debugData, *builtin, _call}, {}};
+			for (auto&& [idx, arg]: _call.arguments | ranges::views::enumerate | ranges::views::reverse)
+				if (!builtin->literalArgument(idx).has_value())
+					result.inputs.emplace_back(std::visit(*this, arg));
+			for (size_t i = 0; i < builtin->returns.size(); ++i)
+				result.outputs.emplace_back(m_graph.newVariable(m_currentBlock));
+			canContinue = builtin->controlFlowSideEffects.canContinue;
+			return result;
+		}
+		else
+		{
+			Scope::Function const& function = lookupFunction(_call.functionName.name);
+			canContinue = m_graph.functionInfos.at(&function).canContinue;
+			SSACFG::Operation result{{}, SSACFG::Call{debugDataOf(_call), function, _call, canContinue}, {}};
+			for (auto const& arg: _call.arguments | ranges::views::reverse)
+				result.inputs.emplace_back(std::visit(*this, arg));
+			for (size_t i = 0; i < function.returns.size(); ++i)
+				result.outputs.emplace_back(m_graph.newVariable(m_currentBlock));
+			return result;
+		}
+	}();
+	auto results = operation.outputs;
+	currentBlock().operations.emplace_back(std::move(operation));
+	if (!canContinue)
+	{
+		currentBlock().exit = SSACFG::BasicBlock::Terminated{};
+		m_currentBlock = m_graph.makeBlock(debugDataOf(currentBlock()));
+		sealBlock(m_currentBlock);
+	}
+	return results;
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::zero()
+{
+	return m_graph.newLiteral(0u);
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block)
+{
+	auto& def = currentDef(_variable, _block);
+	if (def.has_value())
+		return *def;
+	return readVariableRecursive(_variable, _block);
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::readVariableRecursive(Scope::Variable const& _variable, SSACFG::BlockId _block)
+{
+	auto& block = m_graph.block(_block);
+	auto& info = blockInfo(_block);
+
+	if (info.sealed && block.entries.size() == 1)
+		return readVariable(_variable, *block.entries.begin());
+
+	SSACFG::ValueId phi = m_graph.newPhi(_block);
+	block.phis.insert(phi);
+	if (info.sealed)
+	{
+		writeVariable(_variable, _block, phi);
+		phi = addPhiOperands(_variable, phi);
+	}
+	else
+	{
+		info.incompletePhis.emplace_back(std::make_tuple(phi, std::ref(_variable)));
+	}
+	writeVariable(_variable, _block, phi);
+	return phi;
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi)
+{
+	auto* phi = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
+	yulAssert(phi);
+	for (auto pred: m_graph.block(phi->block).entries)
+		phi->arguments.emplace_back(readVariable(_variable, pred));
+	return tryRemoveTrivialPhi(_phi);
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId _phi)
+{
+	// TODO: double-check if this is sane
+	auto* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
+	yulAssert(phiInfo);
+
+	SSACFG::ValueId same;
+	for (SSACFG::ValueId arg: phiInfo->arguments)
+	{
+		if (arg == same || arg == _phi)
+			continue;
+		if (same)
+			return _phi;
+		same = arg;
+	}
+
+	struct Use {
+		std::reference_wrapper<SSACFG::Operation> operation;
+		size_t inputIndex = std::numeric_limits<size_t>::max();
+	};
+	std::vector<Use> uses;
+	std::vector<bool> visited;
+	std::vector<SSACFG::ValueId> phiUses;
+	auto isVisited = [&](SSACFG::BlockId _block) -> bool {
+		if (_block.value < visited.size())
+			return visited.at(_block.value);
+		else
+			return false;
+	};
+	auto markVisited = [&](SSACFG::BlockId _block) {
+		if (visited.size() <= _block.value)
+			visited.resize(_block.value + 1);
+		visited[_block.value] = true;
+	};
+	// does this even need to be recursive? or can uses only be in the same or neighbouring blocks?
+	auto findUses = [&](SSACFG::BlockId _blockId, auto _recurse) -> void {
+		if (isVisited(_blockId))
+			return;
+		markVisited(_blockId);
+		auto& block = m_graph.block(_blockId);
+		for (auto blockPhi: block.phis)
+		{
+			if (blockPhi == _phi)
+				continue;
+			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(blockPhi));
+			yulAssert(blockPhiInfo);
+			bool usedInPhi = false;
+			for (auto input: blockPhiInfo->arguments)
+			{
+				if (input == _phi)
+					usedInPhi = true;
+			}
+			if (usedInPhi)
+				phiUses.emplace_back(blockPhi);
+		}
+		for (auto& op: block.operations)
+		{
+			// TODO: double check when phiVar occurs in outputs here and what to do about it.
+			if (op.outputs.size() == 1 && op.outputs.front() == _phi)
+				continue;
+			// TODO: check if this always hold - and if so if the assertion is really valuable.
+			for (auto& output: op.outputs)
+				yulAssert(output != _phi);
+
+			for (auto&& [n, input]: op.inputs | ranges::views::enumerate)
+				if (input == _phi)
+					uses.emplace_back(Use{std::ref(op), n});
+		}
+		block.forEachExit([&](SSACFG::BlockId _block) {
+			_recurse(_block, _recurse);
+		});
+	};
+	auto phiBlock = phiInfo->block;
+	m_graph.block(phiBlock).phis.erase(_phi);
+	findUses(phiBlock, findUses);
+
+	if (!same)
+		// This will happen for unreachable paths.
+		// TODO: check how best to deal with this
+		same = m_graph.unreachableValue();
+
+	for (auto& use: uses)
+		use.operation.get().inputs.at(use.inputIndex) = same;
+	for (auto phiUse: phiUses)
+	{
+		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phiUse));
+		yulAssert(blockPhiInfo);
+		for (auto& arg: blockPhiInfo->arguments)
+			if (arg == _phi)
+				arg = same;
+	}
+
+	for (auto phiUse: phiUses)
+		tryRemoveTrivialPhi(phiUse);
+
+	return same;
+}
+
+void SSAControlFlowGraphBuilder::writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value)
+{
+	currentDef(_variable, _block) = _value;
+}
+
+Scope::Function const& SSAControlFlowGraphBuilder::lookupFunction(YulName _name) const
+{
+	Scope::Function const* function = nullptr;
+	yulAssert(m_scope->lookup(_name, util::GenericVisitor{
+		[](Scope::Variable&) { yulAssert(false, "Expected function name."); },
+		[&](Scope::Function& _function) { function = &_function; }
+	}), "Function name not found.");
+	yulAssert(function, "");
+	return *function;
+}
+
+Scope::Variable const& SSAControlFlowGraphBuilder::lookupVariable(YulName _name) const
+{
+	yulAssert(m_scope, "");
+	Scope::Variable const* var = nullptr;
+	if (m_scope->lookup(_name, util::GenericVisitor{
+		[&](Scope::Variable& _var) { var = &_var; },
+		[](Scope::Function&)
+		{
+			yulAssert(false, "Function not removed during desugaring.");
+		}
+	}))
+	{
+		yulAssert(var, "");
+		return *var;
+	};
+	yulAssert(false, "External identifier access unimplemented.");
+}
+
+void SSAControlFlowGraphBuilder::sealBlock(SSACFG::BlockId _block)
+{
+	auto& info = blockInfo(_block);
+	yulAssert(!info.sealed, "Trying to seal already sealed block.");
+	for (auto&& [phi, variable] : info.incompletePhis)
+		addPhiOperands(variable, phi);
+	info.sealed = true;
+}
+
+
+void SSAControlFlowGraphBuilder::conditionalJump(
+	langutil::DebugData::ConstPtr _debugData,
+	SSACFG::ValueId _condition,
+	SSACFG::BlockId _nonZero,
+	SSACFG::BlockId _zero
+)
+{
+	currentBlock().exit = SSACFG::BasicBlock::ConditionalJump{
+		std::move(_debugData),
+		_condition,
+		_nonZero,
+		_zero
+	};
+	m_graph.block(_nonZero).entries.insert(m_currentBlock);
+	m_graph.block(_zero).entries.insert(m_currentBlock);
+	m_currentBlock = {};
+}
+
+void SSAControlFlowGraphBuilder::jump(
+	langutil::DebugData::ConstPtr _debugData,
+	SSACFG::BlockId _target
+)
+{
+	currentBlock().exit = SSACFG::BasicBlock::Jump{std::move(_debugData), _target};
+	yulAssert(!blockInfo(_target).sealed);
+	m_graph.block(_target).entries.insert(m_currentBlock);
+	m_currentBlock = _target;
+}
+
+void SSAControlFlowGraphBuilder::tableJump(
+	langutil::DebugData::ConstPtr _debugData,
+	SSACFG::ValueId _value,
+	std::map<u256, SSACFG::BlockId> _cases,
+	SSACFG::BlockId _defaultCase
+)
+{
+	for (auto caseBlock: _cases | ranges::views::values)
+	{
+		yulAssert(!blockInfo(caseBlock).sealed);
+		m_graph.block(caseBlock).entries.insert(m_currentBlock);
+	}
+	yulAssert(!blockInfo(_defaultCase).sealed);
+	m_graph.block(_defaultCase).entries.insert(m_currentBlock);
+	currentBlock().exit = SSACFG::BasicBlock::JumpTable{
+		std::move(_debugData),
+		_value,
+		std::move(_cases),
+		_defaultCase
+	};
+	m_currentBlock = {};
+}
+
+}
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
new file mode 100644
index 0000000000..689e5bf884
--- /dev/null
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -0,0 +1,137 @@
+/*
+	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
+/**
+* Transformation of a Yul AST into a control flow graph.
+*/
+#pragma once
+
+#include <libyul/ControlFlowSideEffects.h>
+#include <libyul/backends/evm/SSAControlFlowGraph.h>
+#include <stack>
+
+namespace solidity::yul
+{
+
+class SSAControlFlowGraphBuilder
+{
+	SSAControlFlowGraphBuilder(
+		SSACFG& _graph,
+		AsmAnalysisInfo const& _analysisInfo,
+		std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
+		Dialect const& _dialect
+	);
+public:
+	SSAControlFlowGraphBuilder(SSAControlFlowGraphBuilder const&) = delete;
+	SSAControlFlowGraphBuilder& operator=(SSAControlFlowGraphBuilder const&) = delete;
+	static std::unique_ptr<SSACFG> build(AsmAnalysisInfo const& _analysisInfo, Dialect const& _dialect, Block const& _block);
+
+	void operator()(ExpressionStatement const& _statement);
+	void operator()(Assignment const& _assignment);
+	void operator()(VariableDeclaration const& _varDecl);
+
+	void operator()(FunctionDefinition const&);
+	void operator()(If const& _if);
+	void operator()(Switch const& _switch);
+	void operator()(ForLoop const&);
+	void operator()(Break const&);
+	void operator()(Continue const&);
+	void operator()(Leave const&);
+
+	void operator()(Block const& _block);
+
+	SSACFG::ValueId operator()(FunctionCall const& _call);
+	SSACFG::ValueId operator()(Identifier const& _identifier);
+	SSACFG::ValueId operator()(Literal const& _literal);
+
+private:
+	void assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression);
+
+	void registerFunction(FunctionDefinition const& _function);
+	std::vector<SSACFG::ValueId> visitFunctionCall(FunctionCall const& _call);
+
+	SSACFG::ValueId zero();
+	SSACFG::ValueId readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block);
+	SSACFG::ValueId readVariableRecursive(Scope::Variable const& _variable, SSACFG::BlockId _block);
+	SSACFG::ValueId addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi);
+	void writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value);
+
+	SSACFG& m_graph;
+	AsmAnalysisInfo const& m_info;
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& m_functionSideEffects;
+	Dialect const& m_dialect;
+	SSACFG::BlockId m_currentBlock;
+	SSACFG::BasicBlock& currentBlock() { return m_graph.block(m_currentBlock); }
+	Scope* m_scope = nullptr;
+	Scope::Function const& lookupFunction(YulName _name) const;
+	Scope::Variable const& lookupVariable(YulName _name) const;
+
+	struct BlockInfo {
+		bool sealed = false;
+		std::vector<std::tuple<SSACFG::ValueId, std::reference_wrapper<Scope::Variable const>>> incompletePhis;
+	};
+	std::vector<BlockInfo> m_blockInfo;
+
+	BlockInfo& blockInfo(SSACFG::BlockId _block)
+	{
+		if (_block.value >= m_blockInfo.size())
+			m_blockInfo.resize(_block.value + 1, {});
+		return m_blockInfo[_block.value];
+	}
+	void sealBlock(SSACFG::BlockId _block);
+
+	std::map<
+		Scope::Variable const*,
+		std::vector<std::optional<SSACFG::ValueId>>
+	> m_currentDef;
+
+	struct ForLoopInfo {
+		SSACFG::BlockId breakBlock;
+		SSACFG::BlockId continueBlock;
+	};
+	std::stack<ForLoopInfo> m_forLoopInfo;
+	SSACFG::FunctionInfo* m_currentFunction = nullptr;
+
+	std::optional<SSACFG::ValueId>& currentDef(Scope::Variable const& _variable, SSACFG::BlockId _block)
+	{
+		auto& varDefs = m_currentDef[&_variable];
+		if (varDefs.size() <= _block.value)
+			varDefs.resize(_block.value + 1);
+		return varDefs.at(_block.value);
+	}
+
+	void conditionalJump(
+		langutil::DebugData::ConstPtr _debugData,
+		SSACFG::ValueId _condition,
+		SSACFG::BlockId _nonZero,
+		SSACFG::BlockId _zero
+	);
+
+	void jump(
+		langutil::DebugData::ConstPtr _debugData,
+		SSACFG::BlockId _target
+	);
+
+	void tableJump(
+		langutil::DebugData::ConstPtr _debugData,
+		SSACFG::ValueId _value,
+		std::map<u256, SSACFG::BlockId> _cases,
+		SSACFG::BlockId _defaultCase
+	);
+};
+
+}

From d9116dc41c8daac9bfa6a2efe0dc3dd2f80f1d2e Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 21 Aug 2024 15:56:32 +0200
Subject: [PATCH 1026/1140] Yul: Split SSA CFG into separate graphs for
 functions

---
 libyul/backends/evm/ControlFlow.h             |  43 ++++
 libyul/backends/evm/SSAControlFlowGraph.h     |  72 +++----
 .../evm/SSAControlFlowGraphBuilder.cpp        | 196 +++++++++---------
 .../backends/evm/SSAControlFlowGraphBuilder.h |  25 ++-
 .../libyul/yulSSAControlFlowGraph/complex.yul | 179 ++++++++++++++++
 .../yulSSAControlFlowGraph/complex2.yul       | 195 +++++++++++++++++
 .../yulSSAControlFlowGraph/function.yul       |  68 ++++++
 test/libyul/yulSSAControlFlowGraph/if.yul     |  40 ++++
 test/libyul/yulSSAControlFlowGraph/switch.yul |  68 ++++++
 9 files changed, 750 insertions(+), 136 deletions(-)
 create mode 100644 libyul/backends/evm/ControlFlow.h
 create mode 100644 test/libyul/yulSSAControlFlowGraph/complex.yul
 create mode 100644 test/libyul/yulSSAControlFlowGraph/complex2.yul
 create mode 100644 test/libyul/yulSSAControlFlowGraph/function.yul
 create mode 100644 test/libyul/yulSSAControlFlowGraph/if.yul
 create mode 100644 test/libyul/yulSSAControlFlowGraph/switch.yul

diff --git a/libyul/backends/evm/ControlFlow.h b/libyul/backends/evm/ControlFlow.h
new file mode 100644
index 0000000000..18b43431a1
--- /dev/null
+++ b/libyul/backends/evm/ControlFlow.h
@@ -0,0 +1,43 @@
+/*
+	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/AST.h>
+#include <libyul/Scope.h>
+#include <libyul/backends/evm/SSAControlFlowGraph.h>
+
+namespace solidity::yul
+{
+
+struct ControlFlow
+{
+	std::unique_ptr<SSACFG> mainGraph{std::make_unique<SSACFG>()};
+	std::vector<std::unique_ptr<SSACFG>> functionGraphs{};
+	std::vector<std::tuple<Scope::Function const*, SSACFG const*>> functionGraphMapping{};
+
+	SSACFG const* functionGraph(Scope::Function const* _function)
+	{
+		auto it = std::find_if(functionGraphMapping.begin(), functionGraphMapping.end(), [_function](auto const& tup) { return _function == std::get<0>(tup); });
+		if (it != functionGraphMapping.end())
+			return std::get<1>(*it);
+		return nullptr;
+	}
+};
+
+}
diff --git a/libyul/backends/evm/SSAControlFlowGraph.h b/libyul/backends/evm/SSAControlFlowGraph.h
index f24b2779f0..311d23e87c 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.h
+++ b/libyul/backends/evm/SSAControlFlowGraph.h
@@ -29,10 +29,10 @@
 
 #include <libsolutil/Numeric.h>
 
+#include <range/v3/view/map.hpp>
 #include <deque>
 #include <functional>
 #include <list>
-#include <range/v3/view/map.hpp>
 #include <vector>
 
 namespace solidity::yul
@@ -41,7 +41,7 @@ namespace solidity::yul
 class SSACFG
 {
 public:
-	SSACFG() {}
+	SSACFG() = default;
 	SSACFG(SSACFG const&) = delete;
 	SSACFG(SSACFG&&) = delete;
 	SSACFG& operator=(SSACFG const&) = delete;
@@ -51,7 +51,6 @@ class SSACFG
 	struct BlockId
 	{
 		size_t value = std::numeric_limits<size_t>::max();
-		operator bool() const { return value != std::numeric_limits<size_t>::max(); }
 		bool operator<(BlockId const& _rhs) const { return value < _rhs.value; }
 		bool operator==(BlockId const& _rhs) const { return value == _rhs.value; }
 		bool operator!=(BlockId const& _rhs) const { return value != _rhs.value; }
@@ -59,11 +58,12 @@ class SSACFG
 	struct ValueId
 	{
 		size_t value = std::numeric_limits<size_t>::max();
-		operator bool() const { return value != std::numeric_limits<size_t>::max(); }
+		bool hasValue() const { return value != std::numeric_limits<size_t>::max(); }
 		bool operator<(ValueId const& _rhs) const { return value < _rhs.value; }
 		bool operator==(ValueId const& _rhs) const { return value == _rhs.value; }
 		bool operator!=(ValueId const& _rhs) const { return value != _rhs.value; }
 	};
+
 	struct BuiltinCall
 	{
 		langutil::DebugData::ConstPtr debugData;
@@ -104,7 +104,6 @@ class SSACFG
 			ValueId value;
 			std::map<u256, BlockId> cases;
 			BlockId defaultCase;
-
 		};
 		struct FunctionReturn
 		{
@@ -115,7 +114,7 @@ class SSACFG
 		langutil::DebugData::ConstPtr debugData;
 		std::set<BlockId> entries;
 		std::set<ValueId> phis;
-		std::list<Operation> operations;
+		std::vector<Operation> operations;
 		std::variant<MainExit, Jump, ConditionalJump, JumpTable, FunctionReturn, Terminated> exit = MainExit{};
 		template<typename Callable>
 		void forEachExit(Callable&& _callable)
@@ -147,50 +146,57 @@ class SSACFG
 private:
 	std::vector<BasicBlock> m_blocks;
 public:
-	struct LiteralValue { u256 value; };
-	struct VariableValue { SSACFG::BlockId definingBlock; };
+	struct LiteralValue {
+		langutil::DebugData::ConstPtr debugData;
+		u256 value;
+	};
+	struct VariableValue {
+		langutil::DebugData::ConstPtr debugData;
+		BlockId definingBlock;
+	};
 	struct PhiValue {
+		langutil::DebugData::ConstPtr debugData;
 		BlockId block;
 		std::vector<ValueId> arguments;
 	};
 	struct UnreachableValue {};
 	using ValueInfo = std::variant<UnreachableValue, VariableValue, LiteralValue, PhiValue>;
-	ValueInfo& valueInfo(SSACFG::ValueId _var)
+	ValueInfo& valueInfo(ValueId const _var)
 	{
-		yulAssert(_var.value < m_valueInfos.size());
 		return m_valueInfos.at(_var.value);
 	}
-	ValueInfo const& valueInfo(SSACFG::ValueId _var) const
+	ValueInfo const& valueInfo(ValueId const _var) const
 	{
-		yulAssert(_var.value < m_valueInfos.size());
 		return m_valueInfos.at(_var.value);
 	}
-	ValueId newPhi(SSACFG::BlockId _definingBlock)
+	ValueId newPhi(BlockId const _definingBlock)
 	{
-		SSACFG::ValueId id { m_valueInfos.size() };
-		m_valueInfos.emplace_back(PhiValue{_definingBlock, {}});
+		ValueId id { m_valueInfos.size() };
+		auto block = m_blocks.at(_definingBlock.value);
+		m_valueInfos.emplace_back(PhiValue{debugDataOf(block), _definingBlock, {}});
 		return id;
 	}
-	ValueId newVariable(SSACFG::BlockId _definingBlock)
+	ValueId newVariable(BlockId const _definingBlock)
 	{
-		SSACFG::ValueId id { m_valueInfos.size() };
-		m_valueInfos.emplace_back(VariableValue{_definingBlock});
+		ValueId id { m_valueInfos.size() };
+		auto block = m_blocks.at(_definingBlock.value);
+		m_valueInfos.emplace_back(VariableValue{debugDataOf(block), _definingBlock});
 		return id;
 	}
 	ValueId unreachableValue()
 	{
 		if (!m_unreachableValue)
 		{
-			m_unreachableValue = SSACFG::ValueId { m_valueInfos.size() };
+			m_unreachableValue = ValueId { m_valueInfos.size() };
 			m_valueInfos.emplace_back(UnreachableValue{});
 		}
 		return *m_unreachableValue;
 	}
-	ValueId newLiteral(u256 _value)
+	ValueId newLiteral(langutil::DebugData::ConstPtr _debugData, u256 _value)
 	{
-		auto [it, inserted] = m_literals.emplace(std::make_pair(_value, SSACFG::ValueId{m_valueInfos.size()}));
+		auto [it, inserted] = m_literals.emplace(_value, ValueId{m_valueInfos.size()});
 		if (inserted)
-			m_valueInfos.emplace_back(LiteralValue{_value});
+			m_valueInfos.emplace_back(LiteralValue{std::move(_debugData), _value});
 		else
 		{
 			yulAssert(_value == it->first);
@@ -205,21 +211,15 @@ class SSACFG
 	std::map<u256, ValueId> m_literals;
 	std::optional<ValueId> m_unreachableValue;
 public:
-	// TODO: the interface for function infos and functions here still sucks.
-	// Maybe we should split the graphs entirely and just have one SSACFG per function instead.
-	struct FunctionInfo {
-		langutil::DebugData::ConstPtr debugData;
-		std::reference_wrapper<Scope::Function const> function;
-		BlockId entry;
-		std::set<BlockId> exits;
-		bool canContinue = true;
-		std::vector<std::tuple<std::reference_wrapper<Scope::Variable const>, ValueId>> arguments;
-		std::vector<std::reference_wrapper<Scope::Variable const>> returns;
-	};
+	langutil::DebugData::ConstPtr debugData;
+	BlockId entry = BlockId{0};
+	std::set<BlockId> exits;
+	Scope::Function const* function = nullptr;
+	bool canContinue = true;
+	std::vector<std::tuple<std::reference_wrapper<Scope::Variable const>, ValueId>> arguments;
+	std::vector<std::reference_wrapper<Scope::Variable const>> returns;
 	std::vector<std::reference_wrapper<Scope::Function const>> functions;
-	/// Container for artificial calls generated for switch statements.
-	/// Ghost calls are used for the equality comparisons of the switch condition ghost variable with
-	/// the switch case literals when transforming the control flow of a switch to a sequence of conditional jumps.
+	// Container for artificial calls generated for switch statements.
 	std::list<FunctionCall> ghostCalls;
 };
 
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index 8648baa176..18720e9bc3 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -22,6 +22,7 @@
 #include <libyul/backends/evm/SSAControlFlowGraphBuilder.h>
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
+#include <libyul/backends/evm/ControlFlow.h>
 #include <libyul/ControlFlowSideEffectsCollector.h>
 
 #include <libsolutil/Algorithms.h>
@@ -54,7 +55,7 @@ SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
 	{
 		if (arg == same || arg == _phi)
 			continue;
-		if (same)
+		if (same.hasValue())
 			return _phi;
 		same = arg;
 	}
@@ -119,7 +120,7 @@ SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
 	_cfg.block(phiBlock).phis.erase(_phi);
 	findUses(phiBlock, findUses);
 
-	if (!same)
+	if (!same.hasValue())
 	{
 		// This will happen for unreachable paths.
 		// TODO: check how best to deal with this
@@ -147,10 +148,7 @@ SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
 void cleanUnreachable(SSACFG& _cfg)
 {
 	// Determine which blocks are reachable from the entry.
-	util::BreadthFirstSearch<SSACFG::BlockId> reachabilityCheck{{SSACFG::BlockId{0}}};
-	for (auto const& functionInfo: _cfg.functionInfos | ranges::views::values)
-		reachabilityCheck.verticesToTraverse.emplace_back(functionInfo.entry);
-
+	util::BreadthFirstSearch<SSACFG::BlockId> reachabilityCheck{{_cfg.entry}};
 	reachabilityCheck.run([&](SSACFG::BlockId _blockId, auto&& _addChild) {
 		auto const& block = _cfg.block(_blockId);
 		visit(util::GenericVisitor{
@@ -217,35 +215,94 @@ namespace solidity::yul
 SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
 	SSACFG& _graph,
 	AsmAnalysisInfo const& _analysisInfo,
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
 	Dialect const& _dialect
 ):
 	m_graph(_graph),
 	m_info(_analysisInfo),
-	m_functionSideEffects(_functionSideEffects),
 	m_dialect(_dialect)
 {
 }
 
-std::unique_ptr<SSACFG> SSAControlFlowGraphBuilder::build(
+std::unique_ptr<ControlFlow> SSAControlFlowGraphBuilder::build(
 	AsmAnalysisInfo const& _analysisInfo,
 	Dialect const& _dialect,
 	Block const& _block
 )
 {
-	auto result = std::make_unique<SSACFG>();
-
 	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
-	SSAControlFlowGraphBuilder builder(*result, _analysisInfo, sideEffects.functionSideEffects(), _dialect);
-	builder.m_currentBlock = result->makeBlock(debugDataOf(_block));
+
+	auto result = std::make_unique<ControlFlow>();
+	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, _dialect, _block);
+	buildFunctionGraphs(*result, _analysisInfo, sideEffects, _dialect, functions);
+
+	cleanUnreachable(*result->mainGraph);
+	for (auto& functionGraph: result->functionGraphs)
+		cleanUnreachable(*functionGraph);
+	return result;
+}
+
+void SSAControlFlowGraphBuilder::buildFunctionGraphs(
+	ControlFlow& _controlFlow,
+	AsmAnalysisInfo const& _info,
+	ControlFlowSideEffectsCollector const& _sideEffects,
+	Dialect const& _dialect,
+	std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> const& _functions
+)
+{
+	for (auto const& [function, functionDefinition]: _functions)
+	{
+		_controlFlow.functionGraphs.emplace_back(std::make_unique<SSACFG>());
+		auto& cfg = *_controlFlow.functionGraphs.back();
+		_controlFlow.functionGraphMapping.emplace_back(function, &cfg);
+
+		yulAssert(_info.scopes.at(&functionDefinition->body), "");
+		Scope* virtualFunctionScope = _info.scopes.at(_info.virtualBlocks.at(functionDefinition).get()).get();
+		yulAssert(virtualFunctionScope, "");
+
+		cfg.entry = cfg.makeBlock(debugDataOf(functionDefinition->body));
+		auto arguments = functionDefinition->parameters | ranges::views::transform([&](auto const& _param) {
+			auto const& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name));
+			// Note: cannot use std::make_tuple since it unwraps reference wrappers.
+			return std::tuple{std::cref(var), cfg.newVariable(cfg.entry)};
+		}) | ranges::to<std::vector>;
+		auto returns = functionDefinition->returnVariables | ranges::views::transform([&](auto const& _param) {
+			return std::cref(std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)));
+		}) | ranges::to<std::vector>;
+
+		cfg.debugData = functionDefinition->debugData;
+		cfg.function = function;
+		cfg.canContinue = _sideEffects.functionSideEffects().at(functionDefinition).canContinue;
+		cfg.arguments = arguments;
+		cfg.returns = returns;
+
+		SSAControlFlowGraphBuilder builder(cfg, _info, _dialect);
+		builder.m_currentBlock = cfg.entry;
+		for (auto&& [var, varId]: cfg.arguments)
+			builder.currentDef(var, cfg.entry) = varId;
+		builder.sealBlock(cfg.entry);
+		builder(functionDefinition->body);
+		cfg.exits.insert(builder.m_currentBlock);
+		// Artificial explicit function exit (`leave`) at the end of the body.
+		builder(Leave{debugDataOf(*functionDefinition)});
+	}
+}
+
+std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> SSAControlFlowGraphBuilder::buildMainGraph(
+	SSACFG& _cfg,
+	AsmAnalysisInfo const& _analysisInfo,
+	Dialect const& _dialect,
+	Block const& _block
+)
+{
+	SSAControlFlowGraphBuilder builder(_cfg, _analysisInfo, _dialect);
+	builder.m_currentBlock = _cfg.makeBlock(debugDataOf(_block));
 	builder.sealBlock(builder.m_currentBlock);
 	builder(_block);
 	if (!builder.blockInfo(builder.m_currentBlock).sealed)
 		builder.sealBlock(builder.m_currentBlock);
-	result->block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
+	_cfg.block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
 
-	cleanUnreachable(*result);
-	return result;
+	return builder.m_functionDefinitions;
 }
 
 void SSAControlFlowGraphBuilder::operator()(ExpressionStatement const& _expressionStatement)
@@ -276,21 +333,9 @@ void SSAControlFlowGraphBuilder::operator()(FunctionDefinition const& _functionD
 {
 	yulAssert(m_scope, "");
 	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
-	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
+	auto& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
 	m_graph.functions.emplace_back(function);
-
-	SSACFG::FunctionInfo& functionInfo = m_graph.functionInfos.at(&function);
-
-	SSAControlFlowGraphBuilder builder{m_graph, m_info, m_functionSideEffects, m_dialect};
-	builder.m_currentFunction = &functionInfo;
-	builder.m_currentBlock = functionInfo.entry;
-	for (auto&& [var, varId]: functionInfo.arguments)
-		builder.currentDef(var, functionInfo.entry) = varId;
-	builder.sealBlock(functionInfo.entry);
-	builder(_functionDefinition.body);
-	functionInfo.exits.insert(builder.m_currentBlock);
-	// Artificial explicit function exit (`leave`) at the end of the body.
-	builder(Leave{debugDataOf(_functionDefinition)});
+	m_functionDefinitions.emplace_back(&function, &_functionDefinition);
 }
 
 void SSAControlFlowGraphBuilder::operator()(If const& _if)
@@ -331,7 +376,9 @@ void SSAControlFlowGraphBuilder::operator()(Switch const& _switch)
 			auto blockId = m_graph.makeBlock(debugDataOf(_case.body));
 			if (_case.value)
 				cases[_case.value->value.value()] = blockId;
-			children.emplace_back(std::make_tuple(blockId, std::ref(_case.body)));
+			else
+				defaultCase = blockId;
+			children.emplace_back(blockId, std::ref(_case.body));
 		}
 		auto afterSwitch = m_graph.makeBlock(debugDataOf(currentBlock()));
 
@@ -349,9 +396,9 @@ void SSAControlFlowGraphBuilder::operator()(Switch const& _switch)
 	else
 	{
 		auto makeValueCompare = [&](Case const& _case) {
-			yul::FunctionCall const& ghostCall = m_graph.ghostCalls.emplace_back(yul::FunctionCall{
+			FunctionCall const& ghostCall = m_graph.ghostCalls.emplace_back(FunctionCall{
 				debugDataOf(_case),
-				yul::Identifier{{}, "eq"_yulname},
+				Identifier{{}, "eq"_yulname},
 				{*_case.value /* skip second argument */ }
 			});
 			auto outputValue = m_graph.newVariable(m_currentBlock);
@@ -363,7 +410,7 @@ void SSAControlFlowGraphBuilder::operator()(Switch const& _switch)
 					*builtin,
 					ghostCall
 				},
-				{m_graph.newLiteral(_case.value->value.value()), expression}
+				{m_graph.newLiteral(debugDataOf(_case), _case.value->value.value()), expression}
 			});
 			return outputValue;
 		};
@@ -404,7 +451,7 @@ void SSAControlFlowGraphBuilder::operator()(ForLoop const& _loop)
 	auto preLoopDebugData = debugDataOf(currentBlock());
 
 	std::optional<bool> constantCondition;
-	if (auto const* literalCondition = std::get_if<yul::Literal>(_loop.condition.get()))
+	if (auto const* literalCondition = std::get_if<Literal>(_loop.condition.get()))
 		constantCondition = literalCondition->value.value() != 0;
 
 	SSACFG::BlockId loopCondition = m_graph.makeBlock(debugDataOf(*_loop.condition));
@@ -477,13 +524,12 @@ void SSAControlFlowGraphBuilder::operator()(Continue const& _continue)
 	sealBlock(m_currentBlock);
 }
 
-void SSAControlFlowGraphBuilder::operator()(Leave const& _leave)
+void SSAControlFlowGraphBuilder::operator()(Leave const& _leaveStatement)
 {
-	yulAssert(m_currentFunction);
 	auto currentBlockDebugData = debugDataOf(currentBlock());
 	currentBlock().exit = SSACFG::BasicBlock::FunctionReturn{
-		debugDataOf(_leave),
-		m_currentFunction->returns | ranges::views::transform([&](auto _var) {
+		debugDataOf(_leaveStatement),
+		m_graph.returns | ranges::views::transform([&](auto _var) {
 			return readVariable(_var, m_currentBlock);
 		}) | ranges::to<std::vector>
 	};
@@ -494,9 +540,6 @@ void SSAControlFlowGraphBuilder::operator()(Leave const& _leave)
 void SSAControlFlowGraphBuilder::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
-	for (auto const& statement: _block.statements)
-		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
-			registerFunction(*function);
 	for (auto const& statement: _block.statements)
 		std::visit(*this, statement);
 }
@@ -516,7 +559,7 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(Identifier const& _identi
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(Literal const& _literal)
 {
-	return m_graph.newLiteral(_literal.value.value());
+	return m_graph.newLiteral(debugDataOf(currentBlock()), _literal.value.value());
 }
 
 void SSAControlFlowGraphBuilder::assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression)
@@ -536,40 +579,6 @@ void SSAControlFlowGraphBuilder::assign(std::vector<std::reference_wrapper<Scope
 
 }
 
-void SSAControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functionDefinition)
-{
-	yulAssert(m_scope, "");
-	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(&_functionDefinition.body), "");
-	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_functionDefinition).get()).get();
-	yulAssert(virtualFunctionScope, "");
-
-	// TODO: think about using another root node before the function body here (in particular as defining block for the
-	// arguments below)
-	SSACFG::BlockId entryBlock = m_graph.makeBlock(debugDataOf(_functionDefinition.body));
-
-	auto arguments = _functionDefinition.parameters | ranges::views::transform([&](auto const& _param) {
-		auto const& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name));
-		// Note: cannot use std::make_tuple since it unwraps reference wrappers.
-		return std::tuple{std::cref(var), m_graph.newVariable(entryBlock)};
-	}) | ranges::to<std::vector>;
-	auto returns = _functionDefinition.returnVariables | ranges::views::transform([&](auto const& _param) {
-		return std::cref(std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)));
-	}) | ranges::to<std::vector>;
-	auto [it, inserted] = m_graph.functionInfos.emplace(std::make_pair(&function, SSACFG::FunctionInfo{
-		_functionDefinition.debugData,
-		function,
-		entryBlock,
-		{},
-		m_functionSideEffects.at(&_functionDefinition).canContinue,
-		arguments,
-		returns
-	}));
-	yulAssert(inserted);
-}
-
 std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
 {
 	bool canContinue = true;
@@ -580,7 +589,7 @@ std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(Funct
 			for (auto&& [idx, arg]: _call.arguments | ranges::views::enumerate | ranges::views::reverse)
 				if (!builtin->literalArgument(idx).has_value())
 					result.inputs.emplace_back(std::visit(*this, arg));
-			for (size_t i = 0; i < builtin->returns.size(); ++i)
+			for (size_t i = 0; i < builtin->numReturns; ++i)
 				result.outputs.emplace_back(m_graph.newVariable(m_currentBlock));
 			canContinue = builtin->controlFlowSideEffects.canContinue;
 			return result;
@@ -588,11 +597,11 @@ std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(Funct
 		else
 		{
 			Scope::Function const& function = lookupFunction(_call.functionName.name);
-			canContinue = m_graph.functionInfos.at(&function).canContinue;
+			canContinue = m_graph.canContinue;
 			SSACFG::Operation result{{}, SSACFG::Call{debugDataOf(_call), function, _call, canContinue}, {}};
 			for (auto const& arg: _call.arguments | ranges::views::reverse)
 				result.inputs.emplace_back(std::visit(*this, arg));
-			for (size_t i = 0; i < function.returns.size(); ++i)
+			for (size_t i = 0; i < function.numReturns; ++i)
 				result.outputs.emplace_back(m_graph.newVariable(m_currentBlock));
 			return result;
 		}
@@ -610,13 +619,12 @@ std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(Funct
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::zero()
 {
-	return m_graph.newLiteral(0u);
+	return m_graph.newLiteral(debugDataOf(currentBlock()), 0u);
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block)
 {
-	auto& def = currentDef(_variable, _block);
-	if (def.has_value())
+	if (auto const& def = currentDef(_variable, _block))
 		return *def;
 	return readVariableRecursive(_variable, _block);
 }
@@ -638,7 +646,7 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::readVariableRecursive(Scope::Variabl
 	}
 	else
 	{
-		info.incompletePhis.emplace_back(std::make_tuple(phi, std::ref(_variable)));
+		info.incompletePhis.emplace_back(phi, std::ref(_variable));
 	}
 	writeVariable(_variable, _block, phi);
 	return phi;
@@ -646,25 +654,25 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::readVariableRecursive(Scope::Variabl
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi)
 {
-	auto* phi = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
-	yulAssert(phi);
-	for (auto pred: m_graph.block(phi->block).entries)
-		phi->arguments.emplace_back(readVariable(_variable, pred));
+	yulAssert(std::holds_alternative<SSACFG::PhiValue>(m_graph.valueInfo(_phi)));
+	auto& phi = std::get<SSACFG::PhiValue>(m_graph.valueInfo(_phi));
+	for (auto pred: m_graph.block(phi.block).entries)
+		phi.arguments.emplace_back(readVariable(_variable, pred));
 	return tryRemoveTrivialPhi(_phi);
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId _phi)
 {
 	// TODO: double-check if this is sane
-	auto* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
-	yulAssert(phiInfo);
+	yulAssert(std::holds_alternative<SSACFG::PhiValue>(m_graph.valueInfo(_phi)));
+	auto& phiInfo = std::get<SSACFG::PhiValue>(m_graph.valueInfo(_phi));
 
 	SSACFG::ValueId same;
-	for (SSACFG::ValueId arg: phiInfo->arguments)
+	for (SSACFG::ValueId arg: phiInfo.arguments)
 	{
 		if (arg == same || arg == _phi)
 			continue;
-		if (same)
+		if (same.hasValue())
 			return _phi;
 		same = arg;
 	}
@@ -725,11 +733,11 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 			_recurse(_block, _recurse);
 		});
 	};
-	auto phiBlock = phiInfo->block;
+	auto phiBlock = phiInfo.block;
 	m_graph.block(phiBlock).phis.erase(_phi);
 	findUses(phiBlock, findUses);
 
-	if (!same)
+	if (!same.hasValue())
 		// This will happen for unreachable paths.
 		// TODO: check how best to deal with this
 		same = m_graph.unreachableValue();
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
index 689e5bf884..031016219c 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -20,7 +20,9 @@
 */
 #pragma once
 
+#include <libyul/backends/evm/ControlFlow.h>
 #include <libyul/ControlFlowSideEffects.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/backends/evm/SSAControlFlowGraph.h>
 #include <stack>
 
@@ -32,13 +34,25 @@ class SSAControlFlowGraphBuilder
 	SSAControlFlowGraphBuilder(
 		SSACFG& _graph,
 		AsmAnalysisInfo const& _analysisInfo,
-		std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
 		Dialect const& _dialect
 	);
 public:
 	SSAControlFlowGraphBuilder(SSAControlFlowGraphBuilder const&) = delete;
 	SSAControlFlowGraphBuilder& operator=(SSAControlFlowGraphBuilder const&) = delete;
-	static std::unique_ptr<SSACFG> build(AsmAnalysisInfo const& _analysisInfo, Dialect const& _dialect, Block const& _block);
+	static std::unique_ptr<ControlFlow> build(AsmAnalysisInfo const& _analysisInfo, Dialect const& _dialect, Block const& _block);
+	static void buildFunctionGraphs(
+		ControlFlow& _controlFlow,
+		AsmAnalysisInfo const& _info,
+		ControlFlowSideEffectsCollector const& _sideEffects,
+		Dialect const& _dialect,
+		std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> const& _functions
+	);
+	static std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> buildMainGraph(
+		SSACFG& _cfg,
+		AsmAnalysisInfo const& _analysisInfo,
+		Dialect const& _dialect,
+		Block const& _block
+	);
 
 	void operator()(ExpressionStatement const& _statement);
 	void operator()(Assignment const& _assignment);
@@ -60,19 +74,17 @@ class SSAControlFlowGraphBuilder
 
 private:
 	void assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression);
-
-	void registerFunction(FunctionDefinition const& _function);
 	std::vector<SSACFG::ValueId> visitFunctionCall(FunctionCall const& _call);
 
 	SSACFG::ValueId zero();
 	SSACFG::ValueId readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block);
 	SSACFG::ValueId readVariableRecursive(Scope::Variable const& _variable, SSACFG::BlockId _block);
 	SSACFG::ValueId addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi);
+	SSACFG::ValueId tryRemoveTrivialPhi(SSACFG::ValueId _phi);
 	void writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value);
 
 	SSACFG& m_graph;
 	AsmAnalysisInfo const& m_info;
-	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& m_functionSideEffects;
 	Dialect const& m_dialect;
 	SSACFG::BlockId m_currentBlock;
 	SSACFG::BasicBlock& currentBlock() { return m_graph.block(m_currentBlock); }
@@ -104,7 +116,6 @@ class SSAControlFlowGraphBuilder
 		SSACFG::BlockId continueBlock;
 	};
 	std::stack<ForLoopInfo> m_forLoopInfo;
-	SSACFG::FunctionInfo* m_currentFunction = nullptr;
 
 	std::optional<SSACFG::ValueId>& currentDef(Scope::Variable const& _variable, SSACFG::BlockId _block)
 	{
@@ -132,6 +143,8 @@ class SSAControlFlowGraphBuilder
 		std::map<u256, SSACFG::BlockId> _cases,
 		SSACFG::BlockId _defaultCase
 	);
+
+	std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> m_functionDefinitions;
 };
 
 }
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
new file mode 100644
index 0000000000..042b313afb
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -0,0 +1,179 @@
+{
+    function f(a, b) -> c {
+        for { let x := 42 } lt(x, a) {
+            x := add(x, 1)
+            if calldataload(x)
+            {
+                sstore(0, x)
+                leave
+                sstore(0x01, 0x0101)
+            }
+            sstore(0xFF, 0xFFFF)
+        }
+        {
+            switch mload(x)
+            case 0 {
+                sstore(0x02, 0x0202)
+                break
+                sstore(0x03, 0x0303)
+            }
+            case 1 {
+                sstore(0x04, 0x0404)
+                leave
+                sstore(0x05, 0x0505)
+            }
+            case 2 {
+                sstore(0x06, 0x0606)
+                revert(0, 0)
+                sstore(0x07, 0x0707)
+            }
+            case 3 {
+                sstore(0x08, 0x0808)
+            }
+            default {
+                if mload(b) {
+                    return(0, 0)
+                    sstore(0x09, 0x0909)
+                }
+                    sstore(0x0A, 0x0A0A)
+            }
+            sstore(0x0B, 0x0B0B)
+        }
+        sstore(0x0C, 0x0C0C)
+    }
+    pop(f(1,2))
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"		]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\nv2 := f(2, 1)\l\
+// pop(v2)\l\
+// "];
+// Block0_0Exit [label="MainExit"];
+// Block0_0 -> Block0_0Exit;
+// FunctionEntry_f_0 [label="function f:
+//  c := f(v0, v1)"];
+// FunctionEntry_f_0 -> Block1_0;
+// Block1_0 [label="\
+// Block 0\n"];
+// Block1_0 -> Block1_0Exit [arrowhead=none];
+// Block1_0Exit [label="Jump" shape=oval];
+// Block1_0Exit -> Block1_1;
+// Block1_1 [label="\
+// Block 1\nv4 := φ(\l\
+// 	Block 0 => 42,\l\
+// 	Block 21 => v43\l\
+// )\l\
+// v5 := lt(v0, v4)\l\
+// "];
+// Block1_1 -> Block1_1Exit;
+// Block1_1Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit:0 -> Block1_4;
+// Block1_1Exit:1 -> Block1_2;
+// Block1_2 [label="\
+// Block 2\nv6 := mload(v4)\l\
+// v7 := eq(0, v6)\l\
+// "];
+// Block1_2 -> Block1_2Exit;
+// Block1_2Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit:0 -> Block1_7;
+// Block1_2Exit:1 -> Block1_6;
+// Block1_4 [label="\
+// Block 4\nsstore(3084, 12)\l\
+// "];
+// Block1_4Exit [label="FunctionReturn[v17]"];
+// Block1_4 -> Block1_4Exit;
+// Block1_6 [label="\
+// Block 6\nsstore(514, 2)\l\
+// "];
+// Block1_6 -> Block1_6Exit [arrowhead=none];
+// Block1_6Exit [label="Jump" shape=oval];
+// Block1_6Exit -> Block1_4;
+// Block1_7 [label="\
+// Block 7\nv13 := eq(1, v6)\l\
+// "];
+// Block1_7 -> Block1_7Exit;
+// Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_7Exit:0 -> Block1_10;
+// Block1_7Exit:1 -> Block1_9;
+// Block1_9 [label="\
+// Block 9\nsstore(1028, 4)\l\
+// "];
+// Block1_9Exit [label="FunctionReturn[v17]"];
+// Block1_9 -> Block1_9Exit;
+// Block1_10 [label="\
+// Block 10\nv20 := eq(2, v6)\l\
+// "];
+// Block1_10 -> Block1_10Exit;
+// Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_10Exit:0 -> Block1_13;
+// Block1_10Exit:1 -> Block1_12;
+// Block1_12 [label="\
+// Block 12\nsstore(1542, 6)\l\
+// revert(0, 0)\l\
+// "];
+// Block1_12Exit [label="Terminated"];
+// Block1_12 -> Block1_12Exit;
+// Block1_13 [label="\
+// Block 13\nv25 := eq(3, v6)\l\
+// "];
+// Block1_13 -> Block1_13Exit;
+// Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_13Exit:0 -> Block1_16;
+// Block1_13Exit:1 -> Block1_15;
+// Block1_15 [label="\
+// Block 15\nsstore(2056, 8)\l\
+// "];
+// Block1_15 -> Block1_15Exit [arrowhead=none];
+// Block1_15Exit [label="Jump" shape=oval];
+// Block1_15Exit -> Block1_5;
+// Block1_16 [label="\
+// Block 16\nv29 := mload(v1)\l\
+// "];
+// Block1_16 -> Block1_16Exit;
+// Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_16Exit:0 -> Block1_18;
+// Block1_16Exit:1 -> Block1_17;
+// Block1_5 [label="\
+// Block 5\nsstore(2827, 11)\l\
+// "];
+// Block1_5 -> Block1_5Exit [arrowhead=none];
+// Block1_5Exit [label="Jump" shape=oval];
+// Block1_5Exit -> Block1_3;
+// Block1_17 [label="\
+// Block 17\nreturn(0, 0)\l\
+// "];
+// Block1_17Exit [label="Terminated"];
+// Block1_17 -> Block1_17Exit;
+// Block1_18 [label="\
+// Block 18\nsstore(2570, 10)\l\
+// "];
+// Block1_18 -> Block1_18Exit [arrowhead=none];
+// Block1_18Exit [label="Jump" shape=oval];
+// Block1_18Exit -> Block1_5;
+// Block1_3 [label="\
+// Block 3\nv43 := add(1, v4)\l\
+// v44 := calldataload(v43)\l\
+// "];
+// Block1_3 -> Block1_3Exit;
+// Block1_3Exit [label="{ If v44| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_3Exit:0 -> Block1_21;
+// Block1_3Exit:1 -> Block1_20;
+// Block1_20 [label="\
+// Block 20\nsstore(v43, 0)\l\
+// "];
+// Block1_20Exit [label="FunctionReturn[v45]"];
+// Block1_20 -> Block1_20Exit;
+// Block1_21 [label="\
+// Block 21\nsstore(65535, 255)\l\
+// "];
+// Block1_21 -> Block1_21Exit [arrowhead=none];
+// Block1_21Exit [label="Jump" shape=oval];
+// Block1_21Exit -> Block1_1;
+// }
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
new file mode 100644
index 0000000000..e7cba5f916
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -0,0 +1,195 @@
+{
+    function f(a, b) -> c {
+        for { let x := 42 } lt(x, a) {
+            x := add(x, 1)
+            if calldataload(x)
+            {
+                sstore(0, x)
+                leave
+                sstore(0x01, 0x0101)
+            }
+            sstore(0xFF, 0xFFFF)
+        }
+        {
+            switch mload(x)
+            case 0 {
+                sstore(0x02, 0x0202)
+                break
+                sstore(0x03, 0x0303)
+            }
+            case 1 {
+                sstore(0x04, 0x0404)
+                leave
+                sstore(0x05, 0x0505)
+            }
+            case 2 {
+                sstore(0x06, 0x0606)
+                revert(0, 0)
+                sstore(0x07, 0x0707)
+            }
+            case 3 {
+                sstore(0x08, 0x0808)
+            }
+            default {
+                if mload(b) {
+                    return(0, 0)
+                    sstore(0x09, 0x0909)
+                }
+                    sstore(0x0A, 0x0A0A)
+            }
+            sstore(0x0B, 0x0B0B)
+        }
+        sstore(0x0C, 0x0C0C)
+        c:=27
+    }
+    sstore(0x1,0x1)
+    pop(f(1,2))
+    let z:= add(5,sload(0))
+    let w := f(z,sload(4))
+    sstore(z,w)
+    let x := f(w,sload(5))
+    sstore(0x1,x)
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"		]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\nsstore(1, 1)\l\
+// v2 := f(2, 1)\l\
+// pop(v2)\l\
+// v4 := sload(0)\l\
+// v6 := add(v4, 5)\l\
+// v8 := sload(4)\l\
+// v9 := f(v8, v6)\l\
+// sstore(v9, v6)\l\
+// v10 := sload(5)\l\
+// v11 := f(v10, v9)\l\
+// sstore(v11, 1)\l\
+// "];
+// Block0_0Exit [label="MainExit"];
+// Block0_0 -> Block0_0Exit;
+// FunctionEntry_f_0 [label="function f:
+//  c := f(v0, v1)"];
+// FunctionEntry_f_0 -> Block1_0;
+// Block1_0 [label="\
+// Block 0\n"];
+// Block1_0 -> Block1_0Exit [arrowhead=none];
+// Block1_0Exit [label="Jump" shape=oval];
+// Block1_0Exit -> Block1_1;
+// Block1_1 [label="\
+// Block 1\nv4 := φ(\l\
+// 	Block 0 => 42,\l\
+// 	Block 21 => v43\l\
+// )\l\
+// v5 := lt(v0, v4)\l\
+// "];
+// Block1_1 -> Block1_1Exit;
+// Block1_1Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit:0 -> Block1_4;
+// Block1_1Exit:1 -> Block1_2;
+// Block1_2 [label="\
+// Block 2\nv6 := mload(v4)\l\
+// v7 := eq(0, v6)\l\
+// "];
+// Block1_2 -> Block1_2Exit;
+// Block1_2Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit:0 -> Block1_7;
+// Block1_2Exit:1 -> Block1_6;
+// Block1_4 [label="\
+// Block 4\nsstore(3084, 12)\l\
+// "];
+// Block1_4Exit [label="FunctionReturn[27]"];
+// Block1_4 -> Block1_4Exit;
+// Block1_6 [label="\
+// Block 6\nsstore(514, 2)\l\
+// "];
+// Block1_6 -> Block1_6Exit [arrowhead=none];
+// Block1_6Exit [label="Jump" shape=oval];
+// Block1_6Exit -> Block1_4;
+// Block1_7 [label="\
+// Block 7\nv13 := eq(1, v6)\l\
+// "];
+// Block1_7 -> Block1_7Exit;
+// Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_7Exit:0 -> Block1_10;
+// Block1_7Exit:1 -> Block1_9;
+// Block1_9 [label="\
+// Block 9\nsstore(1028, 4)\l\
+// "];
+// Block1_9Exit [label="FunctionReturn[v17]"];
+// Block1_9 -> Block1_9Exit;
+// Block1_10 [label="\
+// Block 10\nv20 := eq(2, v6)\l\
+// "];
+// Block1_10 -> Block1_10Exit;
+// Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_10Exit:0 -> Block1_13;
+// Block1_10Exit:1 -> Block1_12;
+// Block1_12 [label="\
+// Block 12\nsstore(1542, 6)\l\
+// revert(0, 0)\l\
+// "];
+// Block1_12Exit [label="Terminated"];
+// Block1_12 -> Block1_12Exit;
+// Block1_13 [label="\
+// Block 13\nv25 := eq(3, v6)\l\
+// "];
+// Block1_13 -> Block1_13Exit;
+// Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_13Exit:0 -> Block1_16;
+// Block1_13Exit:1 -> Block1_15;
+// Block1_15 [label="\
+// Block 15\nsstore(2056, 8)\l\
+// "];
+// Block1_15 -> Block1_15Exit [arrowhead=none];
+// Block1_15Exit [label="Jump" shape=oval];
+// Block1_15Exit -> Block1_5;
+// Block1_16 [label="\
+// Block 16\nv29 := mload(v1)\l\
+// "];
+// Block1_16 -> Block1_16Exit;
+// Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_16Exit:0 -> Block1_18;
+// Block1_16Exit:1 -> Block1_17;
+// Block1_5 [label="\
+// Block 5\nsstore(2827, 11)\l\
+// "];
+// Block1_5 -> Block1_5Exit [arrowhead=none];
+// Block1_5Exit [label="Jump" shape=oval];
+// Block1_5Exit -> Block1_3;
+// Block1_17 [label="\
+// Block 17\nreturn(0, 0)\l\
+// "];
+// Block1_17Exit [label="Terminated"];
+// Block1_17 -> Block1_17Exit;
+// Block1_18 [label="\
+// Block 18\nsstore(2570, 10)\l\
+// "];
+// Block1_18 -> Block1_18Exit [arrowhead=none];
+// Block1_18Exit [label="Jump" shape=oval];
+// Block1_18Exit -> Block1_5;
+// Block1_3 [label="\
+// Block 3\nv43 := add(1, v4)\l\
+// v44 := calldataload(v43)\l\
+// "];
+// Block1_3 -> Block1_3Exit;
+// Block1_3Exit [label="{ If v44| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_3Exit:0 -> Block1_21;
+// Block1_3Exit:1 -> Block1_20;
+// Block1_20 [label="\
+// Block 20\nsstore(v43, 0)\l\
+// "];
+// Block1_20Exit [label="FunctionReturn[v45]"];
+// Block1_20 -> Block1_20Exit;
+// Block1_21 [label="\
+// Block 21\nsstore(65535, 255)\l\
+// "];
+// Block1_21 -> Block1_21Exit [arrowhead=none];
+// Block1_21Exit [label="Jump" shape=oval];
+// Block1_21Exit -> Block1_1;
+// }
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
new file mode 100644
index 0000000000..11eb1ac6cb
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -0,0 +1,68 @@
+{
+    function f(a, b) -> r {
+        let x := add(a,b)
+        r := sub(x,a)
+    }
+    function g() {
+        sstore(0x01, 0x0101)
+    }
+    function h(x) {
+        h(f(x, 0))
+        g()
+    }
+    function i() -> v, w {
+        v := 0x0202
+        w := 0x0303
+    }
+    let x, y := i()
+    h(x)
+    h(y)
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"		]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\nv0, v1 := i()\l\
+// h(v0)\l\
+// h(v1)\l\
+// "];
+// Block0_0Exit [label="MainExit"];
+// Block0_0 -> Block0_0Exit;
+// FunctionEntry_f_0 [label="function f:
+//  r := f(v0, v1)"];
+// FunctionEntry_f_0 -> Block1_0;
+// Block1_0 [label="\
+// Block 0\nv2 := add(v1, v0)\l\
+// v3 := sub(v0, v2)\l\
+// "];
+// Block1_0Exit [label="FunctionReturn[v3]"];
+// Block1_0 -> Block1_0Exit;
+// FunctionEntry_g_0 [label="function g:
+//  g()"];
+// FunctionEntry_g_0 -> Block2_0;
+// Block2_0 [label="\
+// Block 0\nsstore(257, 1)\l\
+// "];
+// Block2_0Exit [label="FunctionReturn[]"];
+// Block2_0 -> Block2_0Exit;
+// FunctionEntry_h_0 [label="function h:
+//  h(v0)"];
+// FunctionEntry_h_0 -> Block3_0;
+// Block3_0 [label="\
+// Block 0\nv2 := f(0, v0)\l\
+// "];
+// Block3_0Exit [label="Terminated"];
+// Block3_0 -> Block3_0Exit;
+// FunctionEntry_i_0 [label="function i:
+//  v, w := i()"];
+// FunctionEntry_i_0 -> Block4_0;
+// Block4_0 [label="\
+// Block 0\n"];
+// Block4_0Exit [label="FunctionReturn[514, 771]"];
+// Block4_0 -> Block4_0Exit;
+// }
diff --git a/test/libyul/yulSSAControlFlowGraph/if.yul b/test/libyul/yulSSAControlFlowGraph/if.yul
new file mode 100644
index 0000000000..6a47ec2835
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/if.yul
@@ -0,0 +1,40 @@
+{
+    let x := calldataload(3)
+    if 0 {
+        x := calldataload(77)
+    }
+    let y := calldataload(x)
+    sstore(y, 0)
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"		]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\nv1 := calldataload(3)\l\
+// "];
+// Block0_0 -> Block0_0Exit;
+// Block0_0Exit [label="{ If 0| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_0Exit:0 -> Block0_2;
+// Block0_0Exit:1 -> Block0_1;
+// Block0_1 [label="\
+// Block 1\nv4 := calldataload(77)\l\
+// "];
+// Block0_1 -> Block0_1Exit [arrowhead=none];
+// Block0_1Exit [label="Jump" shape=oval];
+// Block0_1Exit -> Block0_2;
+// Block0_2 [label="\
+// Block 2\nv5 := φ(\l\
+// 	Block 0 => v1,\l\
+// 	Block 1 => v4\l\
+// )\l\
+// v6 := calldataload(v5)\l\
+// sstore(0, v6)\l\
+// "];
+// Block0_2Exit [label="MainExit"];
+// Block0_2 -> Block0_2Exit;
+// }
diff --git a/test/libyul/yulSSAControlFlowGraph/switch.yul b/test/libyul/yulSSAControlFlowGraph/switch.yul
new file mode 100644
index 0000000000..e0a24dac13
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/switch.yul
@@ -0,0 +1,68 @@
+{
+    let x := calldataload(3)
+
+    switch sload(0)
+    case 0 {
+        x := calldataload(77)
+    }
+    case 1 {
+        x := calldataload(88)
+    }
+    default {
+        x := calldataload(99)
+    }
+    sstore(x, 0)
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"		]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\nv1 := calldataload(3)\l\
+// v3 := sload(0)\l\
+// v4 := eq(0, v3)\l\
+// "];
+// Block0_0 -> Block0_0Exit;
+// Block0_0Exit [label="{ If v4| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_0Exit:0 -> Block0_3;
+// Block0_0Exit:1 -> Block0_2;
+// Block0_2 [label="\
+// Block 2\nv6 := calldataload(77)\l\
+// "];
+// Block0_2 -> Block0_2Exit [arrowhead=none];
+// Block0_2Exit [label="Jump" shape=oval];
+// Block0_2Exit -> Block0_1;
+// Block0_3 [label="\
+// Block 3\nv7 := eq(1, v3)\l\
+// "];
+// Block0_3 -> Block0_3Exit;
+// Block0_3Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_3Exit:0 -> Block0_5;
+// Block0_3Exit:1 -> Block0_4;
+// Block0_1 [label="\
+// Block 1\nv13 := φ(\l\
+// 	Block 2 => v6,\l\
+// 	Block 4 => v10,\l\
+// 	Block 5 => v12\l\
+// )\l\
+// sstore(0, v13)\l\
+// "];
+// Block0_1Exit [label="MainExit"];
+// Block0_1 -> Block0_1Exit;
+// Block0_4 [label="\
+// Block 4\nv10 := calldataload(88)\l\
+// "];
+// Block0_4 -> Block0_4Exit [arrowhead=none];
+// Block0_4Exit [label="Jump" shape=oval];
+// Block0_4Exit -> Block0_1;
+// Block0_5 [label="\
+// Block 5\nv12 := calldataload(99)\l\
+// "];
+// Block0_5 -> Block0_5Exit [arrowhead=none];
+// Block0_5Exit [label="Jump" shape=oval];
+// Block0_5Exit -> Block0_1;
+// }

From 7d87b63991e26dc4a5f2dd78ea8709efd3569506 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Fri, 9 Aug 2024 14:22:30 +0200
Subject: [PATCH 1027/1140] Yul: Dot output of SSA CFG

---
 libyul/backends/evm/SSAControlFlowGraph.h     |   4 +-
 .../evm/SSAControlFlowGraphBuilder.cpp        |   8 -
 test/CMakeLists.txt                           |   2 +
 test/InteractiveTests.h                       |   2 +
 test/libyul/ControlFlowGraphTest.cpp          |   1 -
 test/libyul/SSAControlFlowGraphTest.cpp       | 318 ++++++++++++++++++
 test/libyul/SSAControlFlowGraphTest.h         |  42 +++
 .../libyul/yulSSAControlFlowGraph/complex.yul |   2 +-
 .../yulSSAControlFlowGraph/complex2.yul       |   2 +-
 .../yulSSAControlFlowGraph/function.yul       |   2 +-
 test/libyul/yulSSAControlFlowGraph/if.yul     |   2 +-
 test/libyul/yulSSAControlFlowGraph/switch.yul |   2 +-
 test/tools/CMakeLists.txt                     |   1 +
 13 files changed, 372 insertions(+), 16 deletions(-)
 create mode 100644 test/libyul/SSAControlFlowGraphTest.cpp
 create mode 100644 test/libyul/SSAControlFlowGraphTest.h

diff --git a/libyul/backends/evm/SSAControlFlowGraph.h b/libyul/backends/evm/SSAControlFlowGraph.h
index 311d23e87c..f4d0ec2423 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.h
+++ b/libyul/backends/evm/SSAControlFlowGraph.h
@@ -117,7 +117,7 @@ class SSACFG
 		std::vector<Operation> operations;
 		std::variant<MainExit, Jump, ConditionalJump, JumpTable, FunctionReturn, Terminated> exit = MainExit{};
 		template<typename Callable>
-		void forEachExit(Callable&& _callable)
+		void forEachExit(Callable&& _callable) const
 		{
 			if (auto* jump = std::get_if<Jump>(&exit))
 				_callable(jump->target);
@@ -194,7 +194,7 @@ class SSACFG
 	}
 	ValueId newLiteral(langutil::DebugData::ConstPtr _debugData, u256 _value)
 	{
-		auto [it, inserted] = m_literals.emplace(_value, ValueId{m_valueInfos.size()});
+		auto [it, inserted] = m_literals.emplace(_value, SSACFG::ValueId{m_valueInfos.size()});
 		if (inserted)
 			m_valueInfos.emplace_back(LiteralValue{std::move(_debugData), _value});
 		else
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index 18720e9bc3..d9dc7663cc 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -176,14 +176,6 @@ void cleanUnreachable(SSACFG& _cfg)
 	{
 		auto& block = _cfg.block(blockId);
 
-		for (auto phi: block.phis)
-		{
-			auto& phiValue = std::get<SSACFG::PhiValue>(_cfg.valueInfo(phi));
-			yulAssert(block.entries.size() == phiValue.arguments.size());
-			for (auto&& [entry, arg]: ranges::zip_view(block.entries, phiValue.arguments))
-				yulAssert((reachabilityCheck.visited.count(entry) == 0) == isUnreachableValue(arg));
-		}
-
 		std::set<SSACFG::ValueId> maybeTrivialPhi;
 		for (auto it = block.entries.begin(); it != block.entries.end();)
 			if (reachabilityCheck.visited.count(*it))
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5308a55f78..d3498965dc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -153,6 +153,8 @@ set(libyul_sources
     libyul/ObjectCompilerTest.h
     libyul/ObjectParser.cpp
     libyul/Parser.cpp
+    libyul/SSAControlFlowGraphTest.cpp
+    libyul/SSAControlFlowGraphTest.h
     libyul/StackLayoutGeneratorTest.cpp
     libyul/StackLayoutGeneratorTest.h
     libyul/StackShufflingTest.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 4c2077576c..e043fcdbe6 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -31,6 +31,7 @@
 #include <test/libsolidity/SemanticTest.h>
 #include <test/libsolidity/SMTCheckerTest.h>
 #include <test/libyul/ControlFlowGraphTest.h>
+#include <test/libyul/SSAControlFlowGraphTest.h>
 #include <test/libyul/EVMCodeTransformTest.h>
 #include <test/libyul/YulOptimizerTest.h>
 #include <test/libyul/YulInterpreterTest.h>
@@ -67,6 +68,7 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"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 SSA Control Flow Graph",  "libyul",      "yulSSAControlFlowGraph",        false, false, &yul::test::SSAControlFlowGraphTest::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},
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index 5c9bba8d41..0060b850ef 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -130,7 +130,6 @@ class ControlFlowGraphPrinter
 				},
 				[&](CFG::BuiltinCall const& _call) {
 					m_stream << _call.functionCall.get().functionName.name.str() << ": ";
-
 				},
 				[&](CFG::Assignment const& _assignment) {
 					m_stream << "Assignment(";
diff --git a/test/libyul/SSAControlFlowGraphTest.cpp b/test/libyul/SSAControlFlowGraphTest.cpp
new file mode 100644
index 0000000000..e12751411c
--- /dev/null
+++ b/test/libyul/SSAControlFlowGraphTest.cpp
@@ -0,0 +1,318 @@
+/*
+	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/SSAControlFlowGraphTest.h>
+#include <test/libyul/Common.h>
+#include <test/Common.h>
+
+#include <libyul/backends/evm/SSAControlFlowGraphBuilder.h>
+#include <libyul/backends/evm/StackHelpers.h>
+
+#include <libyul/AsmAnalysis.h>
+#include <libyul/Object.h>
+
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/Visitor.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtautological-compare"
+#include <fmt/ranges.h>
+#pragma GCC diagnostic pop
+
+#ifdef ISOLTEST
+#include <boost/process.hpp>
+#endif
+
+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;
+
+std::unique_ptr<TestCase> SSAControlFlowGraphTest::create(TestCase::Config const& _config) {
+	return std::make_unique<SSAControlFlowGraphTest>(_config.filename);
+}
+
+SSAControlFlowGraphTest::SSAControlFlowGraphTest(std::string const& _filename): TestCase(_filename)
+{
+	m_source = m_reader.source();
+	auto dialectName = m_reader.stringSetting("dialect", "evm");
+	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_expectation = m_reader.simpleExpectations();
+}
+
+class SSACFGPrinter
+{
+public:
+	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId)
+	{
+		printBlock(_cfg, _blockId, 0);
+	}
+	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function)
+	{
+		printFunction(_cfg, _functionIndex, _function);
+	}
+	friend std::ostream& operator<<(std::ostream& stream, SSACFGPrinter const& printer) {
+		stream << printer.m_result.str();
+		return stream;
+	}
+private:
+	std::string varToString(SSACFG const& _cfg, SSACFG::ValueId _var) {
+		if (_var.value == std::numeric_limits<size_t>::max())
+			return "INVALID";
+		auto const& info = _cfg.valueInfo(_var);
+		return std::visit(
+			util::GenericVisitor{
+				[&](SSACFG::UnreachableValue const&) -> std::string {
+					return "[unreachable]";
+				},
+				[&](SSACFG::PhiValue const&) -> std::string {
+					return fmt::format("v{}", _var.value);
+				},
+				[&](SSACFG::VariableValue const&) -> std::string {
+					return fmt::format("v{}", _var.value);
+				},
+				[&](SSACFG::LiteralValue const& _literal) -> std::string {
+					return util::formatNumberReadable(_literal.value);
+				}
+			},
+			info
+		);
+	}
+
+	std::string formatPhi(SSACFG const& _cfg, SSACFG::PhiValue const& _phiValue)
+	{
+		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
+		std::vector<std::string> formattedArgs;
+		formattedArgs.reserve(_phiValue.arguments.size());
+		for(auto const& [arg, entry] : ranges::zip_view(_phiValue.arguments | ranges::views::transform(transform), _cfg.block(_phiValue.block).entries))
+		{
+			formattedArgs.push_back(fmt::format("Block {} => {}", entry.value, arg));
+		}
+		return fmt::format("φ(\\l\\\n\t{}\\l\\\n)", fmt::join(formattedArgs, ",\\l\\\n\t"));
+	}
+
+	void writeBlock(SSACFG const& _cfg, SSACFG::BlockId const& _id, SSACFG::BasicBlock const& _block, size_t _functionIndex)
+	{
+		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
+		bool entryBlock = _id.value == 0 && _functionIndex == 0;
+		if (entryBlock)
+		{
+			m_result << fmt::format("Entry{} [label=\"Entry\"];\n", _functionIndex);
+			m_result << fmt::format("Entry{} -> Block{}_{};\n", _functionIndex, _functionIndex, _id.value);
+		}
+		{
+			m_result << fmt::format("Block{1}_{0} [label=\"\\\nBlock {0}\\n", _id.value, _functionIndex);
+			for (auto const& phi : _block.phis)
+			{
+				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
+				solAssert(phiValue);
+				m_result << fmt::format("v{} := {}\\l\\\n", phi.value, formatPhi(_cfg, *phiValue));
+			}
+			for (auto const& operation : _block.operations)
+			{
+				std::string const label = std::visit(util::GenericVisitor{
+					[&](SSACFG::Call const& _call) {
+					   return _call.function.get().name.str();
+					},
+					[&](SSACFG::BuiltinCall const& _call) {
+					   return _call.builtin.get().name.str();
+					},
+				}, operation.kind);
+				if (operation.outputs.empty())
+					m_result << fmt::format(
+						"{}({})\\l\\\n",
+						label,
+						fmt::join(operation.inputs | ranges::views::transform(transform), ", ")
+					);
+				else
+					m_result << fmt::format(
+						"{} := {}({})\\l\\\n",
+						fmt::join(operation.outputs | ranges::views::transform(transform), ", "),
+						label,
+						fmt::join(operation.inputs | ranges::views::transform(transform), ", ")
+					);
+			}
+			m_result << "\"];\n";
+			std::visit(util::GenericVisitor{
+			   [&](SSACFG::BasicBlock::MainExit const&)
+			   {
+				   m_result << fmt::format("Block{}_{}Exit [label=\"MainExit\"];\n", _functionIndex, _id.value);
+				   m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit;\n", _id.value, _functionIndex);
+			   },
+			   [&](SSACFG::BasicBlock::Jump const& _jump)
+			   {
+				   m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit [arrowhead=none];\n", _id.value, _functionIndex);
+				   m_result << fmt::format("Block{}_{}Exit [label=\"Jump\" shape=oval];\n", _functionIndex, _id.value);
+				   m_result << fmt::format("Block{}_{}Exit -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, _jump.target.value);
+			   },
+			   [&](SSACFG::BasicBlock::ConditionalJump const& _conditionalJump)
+			   {
+				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"{ If ";
+				   m_result << varToString(_cfg, _conditionalJump.condition);
+				   m_result << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
+				   m_result << "Block" << _functionIndex << "_" << _id.value;
+				   m_result << "Exit:0 -> Block" << _functionIndex << "_" << _conditionalJump.zero.value << ";\n";
+				   m_result << "Block" << _functionIndex << "_" << _id.value;
+				   m_result << "Exit:1 -> Block" << _functionIndex << "_" << _conditionalJump.nonZero.value << ";\n";
+			   },
+			   [&](SSACFG::BasicBlock::JumpTable const& jt)
+			   {
+				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+				   std::string options;
+				   for(const auto& jumpCase : jt.cases)
+				   {
+					   if (!options.empty())
+						   options += " | ";
+					   options += fmt::format("<{0}> {0}", formatNumber(jumpCase.first));
+				   }
+				   if (!options.empty())
+					   options += " | ";
+				   options += "<default> default";
+				   m_result << fmt::format("Block{}_{}Exit [label=\"{{ JT | {{ {} }} }}\" shape=Mrecord];\n", _functionIndex, _id.value, options);
+				   for(const auto& jumpCase : jt.cases)
+				   {
+					   m_result << fmt::format("Block{}_{}Exit:{} -> Block{}_{};\n", _functionIndex, _id.value, formatNumber(jumpCase.first), _functionIndex, jumpCase.second.value);
+				   }
+				   m_result << fmt::format("Block{}_{}Exit:default -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, jt.defaultCase.value);
+			   },
+			   [&](SSACFG::BasicBlock::FunctionReturn const& fr)
+			   {
+				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"FunctionReturn["
+						  << fmt::format("{}", fmt::join(fr.returnValues | ranges::views::transform(transform), ", "))
+						  << "]\"];\n";
+				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+			   },
+			   [&](SSACFG::BasicBlock::Terminated const&)
+			   {
+				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"Terminated\"];\n";
+				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+			   }
+		   }, _block.exit);
+		}
+
+	}
+
+	void printBlock(SSACFG const& _cfg, SSACFG::BlockId const& _rootId, size_t _functionIndex)
+	{
+		std::set<SSACFG::BlockId> explored{};
+		explored.insert(_rootId);
+
+		std::deque<SSACFG::BlockId> toVisit{};
+		toVisit.emplace_back(_rootId);
+
+		while(!toVisit.empty())
+		{
+			auto const id = toVisit.front();
+			toVisit.pop_front();
+			auto const& block = _cfg.block(id);
+			writeBlock(_cfg, id, block, _functionIndex);
+			block.forEachExit(
+				[&](SSACFG::BlockId const& _exitBlock)
+				{
+					if (explored.count(_exitBlock) == 0)
+					{
+						explored.insert(_exitBlock);
+						toVisit.emplace_back(_exitBlock);
+					}
+				}
+			);
+		}
+	}
+
+	void printFunction(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _fun)
+	{
+		static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return functionReturnValue.get().name.str(); };
+		static auto constexpr argsTransform = [](auto const& arg) { return fmt::format("v{}", std::get<1>(arg).value); };
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " [label=\"";
+		if (!_cfg.returns.empty())
+			m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+		else
+			m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+		m_result << "\"];\n";
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " -> Block" << _functionIndex << "_" << _cfg.entry.value << ";\n";
+		printBlock(_cfg, _cfg.entry, _functionIndex);
+	}
+
+	std::stringstream m_result{};
+};
+
+TestCase::TestResult SSAControlFlowGraphTest::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." << std::endl;
+		return TestResult::FatalError;
+	}
+
+	std::ostringstream output;
+
+	auto info = AsmAnalyzer::analyzeStrictAssertCorrect(*m_dialect, *object);
+	std::unique_ptr<ControlFlow> controlFlow = SSAControlFlowGraphBuilder::build(
+		info,
+		*m_dialect,
+		object->code()->root()
+	);
+
+	output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
+	output << SSACFGPrinter(*controlFlow->mainGraph, SSACFG::BlockId{0});
+	size_t index = 1;
+	for (auto const& [function, functionGraph]: controlFlow->functionGraphMapping)
+		output << SSACFGPrinter(*functionGraph, index++, *function);
+	output << "}\n";
+
+	m_obtainedResult = output.str();
+
+	auto result = checkResult(_stream, _linePrefix, _formatted);
+
+#ifdef ISOLTEST
+	char* graphDisplayer = nullptr;
+	// The environment variables specify an optional command that will receive the graph encoded in DOT through stdin.
+	// Examples for suitable commands are ``dot -Tx11:cairo`` or ``xdot -``.
+	if (result == TestResult::Failure)
+		// ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND will run on all failing tests (intended for use during modifications).
+		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND");
+	else if (result == TestResult::Success)
+		// ISOLTEST_DISPLAY_GRAPHS_ON_FAILURE_COMMAND will run on all succeeding tests (intended for use during reviews).
+		graphDisplayer = getenv("ISOLTEST_DISPLAY_GRAPHS_ON_SUCCESS_COMMAND");
+
+	if (graphDisplayer)
+	{
+		if (result == TestResult::Success)
+			std::cout << std::endl << m_source << std::endl;
+		boost::process::opstream pipe;
+		boost::process::child child(graphDisplayer, boost::process::std_in < pipe);
+
+		pipe << output.str();
+		pipe.flush();
+		pipe.pipe().close();
+		if (result == TestResult::Success)
+			child.wait();
+		else
+			child.detach();
+	}
+#endif
+
+	return result;
+
+}
diff --git a/test/libyul/SSAControlFlowGraphTest.h b/test/libyul/SSAControlFlowGraphTest.h
new file mode 100644
index 0000000000..f976be03c3
--- /dev/null
+++ b/test/libyul/SSAControlFlowGraphTest.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 <test/TestCase.h>
+
+#include <memory>
+
+namespace solidity::yul
+{
+struct Dialect;
+
+namespace test
+{
+
+class SSAControlFlowGraphTest: public solidity::frontend::test::TestCase
+{
+public:
+	static std::unique_ptr<TestCase> create(Config const& _config);
+	explicit SSAControlFlowGraphTest(std::string const& _filename);
+	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
+private:
+	Dialect const* m_dialect = nullptr;
+};
+}
+}
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
index 042b313afb..d7e16c9f6f 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -46,7 +46,7 @@
 // ----
 // digraph SSACFG {
 // nodesep=0.7;
-// graph[fontname="DejaVu Sans"		]
+// graph[fontname="DejaVu Sans"]
 // node[shape=box,fontname="DejaVu Sans"];
 //
 // Entry0 [label="Entry"];
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
index e7cba5f916..863b021d1e 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex2.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -53,7 +53,7 @@
 // ----
 // digraph SSACFG {
 // nodesep=0.7;
-// graph[fontname="DejaVu Sans"		]
+// graph[fontname="DejaVu Sans"]
 // node[shape=box,fontname="DejaVu Sans"];
 //
 // Entry0 [label="Entry"];
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
index 11eb1ac6cb..aa4b6ac97f 100644
--- a/test/libyul/yulSSAControlFlowGraph/function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -21,7 +21,7 @@
 // ----
 // digraph SSACFG {
 // nodesep=0.7;
-// graph[fontname="DejaVu Sans"		]
+// graph[fontname="DejaVu Sans"]
 // node[shape=box,fontname="DejaVu Sans"];
 //
 // Entry0 [label="Entry"];
diff --git a/test/libyul/yulSSAControlFlowGraph/if.yul b/test/libyul/yulSSAControlFlowGraph/if.yul
index 6a47ec2835..9045d80340 100644
--- a/test/libyul/yulSSAControlFlowGraph/if.yul
+++ b/test/libyul/yulSSAControlFlowGraph/if.yul
@@ -9,7 +9,7 @@
 // ----
 // digraph SSACFG {
 // nodesep=0.7;
-// graph[fontname="DejaVu Sans"		]
+// graph[fontname="DejaVu Sans"]
 // node[shape=box,fontname="DejaVu Sans"];
 //
 // Entry0 [label="Entry"];
diff --git a/test/libyul/yulSSAControlFlowGraph/switch.yul b/test/libyul/yulSSAControlFlowGraph/switch.yul
index e0a24dac13..f6c084b001 100644
--- a/test/libyul/yulSSAControlFlowGraph/switch.yul
+++ b/test/libyul/yulSSAControlFlowGraph/switch.yul
@@ -16,7 +16,7 @@
 // ----
 // digraph SSACFG {
 // nodesep=0.7;
-// graph[fontname="DejaVu Sans"		]
+// graph[fontname="DejaVu Sans"]
 // node[shape=box,fontname="DejaVu Sans"];
 //
 // Entry0 [label="Entry"];
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 44a5e2aa70..5c1d41b7f5 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -40,6 +40,7 @@ add_executable(isoltest
 	../libsolidity/SMTCheckerTest.cpp
 	../libyul/Common.cpp
 	../libyul/ControlFlowGraphTest.cpp
+	../libyul/SSAControlFlowGraphTest.cpp
 	../libyul/ControlFlowSideEffectsTest.cpp
 	../libyul/EVMCodeTransformTest.cpp
 	../libyul/FunctionSideEffects.cpp

From 80533d806b0755dd2fa288af73a1bac35d8ec895 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 31 May 2024 13:50:04 +0200
Subject: [PATCH 1028/1140] Convert Yul CFG to Json

---
 libsolidity/interface/CompilerStack.cpp    |  11 ++
 libsolidity/interface/CompilerStack.h      |   3 +
 libsolidity/interface/StandardCompiler.cpp |  13 +-
 libyul/CMakeLists.txt                      |   2 +
 libyul/YulControlFlowGraphExporter.cpp     | 212 +++++++++++++++++++++
 libyul/YulControlFlowGraphExporter.h       |  42 ++++
 libyul/YulStack.cpp                        |  41 ++++
 libyul/YulStack.h                          |   3 +
 solc/CommandLineInterface.cpp              |  32 +++-
 solc/CommandLineInterface.h                |   1 +
 solc/CommandLineParser.cpp                 |   2 +
 solc/CommandLineParser.h                   |   2 +
 test/solc/CommandLineParser.cpp            |   3 +-
 13 files changed, 362 insertions(+), 5 deletions(-)
 create mode 100644 libyul/YulControlFlowGraphExporter.cpp
 create mode 100644 libyul/YulControlFlowGraphExporter.h

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 1f432db40f..ce9525c2b6 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -924,6 +924,16 @@ Json const& CompilerStack::yulIRAst(std::string const& _contractName) const
 	return contract(_contractName).yulIRAst;
 }
 
+Json const& CompilerStack::yulCFGJson(std::string const& _contractName) const
+{
+	if (m_stackState != CompilationSuccessful)
+		solThrow(CompilerError, "Compilation was not successful.");
+
+	solUnimplementedAssert(!isExperimentalSolidity());
+
+	return contract(_contractName).yulCFGJson;
+}
+
 std::string const& CompilerStack::yulIROptimized(std::string const& _contractName) const
 {
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
@@ -1506,6 +1516,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 	);
 
 	compiledContract.yulIRAst = stack.astJson();
+	compiledContract.yulCFGJson = stack.cfgJson();
 	if (!_unoptimizedOnly)
 	{
 		stack.optimize();
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 25863b6d06..0a62cbf7ef 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -298,6 +298,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// @returns the optimized IR representation of a contract AST in JSON format.
 	Json const& yulIROptimizedAst(std::string const& _contractName) const;
 
+	Json const& yulCFGJson(std::string const& _contractName) const;
+
 	/// @returns the assembled object for a contract.
 	virtual evmasm::LinkerObject const& object(std::string const& _contractName) const override;
 
@@ -411,6 +413,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		std::string yulIROptimized; ///< Reparsed and possibly optimized Yul IR code.
 		Json yulIRAst; ///< JSON AST of Yul IR code.
 		Json yulIROptimizedAst; ///< JSON AST of optimized Yul IR code.
+		Json yulCFGJson; ///< JSON CFG of Yul IR code.
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
 		util::LazyInit<Json const> abi;
 		util::LazyInit<Json const> storageLayout;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 0c1ccb6b76..385e48c223 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -180,7 +180,7 @@ bool hashMatchesContent(std::string const& _hash, std::string const& _content)
 
 bool isArtifactRequested(Json const& _outputSelection, std::string const& _artifact, bool _wildcardMatchesExperimental)
 {
-	static std::set<std::string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
+	static std::set<std::string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst", "yulCFGJson"};
 	for (auto const& selectedArtifactJson: _outputSelection)
 	{
 		std::string const& selectedArtifact = selectedArtifactJson.get<std::string>();
@@ -191,6 +191,9 @@ bool isArtifactRequested(Json const& _outputSelection, std::string const& _artif
 			return true;
 		else if (selectedArtifact == "*")
 		{
+			// TODO: yulCFGJson is only experimental now, so it should not be matched by "*".
+			if (_artifact == "yulCFGJson")
+				return false;
 			// "ir", "irOptimized" can only be matched by "*" if activated.
 			if (experimental.count(_artifact) == 0 || _wildcardMatchesExperimental)
 				return true;
@@ -264,7 +267,7 @@ bool isBinaryRequested(Json const& _outputSelection)
 	// This does not include "evm.methodIdentifiers" on purpose!
 	static std::vector<std::string> const outputsThatRequireBinaries = std::vector<std::string>{
 		"*",
-		"ir", "irAst", "irOptimized", "irOptimizedAst",
+		"ir", "irAst", "irOptimized", "irOptimizedAst", "yulCFGJson",
 		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
 	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
 
@@ -307,7 +310,7 @@ CompilerStack::IROutputSelection irOutputSelection(Json const& _outputSelection)
 		for (auto const& requests: fileRequests)
 			for (auto const& request: requests)
 			{
-				if (request == "irOptimized" || request == "irOptimizedAst")
+				if (request == "irOptimized" || request == "irOptimizedAst" || request == "yulCFGJson")
 					return CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
 
 				if (request == "ir" || request == "irAst")
@@ -1485,6 +1488,8 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 			contractData["irOptimized"] = compilerStack.yulIROptimized(contractName);
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimizedAst", wildcardMatchesExperimental))
 			contractData["irOptimizedAst"] = compilerStack.yulIROptimizedAst(contractName);
+		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "yulCFGJson", wildcardMatchesExperimental))
+			contractData["yulCFGJson"] = compilerStack.yulCFGJson(contractName);
 
 		// EVM
 		Json evmData;
@@ -1698,6 +1703,8 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		output["contracts"][sourceName][contractName]["irOptimized"] = stack.print();
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "evm.assembly", wildcardMatchesExperimental))
 		output["contracts"][sourceName][contractName]["evm"]["assembly"] = object.assembly->assemblyString(stack.debugInfoSelection());
+	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "yulCFGJson", wildcardMatchesExperimental))
+		output["contracts"][sourceName][contractName]["yulCFGJson"] = stack.cfgJson();
 
 	return output;
 }
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index c54513d9ab..c0082f5d69 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -39,6 +39,8 @@ add_library(yul
 	ScopeFiller.h
 	Utilities.cpp
 	Utilities.h
+	YulControlFlowGraphExporter.h
+	YulControlFlowGraphExporter.cpp
 	YulName.h
 	YulString.h
 	backends/evm/AbstractAssembly.h
diff --git a/libyul/YulControlFlowGraphExporter.cpp b/libyul/YulControlFlowGraphExporter.cpp
new file mode 100644
index 0000000000..3f347fcf4f
--- /dev/null
+++ b/libyul/YulControlFlowGraphExporter.cpp
@@ -0,0 +1,212 @@
+/*
+	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/Utilities.h>
+#include <libyul/YulControlFlowGraphExporter.h>
+
+#include <libsolutil/Algorithms.h>
+#include <libsolutil/Numeric.h>
+
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/map.hpp>
+#include <range/v3/view/transform.hpp>
+
+using namespace solidity;
+using namespace solidity::langutil;
+using namespace solidity::util;
+using namespace solidity::yul;
+
+YulControlFlowGraphExporter::YulControlFlowGraphExporter(ControlFlow const& _controlFlow): m_controlFlow(_controlFlow)
+{
+}
+
+std::string YulControlFlowGraphExporter::varToString(SSACFG const& _cfg, SSACFG::ValueId _var)
+{
+	if (_var.value == std::numeric_limits<size_t>::max())
+		return std::string("INVALID");
+	auto const& info = _cfg.valueInfo(_var);
+	return std::visit(
+		util::GenericVisitor{
+			[&](SSACFG::UnreachableValue const&) -> std::string {
+				return "[unreachable]";
+			},
+			[&](SSACFG::LiteralValue const& _literal) {
+				return toCompactHexWithPrefix(_literal.value);
+			},
+			[&](auto const&) {
+				return "v" + std::to_string(_var.value);
+			}
+		},
+		info
+	);
+}
+
+Json YulControlFlowGraphExporter::run()
+{
+	Json yulObjectJson = Json::object();
+	yulObjectJson["blocks"] = exportBlock(*m_controlFlow.mainGraph, SSACFG::BlockId{0});
+
+	Json functionsJson = Json::object();
+	for (auto const& [function, functionGraph]: m_controlFlow.functionGraphMapping)
+		functionsJson[function->name.str()] = exportFunction(*functionGraph);
+	yulObjectJson["functions"] = functionsJson;
+
+	return yulObjectJson;
+}
+
+Json YulControlFlowGraphExporter::exportFunction(SSACFG const& _cfg)
+{
+	Json functionJson = Json::object();
+	functionJson["type"] = "Function";
+	functionJson["entry"] = "Block" + std::to_string(_cfg.entry.value);
+	functionJson["arguments"] = Json::array();
+	for (auto const& [arg, valueId]: _cfg.arguments)
+		functionJson["arguments"].emplace_back(arg.get().name.str());
+	functionJson["returns"] = Json::array();
+	for (auto const& ret: _cfg.returns)
+		functionJson["returns"].emplace_back(ret.get().name.str());
+	functionJson["blocks"] = exportBlock(_cfg, _cfg.entry);
+	return functionJson;
+}
+
+Json YulControlFlowGraphExporter::exportBlock(SSACFG const& _cfg, SSACFG::BlockId _entryId)
+{
+	Json blocksJson = Json::array();
+	util::BreadthFirstSearch<SSACFG::BlockId> bfs{{{_entryId}}};
+	bfs.run([&](SSACFG::BlockId _blockId, auto _addChild) {
+		auto const& block = _cfg.block(_blockId);
+		// Convert current block to JSON
+		Json blockJson = toJson(_cfg, _blockId);
+
+		Json exitBlockJson = Json::object();
+		std::visit(util::GenericVisitor{
+			[&](SSACFG::BasicBlock::MainExit const&) {
+				exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
+				exitBlockJson["type"] = "MainExit";
+			},
+			[&](SSACFG::BasicBlock::Jump const& _jump)
+			{
+				exitBlockJson["targets"] = { "Block" + std::to_string(_jump.target.value) };
+				exitBlockJson["type"] = "Jump";
+				_addChild(_jump.target);
+			},
+			[&](SSACFG::BasicBlock::ConditionalJump const& _conditionalJump)
+			{
+				exitBlockJson["targets"] = { "Block" + std::to_string(_conditionalJump.zero.value), "Block" + std::to_string(_conditionalJump.nonZero.value) };
+				exitBlockJson["cond"] = varToString(_cfg, _conditionalJump.condition);
+				exitBlockJson["type"] = "ConditionalJump";
+
+				_addChild(_conditionalJump.zero);
+				_addChild(_conditionalJump.nonZero);
+			},
+			[&](SSACFG::BasicBlock::FunctionReturn const& _return) {
+				exitBlockJson["instructions"] = toJson(_cfg, _return.returnValues);
+				exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
+				exitBlockJson["type"] = "FunctionReturn";
+			},
+			[&](SSACFG::BasicBlock::Terminated const&) {
+				exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
+				exitBlockJson["type"] = "Terminated";
+			},
+			[&](SSACFG::BasicBlock::JumpTable const&) {
+				yulAssert(false);
+			}
+		}, block.exit);
+		blockJson["exit"] = exitBlockJson;
+		blocksJson.emplace_back(blockJson);
+	});
+
+	return blocksJson;
+}
+
+Json YulControlFlowGraphExporter::toJson(SSACFG const& _cfg, SSACFG::BlockId _blockId)
+{
+	Json blockJson = Json::object();
+	auto const& block = _cfg.block(_blockId);
+
+	blockJson["id"] = "Block" + std::to_string(_blockId.value);
+	blockJson["instructions"] = Json::array();
+	if (!block.phis.empty())
+	{
+		blockJson["entries"] = block.entries
+			| ranges::views::transform([](auto const& entry) { return "Block" + std::to_string(entry.value); })
+			| ranges::to<Json::array_t>();
+		for (auto const& phi: block.phis)
+		{
+			auto* phiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
+			yulAssert(phiInfo);
+			Json phiJson = Json::object();
+			phiJson["op"] = "PhiFunction";
+			phiJson["in"] = toJson(_cfg, phiInfo->arguments);
+			phiJson["out"] = toJson(_cfg, std::vector<SSACFG::ValueId>{phi});
+			blockJson["instructions"].push_back(phiJson);
+		}
+	}
+	for (auto const& operation: block.operations)
+		blockJson["instructions"].push_back(toJson(blockJson, _cfg, operation));
+
+	return blockJson;
+}
+
+Json YulControlFlowGraphExporter::toJson(Json& _ret, SSACFG const& _cfg, SSACFG::Operation const& _operation)
+{
+	Json opJson = Json::object();
+	std::visit(util::GenericVisitor{
+		[&](SSACFG::Call const& _call) {
+			_ret["type"] = "FunctionCall";
+			opJson["op"] = _call.function.get().name.str();
+		},
+		[&](SSACFG::BuiltinCall const& _call) {
+			_ret["type"] = "BuiltinCall";
+			Json builtinArgsJson = Json::array();
+			auto const& builtin = _call.builtin.get();
+			if (!builtin.literalArguments.empty())
+			{
+				auto const& functionCallArgs = _call.call.get().arguments;
+				for (size_t i = 0; i < builtin.literalArguments.size(); ++i)
+				{
+					std::optional<LiteralKind> const& argument = builtin.literalArguments[i];
+					if (argument.has_value() && i < functionCallArgs.size())
+					{
+						// The function call argument at index i must be a literal if builtin.literalArguments[i] is not nullopt
+						yulAssert(std::holds_alternative<Literal>(functionCallArgs[i]));
+						builtinArgsJson.push_back(formatLiteral(std::get<Literal>(functionCallArgs[i])));
+					}
+				}
+			}
+
+			if (!builtinArgsJson.empty())
+				opJson["builtinArgs"] = builtinArgsJson;
+
+			opJson["op"] = _call.builtin.get().name.str();
+		},
+	}, _operation.kind);
+
+	opJson["in"] = toJson(_cfg, _operation.inputs);
+	opJson["out"] = toJson(_cfg, _operation.outputs);
+
+	return opJson;
+}
+
+Json YulControlFlowGraphExporter::toJson(SSACFG const& _cfg, std::vector<SSACFG::ValueId> const& _values)
+{
+	Json ret = Json::array();
+	for (auto const& value: _values)
+		ret.push_back(varToString(_cfg, value));
+	return ret;
+}
diff --git a/libyul/YulControlFlowGraphExporter.h b/libyul/YulControlFlowGraphExporter.h
new file mode 100644
index 0000000000..37520e194b
--- /dev/null
+++ b/libyul/YulControlFlowGraphExporter.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 <libyul/backends/evm/ControlFlow.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/Visitor.h>
+
+using namespace solidity;
+using namespace yul;
+
+class YulControlFlowGraphExporter
+{
+public:
+	YulControlFlowGraphExporter(ControlFlow const& _controlFlow);
+	Json run();
+	Json exportBlock(SSACFG const& _cfg, SSACFG::BlockId _blockId);
+	Json exportFunction(SSACFG const& _cfg);
+	std::string varToString(SSACFG const& _cfg, SSACFG::ValueId _var);
+
+private:
+	ControlFlow const& m_controlFlow;
+	Json toJson(SSACFG const& _cfg, SSACFG::BlockId _blockId);
+	Json toJson(Json& _ret, SSACFG const& _cfg, SSACFG::Operation const& _operation);
+	Json toJson(SSACFG const& _cfg, std::vector<SSACFG::ValueId> const& _values);
+};
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 1f57eda48c..373fb304f8 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -20,6 +20,7 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/backends/evm/SSAControlFlowGraphBuilder.h>
 #include <libyul/backends/evm/EthAssemblyAdapter.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -27,6 +28,7 @@
 #include <libyul/ObjectParser.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/Suite.h>
+#include <libyul/YulControlFlowGraphExporter.h>
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SourceReferenceFormatter.h>
@@ -364,6 +366,45 @@ Json YulStack::astJson() const
 	return  m_parserResult->toJson();
 }
 
+Json YulStack::cfgJson() const
+{
+	yulAssert(m_parserResult, "");
+	yulAssert(m_parserResult->hasCode(), "");
+	yulAssert(m_parserResult->analysisInfo, "");
+	// FIXME: we should not regenerate the cfg, but for now this is sufficient for testing purposes
+	auto exportCFGFromObject = [&](Object const& _object) -> Json {
+		// NOTE: The block Ids are reset for each object
+		std::unique_ptr<ControlFlow> controlFlow = SSAControlFlowGraphBuilder::build(
+			*_object.analysisInfo.get(),
+			languageToDialect(m_language, m_evmVersion),
+			_object.code()->root()
+		);
+		YulControlFlowGraphExporter exporter(*controlFlow);
+		return exporter.run();
+	};
+
+	std::function<Json(std::vector<std::shared_ptr<ObjectNode>>)> exportCFGFromSubObjects;
+	exportCFGFromSubObjects = [&](std::vector<std::shared_ptr<ObjectNode>> _subObjects) -> Json {
+		Json subObjectsJson = Json::object();
+		for (std::shared_ptr<ObjectNode> const& subObjectNode: _subObjects)
+			if (Object const* subObject = dynamic_cast<Object const*>(subObjectNode.get()))
+			{
+				subObjectsJson[subObject->name] = exportCFGFromObject(*subObject);
+				subObjectsJson["type"] = "subObject";
+				if (!subObject->subObjects.empty())
+					subObjectsJson["subObjects"] = exportCFGFromSubObjects(subObject->subObjects);
+			}
+		return subObjectsJson;
+	};
+
+	Object const& object = *m_parserResult.get();
+	Json jsonObject = Json::object();
+	jsonObject[object.name] = exportCFGFromObject(object);
+	jsonObject["type"] = "Object";
+	jsonObject["subObjects"] = exportCFGFromSubObjects(object.subObjects);
+	return jsonObject;
+}
+
 std::shared_ptr<Object> YulStack::parserResult() const
 {
 	yulAssert(m_stackState >= AnalysisSuccessful, "Analysis was not successful.");
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 69c0f01656..746e0c49fa 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -141,6 +141,9 @@ class YulStack: public langutil::CharStreamProvider
 	) const;
 	Json astJson() const;
 
+	// return the JSON representation of the YuL CFG (experimental)
+	Json cfgJson() const;
+
 	/// Return the parsed and analyzed object.
 	std::shared_ptr<Object> parserResult() const;
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 02b6dcade2..f78fdfeb81 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -291,6 +291,30 @@ void CommandLineInterface::handleIRAst(std::string const& _contractName)
 	}
 }
 
+void CommandLineInterface::handleYulCFGExport(std::string const& _contractName)
+{
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+
+	if (!m_options.compiler.outputs.yulCFGJson)
+		return;
+
+	if (!m_options.output.dir.empty())
+		createFile(
+			m_compiler->filesystemFriendlyName(_contractName) + "_yul_cfg.json",
+			util::jsonPrint(
+				m_compiler->yulCFGJson(_contractName),
+				m_options.formatting.json
+			)
+		);
+	else
+	{
+		sout() << util::jsonPrint(
+			m_compiler->yulCFGJson(_contractName),
+			m_options.formatting.json
+		) << std::endl;
+	}
+}
+
 void CommandLineInterface::handleIROptimized(std::string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
@@ -866,7 +890,7 @@ void CommandLineInterface::compile()
 			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
 
 		CompilerStack::IROutputSelection irOutputSelection = CompilerStack::IROutputSelection::None;
-		if (m_options.compiler.outputs.irOptimized || m_options.compiler.outputs.irOptimizedAstJson)
+		if (m_options.compiler.outputs.irOptimized || m_options.compiler.outputs.irOptimizedAstJson || m_options.compiler.outputs.yulCFGJson)
 			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
 		else if (m_options.compiler.outputs.ir || m_options.compiler.outputs.irAstJson)
 			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedOnly;
@@ -1280,6 +1304,11 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			sout() << "AST:" << std::endl << std::endl;
 			sout() << util::jsonPrint(stack.astJson(), m_options.formatting.json) << std::endl;
 		}
+		if (m_options.compiler.outputs.yulCFGJson)
+		{
+			sout() << "Yul Control Flow Graph:" << std::endl << std::endl;
+			sout() << util::jsonPrint(stack.cfgJson(), m_options.formatting.json) << std::endl;
+		}
 		solAssert(_targetMachine == yul::YulStack::Machine::EVM, "");
 		if (m_options.compiler.outputs.asm_)
 		{
@@ -1335,6 +1364,7 @@ void CommandLineInterface::outputCompilationResults()
 			handleIRAst(contract);
 			handleIROptimized(contract);
 			handleIROptimizedAst(contract);
+			handleYulCFGExport(contract);
 			handleSignatureHashes(contract);
 			handleMetadata(contract);
 			handleABI(contract);
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index c23fd9e17b..ce30a4d71d 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -108,6 +108,7 @@ class CommandLineInterface
 	void handleIRAst(std::string const& _contract);
 	void handleIROptimized(std::string const& _contract);
 	void handleIROptimizedAst(std::string const& _contract);
+	void handleYulCFGExport(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 19089d885a..dca68bb1c5 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -473,6 +473,7 @@ void CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
 			CompilerOutputs::componentName(&CompilerOutputs::astCompactJson),
 			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
+			CompilerOutputs::componentName(&CompilerOutputs::yulCFGJson),
 		};
 		static std::set<std::string> const evmAssemblyJsonImportModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
@@ -755,6 +756,7 @@ General Information)").c_str(),
 		(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::yulCFGJson).c_str(), "Control Flow Graph (CFG) of Yul code in 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.")
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 5d941f662c..3d187694e2 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -87,6 +87,7 @@ struct CompilerOutputs
 			{"metadata", &CompilerOutputs::metadata},
 			{"storage-layout", &CompilerOutputs::storageLayout},
 			{"transient-storage-layout", &CompilerOutputs::transientStorageLayout},
+			{"yul-cfg-json", &CompilerOutputs::yulCFGJson},
 		};
 		return components;
 	}
@@ -100,6 +101,7 @@ struct CompilerOutputs
 	bool abi = false;
 	bool ir = false;
 	bool irAstJson = false;
+	bool yulCFGJson = false;
 	bool irOptimized = false;
 	bool irOptimizedAstJson = false;
 	bool signatureHashes = false;
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index e0347a18c4..227b1b9213 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -131,6 +131,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
 			"--ast-compact-json", "--asm", "--asm-json", "--opcodes", "--bin", "--bin-runtime", "--abi",
 			"--ir", "--ir-ast-json", "--ir-optimized", "--ir-optimized-ast-json", "--hashes", "--userdoc", "--devdoc", "--metadata",
+			"--yul-cfg-json",
 			"--storage-layout", "--transient-storage-layout",
 			"--gas",
 			"--combined-json="
@@ -193,7 +194,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			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 = {

From b167c271141715ffca2b28816ede10dd03ba110e Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Mon, 26 Aug 2024 11:31:03 +0200
Subject: [PATCH 1029/1140] prep: Pass `_eofVersion` to `libevmasm/Assembly`
 class

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 libevmasm/Assembly.cpp                     | 23 ++++++++++++++++------
 libevmasm/Assembly.h                       | 11 +++++++++--
 libsolidity/codegen/CompilerContext.h      |  2 +-
 libsolidity/interface/CompilerStack.cpp    |  8 ++++++++
 libyul/YulStack.cpp                        |  2 +-
 libyul/backends/evm/EVMObjectCompiler.cpp  |  2 +-
 libyul/backends/evm/EthAssemblyAdapter.cpp |  2 +-
 test/libevmasm/Assembler.cpp               | 21 ++++++++++----------
 test/libevmasm/Optimiser.cpp               |  4 ++--
 test/libyul/EVMCodeTransformTest.cpp       |  2 +-
 test/tools/fuzzer_common.cpp               |  2 +-
 11 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index ab3879da48..7a28208c1b 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -549,7 +549,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			"Member 'sourceList' may only be present in the root JSON object."
 		);
 
-	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, "" /* _name */);
+	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, std::nullopt, "" /* _name */);
 	std::vector<std::string> parsedSourceList;
 	if (_json.contains("sourceList"))
 	{
@@ -735,7 +735,7 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 	{
 		count = 0;
 
-		if (_settings.runInliner)
+		if (_settings.runInliner && !m_eofVersion.has_value())
 			Inliner{
 				m_items,
 				_tagsReferencedFromOutside,
@@ -762,7 +762,7 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 		}
 
 		// This only modifies PushTags, we have to run again to actually remove code.
-		if (_settings.runDeduplicate)
+		if (_settings.runDeduplicate && !m_eofVersion.has_value())
 		{
 			BlockDeduplicator deduplicator{m_items};
 			if (deduplicator.deduplicate())
@@ -787,7 +787,8 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 			}
 		}
 
-		if (_settings.runCSE)
+		// TODO: investigate for EOF
+		if (_settings.runCSE && !m_eofVersion.has_value())
 		{
 			// Control flow graph optimization has been here before but is disabled because it
 			// assumes we only jump to tags that are pushed. This is not the case anymore with
@@ -839,7 +840,8 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 		}
 	}
 
-	if (_settings.runConstantOptimiser)
+	// TODO: investigate for EOF
+	if (_settings.runConstantOptimiser && !m_eofVersion.has_value())
 		ConstantOptimisationMethod::optimiseConstants(
 			isCreation(),
 			isCreation() ? 1 : _settings.expectedExecutionsPerDeployment,
@@ -862,6 +864,9 @@ LinkerObject const& Assembly::assemble() const
 
 	LinkerObject& ret = m_assembledObject;
 
+	bool const eof = m_eofVersion.has_value();
+	solAssert(!eof || m_eofVersion == 1, "Invalid EOF version.");
+
 	size_t subTagSize = 1;
 	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferencesBySub;
 	for (auto const& sub: m_subs)
@@ -957,6 +962,7 @@ LinkerObject const& Assembly::assemble() const
 		}
 		case PushTag:
 		{
+			assertThrow(!eof, AssemblyException, "PushTag in EOF code");
 			ret.bytecode.push_back(tagPush);
 			tagRef[ret.bytecode.size()] = i.splitForeignPushTag();
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerTag);
@@ -968,6 +974,7 @@ LinkerObject const& Assembly::assemble() const
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSub:
+			assertThrow(!eof, AssemblyException, "PushSub in EOF code");
 			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
 			ret.bytecode.push_back(dataRefPush);
 			subRef.insert(std::make_pair(static_cast<size_t>(i.data()), ret.bytecode.size()));
@@ -975,6 +982,7 @@ LinkerObject const& Assembly::assemble() const
 			break;
 		case PushSubSize:
 		{
+			assertThrow(!eof, AssemblyException, "PushSubSize in EOF code");
 			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));
@@ -987,6 +995,7 @@ LinkerObject const& Assembly::assemble() const
 		}
 		case PushProgramSize:
 		{
+			assertThrow(!eof, AssemblyException, "PushProgramSize in EOF code");
 			ret.bytecode.push_back(dataRefPush);
 			sizeRef.push_back(static_cast<unsigned>(ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
@@ -998,6 +1007,7 @@ LinkerObject const& Assembly::assemble() const
 			ret.bytecode.resize(ret.bytecode.size() + 20);
 			break;
 		case PushImmutable:
+			assertThrow(!eof, AssemblyException, "PushImmutable in EOF code");
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH32));
 			// Maps keccak back to the "identifier" std::string of that immutable.
 			ret.immutableReferences[i.data()].first = m_immutables.at(i.data());
@@ -1011,6 +1021,7 @@ LinkerObject const& Assembly::assemble() const
 			break;
 		case AssignImmutable:
 		{
+			assertThrow(!eof, AssemblyException, "AssignImmutable in EOF code");
 			// Expect 2 elements on stack (source, dest_base)
 			auto const& offsets = immutableReferencesBySub[i.data()].second;
 			for (size_t i = 0; i < offsets.size(); ++i)
@@ -1063,7 +1074,7 @@ LinkerObject const& Assembly::assemble() const
 				"Some immutables were read from but never assigned, possibly because of optimization."
 			);
 
-	if (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty())
+	if (!eof && (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty()))
 		// Append an INVALID here to help tests find miscompilation.
 		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
 
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 123d7f3ddd..2b0ef93df2 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -48,8 +48,14 @@ using AssemblyPointer = std::shared_ptr<Assembly>;
 class Assembly
 {
 public:
-	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::string _name): m_evmVersion(_evmVersion), m_creation(_creation), m_name(std::move(_name)) { }
-
+	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::optional<uint8_t> _eofVersion, std::string _name):
+	m_evmVersion(_evmVersion),
+	m_creation(_creation),
+	m_eofVersion(_eofVersion),
+	m_name(std::move(_name))
+	{}
+
+	std::optional<uint8_t> eofVersion() const { return m_eofVersion; }
 	AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); }
 	AssemblyItem newPushTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(PushTag, m_usedTags++); }
 	/// Returns a tag identified by the given name. Creates it if it does not yet exist.
@@ -242,6 +248,7 @@ class Assembly
 	int m_deposit = 0;
 	/// True, if the assembly contains contract creation code.
 	bool const m_creation = false;
+	std::optional<uint8_t> m_eofVersion;
 	/// 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 c6972f92b8..3469ee7d27 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>(_evmVersion, _runtimeContext != nullptr, std::string{})),
+		m_asm(std::make_shared<evmasm::Assembly>(_evmVersion, _runtimeContext != nullptr, std::nullopt, std::string{})),
 		m_evmVersion(_evmVersion),
 		m_revertStrings(_revertStrings),
 		m_reservedMemory{0},
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 1f432db40f..60f41a7b6b 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -864,6 +864,10 @@ std::string const* CompilerStack::sourceMapping(std::string const& _contractName
 {
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
+	// TODO
+	if (m_eofVersion.has_value())
+		return nullptr;
+
 	Contract const& c = contract(_contractName);
 	if (!c.sourceMapping)
 	{
@@ -877,6 +881,10 @@ std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contr
 {
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
+	// TODO
+	if (m_eofVersion.has_value())
+		return nullptr;
+
 	Contract const& c = contract(_contractName);
 	if (!c.runtimeSourceMapping)
 	{
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 1f57eda48c..da9ac35dc3 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -295,7 +295,7 @@ YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName)
 	yulAssert(m_parserResult->hasCode(), "");
 	yulAssert(m_parserResult->analysisInfo, "");
 
-	evmasm::Assembly assembly(m_evmVersion, true, {});
+	evmasm::Assembly assembly(m_evmVersion, true, m_eofVersion, {});
 	EthAssemblyAdapter adapter(assembly);
 
 	// NOTE: We always need stack optimization when Yul optimizer is disabled (unless code contains
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index ccd8af6d29..a7ac67c3a6 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -75,7 +75,7 @@ void EVMObjectCompiler::run(Object const& _object, bool _optimize)
 	yulAssert(_object.hasCode(), "No code.");
 	if (m_eofVersion.has_value())
 		yulAssert(
-			_optimize && (m_dialect.evmVersion() == langutil::EVMVersion()),
+			_optimize && (m_dialect.evmVersion() >= langutil::EVMVersion::prague()),
 			"Experimental EOF support is only available for optimized via-IR compilation and the most recent EVM version."
 		);
 	if (_optimize && m_dialect.evmVersion().canOverchargeGasForCall())
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 79146f859c..e3a2e01e1b 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -123,7 +123,7 @@ void EthAssemblyAdapter::appendAssemblySize()
 
 std::pair<std::shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, std::string _name)
 {
-	std::shared_ptr<evmasm::Assembly> assembly{std::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, m_assembly.eofVersion(), std::move(_name))};
 	auto sub = m_assembly.newSub(assembly);
 	return {std::make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
 }
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index afad9d13dd..06c7fb6a97 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -27,6 +27,7 @@
 #include <libevmasm/Disassemble.h>
 #include <libyul/Exceptions.h>
 
+#include <test/Common.h>
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
@@ -61,15 +62,15 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		{ "verbatim.asm", 2 }
 	};
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly _assembly{evmVersion, false, {}};
+	Assembly _assembly{evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), {}};
 	auto root_asm = std::make_shared<std::string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm{evmVersion, false, {}};
+	Assembly _subAsm{evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), {}};
 	auto sub_asm = std::make_shared<std::string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 
-	Assembly _verbatimAsm(evmVersion, true, "");
+	Assembly _verbatimAsm(evmVersion, true, solidity::test::CommonOptions::get().eofVersion(), "");
 	auto verbatim_asm = std::make_shared<std::string>("verbatim.asm");
 	_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
 
@@ -246,7 +247,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				{ *subName, 1 }
 			};
 
-			auto subAsm = std::make_shared<Assembly>(evmVersion, false, std::string{});
+			auto subAsm = std::make_shared<Assembly>(evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), std::string{});
 			for (char i = 0; i < numImmutables; ++i)
 			{
 				for (int r = 0; r < numActualRefs; ++r)
@@ -256,7 +257,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				}
 			}
 
-			Assembly assembly{evmVersion, true, {}};
+			Assembly assembly{evmVersion, true, solidity::test::CommonOptions::get().eofVersion(), {}};
 			for (char i = 1; i <= numImmutables; ++i)
 			{
 				assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
@@ -306,11 +307,11 @@ BOOST_AUTO_TEST_CASE(immutable)
 		{ "sub.asm", 1 }
 	};
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly _assembly{evmVersion, true, {}};
+	Assembly _assembly{evmVersion, true, solidity::test::CommonOptions::get().eofVersion(), {}};
 	auto root_asm = std::make_shared<std::string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm{evmVersion, false, {}};
+	Assembly _subAsm{evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), {}};
 	auto sub_asm = std::make_shared<std::string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 	_subAsm.appendImmutable("someImmutable");
@@ -404,10 +405,10 @@ BOOST_AUTO_TEST_CASE(immutable)
 BOOST_AUTO_TEST_CASE(subobject_encode_decode)
 {
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	Assembly assembly{evmVersion, true, {}};
+	Assembly assembly{evmVersion, true, solidity::test::CommonOptions::get().eofVersion(), {}};
 
-	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{});
+	std::shared_ptr<Assembly> subAsmPtr = std::make_shared<Assembly>(evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), std::string{});
+	std::shared_ptr<Assembly> subSubAsmPtr = std::make_shared<Assembly>(evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), std::string{});
 
 	assembly.appendSubroutine(subAsmPtr);
 	subAsmPtr->appendSubroutine(subSubAsmPtr);
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 13fa58bf4b..13d9d6f2bb 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1346,8 +1346,8 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
 
-	Assembly main{settings.evmVersion, false, {}};
-	AssemblyPointer sub = std::make_shared<Assembly>(settings.evmVersion, true, std::string{});
+	Assembly main{settings.evmVersion, false, solidity::test::CommonOptions::get().eofVersion(), {}};
+	AssemblyPointer sub = std::make_shared<Assembly>(settings.evmVersion, true, solidity::test::CommonOptions::get().eofVersion(), std::string{});
 
 	sub->append(u256(1));
 	auto t1 = sub->newTag();
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 4c2eecab05..e54ab9c8f0 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -67,7 +67,7 @@ TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::strin
 		return TestResult::FatalError;
 	}
 
-	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, {}};
+	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, std::nullopt, {}};
 	EthAssemblyAdapter adapter(assembly);
 	EVMObjectCompiler::compile(
 		*stack.parserResult(),
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index adf5a064be..1caa5357e5 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -190,7 +190,7 @@ void FuzzerUtil::testConstantOptimizer(std::string const& _input, bool _quiet)
 
 	for (bool isCreation: {false, true})
 	{
-		Assembly assembly{langutil::EVMVersion{}, isCreation, {}};
+		Assembly assembly{langutil::EVMVersion{}, isCreation, std::nullopt, {}};
 		for (u256 const& n: numbers)
 		{
 			if (!_quiet)

From 1854186942cc24e94cfed2708ec4d0fc3e668a62 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Wed, 28 Aug 2024 15:11:44 +0200
Subject: [PATCH 1030/1140] eof: Remove eof experimental test. It should be
 reintroduced later.

---
 test/libsolidity/Metadata.cpp | 39 -----------------------------------
 1 file changed, 39 deletions(-)

diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index 94687f9900..ed490b9a83 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -225,45 +225,6 @@ 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;
-		std::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;

From 92a74edfba8ab97eaecad1d97760d2f70b57f77e Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Sat, 20 Jul 2024 11:58:08 +0200
Subject: [PATCH 1031/1140] SMTChecker: Introduce helper struct for query
 result

---
 libsmtutil/CHCSmtLib2Interface.cpp           |  2 +-
 libsmtutil/CHCSmtLib2Interface.h             |  2 +-
 libsmtutil/CHCSolverInterface.h              | 10 +++++++---
 libsmtutil/Z3CHCInterface.cpp                |  2 +-
 libsmtutil/Z3CHCInterface.h                  |  2 +-
 libsolidity/formal/CHC.cpp                   | 21 +++++++-------------
 libsolidity/formal/CHC.h                     |  2 +-
 libsolidity/formal/Z3CHCSmtLib2Interface.cpp |  2 +-
 libsolidity/formal/Z3CHCSmtLib2Interface.h   |  2 +-
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 6e535f0993..d23249d220 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -90,7 +90,7 @@ void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*
 	m_commands.assertion("(forall" + forall(_expr) + '\n' + m_context.toSExpr(_expr) + ")\n");
 }
 
-std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
+CHCSolverInterface::QueryResult CHCSmtLib2Interface::query(Expression const& _block)
 {
 	std::string query = dumpQuery(_block);
 	std::string response = querySolver(query);
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index b5baba7d69..0f8fc061d3 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -47,7 +47,7 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	/// 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;
+	QueryResult 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 a20283b4fe..8feb18aa82 100644
--- a/libsmtutil/CHCSolverInterface.h
+++ b/libsmtutil/CHCSolverInterface.h
@@ -49,11 +49,15 @@ class CHCSolverInterface : public SolverInterface
 		std::map<unsigned, std::vector<unsigned>> edges;
 	};
 
+	struct QueryResult
+	{
+		CheckResult answer;
+		Expression invariant;
+		CexGraph cex;
+	};
 	/// Takes a function application _expr and checks for reachability.
 	/// @returns solving result, an invariant, and counterexample graph, if possible.
-	virtual std::tuple<CheckResult, Expression, CexGraph> query(
-		Expression const& _expr
-	) = 0;
+	virtual QueryResult query(Expression const& _expr) = 0;
 
 protected:
 	std::optional<unsigned> m_queryTimeout;
diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
index 787d46d72e..a79630b6e5 100644
--- a/libsmtutil/Z3CHCInterface.cpp
+++ b/libsmtutil/Z3CHCInterface.cpp
@@ -78,7 +78,7 @@ void Z3CHCInterface::addRule(Expression const& _expr, std::string const& _name)
 	}
 }
 
-std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
+CHCSolverInterface::QueryResult Z3CHCInterface::query(Expression const& _expr)
 {
 	CheckResult result;
 	try
diff --git a/libsmtutil/Z3CHCInterface.h b/libsmtutil/Z3CHCInterface.h
index 5a768f65cb..98f21246c2 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::tuple<CheckResult, Expression, CexGraph> query(Expression const& _expr) override;
+	QueryResult query(Expression const& _expr) override;
 
 	Z3Interface* z3Interface() const { return m_z3Interface.get(); }
 
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 2bd0195375..c52a83a261 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1916,11 +1916,8 @@ void CHC::addRule(smtutil::Expression const& _rule, std::string const& _ruleName
 	m_interface->addRule(_rule, _ruleName);
 }
 
-std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
+CHCSolverInterface::QueryResult CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
 {
-	CheckResult result;
-	smtutil::Expression invariant(true);
-	CHCSolverInterface::CexGraph cex;
 	if (m_settings.printQuery)
 	{
 		auto smtLibInterface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
@@ -1931,8 +1928,8 @@ std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::
 			"CHC: Requested query:\n" + smtLibCode
 		);
 	}
-	std::tie(result, invariant, cex) = m_interface->query(_query);
-	switch (result)
+	auto result = m_interface->query(_query);
+	switch (result.answer)
 	{
 	case CheckResult::SATISFIABLE:
 	{
@@ -1946,13 +1943,10 @@ std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::
 			solAssert(spacer, "");
 			spacer->setSpacerOptions(false);
 
-			CheckResult resultNoOpt;
-			smtutil::Expression invariantNoOpt(true);
-			CHCSolverInterface::CexGraph cexNoOpt;
-			std::tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
+			auto resultNoOpt = m_interface->query(_query);
 
-			if (resultNoOpt == CheckResult::SATISFIABLE)
-				cex = std::move(cexNoOpt);
+			if (resultNoOpt.answer == CheckResult::SATISFIABLE)
+				result.cex = std::move(resultNoOpt.cex);
 
 			spacer->setSpacerOptions(true);
 #else
@@ -1962,7 +1956,6 @@ std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::
 		break;
 	}
 	case CheckResult::UNSATISFIABLE:
-		break;
 	case CheckResult::UNKNOWN:
 		break;
 	case CheckResult::CONFLICTING:
@@ -1972,7 +1965,7 @@ std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::
 		m_errorReporter.warning(1218_error, _location, "CHC: Error trying to invoke SMT solver.");
 		break;
 	}
-	return {result, invariant, cex};
+	return result;
 }
 
 void CHC::verificationTargetEncountered(
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 8a40ecb223..8ecef3960f 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -296,7 +296,7 @@ class CHC: public SMTEncoder
 	void addRule(smtutil::Expression const& _rule, std::string const& _ruleName);
 	/// @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);
+	smtutil::CHCSolverInterface::QueryResult query(smtutil::Expression const& _query, langutil::SourceLocation const& _location);
 
 	void verificationTargetEncountered(ASTNode const* const _errorNode, VerificationTargetType _type, smtutil::Expression const& _errorCondition);
 
diff --git a/libsolidity/formal/Z3CHCSmtLib2Interface.cpp b/libsolidity/formal/Z3CHCSmtLib2Interface.cpp
index cd06a9d331..d8448fc0be 100644
--- a/libsolidity/formal/Z3CHCSmtLib2Interface.cpp
+++ b/libsolidity/formal/Z3CHCSmtLib2Interface.cpp
@@ -43,7 +43,7 @@ void Z3CHCSmtLib2Interface::setupSmtCallback(bool _enablePreprocessing)
 		universalCallback->smtCommand().setZ3(m_queryTimeout, _enablePreprocessing, m_computeInvariants);
 }
 
-std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCSmtLib2Interface::query(smtutil::Expression const& _block)
+CHCSolverInterface::QueryResult Z3CHCSmtLib2Interface::query(smtutil::Expression const& _block)
 {
 	setupSmtCallback(true);
 	std::string query = dumpQuery(_block);
diff --git a/libsolidity/formal/Z3CHCSmtLib2Interface.h b/libsolidity/formal/Z3CHCSmtLib2Interface.h
index 39456cde0c..a58e7f8572 100644
--- a/libsolidity/formal/Z3CHCSmtLib2Interface.h
+++ b/libsolidity/formal/Z3CHCSmtLib2Interface.h
@@ -35,7 +35,7 @@ class Z3CHCSmtLib2Interface: public smtutil::CHCSmtLib2Interface
 private:
 	void setupSmtCallback(bool _disablePreprocessing);
 
-	std::tuple<smtutil::CheckResult, smtutil::Expression, CexGraph> query(smtutil::Expression const& _expr) override;
+	CHCSolverInterface::QueryResult query(smtutil::Expression const& _expr) override;
 
 	CHCSolverInterface::CexGraph graphFromZ3Answer(std::string const& _proof) const;
 

From 03880e420226de043329b378f0879cd27d073dc4 Mon Sep 17 00:00:00 2001
From: Guilherme Ferreira <guilhermeaferreira_t@yahoo.com.br>
Date: Tue, 13 Feb 2024 01:01:40 +0100
Subject: [PATCH 1032/1140] Updating copyright year to 2024

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index ddc3ee81bb..9c9e2d5a06 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,7 +67,7 @@ def setup(sphinx):
 
 # General information about the project.
 project = 'Solidity'
-project_copyright = '2016-2023, The Solidity Authors'
+project_copyright = '2016-2024, 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 d7865f171226cf282d6f9c099b27b14b746935a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 30 Aug 2024 15:42:16 +0200
Subject: [PATCH 1033/1140] Do not suppress the original message from
 unexpected AssemblyExceptions

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

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index ce9525c2b6..3851093571 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1348,9 +1348,9 @@ void CompilerStack::assembleYul(
 		// Assemble deployment (incl. runtime)  object.
 		compiledContract.object = compiledContract.evmAssembly->assemble();
 	}
-	catch (evmasm::AssemblyException const&)
+	catch (evmasm::AssemblyException const& error)
 	{
-		solAssert(false, "Assembly exception for bytecode");
+		solAssert(false, "Assembly exception for bytecode: "s + error.what());
 	}
 	solAssert(compiledContract.object.immutableReferences.empty(), "Leftover immutables.");
 
@@ -1361,9 +1361,9 @@ void CompilerStack::assembleYul(
 		// Assemble runtime object.
 		compiledContract.runtimeObject = compiledContract.evmRuntimeAssembly->assemble();
 	}
-	catch (evmasm::AssemblyException const&)
+	catch (evmasm::AssemblyException const& error)
 	{
-		solAssert(false, "Assembly exception for deployed bytecode");
+		solAssert(false, "Assembly exception for deployed bytecode"s + error.what());
 	}
 
 	// Throw a warning if EIP-170 limits are exceeded:

From 2f46323b171bd3fa086d553430b293e8a3141687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 30 Aug 2024 16:08:40 +0200
Subject: [PATCH 1034/1140] Bump min Boost dependency to 1.67 on Linux and
 macOS

---
 cmake/EthDependencies.cmake  | 3 ++-
 docs/installing-solidity.rst | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index 16f30a640d..87a5e1b5e1 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -37,7 +37,8 @@ if (WIN32)
 	find_package(Boost 1.77.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 else()
 	# Boost 1.65 is the first to also provide boost::get for rvalue-references (#5787).
-	find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+	# Boost 1.67 moved container_hash into is own module.
+	find_package(Boost 1.67.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 endif()
 
 # If cmake is older than boost and boost is older than 1.70,
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index b1b3e1a3fb..5473dbb524 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -327,7 +327,7 @@ The following are dependencies for all builds of Solidity:
 | Windows, 3.13+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
 | `Boost`_ (version 1.77+ on        | C++ libraries.                                        |
-| Windows, 1.65+ otherwise)         |                                                       |
+| Windows, 1.67+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
 | `Git`_                            | Command-line tool for retrieving source code.         |
 +-----------------------------------+-------------------------------------------------------+

From ad969e2b94be91ce54f614c0d5e74ec5ea7686d7 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 2 Sep 2024 12:34:31 +0200
Subject: [PATCH 1035/1140] Hide undocumented yul export cfg option

---
 solc/CommandLineParser.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index dca68bb1c5..4607250a62 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -756,7 +756,6 @@ General Information)").c_str(),
 		(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::yulCFGJson).c_str(), "Control Flow Graph (CFG) of Yul code in 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.")
@@ -764,6 +763,10 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::storageLayout).c_str(), "Slots, offsets and types of the contract's state variables located in storage.")
 		(CompilerOutputs::componentName(&CompilerOutputs::transientStorageLayout).c_str(), "Slots, offsets and types of the contract's state variables located in transient storage.")
 	;
+	if (!_forHelp) // Note: We intentionally keep this undocumented for now.
+		outputComponents.add_options()
+			(CompilerOutputs::componentName(&CompilerOutputs::yulCFGJson).c_str(), "Control Flow Graph (CFG) of Yul code in JSON format.")
+		;
 	desc.add(outputComponents);
 
 	po::options_description extraOutput("Extra Output");

From b30f1e2af0b9605ae295282188fc4eadc0b10721 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Mon, 2 Sep 2024 12:39:46 +0200
Subject: [PATCH 1036/1140] Create opRetro.json

---
 opRetro.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 opRetro.json

diff --git a/opRetro.json b/opRetro.json
new file mode 100644
index 0000000000..6fb1f338bf
--- /dev/null
+++ b/opRetro.json
@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0xcc8d03e014e121d10602eeff729b755d5dc6a317df0d6302c8a9d3b5424aaba8"
+  }
+}

From 1673c5c27ad42a41019a7bafa96e636ef12a0334 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 29 Aug 2024 11:12:22 +0200
Subject: [PATCH 1037/1140] Introduce ubuntu2404 clang docker image

wip
---
 .github/workflows/buildpack-deps.yml          |   3 +-
 .../buildpack-deps_test_ubuntu2404.clang.sh   |   1 +
 .../Dockerfile.ubuntu2404.clang               | 107 ++++++++++++++++++
 3 files changed, 110 insertions(+), 1 deletion(-)
 create mode 120000 scripts/ci/buildpack-deps_test_ubuntu2404.clang.sh
 create mode 100644 scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 5f66487e07..1b9555ddc2 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -10,6 +10,7 @@ on:
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2404'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang'
 
 jobs:
   buildpack-deps:
@@ -24,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204, ubuntu2404]
+        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204, ubuntu2404, ubuntu2404.clang]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2404.clang.sh b/scripts/ci/buildpack-deps_test_ubuntu2404.clang.sh
new file mode 120000
index 0000000000..c07a74de4f
--- /dev/null
+++ b/scripts/ci/buildpack-deps_test_ubuntu2404.clang.sh
@@ -0,0 +1 @@
+build.sh
\ No newline at end of file
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
new file mode 100644
index 0000000000..c6b1fd9707
--- /dev/null
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
@@ -0,0 +1,107 @@
+# vim:syntax=dockerfile
+#------------------------------------------------------------------------------
+# Dockerfile for building and testing Solidity Compiler on CI
+# Target: Ubuntu 19.04 (Disco Dingo) Clang variant
+# 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-2024 solidity contributors.
+#------------------------------------------------------------------------------
+FROM buildpack-deps:noble AS base
+LABEL version="1"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+# From Python3.11, pip requires a virtual environment, and will thus terminate when installing packages globally.
+# Since we're building this image from scratch, it's perfectly fine to use the below flag.
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
+
+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 \
+		clang \
+		cmake \
+		jq \
+		lsof \
+		libboost-filesystem-dev \
+		libboost-program-options-dev \
+		libboost-system-dev \
+		libboost-test-dev \
+		libcln-dev \
+		libz3-static-dev \
+		ninja-build \
+		python3-pip \
+		software-properties-common \
+		sudo \
+		z3-static; \
+	pip3 install \
+		codecov \
+		colorama \
+		deepdiff \
+		parsec \
+		pygments-lexer-solidity \
+		pylint \
+		requests \
+		tabulate \
+		z3-solver;
+
+# Eldarica
+RUN set -ex; \
+	apt-get update; \
+	apt-get install -qy \
+		openjdk-11-jre \
+		unzip; \
+	eldarica_version="2.1"; \
+	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
+	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
+	unzip /opt/eld_binaries.zip -d /opt; \
+	rm -f /opt/eld_binaries.zip;
+
+# CVC5
+RUN set -ex; \
+	cvc5_version="1.1.2"; \
+	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
+	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
+	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
+	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
+	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
+	mv /opt/cvc5-Linux-static/include/* /usr/include; \
+	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
+
+FROM base AS libraries
+
+ENV CC clang
+ENV CXX clang++
+
+# EVMONE
+RUN set -ex; \
+	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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
+COPY --from=libraries /usr/bin /usr/bin
+COPY --from=libraries /usr/include /usr/include
+COPY --from=libraries /opt/eldarica /opt/eldarica
+ENV PATH="$PATH:/opt/eldarica"

From b3ba1b2e373f6ec850733e5ebf12b3808a6f9b74 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Mon, 2 Sep 2024 14:15:24 +0200
Subject: [PATCH 1038/1140] Rename opRetro.json to funding.json

---
 opRetro.json => funding.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename opRetro.json => funding.json (100%)

diff --git a/opRetro.json b/funding.json
similarity index 100%
rename from opRetro.json
rename to funding.json

From 79f05ca5738d927ac7d4f25bbb2d5717017c6736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 30 Aug 2024 16:46:42 +0200
Subject: [PATCH 1039/1140] Mark PROFILE_OPTIMIZER_STEPS CMake option as
 advanced

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71f83b80ed..02d45d8e6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser ste
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
 option(STRICT_NLOHMANN_JSON_VERSION "Strictly check installed nlohmann json version" ON)
+mark_as_advanced(PROFILE_OPTIMIZER_STEPS)
 mark_as_advanced(USE_SYSTEM_LIBRARIES)
 mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
 mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)

From b52094bc2832b40c43134990182cc89caabcbf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 30 Aug 2024 16:49:43 +0200
Subject: [PATCH 1040/1140] Remove nlohmann JSON version check

- The git submodule is pinned to that version, which should be enough of a hint that this is the version we expect. If someone builds with a different version and it passes tests, we should not block that.
---
 CMakeLists.txt      | 2 --
 libsolutil/JSON.cpp | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02d45d8e6e..a08e44da51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,11 +39,9 @@ option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warni
 option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
 option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
 option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
-option(STRICT_NLOHMANN_JSON_VERSION "Strictly check installed nlohmann json version" ON)
 mark_as_advanced(PROFILE_OPTIMIZER_STEPS)
 mark_as_advanced(USE_SYSTEM_LIBRARIES)
 mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
-mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)
 
 # Setup cccache.
 include(EthCcache)
diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index 055024edb3..548fdfe0b8 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -28,12 +28,6 @@
 
 #include <sstream>
 
-#ifdef STRICT_NLOHMANN_JSON_VERSION_CHECK
-static_assert(
-	(NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 11) && (NLOHMANN_JSON_VERSION_PATCH == 3),
-	"Unexpected nlohmann-json version. Expecting 3.11.3.");
-#endif
-
 namespace solidity::util
 {
 

From 01a01eb2e0e7fc802d9d35ad89eb50fa2bdc21da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 30 Aug 2024 17:20:49 +0200
Subject: [PATCH 1041/1140] Clearer names and descriptions for advanced CMake
 options

---
 CMakeLists.txt         | 17 +++++++++++++----
 cmake/submodules.cmake |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a08e44da51..8b20f1d102 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,19 @@ option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libs
 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)
-option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
-option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
+option(
+	IGNORE_VENDORED_DEPENDENCIES
+	"Ignore libraries provided as submodules of the repository and allow CMake to look for \
+them in the typical locations, including system-wide dirs."
+	OFF
+)
+option(
+	ONLY_BUILD_SOLIDITY_LIBRARIES
+	"Only build library targets that can be statically linked against. Do not build executables or tests."
+	OFF
+)
 mark_as_advanced(PROFILE_OPTIMIZER_STEPS)
-mark_as_advanced(USE_SYSTEM_LIBRARIES)
+mark_as_advanced(IGNORE_VENDORED_DEPENDENCIES)
 mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
 
 # Setup cccache.
@@ -48,7 +57,7 @@ include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-if (NOT USE_SYSTEM_LIBRARIES)
+if (NOT IGNORE_VENDORED_DEPENDENCIES)
   include(fmtlib)
   include(nlohmann-json)
   include(range-v3)
diff --git a/cmake/submodules.cmake b/cmake/submodules.cmake
index 099aceaa92..1ef55d289c 100644
--- a/cmake/submodules.cmake
+++ b/cmake/submodules.cmake
@@ -1,5 +1,5 @@
 macro(initialize_submodule SUBMODULE_PATH)
-	if(NOT USE_SYSTEM_LIBRARIES)
+	if(NOT IGNORE_VENDORED_DEPENDENCIES)
 		file(GLOB submodule_contents "${CMAKE_SOURCE_DIR}/deps/${SUBMODULE_PATH}/*")
 
 		if(submodule_contents)

From 3184534fd66579f2fa21bd3896ac0f9b12ae887b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 2 Sep 2024 13:04:03 +0200
Subject: [PATCH 1042/1140] Improve names/descriptions of Z3-related CMake
 variables

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b20f1d102..656cec3486 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,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(STRICT_Z3_VERSION "Require the exact version of Z3 solver expected by our test suite." 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)
 option(
@@ -94,15 +94,15 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/license.h.in" include/lice
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.12.1")
+set(TESTED_Z3_VERSION "4.12.1")
 set(MINIMUM_Z3_VERSION "4.8.16")
 find_package(Z3)
 if (${Z3_FOUND})
   if (${STRICT_Z3_VERSION})
-    if (NOT ("${Z3_VERSION_STRING}" VERSION_EQUAL ${LATEST_Z3_VERSION}))
+    if (NOT ("${Z3_VERSION_STRING}" VERSION_EQUAL ${TESTED_Z3_VERSION}))
       message(
         FATAL_ERROR
-        "SMTChecker tests require Z3 ${LATEST_Z3_VERSION} for all tests to pass.\n\
+        "SMTChecker tests require Z3 ${TESTED_Z3_VERSION} for all tests to pass.\n\
 Build with -DSTRICT_Z3_VERSION=OFF if you want to use a different version. \
 You can also use -DUSE_Z3=OFF to build without Z3. In both cases use --no-smt when running tests."
       )

From 3b040385d0926be18eb6b3fdd2f0610d382d4619 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 3 Sep 2024 14:57:30 +0200
Subject: [PATCH 1043/1140] Disable failing import tests introduced by boost
 upgrade

---
 test/libsolidity/interface/FileReader.cpp          | 14 +++++++++-----
 .../syntaxTests/imports/boost_filesystem_bug.sol   |  5 -----
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol

diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
index dbb03c23f2..2603c4c60d 100644
--- a/test/libsolidity/interface/FileReader.cpp
+++ b/test/libsolidity/interface/FileReader.cpp
@@ -151,9 +151,11 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_unc_path)
 	{
 		// UNC paths start with // or \\ followed by a name. They are used for network shares on Windows.
 		// On UNIX systems they are not supported but still treated in a special way.
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/", resolveSymlinks), "//host/");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b", resolveSymlinks), "//host/a/b");
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b/", resolveSymlinks), "//host/a/b/");
+
+		// TODO: Re-enable these once the boost 1.86 change has been addressed
+		//BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/", resolveSymlinks), "//host/");
+		//BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b", resolveSymlinks), "//host/a/b");
+		//BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host/a/b/", resolveSymlinks), "//host/a/b/");
 
 #if defined(_WIN32)
 		// On Windows an UNC path can also start with \\ instead of //
@@ -187,10 +189,12 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_root_name_only)
 	{
 		// UNC paths
 		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//", resolveSymlinks), "//" / expectedWorkDir);
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host", resolveSymlinks), "//host" / expectedWorkDir);
+		// TODO: Re-enable these once the boost 1.86 change has been addressed
+		//BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("//host", resolveSymlinks), "//host" / expectedWorkDir);
 
 		// On UNIX systems root name is empty.
-		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("", resolveSymlinks), expectedWorkDir);
+		// TODO: Re-enable these once the boost 1.86 change has been addressed
+		//BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS("", resolveSymlinks), expectedWorkDir);
 
 #if defined(_WIN32)
 		boost::filesystem::path driveLetter = boost::filesystem::current_path().root_name();
diff --git a/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol b/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol
deleted file mode 100644
index 8dc8da0681..0000000000
--- a/test/libsolidity/syntaxTests/imports/boost_filesystem_bug.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-==== Source: //// ====
-// This test used to throw due to a bug in boost::filesystem.
-// See https://github.com/boostorg/filesystem/issues/176
-import ".";
-// ----

From 3f6f2d3f90de9a4f506b196f9fac1d5909693d5f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 3 Sep 2024 15:33:33 +0200
Subject: [PATCH 1044/1140] Fix Yul stack output using standard json in the
 presence of warnings.

---
 Changelog.md                                  |  1 +
 libsolidity/interface/StandardCompiler.cpp    | 26 ++++----
 libyul/YulStack.h                             |  1 +
 .../standard_yul_output_warning/input.json    | 20 ++++++
 .../standard_yul_output_warning/output.json   | 61 +++++++++++++++++++
 5 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 test/cmdlineTests/standard_yul_output_warning/input.json
 create mode 100644 test/cmdlineTests/standard_yul_output_warning/output.json

diff --git a/Changelog.md b/Changelog.md
index 04bfa92953..299a7a5bdd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,6 +32,7 @@ Bugfixes:
  * SMTChecker: Fix formatting of unary minus expressions in invariants.
  * SMTChecker: Fix internal compiler error when reporting proved targets for BMC engine.
  * SMTChecker: Fix SMT logic error when assigning to an array of contracts or functions.
+ * Standard JSON Interface: For Yul input, properly produce output artifacts in case of warnings.
  * TypeChecker: Fix segfault when assigning nested tuple to tuple.
  * Yul IR Code Generation: Deterministic order of Yul subobjects.
  * Yul Optimizer: Fix Yul source locations always referring to unoptimized source, even in optimized outputs.
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 385e48c223..0194aa937d 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1620,7 +1620,7 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	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())
+	if (!stack.parseAndAnalyze(sourceName, sourceContents) && !stack.hasErrors())
 	{
 		output["errors"].emplace_back(formatError(
 			Error::Type::InternalCompilerError,
@@ -1630,22 +1630,20 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		return output;
 	}
 
-	if (!stack.errors().empty())
+	for (auto const& error: stack.errors())
 	{
-		for (auto const& error: stack.errors())
-		{
-			auto err = std::dynamic_pointer_cast<Error const>(error);
+		auto err = std::dynamic_pointer_cast<Error const>(error);
 
-			output["errors"].emplace_back(formatErrorWithException(
-				stack,
-				*error,
-				err->type(),
-				"general",
-				""
-			));
-		}
-		return output;
+		output["errors"].emplace_back(formatErrorWithException(
+			stack,
+			*error,
+			err->type(),
+			"general",
+			""
+		));
 	}
+	if (stack.hasErrors())
+		return output;
 
 	std::string contractName = stack.parserResult()->name;
 
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 746e0c49fa..0dc90baf89 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -134,6 +134,7 @@ class YulStack: public langutil::CharStreamProvider
 
 	/// @returns the errors generated during parsing, analysis (and potentially assembly).
 	langutil::ErrorList const& errors() const { return m_errors; }
+	bool hasErrors() const { return m_errorReporter.hasErrors(); }
 
 	/// Pretty-print the input after having parsed it.
 	std::string print(
diff --git a/test/cmdlineTests/standard_yul_output_warning/input.json b/test/cmdlineTests/standard_yul_output_warning/input.json
new file mode 100644
index 0000000000..f6f519d82f
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_output_warning/input.json
@@ -0,0 +1,20 @@
+{
+	"language": "Yul",
+	"sources":
+	{
+		"C":
+		{
+			"content": "{ let x := tload(0) tstore(add(x, 1), 0) }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": {
+				"*": ["evm.bytecode", "evm.assembly", "irOptimized"],
+				"": [ "*" ]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_yul_output_warning/output.json b/test/cmdlineTests/standard_yul_output_warning/output.json
new file mode 100644
index 0000000000..3234be1817
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_output_warning/output.json
@@ -0,0 +1,61 @@
+{
+    "contracts": {
+        "C": {
+            "object": {
+                "evm": {
+                    "assembly": "    /* \"C\":99:100   */
+  0x00
+    /* \"C\":95:96   */
+  0x01
+    /* \"C\":60:68   */
+  dup2
+  tload
+    /* \"C\":88:97   */
+  add
+    /* \"C\":81:101   */
+  tstore
+    /* \"C\":27:117   */
+  stop
+",
+                    "bytecode": {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "irOptimized": "object \"object\" {
+    code {
+        {
+            let x := tload(0)
+            tstore(add(x, 1), 0)
+        }
+    }
+}
+"
+            }
+        }
+    },
+    "errors": [
+        {
+            "component": "general",
+            "formattedMessage": "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.
+ --> C:1:21:
+  |
+1 | { let x := tload(0) tstore(add(x, 1), 0) }
+  |                     ^^^^^^
+
+",
+            "message": "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.",
+            "severity": "warning",
+            "sourceLocation": {
+                "end": 26,
+                "file": "C",
+                "start": 20
+            },
+            "type": "Warning"
+        }
+    ]
+}

From 3e5060c5a45ab92e7bcd3a50e0a481e016449c5d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 3 Sep 2024 13:46:07 +0200
Subject: [PATCH 1045/1140] Remove mantic from release PPA script (obsolete).

---
 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 016cd5d21e..9e273188cf 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 mantic noble"
+DISTRIBUTIONS="focal jammy noble oracular"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 3b7c8347c0..64a81f542e 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 mantic noble"
+DISTRIBUTIONS="focal jammy noble oracular"
 
 if is_release
 then

From b92cabd44be5f1a0dc3ce8fb79eb0408d214556f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 3 Sep 2024 15:05:15 +0200
Subject: [PATCH 1046/1140] Sort changelog for the upcoming release

---
 Changelog.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 299a7a5bdd..8802f7b387 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,22 +7,22 @@ Language Features:
 
 
 Compiler Features:
- * Command Line Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Commandline Interface: Add ``--transient-storage-layout`` output.
+ * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
+ * Commandline Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Constant Optimizer: Uses ``PUSH0`` if supported by the selected evm version.
  * Error Reporting: Unimplemented features are now properly reported as errors instead of being handled as if they were bugs.
  * EVM: Support for the EVM version "Prague".
  * Peephole Optimizer: ``PUSH0``, when supported, is duplicated explicitly instead of using ``DUP1``.
- * Peephole optimizer: Remove identical code snippets that terminate the control flow if they occur one after another.
+ * Peephole Optimizer: Remove identical code snippets that terminate the control flow if they occur one after another.
  * SMTChecker: Add CHC engine check for underflow and overflow in unary minus operation.
  * SMTChecker: Replace CVC4 as a possible BMC backend with cvc5.
- * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Standard JSON Interface: Add ``transientStorageLayout`` output.
+ * Standard JSON Interface: Do not perform IR optimization when only unoptimized IR is requested.
  * Yul: Drop the deprecated typed Yul dialect that was only accessible via ``--yul`` in the CLI.
  * Yul: The presence of types in untyped Yul dialects is now a parser error.
  * Yul Optimizer: Caching of optimized IR to speed up optimization of contracts with bytecode dependencies.
  * Yul Optimizer: The optimizer now treats some previously unrecognized identical literals as identical.
- * Commandline Interface: Allow the use of ``--asm-json`` output option in assembler mode to export EVM assembly of the contracts in JSON format.
 
 
 Bugfixes:

From 830ec2c4190f6a1ea4960def64edd1911c68ef3b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 4 Sep 2024 09:03:36 +0200
Subject: [PATCH 1047/1140] Set changelog 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 8802f7b387..01abe1af6b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.27 (unreleased)
+### 0.8.27 (2024-09-04)
 
 Language Features:
  * Accept declarations of state variables with ``transient`` data location (parser support only, no code generation yet).
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 037a36341c..f9913d812c 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1898,6 +1898,10 @@
         "bugs": [],
         "released": "2024-05-21"
     },
+    "0.8.27": {
+        "bugs": [],
+        "released": "2024-09-04"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 7e5836a65ec3354864d5a936e1bc42d78e24186e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 4 Sep 2024 09:14:49 +0200
Subject: [PATCH 1048/1140] Set version to 0.8.28

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 656cec3486..7770d29e63 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.27")
+set(PROJECT_VERSION "0.8.28")
 # 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 01abe1af6b..0ecb280c7d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.28 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.27 (2024-09-04)
 
 Language Features:

From a298438fbb296e4a65aa8e179ac9855ded915a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 2 Sep 2024 18:38:48 +0200
Subject: [PATCH 1049/1140] We no longer use a `release` branch

---
 scripts/docker_deploy_manual.sh | 2 +-
 scripts/release_ppa.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 48d021ff0b..11c0b8d3af 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -21,7 +21,7 @@ cd solidity
 commithash=$(git rev-parse --short=8 HEAD)
 echo -n "$commithash" > commit_hash.txt
 version=$("$(dirname "$0")/get_version.sh")
-if [ "$branch" = "release" ] || [ "$branch" = v"$version" ]
+if [ "$branch" = v"$version" ]
 then
     echo -n > prerelease.txt
 else
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 64a81f542e..773c43cc99 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -6,7 +6,7 @@
 ## You can pass a branch name as argument to this script (which, if no argument is given,
 ## will default to "develop").
 ##
-## If the given branch is "release", the resulting package will be uploaded to
+## If the given branch matches a release version tag, the resulting package will be uploaded to
 ## ethereum/ethereum PPA, or ethereum/ethereum-dev PPA otherwise.
 ##
 ## It will clone the Solidity git from github, determine the version,

From ee08a758dc7d857704d533413f174e4e565216e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 2 Sep 2024 19:27:02 +0200
Subject: [PATCH 1050/1140] docker_deploy_manual.sh: Make script more
 configurable to allow testing it in CI

---
 scripts/docker_deploy_manual.sh | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 11c0b8d3af..67f5e6b95b 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -2,13 +2,25 @@
 
 set -e
 
-if [ -z "$1" ]
-then
-    echo "Usage: $0 <tag/branch>"
-    exit 1
-fi
+REPO_ROOT="$(dirname "$0")/.."
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
 image="ethereum/solc"
+
+if (( $# < 1 || $# > 3 )); then
+    fail "Usage: $0 <tag/branch> [repo URL] [--no-push]"
+fi
+
 branch="$1"
+repo_url="${2:-https://github.com/ethereum/solidity.git}"
+
+if (( $# >= 3 )); then
+    [[ $3 == --no-push ]] || fail "Invalid flag: $3. Expected --no-push."
+    publish=false
+else
+    publish=true
+fi
 
 #docker login
 
@@ -16,7 +28,7 @@ DIR=$(mktemp -d)
 (
 cd "$DIR"
 
-git clone --recursive --depth 2 https://github.com/ethereum/solidity.git -b "$branch"
+git clone --recursive --depth 2 "$repo_url" -b "$branch"
 cd solidity
 commithash=$(git rev-parse --short=8 HEAD)
 echo -n "$commithash" > commit_hash.txt
@@ -31,7 +43,7 @@ fi
 function tag_and_push
 {
     docker tag "$image:$1" "$image:$2"
-    docker push "$image:$2"
+    [[ $publish == false ]] || docker push "$image:$2"
 }
 
 rm -rf .git

From 7cca807d218aead77a4c1960d28a5b1dd18e2a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 2 Sep 2024 19:27:11 +0200
Subject: [PATCH 1051/1140] b_alpine_docker nightly job

---
 .circleci/config.yml            | 19 +++++++++++++++++++
 scripts/docker_deploy_manual.sh |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b5d0b76d6e..710d275d43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1830,6 +1830,22 @@ jobs:
       - matrix_notify_failure_unless_pr
       - matrix_notify_release_unless_pr
 
+  b_alpine_docker:
+    <<: *base_cimg_small
+    steps:
+      - setup_remote_docker:
+          # Always build from scratch to use current packages.
+          # This job is only meant to run nightly so build time is not an issue.
+          docker_layer_caching: false
+      - checkout
+      - run:
+          name: Build and tag the container
+          command: scripts/docker_deploy_manual.sh develop "file://$PWD" --no-push
+      - run:
+          name: Smoke test
+          command: docker run --pull=never ethereum/solc:build-alpine --version
+      - matrix_notify_failure_unless_pr
+
 workflows:
   version: 2
 
@@ -2009,6 +2025,9 @@ workflows:
       - b_ubu: *requires_nothing
       - t_ubu_soltest_deprecated_evm_versions: *requires_b_ubu
 
+      # Build in a Docker container (on Alpine Linux)
+      - b_alpine_docker: *requires_nothing
+
   nightly-ossfuzz:
 
     triggers:
diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 67f5e6b95b..232fcbe449 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -28,7 +28,7 @@ DIR=$(mktemp -d)
 (
 cd "$DIR"
 
-git clone --recursive --depth 2 "$repo_url" -b "$branch"
+git clone --recursive --depth 2 "$repo_url" -b "$branch" solidity
 cd solidity
 commithash=$(git rev-parse --short=8 HEAD)
 echo -n "$commithash" > commit_hash.txt

From 32b8b41351c019bec6ea51c984edc18c5fe4bf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 2 Sep 2024 20:19:46 +0200
Subject: [PATCH 1052/1140] docker_deploy_manual.sh: Switch to plain docker
 build output

- For some reason it defaults to `tty` on CircleCI which is very spammy and makes logs unreadable.
---
 scripts/docker_deploy_manual.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 232fcbe449..8753d59c9a 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -47,13 +47,13 @@ function tag_and_push
 }
 
 rm -rf .git
-docker build -t "$image":build -f scripts/Dockerfile .
+docker build -t "$image":build -f scripts/Dockerfile . --progress plain
 tmp_container=$(docker create "$image":build sh)
 
 # Alpine image
 mkdir -p upload
 docker cp "${tmp_container}":/usr/bin/solc upload/solc-static-linux
-docker build -t "$image":build-alpine -f scripts/Dockerfile_alpine .
+docker build -t "$image":build-alpine -f scripts/Dockerfile_alpine . --progress plain
 
 if [ "$branch" = "develop" ]
 then

From 7f582e4265ed2bcad06415eeaf0d5fa20f1c4ab2 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 5 Sep 2024 08:58:18 +0200
Subject: [PATCH 1053/1140] Add ContiguousDisjointSet datastructure

---
 libsolutil/CMakeLists.txt       |   2 +
 libsolutil/DisjointSet.cpp      | 109 ++++++++++++++++++++++++++++++++
 libsolutil/DisjointSet.h        |  66 +++++++++++++++++++
 test/CMakeLists.txt             |   1 +
 test/libsolutil/DisjointSet.cpp | 103 ++++++++++++++++++++++++++++++
 5 files changed, 281 insertions(+)
 create mode 100644 libsolutil/DisjointSet.cpp
 create mode 100644 libsolutil/DisjointSet.h
 create mode 100644 test/libsolutil/DisjointSet.cpp

diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index a1e9559ede..6ece23805a 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -8,6 +8,8 @@ set(sources
 	CommonIO.cpp
 	CommonIO.h
 	cxx20.h
+	DisjointSet.cpp
+	DisjointSet.h
 	DominatorFinder.h
 	Exceptions.cpp
 	Exceptions.h
diff --git a/libsolutil/DisjointSet.cpp b/libsolutil/DisjointSet.cpp
new file mode 100644
index 0000000000..43d3bfa188
--- /dev/null
+++ b/libsolutil/DisjointSet.cpp
@@ -0,0 +1,109 @@
+/*
+	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/DisjointSet.h>
+
+#include <liblangutil/Exceptions.h>
+
+#include <numeric>
+
+using namespace solidity::util;
+
+ContiguousDisjointSet::ContiguousDisjointSet(size_t const _numNodes):
+	m_parents(_numNodes),
+	m_neighbors(_numNodes),
+	m_sizes(_numNodes, static_cast<value_type>(1)),
+	m_numSets(_numNodes)
+{
+	// each is their own neighbor and parent
+	std::iota(m_parents.begin(), m_parents.end(), 0);
+	std::iota(m_neighbors.begin(), m_neighbors.end(), 0);
+}
+
+size_t ContiguousDisjointSet::numSets() const { return m_numSets; }
+
+ContiguousDisjointSet::value_type ContiguousDisjointSet::find(value_type const _element) const
+{
+	solAssert(_element < m_parents.size());
+	// path halving
+	value_type rootElement = _element;
+	while (rootElement != m_parents[rootElement])
+	{
+		m_parents[rootElement] = m_parents[m_parents[rootElement]];
+		rootElement = m_parents[rootElement];
+	}
+	return rootElement;
+}
+
+void ContiguousDisjointSet::merge(value_type const _x, value_type const _y, bool const _mergeBySize)
+{
+	auto xRoot = find(_x);
+	auto yRoot = find(_y);
+
+	if (xRoot == yRoot)
+		return;  // we're done, nothing to merge here
+
+	// if merge by size: merge smaller (yRoot) into larger (xRoot) subset;
+	// otherwise if _x is the representative of subset(_x), it will stay representative
+	if (_mergeBySize && m_sizes[xRoot] < m_sizes[yRoot])
+		std::swap(xRoot, yRoot);
+
+	m_parents[yRoot] = xRoot;
+	m_sizes[xRoot] += m_sizes[yRoot];
+	std::swap(m_neighbors[xRoot], m_neighbors[yRoot]);
+	--m_numSets;
+}
+
+bool ContiguousDisjointSet::sameSubset(value_type const _x, value_type const _y) const
+{
+	return find(_x) == find(_y);
+}
+
+ContiguousDisjointSet::size_type ContiguousDisjointSet::sizeOfSubset(value_type const _x) const
+{
+	return m_sizes[find(_x)];
+}
+
+std::set<ContiguousDisjointSet::value_type> ContiguousDisjointSet::subset(value_type const _x) const
+{
+	solAssert(_x < m_parents.size());
+	std::set<value_type> result{_x};
+	value_type neighbor = m_neighbors[_x];
+	while (neighbor != _x)
+	{
+		result.insert(neighbor);
+		neighbor = m_neighbors[neighbor];
+	}
+	return result;
+}
+
+std::vector<std::set<ContiguousDisjointSet::value_type>> ContiguousDisjointSet::subsets() const
+{
+	std::vector<std::set<value_type>> result;
+	std::vector<std::uint8_t> visited(m_parents.size(), false);
+	for (value_type x = 0; x < m_parents.size(); ++x)
+	{
+		auto xRoot = find(x);
+		if (!visited[xRoot])
+		{
+			result.push_back(subset(xRoot));
+			visited[xRoot] = true;
+		}
+	}
+	return result;
+}
diff --git a/libsolutil/DisjointSet.h b/libsolutil/DisjointSet.h
new file mode 100644
index 0000000000..02792cbe69
--- /dev/null
+++ b/libsolutil/DisjointSet.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 <cstddef>
+#include <set>
+#include <vector>
+
+namespace solidity::util
+{
+
+/// Implementation of the Disjoint set data structure [1], also called union-set, with path-halving [2].
+/// This implementation assumes that each set element is identified with an element in a iota range (hence contiguous).
+///
+/// [1] https://en.wikipedia.org/wiki/Disjoint-set_data_structure
+/// [2] Tarjan, Robert E., and Jan Van Leeuwen. "Worst-case analysis of set union algorithms."
+///     Journal of the ACM (JACM) 31.2 (1984): 245-281.
+class ContiguousDisjointSet
+{
+public:
+	using size_type = size_t;
+	using value_type = size_t;
+
+	/// Constructs a new disjoint set datastructure with `_numNodes` elements and each element in its own individual set
+	explicit ContiguousDisjointSet(size_t _numNodes);
+
+	size_type numSets() const;
+
+	/// finds one representative for a set that contains `_element`
+	value_type find(value_type _element) const;
+
+	/// joins the two sets containing `_x` and `_y`, returns true if the sets were disjoint, otherwise false
+	void merge(value_type _x, value_type _y, bool _mergeBySize=true);
+
+	bool sameSubset(value_type _x, value_type _y) const;
+
+	size_type sizeOfSubset(value_type _x) const;
+
+	std::set<value_type> subset(value_type _x) const;
+
+	std::vector<std::set<value_type>> subsets() const;
+
+private:
+	std::vector<value_type> mutable m_parents;  // mutable for path compression, doesn't change semantic state
+	std::vector<value_type> m_neighbors;
+	std::vector<value_type> m_sizes;
+	size_type m_numSets;
+};
+
+}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d3498965dc..da115f0d4a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,6 +31,7 @@ set(libsolutil_sources
     libsolutil/Checksum.cpp
     libsolutil/CommonData.cpp
     libsolutil/CommonIO.cpp
+    libsolutil/DisjointSet.cpp
     libsolutil/DominatorFinderTest.cpp
     libsolutil/FixedHash.cpp
     libsolutil/FunctionSelector.cpp
diff --git a/test/libsolutil/DisjointSet.cpp b/test/libsolutil/DisjointSet.cpp
new file mode 100644
index 0000000000..338138b6ae
--- /dev/null
+++ b/test/libsolutil/DisjointSet.cpp
@@ -0,0 +1,103 @@
+/*
+	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 DisjointSet.
+ */
+
+#include <libsolutil/DisjointSet.h>
+
+#include <boost/test/unit_test.hpp>
+
+namespace solidity::util::test
+{
+
+BOOST_AUTO_TEST_SUITE(DisjointSetTest)
+
+BOOST_AUTO_TEST_CASE(full_union)
+{
+	ContiguousDisjointSet ds(10);
+	for (size_t i = 1; i < 10; ++i)
+	{
+		BOOST_CHECK(!ds.sameSubset(0, i));
+		ds.merge(0, i);
+		BOOST_CHECK(ds.sameSubset(0, i));
+	}
+	BOOST_CHECK_EQUAL(ds.numSets(), 1);
+	auto const& subsets = ds.subsets();
+	BOOST_CHECK_EQUAL(subsets.size(), 1);
+	std::set<size_t> fullSet{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+	BOOST_CHECK_EQUAL_COLLECTIONS(subsets[0].begin(), subsets[0].end(), fullSet.begin(), fullSet.end());
+
+	for (size_t i = 1; i < 10; ++i) BOOST_CHECK_EQUAL(ds.find(0), ds.find(i));
+}
+
+BOOST_AUTO_TEST_CASE(pairs)
+{
+	ContiguousDisjointSet ds(10);
+	BOOST_CHECK_EQUAL(ds.numSets(), 10);
+	BOOST_CHECK_EQUAL(ds.subsets().size(), 10);
+
+	auto const checkPair = [&](size_t expectedNumSubsets, size_t x, size_t y)
+	{
+		BOOST_CHECK_EQUAL(ds.numSets(), expectedNumSubsets);
+		BOOST_CHECK_EQUAL(ds.subsets().size(), expectedNumSubsets);
+		BOOST_CHECK(ds.sameSubset(x, y));
+		auto const subset = ds.subset(x);
+		std::set<size_t> subsetRef{x, y};
+		BOOST_CHECK_EQUAL_COLLECTIONS(subset.begin(), subset.end(), subsetRef.begin(), subsetRef.end());
+	};
+
+	ds.merge(5, 3);
+	checkPair(9, 5, 3);
+
+	ds.merge(1, 6);
+	checkPair(8, 1, 6);
+
+	ds.merge(0, 2);
+	checkPair(7, 0, 2);
+
+	ds.merge(1, 5);
+	BOOST_CHECK_EQUAL(ds.sizeOfSubset(3), 4);
+
+	ds.merge(1, 0);
+
+	// now we should have a subset with {0, 1, 2, 3, 5, 6}
+	std::set<size_t> subsetRef{0, 1, 2, 3, 5, 6};
+	BOOST_CHECK_EQUAL(ds.sizeOfSubset(6), subsetRef.size());
+	auto const subset = ds.subset(2);
+	BOOST_CHECK_EQUAL_COLLECTIONS(subset.begin(), subset.end(), subsetRef.begin(), subsetRef.end());
+}
+
+BOOST_AUTO_TEST_CASE(merge_with_fixed_representative)
+{
+	ContiguousDisjointSet ds(10);
+	ds.merge(5, 3, false);
+	BOOST_CHECK_EQUAL(ds.find(5), 5);
+	ds.merge(1, 2);
+	ds.merge(7, 8);
+	ds.merge(0, 9);
+	ds.merge(5, 1, false);
+	BOOST_CHECK_EQUAL(ds.find(5), 5);
+	ds.merge(5, 0, false);
+	BOOST_CHECK_EQUAL(ds.find(5), 5);
+	ds.merge(5, 7, false);
+	BOOST_CHECK_EQUAL(ds.find(5), 5);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}

From fc2e90fdda623768d9d41b6a1ccd8a9995e479c6 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 9 Sep 2024 10:13:52 +0200
Subject: [PATCH 1054/1140] Add topological sort implementation for forward
 SSACFG

---
 libyul/CMakeLists.txt                         |  2 +
 libyul/backends/evm/SSACFGTopologicalSort.cpp | 93 +++++++++++++++++++
 libyul/backends/evm/SSACFGTopologicalSort.h   | 60 ++++++++++++
 3 files changed, 155 insertions(+)
 create mode 100644 libyul/backends/evm/SSACFGTopologicalSort.cpp
 create mode 100644 libyul/backends/evm/SSACFGTopologicalSort.h

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index c0082f5d69..704e04921b 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -65,6 +65,8 @@ add_library(yul
 	backends/evm/NoOutputAssembly.cpp
 	backends/evm/OptimizedEVMCodeTransform.cpp
 	backends/evm/OptimizedEVMCodeTransform.h
+	backends/evm/SSACFGTopologicalSort.cpp
+	backends/evm/SSACFGTopologicalSort.h
 	backends/evm/SSAControlFlowGraph.h
 	backends/evm/SSAControlFlowGraphBuilder.cpp
 	backends/evm/SSAControlFlowGraphBuilder.h
diff --git a/libyul/backends/evm/SSACFGTopologicalSort.cpp b/libyul/backends/evm/SSACFGTopologicalSort.cpp
new file mode 100644
index 0000000000..e0370aa275
--- /dev/null
+++ b/libyul/backends/evm/SSACFGTopologicalSort.cpp
@@ -0,0 +1,93 @@
+/*
+	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/backends/evm/SSACFGTopologicalSort.h>
+
+using namespace solidity::yul;
+
+ForwardSSACFGTopologicalSort::ForwardSSACFGTopologicalSort(SSACFG const& _cfg):
+	m_cfg(_cfg),
+	m_explored(m_cfg.numBlocks(), false),
+	m_reversedPostOrder(m_cfg.numBlocks(), std::numeric_limits<size_t>::max()),
+	m_preOrder(m_cfg.numBlocks(), std::numeric_limits<size_t>::max()),
+	m_maxSubtreePreOrder(m_cfg.numBlocks(), 0),
+	m_predecessors(m_cfg.numBlocks())
+{
+	for (size_t id = 0; id < m_cfg.numBlocks(); ++id)
+	{
+		if (!m_explored[id])
+			dfs(id);
+	}
+	std::reverse(m_reversedPostOrder.begin(), m_reversedPostOrder.end());
+
+	for (auto const& [v1, v2]: m_potentialBackEdges)
+		if (ancestor(v2, v1))
+			m_backEdgeTargets.insert(v2);
+}
+
+void ForwardSSACFGTopologicalSort::dfs(size_t const _vertex) {
+	yulAssert(!m_explored[_vertex]);
+	m_explored[_vertex] = true;
+	m_preOrder[_vertex] = m_currentNode++;
+	m_maxSubtreePreOrder[_vertex] = m_preOrder[_vertex];
+
+	m_cfg.block(SSACFG::BlockId{_vertex}).forEachExit([&](SSACFG::BlockId const& _exitBlock){
+		m_predecessors[_exitBlock.value].insert(_vertex);
+		if (!m_explored[_exitBlock.value])
+		{
+			dfs(_exitBlock.value);
+			m_maxSubtreePreOrder[_vertex] = std::max(m_maxSubtreePreOrder[_vertex], m_maxSubtreePreOrder[_exitBlock.value]);
+		}
+		else
+			m_potentialBackEdges.emplace_back(_vertex, _exitBlock.value);
+	});
+
+	m_reversedPostOrder[m_preOrder[_vertex]] = _vertex;
+}
+
+std::vector<size_t> const& ForwardSSACFGTopologicalSort::sortedBlocks() const {  return m_reversedPostOrder; }
+std::vector<size_t> const& ForwardSSACFGTopologicalSort::preOrder() const { return m_preOrder; }
+std::vector<size_t> const& ForwardSSACFGTopologicalSort::reversedPostOrder() const { return m_reversedPostOrder; }
+std::vector<size_t> const& ForwardSSACFGTopologicalSort::maxSubtreePreOrder() const { return m_maxSubtreePreOrder; }
+std::set<size_t> const& ForwardSSACFGTopologicalSort::backEdgeTargets() const { return m_backEdgeTargets; }
+std::vector<std::set<size_t>> const& ForwardSSACFGTopologicalSort::predecessors() const { return m_predecessors; }
+SSACFG const& ForwardSSACFGTopologicalSort::cfg() const { return m_cfg; }
+
+bool ForwardSSACFGTopologicalSort::ancestor(size_t const _block1, size_t const _block2) const {
+	yulAssert(_block1 < m_preOrder.size());
+	yulAssert(_block2 < m_preOrder.size());
+
+	auto const preOrderIndex1 = m_preOrder[_block1];
+	auto const preOrderIndex2 = m_preOrder[_block2];
+
+	bool const node1VisitedBeforeNode2 = preOrderIndex1 <= preOrderIndex2;
+	bool const node2InSubtreeOfNode1 = preOrderIndex2 <= m_maxSubtreePreOrder[_block1];
+	return node1VisitedBeforeNode2 && node2InSubtreeOfNode1;
+}
+
+bool ForwardSSACFGTopologicalSort::backEdge(SSACFG::BlockId const& _block1, SSACFG::BlockId const& _block2) const
+{
+	if (ancestor(_block2.value, _block1.value))
+	{
+		// check that block1 -> block2 is indeed an edge in the cfg
+		bool isEdge = false;
+		m_cfg.block(_block1).forEachExit([&_block2, &isEdge](SSACFG::BlockId const& _exit) { isEdge |= _block2 == _exit; });
+		return isEdge;
+	}
+	return false;
+}
diff --git a/libyul/backends/evm/SSACFGTopologicalSort.h b/libyul/backends/evm/SSACFGTopologicalSort.h
new file mode 100644
index 0000000000..ec62eb0137
--- /dev/null
+++ b/libyul/backends/evm/SSACFGTopologicalSort.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 <libyul/backends/evm/SSAControlFlowGraph.h>
+
+#include <cstddef>
+#include <set>
+#include <vector>
+
+namespace solidity::yul
+{
+
+/// Performs a topological sort on the forward CFG (no back/cross edges)
+class ForwardSSACFGTopologicalSort
+{
+public:
+	explicit ForwardSSACFGTopologicalSort(SSACFG const& _cfg);
+
+	std::vector<size_t> const& sortedBlocks() const;
+	std::vector<size_t> const& preOrder() const;
+	std::vector<size_t> const& reversedPostOrder() const;
+	std::vector<size_t> const& maxSubtreePreOrder() const;
+	std::set<size_t> const& backEdgeTargets() const;
+	std::vector<std::set<size_t>> const& predecessors() const;
+	SSACFG const& cfg() const;
+	bool ancestor(size_t _block1, size_t _block2) const;
+	bool backEdge(SSACFG::BlockId const& _block1, SSACFG::BlockId const& _block2) const;
+
+private:
+	void dfs(size_t _vertex);
+
+	SSACFG const& m_cfg;
+
+	size_t m_currentNode {0};
+	std::vector<char> m_explored{};
+	std::vector<size_t> m_reversedPostOrder{};
+	std::vector<size_t> m_preOrder{};
+	std::vector<size_t> m_maxSubtreePreOrder{};
+	std::vector<std::tuple<size_t, size_t>> m_potentialBackEdges{};
+	std::set<size_t> m_backEdgeTargets{};
+	std::vector<std::set<size_t>> m_predecessors{};
+};
+}

From 13fe5ba98c763ea9e6ed6bb747ee101fdedff679 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 17 Jun 2024 22:22:34 -0300
Subject: [PATCH 1055/1140] Replace errors/warning/info empty check with proper
 errors only check

---
 liblangutil/ErrorReporter.h                     | 6 ++++++
 liblangutil/Exceptions.h                        | 5 +++++
 libsolidity/analysis/DeclarationTypeChecker.cpp | 2 +-
 libsolidity/codegen/CompilerContext.cpp         | 6 +++---
 libsolidity/interface/StandardCompiler.cpp      | 9 +--------
 libyul/YulStack.cpp                             | 2 +-
 test/libsolidity/InlineAssembly.cpp             | 4 ++--
 test/libyul/Common.cpp                          | 2 +-
 test/tools/yulopti.cpp                          | 4 ++--
 test/tools/yulrun.cpp                           | 2 +-
 tools/yulPhaser/Program.cpp                     | 4 ++--
 11 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index d7e280ed90..989cc4d5e3 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -130,6 +130,12 @@ class ErrorReporter
 		return m_errorCount > 0;
 	}
 
+	/// @returns true if there is any error, warning or info.
+	bool hasErrorsWarningsOrInfos() const
+	{
+		return m_errorCount + m_warningCount + m_infoCount > 0;
+	}
+
 	/// @returns the number of errors (ignores warnings and infos).
 	unsigned errorCount() const
 	{
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index b0701f9993..c441a6d2f9 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -256,6 +256,11 @@ class Error: virtual public util::Exception
 		return false;
 	}
 
+	static bool hasErrorsWarningsOrInfos(ErrorList const& _list)
+	{
+		return !_list.empty();
+	}
+
 	static std::string formatErrorSeverity(Severity _severity)
 	{
 		switch (_severity)
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index bdf023c5c0..f5db211000 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -329,7 +329,7 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 	Type const* baseType = _typeName.baseType().annotation().type;
 	if (!baseType)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "");
+		solAssert(m_errorReporter.hasErrors(), "");
 		return;
 	}
 
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 2e94e9f0b8..83b4589fe9 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -473,7 +473,7 @@ void CompilerContext::appendInlineAssembly(
 			dialect,
 			identifierAccess.resolve
 		).analyze(parserResult->root());
-	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
+	if (!parserResult || errorReporter.hasErrorsWarningsOrInfos() || !analyzerResult)
 		reportError("Invalid assembly generated by code generator.");
 	std::shared_ptr<yul::AST const> toBeAssembledAST = parserResult;
 
@@ -513,10 +513,10 @@ void CompilerContext::appendInlineAssembly(
 		m_generatedYulUtilityCode = _assembly;
 	}
 
-	if (!errorReporter.errors().empty())
+	if (errorReporter.hasErrorsWarningsOrInfos())
 		reportError("Failed to analyze inline assembly block.");
 
-	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
+	solAssert(!errorReporter.hasErrorsWarningsOrInfos(), "Failed to analyze inline assembly block.");
 	yul::CodeGenerator::assemble(
 		toBeAssembledAST->root(),
 		analysisInfo,
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 0194aa937d..7271cce8be 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1621,14 +1621,7 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	// Inconsistent state - stop here to receive error reports from users
 	if (!stack.parseAndAnalyze(sourceName, sourceContents) && !stack.hasErrors())
-	{
-		output["errors"].emplace_back(formatError(
-			Error::Type::InternalCompilerError,
-			"general",
-			"No error reported, but compilation failed."
-		));
-		return output;
-	}
+		solAssert(false, "No error reported, but parsing/analysis failed.");
 
 	for (auto const& error: stack.errors())
 	{
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index bd2c739061..01eb5b7383 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -64,7 +64,7 @@ bool YulStack::parse(std::string const& _sourceName, std::string const& _source)
 		reportUnimplementedFeatureError(_error);
 	}
 
-	if (m_errorReporter.errors().empty())
+	if (!m_errorReporter.hasErrors())
 		m_stackState = Parsed;
 
 	return m_stackState == Parsed;
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index a0aa39be49..b3993e39f3 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -131,7 +131,7 @@ void parsePrintCompare(std::string const& _source, bool _canWarn = false)
 	if (_canWarn)
 		BOOST_REQUIRE(!Error::containsErrors(stack.errors()));
 	else
-		BOOST_REQUIRE(stack.errors().empty());
+		BOOST_REQUIRE(!Error::hasErrorsWarningsOrInfos(stack.errors()));
 	std::string expectation = "object \"object\" {\n    code " + boost::replace_all_copy(_source, "\n", "\n    ") + "\n}\n";
 	BOOST_CHECK_EQUAL(stack.print(), expectation);
 }
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 		DebugInfoSelection::None()
 	);
 	BOOST_REQUIRE(stack.parseAndAnalyze("", source));
-	BOOST_REQUIRE(stack.errors().empty());
+	BOOST_REQUIRE(!Error::hasErrorsWarningsOrInfos(stack.errors()));
 	BOOST_CHECK_EQUAL(stack.print(), parsed);
 
 	std::string parsedInner = "{ let x := \"\\xe1\\xae\\xac\" }";
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 8980adcb18..7640e4a5dd 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -61,7 +61,7 @@ std::pair<std::shared_ptr<AST const>, std::shared_ptr<yul::AsmAnalysisInfo>> yul
 			solidity::frontend::OptimiserSettings::minimal(),
 		DebugInfoSelection::All()
 	);
-	if (!stack.parseAndAnalyze("", _source) || !stack.errors().empty())
+	if (!stack.parseAndAnalyze("", _source) || Error::hasErrorsWarningsOrInfos(stack.errors()))
 		BOOST_FAIL("Invalid source.");
 	return std::make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 }
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 891f39c433..13375f8277 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -91,7 +91,7 @@ class YulOpti
 		try
 		{
 			auto ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
-			if (!m_astRoot || !errorReporter.errors().empty())
+			if (!m_astRoot || errorReporter.hasErrors())
 			{
 				std::cerr << "Error parsing source." << std::endl;
 				printErrors(_charStream, errors);
@@ -104,7 +104,7 @@ class YulOpti
 				errorReporter,
 				m_dialect
 			);
-			if (!analyzer.analyze(*m_astRoot) || !errorReporter.errors().empty())
+			if (!analyzer.analyze(*m_astRoot) || errorReporter.hasErrors())
 			{
 				std::cerr << "Error analyzing source." << std::endl;
 				printErrors(_charStream, errors);
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index c3a7fb19fc..e857c26645 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -65,7 +65,7 @@ std::pair<std::shared_ptr<AST const>, std::shared_ptr<AsmAnalysisInfo>> parse(st
 	);
 	if (stack.parseAndAnalyze("--INPUT--", _source))
 	{
-		yulAssert(stack.errors().empty(), "Parsed successfully but had errors.");
+		yulAssert(!Error::hasErrorsWarningsOrInfos(stack.errors()), "Parsed successfully but had errors.");
 		return make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 	}
 	else
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index bb9eebc4ba..57e1bf2b93 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -122,7 +122,7 @@ std::variant<std::unique_ptr<AST>, ErrorList> Program::parseObject(Dialect const
 
 	ObjectParser parser(errorReporter, _dialect);
 	std::shared_ptr<Object> object = parser.parse(scanner, false);
-	if (object == nullptr || !errorReporter.errors().empty())
+	if (object == nullptr || errorReporter.hasErrors())
 		// NOTE: It's possible to get errors even if the returned object is non-null.
 		// For example when there are errors in a nested object.
 		return errors;
@@ -165,7 +165,7 @@ std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Di
 	if (!analysisSuccessful)
 		return errors;
 
-	assert(errorReporter.errors().empty());
+	assert(!errorReporter.hasErrors());
 	return std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
 }
 

From c446d3bb20bf0689926a428cedc0ac65140d9f30 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Thu, 22 Aug 2024 16:19:09 +0200
Subject: [PATCH 1056/1140] SMTChecker: Fix parsing of model values in BMC

SMT solvers return model values as pairs (enclosed in parentheses) of
name and value.
Previous way of parsing model values relied on finding the next
closing bracket. However, this does not work for negative numbers, which
are themselves wrapped in parentheses, e.g. (- 1).
---
 libsmtutil/SMTLib2Interface.cpp | 55 +++++++++++++++++++++++----------
 libsmtutil/SMTLib2Interface.h   |  1 -
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index 81ad5ddd4b..0914f8305d 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -18,6 +18,8 @@
 
 #include <libsmtutil/SMTLib2Interface.h>
 
+#include <libsmtutil/SMTLib2Parser.h>
+
 #include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string/join.hpp>
@@ -110,6 +112,41 @@ void SMTLib2Interface::addAssertion(Expression const& _expr)
 	m_commands.assertion(toSExpr(_expr));
 }
 
+namespace
+{
+std::vector<std::string> parseValuesFromResponse(std::string const& _response)
+{
+	std::stringstream ss(_response);
+	std::string answer;
+	ss >> answer;
+	smtAssert(answer == "sat");
+
+	std::vector<SMTLib2Expression> parsedOutput;
+	SMTLib2Parser parser(ss);
+	try
+	{
+		while (!parser.isEOF())
+			parsedOutput.push_back(parser.parseExpression());
+	}
+	catch(SMTLib2Parser::ParsingException&)
+	{
+		return {};
+	}
+	smtAssert(parsedOutput.size() == 1, "SMT: Expected model values as a single s-expression");
+	auto const& values = parsedOutput[0];
+	smtAssert(!isAtom(values));
+	std::vector<std::string> parsedValues;
+	for (auto const& nameValuePair: asSubExpressions(values))
+	{
+		smtAssert(!isAtom(nameValuePair));
+		smtAssert(asSubExpressions(nameValuePair).size() == 2);
+		auto const& value = asSubExpressions(nameValuePair)[1];
+		parsedValues.push_back(value.toString());
+	}
+	return parsedValues;
+}
+} // namespace
+
 std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	std::string response = querySolver(dumpQuery(_expressionsToEvaluate));
@@ -127,7 +164,7 @@ std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::ve
 
 	std::vector<std::string> values;
 	if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
-		values = parseValues(find(response.cbegin(), response.cend(), '\n'), response.cend());
+		values = parseValuesFromResponse(response);
 	return std::make_pair(result, values);
 }
 
@@ -175,22 +212,6 @@ std::string SMTLib2Interface::checkSatAndGetValuesCommand(std::vector<Expression
 	return command;
 }
 
-std::vector<std::string> SMTLib2Interface::parseValues(std::string::const_iterator _start, std::string::const_iterator _end)
-{
-	std::vector<std::string> values;
-	while (_start < _end)
-	{
-		auto valStart = find(_start, _end, ' ');
-		if (valStart < _end)
-			++valStart;
-		auto valEnd = find(valStart, _end, ')');
-		values.emplace_back(valStart, valEnd);
-		_start = find(valEnd, _end, '(');
-	}
-
-	return values;
-}
-
 std::string SMTLib2Interface::querySolver(std::string const& _input)
 {
 	h256 inputHash = keccak256(_input);
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
index 11478223cf..02b1c85ffe 100644
--- a/libsmtutil/SMTLib2Interface.h
+++ b/libsmtutil/SMTLib2Interface.h
@@ -103,7 +103,6 @@ class SMTLib2Interface: public BMCSolverInterface
 	void declareFunction(std::string const& _name, SortPointer const& _sort);
 
 	std::string checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate);
-	std::vector<std::string> parseValues(std::string::const_iterator _start, std::string::const_iterator _end);
 
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
 	std::string querySolver(std::string const& _input);

From a204f475fbcadef3cca82f78a2e0665811dafac1 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@ethereum.org>
Date: Thu, 29 Aug 2024 13:42:46 +0200
Subject: [PATCH 1057/1140] SMTChecker: Prepare Z3 SMT-LIB interface for BMC
 engine

This is a first draft and will not be used yet.
---
 libsolidity/formal/Z3SMTLib2Interface.cpp | 35 +++++++++++++++++++++
 libsolidity/formal/Z3SMTLib2Interface.h   | 37 +++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 libsolidity/formal/Z3SMTLib2Interface.cpp
 create mode 100644 libsolidity/formal/Z3SMTLib2Interface.h

diff --git a/libsolidity/formal/Z3SMTLib2Interface.cpp b/libsolidity/formal/Z3SMTLib2Interface.cpp
new file mode 100644
index 0000000000..b76cdd2522
--- /dev/null
+++ b/libsolidity/formal/Z3SMTLib2Interface.cpp
@@ -0,0 +1,35 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+
+#include <libsolidity/formal/Z3SMTLib2Interface.h>
+
+#include <libsolidity/interface/UniversalCallback.h>
+
+using namespace solidity::frontend::smt;
+
+Z3SMTLib2Interface::Z3SMTLib2Interface(
+	frontend::ReadCallback::Callback _smtCallback,
+	std::optional<unsigned int> _queryTimeout
+): SMTLib2Interface({}, std::move(_smtCallback), _queryTimeout)
+{
+}
+
+void Z3SMTLib2Interface::setupSmtCallback() {
+	if (auto* universalCallback = m_smtCallback.target<frontend::UniversalCallback>())
+		universalCallback->smtCommand().setZ3(m_queryTimeout, true, false);
+}
diff --git a/libsolidity/formal/Z3SMTLib2Interface.h b/libsolidity/formal/Z3SMTLib2Interface.h
new file mode 100644
index 0000000000..07e1387106
--- /dev/null
+++ b/libsolidity/formal/Z3SMTLib2Interface.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 <libsmtutil/SMTLib2Interface.h>
+
+namespace solidity::frontend::smt
+{
+
+class Z3SMTLib2Interface: public smtutil::SMTLib2Interface
+{
+public:
+	explicit Z3SMTLib2Interface(
+		frontend::ReadCallback::Callback _smtCallback = {},
+		std::optional<unsigned> _queryTimeout = {}
+	);
+private:
+	void setupSmtCallback() override;
+};
+
+}

From 6f548bec194776bef61b8f12172ce41f464c56c8 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 9 Sep 2024 16:20:50 +0200
Subject: [PATCH 1058/1140] Upgrade jobs to run on Ubuntu 2404

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 710d275d43..8384f2eeac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,6 +19,14 @@ parameters:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-8
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:2662376fe0e1ec2d346495a19a6d64508c1048d5a7325d8600c33c343fa64a0f"
+  ubuntu-2404-docker-image:
+    type: string
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:5d6d27551104321a30326d6024bd4e96d9d899a97a78eb9feea364996f1d18b5"
+  ubuntu-2404-clang-docker-image:
+    type: string
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404.clang-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8df0086907cc1e57068ad48841f2284a87bfbd0a95006286a19a7132d84bb861"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-6
@@ -602,6 +610,56 @@ defaults:
         MAKEFLAGS: -j 10
         CPUs: 10
 
+  - base_ubuntu2404: &base_ubuntu2404
+      docker:
+        - image: << pipeline.parameters.ubuntu-2404-docker-image >>
+      environment: &base_ubuntu2404_env
+        TERM: xterm
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2404_clang: &base_ubuntu2404_clang
+      docker:
+        - image: << pipeline.parameters.ubuntu-2404-clang-docker-image >>
+      environment: &base_ubuntu2404_clang_env
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2404_clang_large: &base_ubuntu2404_clang_large
+      <<: *base_ubuntu2404_clang
+      resource_class: large
+      environment: &base_ubuntu2404_clang_large_env
+        <<: *base_ubuntu2404_clang_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
+  - base_ubuntu2404_small: &base_ubuntu2404_small
+      <<: *base_ubuntu2404
+      resource_class: small
+      environment: &base_ubuntu2404_small_env
+        <<: *base_ubuntu2404_env
+        MAKEFLAGS: -j 2
+        CPUs: 2
+
+  - base_ubuntu2404_large: &base_ubuntu2404_large
+      <<: *base_ubuntu2404
+      resource_class: large
+      environment: &base_ubuntu2404_large_env
+        <<: *base_ubuntu2404_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
+  - base_ubuntu2404_xlarge: &base_ubuntu2404_xlarge
+      <<: *base_ubuntu2404
+      resource_class: xlarge
+      environment: &base_ubuntu2404_xlarge_env
+        <<: *base_ubuntu2404_env
+        MAKEFLAGS: -j 10
+        CPUs: 10
+
   - base_win: &base_win
       executor:
         name: win/default

From 6a695274cc65a68c9f050ff410ee85d6031b8dac Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Mon, 9 Sep 2024 15:15:07 +0200
Subject: [PATCH 1059/1140] xSMTChecker: Fix SMT logic error when assigning to
 an array of addresses

---
 Changelog.md                                     |  2 +-
 libsolidity/formal/SymbolicTypes.cpp             |  4 ++++
 .../smtCheckerTests/types/array_of_addresses.sol | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/types/array_of_addresses.sol

diff --git a/Changelog.md b/Changelog.md
index 0ecb280c7d..f001a0efc6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,7 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
-
+ * SMTChecker: Fix SMT logic error when assigning to an array of addresses.
 
 ### 0.8.27 (2024-09-04)
 
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 4a4ac8175f..f9ec9b0110 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -118,6 +118,10 @@ SortPointer smtSort(frontend::Type const& _type)
 				// use a common sort for functions so pure and view modifier do not cause conflicting SMT types
 				// solc handles types mismtach
 				tupleName = "function";
+			else if (isAddress(*baseType))
+				// use a common sort for address and address payable so it does not cause conflicting SMT types
+				// solc handles types mismtach
+				tupleName = "address";
 			else if (
 				baseType->category() == frontend::Type::Category::Integer ||
 				baseType->category() == frontend::Type::Category::FixedPoint
diff --git a/test/libsolidity/smtCheckerTests/types/array_of_addresses.sol b/test/libsolidity/smtCheckerTests/types/array_of_addresses.sol
new file mode 100644
index 0000000000..74f8548469
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/array_of_addresses.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0
+
+pragma solidity >=0.0.0;
+contract C {
+	address[10] a;
+	address payable[10] b;
+
+	function f() public {
+		a = b;
+		assert(a[0] == b[0]);
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 9d7cc42bc1c12bb43e9dccf8c6c36833fdfcbbca Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 8 Jul 2024 19:27:57 -0300
Subject: [PATCH 1060/1140] legacy codegen transient storage support for state
 variables

---
 Changelog.md                                  |  1 +
 .../analysis/DeclarationTypeChecker.cpp       |  7 ++
 libsolidity/analysis/ReferencesResolver.cpp   |  2 +-
 libsolidity/analysis/TypeChecker.cpp          |  6 +-
 libsolidity/ast/Types.cpp                     | 29 +++----
 libsolidity/ast/Types.h                       |  2 +-
 libsolidity/codegen/Compiler.cpp              | 14 +--
 libsolidity/codegen/ContractCompiler.cpp      |  8 +-
 libsolidity/codegen/ExpressionCompiler.cpp    | 16 +++-
 libsolidity/codegen/LValue.cpp                | 43 ++++++----
 libsolidity/codegen/LValue.h                  | 17 +++-
 libsolidity/codegen/ir/IRGenerator.cpp        |  7 +-
 .../args                                      |  1 +
 .../err                                       |  2 +-
 .../input.sol                                 |  0
 .../output                                    |  2 +-
 .../evmasm_transient_storage_opcodes/args     |  1 -
 .../args                                      |  1 +
 .../input.sol                                 |  9 ++
 .../output                                    | 86 +++++++++++++++++++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../exit                                      |  1 +
 .../input.sol                                 |  9 ++
 test/libsolidity/ASTPropertyTest.cpp          |  2 +-
 test/libsolidity/ASTPropertyTest.h            |  2 +-
 .../isSimpleCounterLoop_negative_cases.sol    | 11 +++
 .../transient_data_location.sol               |  2 +
 .../getters/transient_value_types.sol         | 15 ++++
 ...transient_value_types_multi_frame_call.sol | 23 +++++
 ...ansient_storage_access_inside_function.sol | 23 +++++
 .../compound_assign_transient_storage.sol     | 23 +++++
 ...t_storage_variable_increment_decrement.sol | 16 ++++
 .../delete_transient_state_variable.sol       | 13 +++
 ...transient_function_type_state_variable.sol | 17 ++++
 ...ansient_state_address_variable_members.sol | 21 +++++
 .../transient_state_enum_variable.sol         | 18 ++++
 .../variables/transient_state_variable.sol    | 22 +++++
 ...ient_state_variable_cleanup_assignment.sol | 17 ++++
 ...ransient_state_variable_cleanup_tstore.sol | 15 ++++
 ...nt_state_variable_slot_inline_assembly.sol | 32 +++++++
 ...nsient_state_variable_tuple_assignment.sol | 21 +++++
 .../transient_state_variable_udvt.sol         | 23 +++++
 .../transient_storage_reentrancy_lock.sol     | 24 ++++++
 .../constant_transient_state_variable.sol     |  2 +
 ...transient_dynamic_array_state_variable.sol |  2 +
 .../transient_fixed_array_state_variable.sol  |  2 +
 .../dataLocations/transient_function_type.sol |  3 +-
 .../transient_mapping_state_variable.sol      |  3 +-
 .../transient_state_variable_visibility.sol   |  3 +-
 .../transient_storage_variable_pre_cancun.sol |  7 ++
 .../transient_struct_state_variable.sol       |  2 +
 .../transient_value_type_state_variables.sol  |  3 +-
 ...ue_type_state_variables_initialization.sol |  2 +
 .../state_var_transient_data_location.sol     |  2 +
 .../invalid/constant_variable_via_offset.sol  |  2 +-
 .../invalid/storage_assignment.sol            |  2 +-
 .../storage_assignment_in_modifier.sol        |  2 +-
 .../invalid/transient_storage_assignment.sol  | 12 +++
 .../invalid/unbalanced_two_stack_load.sol     |  2 +-
 .../storage_reference_assignment_statevar.sol |  4 +-
 .../inlineAssembly/storage_reference_old.sol  |  4 +-
 ...ient_storage_value_assignment_statevar.sol | 14 +++
 ..._both_transient_storage_identical_name.sol |  8 ++
 64 files changed, 614 insertions(+), 73 deletions(-)
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
 rename test/cmdlineTests/{evmasm_transient_storage_opcodes => evmasm_transient_storage_inline_assembly}/err (90%)
 rename test/cmdlineTests/{evmasm_transient_storage_opcodes => evmasm_transient_storage_inline_assembly}/input.sol (100%)
 rename test/cmdlineTests/{evmasm_transient_storage_opcodes => evmasm_transient_storage_inline_assembly}/output (90%)
 delete mode 100644 test/cmdlineTests/evmasm_transient_storage_opcodes/args
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable/args
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable/input.sol
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable/output
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/input.sol
 create mode 100644 test/libsolidity/semanticTests/getters/transient_value_types.sol
 create mode 100644 test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
 create mode 100644 test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
 create mode 100644 test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
 create mode 100644 test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
 create mode 100644 test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
 create mode 100644 test/libsolidity/syntaxTests/dataLocations/transient_storage_variable_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/invalid/transient_storage_assignment.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/transient_storage_value_assignment_statevar.sol
 create mode 100644 test/libsolidity/syntaxTests/variableDeclaration/state_variables_both_transient_storage_identical_name.sol

diff --git a/Changelog.md b/Changelog.md
index f001a0efc6..9f531daea1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: Transient storage value type state variables are now supported by the legacy pipeline.
 
 
 Bugfixes:
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index f5db211000..e5549f0350 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -398,6 +398,13 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 	Location varLoc = _variable.referenceLocation();
 	DataLocation typeLoc = DataLocation::Memory;
 
+	if (varLoc == VariableDeclaration::Location::Transient && !m_evmVersion.supportsTransientStorage())
+		m_errorReporter.declarationError(
+			7985_error,
+			_variable.location(),
+			"Transient storage is not supported by EVM versions older than cancun."
+		);
+
 	std::set<Location> allowedDataLocations = _variable.allowedDataLocations();
 	if (!allowedDataLocations.count(varLoc))
 	{
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 079bbf33ce..cfbdec91ab 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -370,7 +370,7 @@ void ReferencesResolver::operator()(yul::Identifier const& _identifier)
 			m_errorReporter.declarationError(
 				9467_error,
 				nativeLocationOf(_identifier),
-				"Identifier not found. Use \".slot\" and \".offset\" to access storage variables."
+				"Identifier not found. Use \".slot\" and \".offset\" to access storage or transient storage variables."
 			);
 		return;
 	}
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 3b7a314fe3..9935414726 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -785,7 +785,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 				}
 				else if (identifierInfo.suffix == "slot" || identifierInfo.suffix == "offset")
 				{
-					m_errorReporter.typeError(6617_error, nativeLocationOf(_identifier), "The suffixes .offset and .slot can only be used on non-constant storage variables.");
+					m_errorReporter.typeError(6617_error, nativeLocationOf(_identifier), "The suffixes .offset and .slot can only be used on non-constant storage or transient storage variables.");
 					return false;
 				}
 				else if (var && var->value() && !var->value()->annotation().type && !dynamic_cast<Literal const*>(var->value().get()))
@@ -824,7 +824,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 					{
 						if (var->isStateVariable())
 						{
-							m_errorReporter.typeError(4713_error, nativeLocationOf(_identifier), "State variables cannot be assigned to - you have to use \"sstore()\".");
+							m_errorReporter.typeError(4713_error, nativeLocationOf(_identifier), "State variables cannot be assigned to - you have to use \"sstore()\" or \"tstore()\".");
 							return false;
 						}
 						else if (suffix != "slot")
@@ -869,7 +869,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 				m_errorReporter.typeError(
 					1408_error,
 					nativeLocationOf(_identifier),
-					"Only local variables are supported. To access storage variables, use the \".slot\" and \".offset\" suffixes."
+					"Only local variables are supported. To access state variables, use the \".slot\" and \".offset\" suffixes."
 				);
 				return false;
 			}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index f6e2a54138..95f2495161 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2140,30 +2140,25 @@ FunctionType const* ContractType::newExpressionType() const
 	return m_constructorType;
 }
 
-std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables(std::optional<DataLocation> _location) const
+std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables(DataLocation _location) const
 {
-	std::optional<VariableDeclaration::Location> location;
-	if (_location.has_value())
+	VariableDeclaration::Location location;
+	switch (_location)
 	{
-		switch (_location.value())
-		{
-		case DataLocation::Storage:
-			location = std::make_optional(VariableDeclaration::Location::Unspecified); // By default state variables have unspecified (storage) data location
-			break;
-		case DataLocation::Transient:
-			location = std::make_optional(VariableDeclaration::Location::Transient);
-			break;
-		default: solAssert(false);
-		}
+	case DataLocation::Storage:
+		location = VariableDeclaration::Location::Unspecified;
+		break;
+	case DataLocation::Transient:
+		location = VariableDeclaration::Location::Transient;
+		break;
+	default:
+		solAssert(false);
 	}
 
 	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()) &&
-				variable->referenceLocation() == location.value_or(variable->referenceLocation())
-			)
+			if (!(variable->isConstant() || variable->immutable()) && variable->referenceLocation() == location)
 				variables.push_back(variable);
 	TypePointers types;
 	for (auto variable: variables)
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 5a5040c40d..c642362029 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1002,7 +1002,7 @@ class ContractType: public Type
 
 	/// @returns a list of all state variables (including inherited) of the contract and their
 	/// offsets in storage/transient storage.
-	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> stateVariables(std::optional<DataLocation> _location = std::nullopt) const;
+	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> stateVariables(DataLocation _location) const;
 	/// @returns a list of all immutable variables (including inherited) of the contract.
 	std::vector<VariableDeclaration const*> immutableVariables() const;
 protected:
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
index 07b65fcc8c..3e3f149969 100644
--- a/libsolidity/codegen/Compiler.cpp
+++ b/libsolidity/codegen/Compiler.cpp
@@ -26,7 +26,7 @@
 #include <libsolidity/codegen/ContractCompiler.h>
 #include <libevmasm/Assembly.h>
 
-#include <range/v3/algorithm/all_of.hpp>
+#include <range/v3/algorithm/none_of.hpp>
 
 using namespace solidity;
 using namespace solidity::frontend;
@@ -37,14 +37,16 @@ void Compiler::compileContract(
 	bytes const& _metadata
 )
 {
-	auto static notTransient = [](VariableDeclaration const* _varDeclaration) {
-		solAssert(_varDeclaration);
-		return _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient;
+	auto static isTransientReferenceType = [](VariableDeclaration const* _varDeclaration) {
+		solAssert(_varDeclaration && _varDeclaration->type());
+		return
+			_varDeclaration->referenceLocation() == VariableDeclaration::Location::Transient &&
+			!_varDeclaration->type()->isValueType();
 	};
 
 	solUnimplementedAssert(
-		ranges::all_of(_contract.stateVariables(), notTransient),
-		"Transient storage variables are not supported."
+		ranges::none_of(_contract.stateVariables(), isTransientReferenceType),
+		"Transient storage reference type variables are not supported."
 	);
 
 	ContractCompiler runtimeCompiler(nullptr, m_runtimeContext, m_optimiserSettings);
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 66cfe35c40..5ed6e8f964 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -570,8 +570,9 @@ void ContractCompiler::appendReturnValuePacker(TypePointers const& _typeParamete
 
 void ContractCompiler::registerStateVariables(ContractDefinition const& _contract)
 {
-	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
+	for (auto const location: {DataLocation::Storage, DataLocation::Transient})
+		for (auto const& var: ContractType(_contract).stateVariables(location))
+			m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
 }
 
 void ContractCompiler::registerImmutableVariables(ContractDefinition const& _contract)
@@ -586,7 +587,7 @@ void ContractCompiler::initializeStateVariables(ContractDefinition const& _contr
 	solAssert(!_contract.isLibrary(), "Tried to initialize state variables of library.");
 	for (VariableDeclaration const* variable: _contract.stateVariables())
 	{
-		solUnimplementedAssert(variable->referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
+		solAssert(variable->referenceLocation() != VariableDeclaration::Location::Transient || !variable->value());
 		if (variable->value() && !variable->isConstant())
 			ExpressionCompiler(m_context, m_optimiserSettings.runOrderLiterals).appendStateVariableInitialization(*variable);
 	}
@@ -595,7 +596,6 @@ void ContractCompiler::initializeStateVariables(ContractDefinition const& _contr
 bool ContractCompiler::visit(VariableDeclaration const& _variableDeclaration)
 {
 	solAssert(_variableDeclaration.isStateVariable(), "Compiler visit to non-state variable declaration.");
-	solUnimplementedAssert(_variableDeclaration.referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
 	CompilerContext::LocationSetter locationSetter(m_context, _variableDeclaration);
 
 	m_context.startFunction(_variableDeclaration);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 95b7435ed6..85634906e0 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -108,7 +108,10 @@ void ExpressionCompiler::appendStateVariableInitialization(VariableDeclaration c
 	if (_varDecl.immutable())
 		ImmutableItem(m_context, _varDecl).storeValue(*type, _varDecl.location(), true);
 	else
+	{
+		solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient);
 		StorageItem(m_context, _varDecl).storeValue(*type, _varDecl.location(), true);
+	}
 }
 
 void ExpressionCompiler::appendConstStateVariableAccessor(VariableDeclaration const& _varDecl)
@@ -147,6 +150,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 		if (auto mappingType = dynamic_cast<MappingType const*>(returnType))
 		{
 			solAssert(CompilerUtils::freeMemoryPointer >= 0x40, "");
+			solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient);
 
 			// pop offset
 			m_context << Instruction::POP;
@@ -196,6 +200,8 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 		}
 		else if (auto arrayType = dynamic_cast<ArrayType const*>(returnType))
 		{
+			solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient);
+
 			// pop offset
 			m_context << Instruction::POP;
 			utils().copyToStackTop(static_cast<unsigned>(paramTypes.size() - i + 1), 1);
@@ -229,6 +235,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 	solAssert(returnTypes.size() >= 1, "");
 	if (StructType const* structType = dynamic_cast<StructType const*>(returnType))
 	{
+		solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient);
 		solAssert(!_varDecl.immutable(), "");
 		// remove offset
 		m_context << Instruction::POP;
@@ -258,6 +265,8 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 		solAssert(returnTypes.size() == 1, "");
 		if (_varDecl.immutable())
 			ImmutableItem(m_context, _varDecl).retrieveValue(SourceLocation());
+		else if (_varDecl.referenceLocation() == VariableDeclaration::Location::Transient)
+			TransientStorageItem(m_context, *returnType).retrieveValue(SourceLocation(), true);
 		else
 			StorageItem(m_context, *returnType).retrieveValue(SourceLocation(), true);
 		utils().convertType(*returnType, *returnTypes.front());
@@ -2995,7 +3004,12 @@ void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaratio
 	if (m_context.isLocalVariable(&_declaration))
 		setLValue<StackVariable>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
 	else if (m_context.isStateVariable(&_declaration))
-		setLValue<StorageItem>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
+	{
+		if (dynamic_cast<VariableDeclaration const&>(_declaration).referenceLocation() == VariableDeclaration::Location::Transient)
+			setLValue<TransientStorageItem>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
+		else
+			setLValue<StorageItem>(_expression, dynamic_cast<VariableDeclaration const&>(_declaration));
+	}
 	else
 		solAssert(false, "Identifier type not supported or identifier not found.");
 }
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index 4847cb0938..78efb9f811 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -36,7 +36,6 @@ using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
-
 StackVariable::StackVariable(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):
 	LValue(_compilerContext, _declaration.annotation().type),
 	m_baseStackOffset(m_context.baseStackOffsetOfVariable(_declaration)),
@@ -198,15 +197,17 @@ void ImmutableItem::setToZero(SourceLocation const&, bool _removeReference) cons
 	m_context << Instruction::POP;
 }
 
-StorageItem::StorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):
-	StorageItem(_compilerContext, *_declaration.annotation().type)
+template<bool IsTransient>
+GenericStorageItem<IsTransient>::GenericStorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):
+	GenericStorageItem<IsTransient>(_compilerContext, *_declaration.annotation().type)
 {
 	solAssert(!_declaration.immutable(), "");
 	auto const& location = m_context.storageLocationOfVariable(_declaration);
 	m_context << location.first << u256(location.second);
 }
 
-StorageItem::StorageItem(CompilerContext& _compilerContext, Type const& _type):
+template<bool IsTransient>
+GenericStorageItem<IsTransient>::GenericStorageItem(CompilerContext& _compilerContext, Type const& _type):
 	LValue(_compilerContext, &_type)
 {
 	if (m_dataType->isValueType())
@@ -217,11 +218,13 @@ StorageItem::StorageItem(CompilerContext& _compilerContext, Type const& _type):
 	}
 }
 
-void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
+template<bool IsTransient>
+void GenericStorageItem<IsTransient>::retrieveValue(langutil::SourceLocation const&, bool _remove) const
 {
 	// stack: storage_key storage_offset
 	if (!m_dataType->isValueType())
 	{
+		solUnimplementedAssert(!IsTransient, "Transient storage reference types are not supported yet.");
 		solAssert(m_dataType->sizeOnStack() == 1, "Invalid storage ref size.");
 		if (_remove)
 			m_context << Instruction::POP; // remove byte offset
@@ -232,7 +235,7 @@ void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
 	if (!_remove)
 		CompilerUtils(m_context).copyToStackTop(sizeOnStack(), sizeOnStack());
 	if (m_dataType->storageBytes() == 32)
-		m_context << Instruction::POP << Instruction::SLOAD;
+		m_context << Instruction::POP << s_loadInstruction;
 	else
 	{
 		Type const* type = m_dataType;
@@ -240,12 +243,12 @@ void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
 			type = type->encodingType();
 		bool cleaned = false;
 		m_context
-			<< Instruction::SWAP1 << Instruction::SLOAD << Instruction::SWAP1
+			<< Instruction::SWAP1 << s_loadInstruction << Instruction::SWAP1
 			<< u256(0x100) << Instruction::EXP << Instruction::SWAP1 << Instruction::DIV;
 		if (type->category() == Type::Category::FixedPoint)
 			// implementation should be very similar to the integer case.
 			solUnimplemented("Not yet implemented - FixedPointType.");
-		else if (FunctionType const* fun = dynamic_cast<decltype(fun)>(type))
+		else if (auto const* fun = dynamic_cast<FunctionType const*>(type))
 		{
 			if (fun->kind() == FunctionType::Kind::External)
 			{
@@ -281,7 +284,8 @@ void StorageItem::retrieveValue(SourceLocation const&, bool _remove) const
 	}
 }
 
-void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _location, bool _move) const
+template<bool IsTransient>
+void GenericStorageItem<IsTransient>::storeValue(Type const& _sourceType, langutil::SourceLocation const& _location, bool _move) const
 {
 	CompilerUtils utils(m_context);
 	solAssert(m_dataType, "");
@@ -303,7 +307,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 			utils.convertType(_sourceType, *m_dataType, true);
 			m_context << Instruction::SWAP1;
 
-			m_context << Instruction::SSTORE;
+			m_context << s_storeInstruction;
 		}
 		else
 		{
@@ -311,7 +315,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 			m_context << u256(0x100) << Instruction::EXP;
 			// stack: value storage_ref multiplier
 			// fetch old value
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
+			m_context << Instruction::DUP2 << s_loadInstruction;
 			// stack: value storage_ref multiplier old_full_value
 			// clear bytes in old value
 			m_context
@@ -358,13 +362,14 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 			}
 			m_context  << Instruction::MUL << Instruction::OR;
 			// stack: value storage_ref updated_value
-			m_context << Instruction::SWAP1 << Instruction::SSTORE;
+			m_context << Instruction::SWAP1 << s_storeInstruction;
 			if (_move)
 				utils.popStackElement(*m_dataType);
 		}
 	}
 	else
 	{
+		solUnimplementedAssert(!IsTransient, "Transient storage reference types are not supported yet.");
 		solAssert(
 			_sourceType.category() == m_dataType->category(),
 			"Wrong type conversation for assignment."
@@ -445,16 +450,19 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 	}
 }
 
-void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
+template<bool IsTransient>
+void GenericStorageItem<IsTransient>::setToZero(langutil::SourceLocation const&, bool _removeReference) const
 {
 	if (m_dataType->category() == Type::Category::Array)
 	{
+		solUnimplementedAssert(!IsTransient, "Transient storage reference types are not supported yet.");
 		if (!_removeReference)
 			CompilerUtils(m_context).copyToStackTop(sizeOnStack(), sizeOnStack());
 		ArrayUtils(m_context).clearArray(dynamic_cast<ArrayType const&>(*m_dataType));
 	}
 	else if (m_dataType->category() == Type::Category::Struct)
 	{
+		solUnimplementedAssert(!IsTransient, "Transient storage reference types are not supported yet.");
 		// stack layout: storage_key storage_offset
 		// @todo this can be improved: use StorageItem for non-value types, and just store 0 in
 		// all slots that contain value types later.
@@ -484,14 +492,14 @@ void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
 			// offset should be zero
 			m_context
 				<< Instruction::POP << u256(0)
-				<< Instruction::SWAP1 << Instruction::SSTORE;
+				<< Instruction::SWAP1 << s_storeInstruction;
 		}
 		else
 		{
 			m_context << u256(0x100) << Instruction::EXP;
 			// stack: storage_ref multiplier
 			// fetch old value
-			m_context << Instruction::DUP2 << Instruction::SLOAD;
+			m_context << Instruction::DUP2 << s_loadInstruction;
 			// stack: storage_ref multiplier old_full_value
 			// clear bytes in old value
 			m_context
@@ -499,7 +507,7 @@ void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
 				<< Instruction::MUL;
 			m_context << Instruction::NOT << Instruction::AND;
 			// stack: storage_ref cleared_value
-			m_context << Instruction::SWAP1 << Instruction::SSTORE;
+			m_context << Instruction::SWAP1 << s_storeInstruction;
 		}
 	}
 }
@@ -610,3 +618,6 @@ void TupleObject::setToZero(SourceLocation const&, bool) const
 {
 	solAssert(false, "Tried to delete tuple.");
 }
+
+template class solidity::frontend::GenericStorageItem<false>;
+template class solidity::frontend::GenericStorageItem<true>;
diff --git a/libsolidity/codegen/LValue.h b/libsolidity/codegen/LValue.h
index 9bf0d1c05c..430419727b 100644
--- a/libsolidity/codegen/LValue.h
+++ b/libsolidity/codegen/LValue.h
@@ -26,6 +26,7 @@
 #include <libsolidity/codegen/ArrayUtils.h>
 #include <libsolutil/Common.h>
 #include <liblangutil/SourceLocation.h>
+#include <libevmasm/Instruction.h>
 #include <memory>
 #include <vector>
 
@@ -149,17 +150,18 @@ class ImmutableItem: public LValue
 };
 
 /**
- * Reference to some item in storage. On the stack this is <storage key> <offset_inside_value>,
+ * Reference to some item in storage/transient storage. On the stack this is <storage key> <offset_inside_value>,
  * where 0 <= offset_inside_value < 32 and an offset of i means that the value is multiplied
  * by 2**i before storing it.
  */
-class StorageItem: public LValue
+template<bool IsTransient>
+class GenericStorageItem : public LValue
 {
 public:
 	/// Constructs the LValue and pushes the location of @a _declaration onto the stack.
-	StorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration);
+	GenericStorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration);
 	/// Constructs the LValue and assumes that the storage reference is already on the stack.
-	StorageItem(CompilerContext& _compilerContext, Type const& _type);
+	GenericStorageItem(CompilerContext& _compilerContext, Type const& _type);
 	unsigned sizeOnStack() const override { return 2; }
 	void retrieveValue(langutil::SourceLocation const& _location, bool _remove = false) const override;
 	void storeValue(
@@ -171,7 +173,14 @@ class StorageItem: public LValue
 		langutil::SourceLocation const& _location = {},
 		bool _removeReference = true
 	) const override;
+private:
+	static constexpr evmasm::Instruction s_storeInstruction = IsTransient ? evmasm::Instruction::TSTORE : evmasm::Instruction::SSTORE;
+	static constexpr evmasm::Instruction s_loadInstruction = IsTransient ? evmasm::Instruction::TLOAD : evmasm::Instruction::SLOAD;
 };
+extern template class GenericStorageItem<false>;
+extern template class GenericStorageItem<true>;
+using StorageItem = GenericStorageItem<false>;
+using TransientStorageItem = GenericStorageItem<true>;
 
 /**
  * Reference to a single byte inside a storage byte array.
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 00c9fa196b..f495d97abd 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -110,7 +110,7 @@ std::string IRGenerator::generate(
 
 	solUnimplementedAssert(
 		ranges::all_of(_contract.stateVariables(), notTransient),
-		"Transient storage variables are not supported."
+		"Transient storage variables are not supported when compiling via IR."
 	);
 
 	auto subObjectSources = [&_otherYulSources](UniqueVector<ContractDefinition const*> const& _subObjects) -> std::string
@@ -1115,8 +1115,9 @@ void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionCon
 	m_context = std::move(newContext);
 
 	m_context.setMostDerivedContract(_contract);
-	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
+	for (auto const location: {DataLocation::Storage, DataLocation::Transient})
+		for (auto const& var: ContractType(_contract).stateVariables(location))
+			m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
 }
 
 std::string IRGenerator::dispenseLocationComment(ASTNode const& _node)
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
new file mode 100644
index 0000000000..8430fd558f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
@@ -0,0 +1 @@
+--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_inline_assembly/err
similarity index 90%
rename from test/cmdlineTests/evmasm_transient_storage_opcodes/err
rename to test/cmdlineTests/evmasm_transient_storage_inline_assembly/err
index a6cd56261e..5071bc457b 100644
--- a/test/cmdlineTests/evmasm_transient_storage_opcodes/err
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/err
@@ -1,5 +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:
+ --> evmasm_transient_storage_inline_assembly/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_inline_assembly/input.sol
similarity index 100%
rename from test/cmdlineTests/evmasm_transient_storage_opcodes/input.sol
rename to test/cmdlineTests/evmasm_transient_storage_inline_assembly/input.sol
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/output b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
similarity index 90%
rename from test/cmdlineTests/evmasm_transient_storage_opcodes/output
rename to test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
index 3d1eddc9ad..56dea1afb4 100644
--- a/test/cmdlineTests/evmasm_transient_storage_opcodes/output
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
@@ -1,5 +1,5 @@
 
-======= evmasm_transient_storage_opcodes/input.sol:C =======
+======= evmasm_transient_storage_inline_assembly/input.sol:C =======
 EVM assembly:
   0x80
   dup1
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/args b/test/cmdlineTests/evmasm_transient_storage_opcodes/args
deleted file mode 100644
index 552cea1ca1..0000000000
--- a/test/cmdlineTests/evmasm_transient_storage_opcodes/args
+++ /dev/null
@@ -1 +0,0 @@
---evm-version cancun --no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable/args b/test/cmdlineTests/evmasm_transient_storage_state_variable/args
new file mode 100644
index 0000000000..0df1b673eb
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable/args
@@ -0,0 +1 @@
+--no-cbor-metadata --optimize --asm --debug-info none
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable/input.sol b/test/cmdlineTests/evmasm_transient_storage_state_variable/input.sol
new file mode 100644
index 0000000000..7177bdb64f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    uint transient x;
+    function f() public {
+        x = x + 1;
+    }
+}
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable/output b/test/cmdlineTests/evmasm_transient_storage_state_variable/output
new file mode 100644
index 0000000000..e80eb3c57f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable/output
@@ -0,0 +1,86 @@
+
+======= evmasm_transient_storage_state_variable/input.sol:C =======
+EVM assembly:
+  mstore(0x40, 0x80)
+  callvalue
+  dup1
+  iszero
+  tag_1
+  jumpi
+  revert(0x00, 0x00)
+tag_1:
+  pop
+  dataSize(sub_0)
+  dup1
+  dataOffset(sub_0)
+  0x00
+  codecopy
+  0x00
+  return
+stop
+
+sub_0: assembly {
+      mstore(0x40, 0x80)
+      callvalue
+      dup1
+      iszero
+      tag_1
+      jumpi
+      revert(0x00, 0x00)
+    tag_1:
+      pop
+      jumpi(tag_2, lt(calldatasize, 0x04))
+      shr(0xe0, calldataload(0x00))
+      dup1
+      0x26121ff0
+      eq
+      tag_3
+      jumpi
+    tag_2:
+      revert(0x00, 0x00)
+    tag_3:
+      tag_4
+      tag_5
+      jump	// in
+    tag_4:
+      stop
+    tag_5:
+      tag_7
+      tload(0x00)
+      0x01
+      tag_8
+      jump	// in
+    tag_7:
+      dup1
+      0x00
+      tstore
+      pop
+      jump	// out
+    tag_8:
+      dup1
+      dup3
+      add
+      dup1
+      dup3
+      gt
+      iszero
+      tag_11
+      jumpi
+      0x4e487b71
+      0xe0
+      shl
+      0x00
+      mstore
+      0x11
+      0x04
+      mstore
+      0x24
+      0x00
+      revert
+    tag_11:
+      swap3
+      swap2
+      pop
+      pop
+      jump	// out
+}
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
new file mode 100644
index 0000000000..00dcc37773
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
@@ -0,0 +1 @@
+--no-cbor-metadata --ir-optimized --debug-info none
\ No newline at end of file
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
new file mode 100644
index 0000000000..2f81d6cd3d
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
@@ -0,0 +1 @@
+Error: Transient storage variables are not supported when compiling via IR.
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/input.sol b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/input.sol
new file mode 100644
index 0000000000..7177bdb64f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    uint transient x;
+    function f() public {
+        x = x + 1;
+    }
+}
diff --git a/test/libsolidity/ASTPropertyTest.cpp b/test/libsolidity/ASTPropertyTest.cpp
index 05c9b8786d..3419d51c57 100644
--- a/test/libsolidity/ASTPropertyTest.cpp
+++ b/test/libsolidity/ASTPropertyTest.cpp
@@ -43,7 +43,7 @@ using namespace solidity;
 using namespace std::string_literals;
 
 ASTPropertyTest::ASTPropertyTest(std::string const& _filename):
-	TestCase(_filename)
+	EVMVersionRestrictedTestCase(_filename)
 {
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
 		BOOST_THROW_EXCEPTION(std::runtime_error("Not a Solidity file: \"" + _filename + "\"."));
diff --git a/test/libsolidity/ASTPropertyTest.h b/test/libsolidity/ASTPropertyTest.h
index 6130cedb29..9d6414e775 100644
--- a/test/libsolidity/ASTPropertyTest.h
+++ b/test/libsolidity/ASTPropertyTest.h
@@ -35,7 +35,7 @@ namespace solidity::frontend::test
 
 using StringPair = std::pair<std::string, std::string>;
 
-class ASTPropertyTest: public TestCase
+class ASTPropertyTest: public EVMVersionRestrictedTestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)
diff --git a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
index cfdda3813c..57e160fcf9 100644
--- a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
+++ b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
@@ -20,6 +20,7 @@ function h() pure returns (uint) {
 
 contract C {
     uint z = 0;
+    uint transient t;
 
     function modifyStateVarZ() public returns (uint) {
         z = type(uint).max;
@@ -117,6 +118,12 @@ contract C {
         for (z = 1; z < 2048; ++z) {
             modifyStateVarZ();
         }
+        /// StorageStateVarCounter: isSimpleCounterLoop
+        for (z = 1; z < 2048; ++z) {
+        }
+        /// TransientStateVarCounter: isSimpleCounterLoop
+        for (t = 1; t < 2048; ++t) {
+        }
         /// NonIntegerCounter: isSimpleCounterLoop
         for (address i = address(0x123); i < address(this); i = address(0x123 + 1)) {
         }
@@ -135,6 +142,8 @@ contract C {
         }
     }
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // AdditionLoopExpression: false
 // ShortHandAdditionLoopExpression: false
@@ -160,6 +169,8 @@ contract C {
 // LiteralDifferentCommonTypeConditionRHS: false
 // StateVarCounterModifiedFunctionConditionRHS: false
 // StateVarCounterModifiedFunctionLoopBody: false
+// StorageStateVarCounter: false
+// TransientStateVarCounter: false
 // NonIntegerCounter: false
 // AssemblyAfterAssignmentToCounter: false
 // ExpressionIncrement: false
diff --git a/test/libsolidity/astPropertyTests/transient_data_location.sol b/test/libsolidity/astPropertyTests/transient_data_location.sol
index be220a366b..327564dab1 100644
--- a/test/libsolidity/astPropertyTests/transient_data_location.sol
+++ b/test/libsolidity/astPropertyTests/transient_data_location.sol
@@ -7,6 +7,8 @@ contract C {
     uint y;
 
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // TransientDataLocation: transient
 // TransientVarName: x
diff --git a/test/libsolidity/semanticTests/getters/transient_value_types.sol b/test/libsolidity/semanticTests/getters/transient_value_types.sol
new file mode 100644
index 0000000000..cc345cb912
--- /dev/null
+++ b/test/libsolidity/semanticTests/getters/transient_value_types.sol
@@ -0,0 +1,15 @@
+contract C {
+    int8 public transient x;
+
+    function f() public returns(int8) {
+        x = -1;
+        return this.x();
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// x() -> 0
+// f() -> -1
+// x() -> 0
diff --git a/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol b/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
new file mode 100644
index 0000000000..5e6b3f0543
--- /dev/null
+++ b/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
@@ -0,0 +1,23 @@
+contract C {
+    int8 public transient x;
+
+    function f() public returns(int8) {
+        x = -1;
+        return this.h();
+    }
+    function g() public {
+        x = x - 1;
+    }
+    function h() public returns(int8) {
+        this.g();
+        return this.x();
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// x() -> 0
+// f() -> -2
+// h() -> -1
+// x() -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
new file mode 100644
index 0000000000..86463473bd
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
@@ -0,0 +1,23 @@
+contract C {
+    uint16 transient x;
+    uint16 public transient y;
+    uint256 public transient z;
+
+    function f() public returns (uint256) {
+        uint256 offset;
+        assembly {
+            function f() -> o1 {
+                tstore(z.slot, 7)
+                o1 := y.offset
+            }
+            offset := f()
+        }
+        assert(offset == 2);
+        return z;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 7
diff --git a/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol b/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
new file mode 100644
index 0000000000..a20c8403ef
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
@@ -0,0 +1,23 @@
+contract test {
+	uint value1;
+	uint transient value2;
+	function f(uint x, uint y) public returns (uint w) {
+		uint value3 = y;
+		value1 += x;
+		value3 *= x;
+		value2 += value3 + value1;
+		return value2 += 7;
+	}
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f(uint256,uint256): 0, 6 -> 7
+// f(uint256,uint256): 1, 3 -> 11
+// f(uint256,uint256): 2, 25 -> 0x3c
+// f(uint256,uint256): 3, 69 -> 0xdc
+// f(uint256,uint256): 4, 84 -> 353
+// f(uint256,uint256): 5, 2 -> 0x20
+// f(uint256,uint256): 6, 51 -> 334
+// f(uint256,uint256): 7, 48 -> 371
diff --git a/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol b/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
new file mode 100644
index 0000000000..ac32eee1cd
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
@@ -0,0 +1,16 @@
+contract C {
+    int transient x;
+    function f() public returns (int) {
+        ++x;
+        ++x;
+        --x;
+        x++;
+        x--;
+        return x;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 1
diff --git a/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol b/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
new file mode 100644
index 0000000000..5f584fc898
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
@@ -0,0 +1,13 @@
+contract C {
+    uint transient x;
+    function f() public returns (uint) {
+        x = 10;
+        delete x;
+        return x;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol b/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
new file mode 100644
index 0000000000..56a69649ee
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
@@ -0,0 +1,17 @@
+contract C {
+    function () external transient f;
+    function g() external {
+    }
+
+    function test() public returns (bool) {
+        assert(f != this.g);
+        f = this.g;
+
+        return f == this.g;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
new file mode 100644
index 0000000000..6a388b3ee1
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
@@ -0,0 +1,21 @@
+contract C {
+    address transient a;
+    function f() public returns (uint) {
+        a = msg.sender;
+        return a.balance;
+    }
+    function g() public returns (uint) {
+        return a.balance;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// constructor() ->
+// gas legacy: 59027
+// gas legacy code: 70400
+// account: 0 -> 0x1212121212121212121212121212120000000012
+// balance: 0x1212121212121212121212121212120000000012 -> 1267650600228229401496703205376
+// f() -> 1267650600228229401496703205376
+// g() -> 0
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol b/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
new file mode 100644
index 0000000000..a472212d40
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
@@ -0,0 +1,18 @@
+contract C {
+    enum Pets { Dog, Cat, Bird, Fish }
+    Pets transient myPet;
+
+    function f() public {
+        myPet = Pets.Bird;
+        this.g();
+        assert(myPet == Pets.Cat);
+    }
+    function g() public {
+        myPet = Pets.Cat;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() ->
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable.sol b/test/libsolidity/semanticTests/variables/transient_state_variable.sol
new file mode 100644
index 0000000000..71ed212d0b
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint transient public x;
+
+    function f() public {
+        x = 8;
+    }
+    function g() public returns (uint) {
+        x = 0;
+        this.f();
+        return x;
+    }
+    function h() public returns (uint) {
+        return x;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// x() -> 0
+// g() -> 8
+// h() -> 0
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
new file mode 100644
index 0000000000..d1f0cc5797
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
@@ -0,0 +1,17 @@
+contract C {
+    uint8 transient x;
+    function f() public returns(uint256 r) {
+        uint8 y;
+        assembly { y := 0xFFFF }
+        x = y;
+        assembly {
+            r := tload(x.slot)
+        }
+
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 0xff
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
new file mode 100644
index 0000000000..425be55009
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
@@ -0,0 +1,15 @@
+contract C {
+    uint8 transient x;
+    function f() public returns(uint256 r) {
+        assembly {
+            tstore(x.slot, 0xFFFF)
+        }
+       return x;
+
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 0xff
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
new file mode 100644
index 0000000000..6cf05068e3
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
@@ -0,0 +1,32 @@
+contract C {
+    uint256 y;
+    uint256 transient x;
+    int8 transient w;
+    int z;
+    address transient a;
+    function f() public returns(uint256 s, uint256 o) {
+        assembly {
+            s := x.slot
+            o := x.offset
+        }
+    }
+    function g() public returns(uint256 s, uint256 o) {
+        assembly {
+            s := w.slot
+            o := w.offset
+        }
+    }
+    function h() public returns(uint256 s, uint256 o) {
+        assembly {
+            s := a.slot
+            o := a.offset
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 0, 0
+// g() -> 1, 0
+// h() -> 1, 1
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
new file mode 100644
index 0000000000..1b5180635c
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
@@ -0,0 +1,21 @@
+contract C {
+    uint transient x;
+    uint y;
+    uint transient w;
+    uint z;
+
+    function f() public returns (uint, uint, uint) {
+        x = 1;
+        y = 2;
+        w = 3;
+        z = 4;
+
+        (x, y, w) = (y, w, z);
+        return (x, y, w);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// f() -> 2, 3, 4
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
new file mode 100644
index 0000000000..2f49a32b04
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
@@ -0,0 +1,23 @@
+type MyInt is int256;
+contract C {
+    MyInt transient public x;
+
+    function f() public {
+        x = MyInt.wrap(2);
+    }
+    function g() public returns (MyInt) {
+        x = MyInt.wrap(0);
+        this.f();
+        return x;
+    }
+    function h() public returns (MyInt) {
+        return x;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// x() -> 0
+// g() -> 2
+// h() -> 0
diff --git a/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol b/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
new file mode 100644
index 0000000000..aa38286015
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
@@ -0,0 +1,24 @@
+contract C {
+    bool transient locked;
+    modifier nonReentrant {
+        require(!locked, "Reentrancy attempt");
+        locked = true;
+        _;
+        locked = false;
+    }
+
+    function test(address newAddress, bool reentrancy) nonReentrant public {
+        if (reentrancy)
+            reentrantCall(newAddress);
+    }
+
+    function reentrantCall(address a) public {
+        this.test(a, false);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// compileViaYul: false
+// ----
+// test(address,bool): 0x1234abcd, true -> FAILURE, hex"08c379a0", 0x20, 0x12, "Reentrancy attempt"
+// test(address,bool): 0x1234abcd, false ->
diff --git a/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
index 15913360c3..f30494286f 100644
--- a/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_transient_state_variable.sol
@@ -1,6 +1,8 @@
 contract C {
     int constant public transient x = 0;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // DeclarationError 2197: (17-52): Transient cannot be used as data location for constant or immutable variables.
 // DeclarationError 9825: (17-52): Initialization of transient storage state variables is not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
index 7a3caa86e5..b1b436732a 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_dynamic_array_state_variable.sol
@@ -1,5 +1,7 @@
 contract C {
 	uint[] transient x;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
index 10b942e236..ca3898f29e 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_fixed_array_state_variable.sol
@@ -1,5 +1,7 @@
 contract C {
 	uint[3] transient x;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
index 5645629088..1d0ccf0c40 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_function_type.sol
@@ -6,5 +6,6 @@ contract C {
     function () internal transient internal fiti;
     function () internal internal transient fiit;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
-// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
index 2a21b3e00a..6c7822bf31 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_mapping_state_variable.sol
@@ -1,6 +1,7 @@
 contract C {
 	mapping(uint => uint) transient y;
 }
-
+// ====
+// EVMVersion: >=cancun
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
index f598fb72c8..45ad6e6c5e 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_state_variable_visibility.sol
@@ -7,5 +7,6 @@ contract C {
     uint transient internal ti;
     uint transient private tprv;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
-// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_storage_variable_pre_cancun.sol b/test/libsolidity/syntaxTests/dataLocations/transient_storage_variable_pre_cancun.sol
new file mode 100644
index 0000000000..8eb4dd565d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_storage_variable_pre_cancun.sol
@@ -0,0 +1,7 @@
+contract C {
+    uint transient x;
+}
+// ====
+// EVMVersion: <cancun
+// ----
+// DeclarationError 7985: (17-33): Transient storage is not supported by EVM versions older than cancun.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
index f89608be42..245832ea63 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_struct_state_variable.sol
@@ -6,5 +6,7 @@ struct S {
 contract C {
 	S transient s;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // UnimplementedFeatureError 1834: Transient data location is only supported for value types.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
index d2eac46f7b..65188a9006 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables.sol
@@ -7,5 +7,6 @@ contract C {
 	uint transient x;
 	bytes32 transient y;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
-// UnimplementedFeatureError 1834: Transient storage variables are not supported.
diff --git a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol
index 570642485e..080ca89ccd 100644
--- a/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/transient_value_type_state_variables_initialization.sol
@@ -5,6 +5,8 @@ contract C {
 	address transient a = address(0xABC);
 	bool transient b = x > 0 ? false : true;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // DeclarationError 9825: (30-51): Initialization of transient storage state variables is not supported.
 // DeclarationError 9825: (54-90): Initialization of transient storage state variables is not supported.
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol b/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
index a3d93848d9..f4b7e078ea 100644
--- a/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
+++ b/test/libsolidity/syntaxTests/immutable/state_var_transient_data_location.sol
@@ -1,5 +1,7 @@
 contract C {
     uint public immutable transient x;
 }
+// ====
+// EVMVersion: >=cancun
 // ----
 // DeclarationError 2197: (17-50): Transient cannot be used as data location for constant or immutable variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
index eab2d2b4ef..a6797e05a3 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 6617: (112-120): The suffixes .offset and .slot can only be used on non-constant storage variables.
+// TypeError 6617: (112-120): The suffixes .offset and .slot can only be used on non-constant storage or transient storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
index b01f1ee21f..bcc5eb87c7 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 1408: (89-90): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (89-90): Only local variables are supported. To access state variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
index 64cfc86236..7c1265e974 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
@@ -10,4 +10,4 @@ contract test {
     }
 }
 // ----
-// TypeError 1408: (80-81): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (80-81): Only local variables are supported. To access state variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/transient_storage_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/transient_storage_assignment.sol
new file mode 100644
index 0000000000..4cab6ffa2a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/transient_storage_assignment.sol
@@ -0,0 +1,12 @@
+contract test {
+    uint transient x;
+    function f() public {
+        assembly {
+            x := 2
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 1408: (95-96): Only local variables are supported. To access state variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
index b1f8ba435e..0507166091 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// TypeError 1408: (75-76): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (75-76): Only local variables are supported. To access state variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
index f4ed7c3787..5fa0eedbb8 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// TypeError 4713: (84-90): State variables cannot be assigned to - you have to use "sstore()".
-// TypeError 4713: (108-116): State variables cannot be assigned to - you have to use "sstore()".
+// TypeError 4713: (84-90): State variables cannot be assigned to - you have to use "sstore()" or "tstore()".
+// TypeError 4713: (108-116): State variables cannot be assigned to - you have to use "sstore()" or "tstore()".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
index d2ca4d7cbf..2876ac726e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// DeclarationError 9467: (118-124): Identifier not found. Use ".slot" and ".offset" to access storage variables.
-// DeclarationError 9467: (142-150): Identifier not found. Use ".slot" and ".offset" to access storage variables.
+// DeclarationError 9467: (118-124): Identifier not found. Use ".slot" and ".offset" to access storage or transient storage variables.
+// DeclarationError 9467: (142-150): Identifier not found. Use ".slot" and ".offset" to access storage or transient storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_value_assignment_statevar.sol b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_value_assignment_statevar.sol
new file mode 100644
index 0000000000..704a771f7e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_value_assignment_statevar.sol
@@ -0,0 +1,14 @@
+contract C {
+    uint transient x;
+    fallback() external {
+        assembly {
+            x.slot := 1
+            x.offset := 2
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 4713: (92-98): State variables cannot be assigned to - you have to use "sstore()" or "tstore()".
+// TypeError 4713: (116-124): State variables cannot be assigned to - you have to use "sstore()" or "tstore()".
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/state_variables_both_transient_storage_identical_name.sol b/test/libsolidity/syntaxTests/variableDeclaration/state_variables_both_transient_storage_identical_name.sol
new file mode 100644
index 0000000000..d34c1153a6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/variableDeclaration/state_variables_both_transient_storage_identical_name.sol
@@ -0,0 +1,8 @@
+contract C {
+    uint public x;
+    uint public transient x;
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// DeclarationError 2333: (36-59): Identifier already declared.

From 668adbeebd47c8ed581265419a72dceacaf256f0 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 9 Sep 2024 22:48:17 +0200
Subject: [PATCH 1061/1140] Remove STRICT_NLOHMANN_JSON_VERSION_CHECK leftover.

---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7770d29e63..7c36ff73b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,10 +73,6 @@ if (PROFILE_OPTIMIZER_STEPS)
     add_definitions(-DPROFILE_OPTIMIZER_STEPS)
 endif()
 
-if (STRICT_NLOHMANN_JSON_VERSION)
-	add_definitions(-DSTRICT_NLOHMANN_JSON_VERSION_CHECK)
-endif()
-
 # Figure out what compiler and system are we using
 include(EthCompilerSettings)
 

From 16b244791392cb0ff9d8da19db0cf0d209cd498d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 9 Sep 2024 16:20:50 +0200
Subject: [PATCH 1062/1140] Upgrade jobs to run on Ubuntu 2404

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8384f2eeac..68626408f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1293,7 +1293,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_ubu_soltest_all: &t_ubu_soltest_all
-    <<: *base_ubuntu2204_large
+    <<: *base_ubuntu2404_large
     parallelism: 50
     steps:
       - soltest_all
@@ -1335,10 +1335,10 @@ jobs:
       - soltest
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
-    <<: *base_ubuntu2204_clang
+    <<: *base_ubuntu2404_clang
     parallelism: 20
     environment:
-      <<: *base_ubuntu2204_clang_env
+      <<: *base_ubuntu2404_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,
@@ -1353,7 +1353,7 @@ jobs:
     <<: *t_ubu_soltest_all
 
   t_ubu_cli: &t_ubu_cli
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     steps:
       - cmdline_tests

From 1d58415f1ed8377404d6597621f1e364a3c5be4e Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Fri, 13 Sep 2024 10:11:11 +0200
Subject: [PATCH 1063/1140] Update `evmc to` `12.0.0` and `evmone` to `0.12.0`

---
 .circleci/config.yml                  | 12 ++--
 .circleci/osx_install_dependencies.sh | 28 ++------
 scripts/install_evmone.ps1            |  2 +-
 test/Common.h                         |  6 +-
 test/evmc/README.md                   |  2 +-
 test/evmc/bytes.hpp                   | 93 +++++++++++++++++++++++++++
 test/evmc/evmc.h                      | 65 +++++++++++++------
 test/evmc/evmc.hpp                    |  3 -
 test/evmc/helpers.h                   |  2 +
 test/evmc/hex.hpp                     |  8 +--
 test/evmc/mocked_host.hpp             |  5 +-
 11 files changed, 160 insertions(+), 66 deletions(-)
 create mode 100644 test/evmc/bytes.hpp

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68626408f2..931ce476a3 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-24
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b8b645fa7ab40d55f2d16eac295d16ca01ec51d32be7d668ae6eaecd47dbd763"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-25
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b3f321fb2d8e7a41ca9328672061c1840e5cd3fb5be503aa158d1c508deacf0a"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-9
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:80247de9655b1f39afd4ac22b14266bc9b9a0d64b283ae8fb9cb5b8250e4e77d"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-10
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ba2d878c26d681a7d6c1922258b47c2e5dd61d0e46ab4c6a4862b473e61997b6"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-8
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:2662376fe0e1ec2d346495a19a6d64508c1048d5a7325d8600c33c343fa64a0f"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-9
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:703cdad5fa5c8686a3080ebb1aea1485ded2446561bf56e2945a87f2fa20a446"
   ubuntu-2404-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-1
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 5436c31fe0..dff85b489c 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -112,26 +112,10 @@ then
   rm -rf "$z3_dir"
 
   # evmone
-  evmone_version="0.11.0"
-  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
+  evmone_version="0.12.0"
+  evmone_package="evmone-${evmone_version}-darwin-arm64.tar.gz"
+  wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
+  validate_checksum "$evmone_package" e164e0d2b985cc1cca07b501538b2e804bf872d1d8d531f9241d518a886234a6
+  sudo tar xzpf "$evmone_package" -C /usr/local
+  rm "$evmone_package"
 fi
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
index 5864f24915..7295afa01e 100644
--- a/scripts/install_evmone.ps1
+++ b/scripts/install_evmone.ps1
@@ -3,6 +3,6 @@ $ErrorActionPreference = "Stop"
 # Needed for Invoke-WebRequest to work via CI.
 $progressPreference = "silentlyContinue"
 
-Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-windows-amd64.zip" -OutFile "evmone.zip"
+Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-windows-amd64.zip" -OutFile "evmone.zip"
 tar -xf evmone.zip "bin/evmone.dll"
 mv bin/evmone.dll deps/
diff --git a/test/Common.h b/test/Common.h
index b5963c8875..3adb980a0d 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -34,13 +34,13 @@ namespace solidity::test
 
 #ifdef _WIN32
 static constexpr auto evmoneFilename = "evmone.dll";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-windows-amd64.zip";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.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.11.0/evmone-0.11.0-darwin-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.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.11.0/evmone-0.11.0-linux-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz";
 #endif
 
 struct ConfigException: public util::Exception {};
diff --git a/test/evmc/README.md b/test/evmc/README.md
index 9381b4f53e..35fb11901c 100644
--- a/test/evmc/README.md
+++ b/test/evmc/README.md
@@ -1,6 +1,6 @@
 # EVMC
 
-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).
+This is an import of [EVMC](https://github.com/ethereum/evmc) version [12.0.0](https://github.com/ethereum/evmc/releases/tag/v12.0.0).
 
 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)
diff --git a/test/evmc/bytes.hpp b/test/evmc/bytes.hpp
new file mode 100644
index 0000000000..34ddc2f2cf
--- /dev/null
+++ b/test/evmc/bytes.hpp
@@ -0,0 +1,93 @@
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2024 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
+#pragma once
+
+#include <algorithm>
+#include <cstring>
+#include <string>
+#include <string_view>
+
+namespace evmc
+{
+/// The char traits for byte-like types.
+///
+/// See: https://en.cppreference.com/w/cpp/string/char_traits.
+template <typename T>
+struct byte_traits : std::char_traits<char>
+{
+    static_assert(sizeof(T) == 1, "type must be a byte");
+
+    using char_type = T;  ///< The byte type.
+
+    /// Assigns c2 to c1.
+    static constexpr void assign(char_type& c1, const char_type& c2) { c1 = c2; }
+
+    /// Assigns value to each byte in [ptr, ptr+count).
+    static constexpr char_type* assign(char_type* ptr, std::size_t count, char_type value)
+    {
+        std::fill_n(ptr, count, value);
+        return ptr;
+    }
+
+    /// Returns true if bytes are equal.
+    static constexpr bool eq(char_type a, char_type b) { return a == b; }
+
+    /// Returns true if byte a is less than byte b.
+    static constexpr bool lt(char_type a, char_type b) { return a < b; }
+
+    /// Copies count bytes from src to dest. Performs correctly even if ranges overlap.
+    static constexpr char_type* move(char_type* dest, const char_type* src, std::size_t count)
+    {
+        if (dest < src)
+            std::copy_n(src, count, dest);
+        else if (src < dest)
+            std::copy_backward(src, src + count, dest + count);
+        return dest;
+    }
+
+    /// Copies count bytes from src to dest. The ranges must not overlap.
+    static constexpr char_type* copy(char_type* dest, const char_type* src, std::size_t count)
+    {
+        std::copy_n(src, count, dest);
+        return dest;
+    }
+
+    /// Compares lexicographically the bytes in two ranges of equal length.
+    static constexpr int compare(const char_type* a, const char_type* b, std::size_t count)
+    {
+        for (; count != 0; --count, ++a, ++b)
+        {
+            if (lt(*a, *b))
+                return -1;
+            if (lt(*b, *a))
+                return 1;
+        }
+        return 0;
+    }
+
+    /// Returns the length of a null-terminated byte string.
+    // TODO: Not constexpr
+    static std::size_t length(const char_type* s)
+    {
+        return std::strlen(reinterpret_cast<const char*>(s));
+    }
+
+    /// Finds the value in the range of bytes and returns the pointer to the first occurrence
+    /// or nullptr if not found.
+    static constexpr const char_type* find(const char_type* s,
+                                           std::size_t count,
+                                           const char_type& value)
+    {
+        const auto end = s + count;
+        const auto p = std::find(s, end, value);
+        return p != end ? p : nullptr;
+    }
+};
+
+/// String of unsigned chars representing bytes.
+using bytes = std::basic_string<unsigned char, byte_traits<unsigned char>>;
+
+/// String view of unsigned chars representing bytes.
+using bytes_view = std::basic_string_view<unsigned char, byte_traits<unsigned char>>;
+}  // namespace evmc
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
index 571c97f474..bec847597c 100644
--- a/test/evmc/evmc.h
+++ b/test/evmc/evmc.h
@@ -44,7 +44,7 @@ enum
      *
      * @see @ref versioning
      */
-    EVMC_ABI_VERSION = 11
+    EVMC_ABI_VERSION = 12
 };
 
 
@@ -79,7 +79,8 @@ enum evmc_call_kind
                                 The value param ignored. */
     EVMC_CALLCODE = 2,     /**< Request CALLCODE. */
     EVMC_CREATE = 3,       /**< Request CREATE. */
-    EVMC_CREATE2 = 4       /**< Request CREATE2. Valid since Constantinople.*/
+    EVMC_CREATE2 = 4,      /**< Request CREATE2. Valid since Constantinople.*/
+    EVMC_EOFCREATE = 5     /**< Request EOFCREATE. Valid since Prague.*/
 };
 
 /** The flags for ::evmc_message. */
@@ -168,7 +169,8 @@ struct evmc_message
     /**
      * The optional value used in new contract address construction.
      *
-     * Needed only for a Host to calculate created address when kind is ::EVMC_CREATE2.
+     * Needed only for a Host to calculate created address when kind is ::EVMC_CREATE2 or
+     * ::EVMC_EOFCREATE.
      * Ignored in evmc_execute_fn().
      */
     evmc_bytes32 create2_salt;
@@ -179,7 +181,7 @@ struct evmc_message
      * 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.
+     * Ignored if kind is ::EVMC_CREATE, ::EVMC_CREATE2 or ::EVMC_EOFCREATE.
      *
      * In case of ::EVMC_CAPABILITY_PRECOMPILES implementation, this fields should be inspected
      * to identify the requested precompile.
@@ -187,24 +189,43 @@ struct evmc_message
      * Defined as `c` in the Yellow Paper.
      */
     evmc_address code_address;
+
+    /**
+     * The code to be executed.
+     */
+    const uint8_t* code;
+
+    /**
+     * The length of the code to be executed.
+     */
+    size_t code_size;
 };
 
+/** The hashed initcode used for TXCREATE instruction. */
+typedef struct evmc_tx_initcode
+{
+    evmc_bytes32 hash;   /**< The initcode hash. */
+    const uint8_t* code; /**< The code. */
+    size_t code_size;    /**< The length of the code. */
+} evmc_tx_initcode;
 
 /** 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_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). */
+    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). */
+    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). */
+    const evmc_tx_initcode* initcodes; /**< The array of transaction initcodes (TXCREATE). */
+    size_t initcodes_count;            /**< The number of transaction initcodes (TXCREATE). */
 };
 
 /**
@@ -1007,7 +1028,6 @@ 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,
@@ -1019,15 +1039,22 @@ enum evmc_revision
      */
     EVMC_PRAGUE = 13,
 
+    /**
+     * The Osaka revision.
+     *
+     * The future next revision after Prague.
+     */
+    EVMC_OSAKA = 14,
+
     /** The maximum EVM revision supported. */
-    EVMC_MAX_REVISION = EVMC_PRAGUE,
+    EVMC_MAX_REVISION = EVMC_OSAKA,
 
     /**
      * 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_SHANGHAI
+    EVMC_LATEST_STABLE_REVISION = EVMC_CANCUN
 };
 
 
diff --git a/test/evmc/evmc.hpp b/test/evmc/evmc.hpp
index 91386c46f8..2dfabf8260 100644
--- a/test/evmc/evmc.hpp
+++ b/test/evmc/evmc.hpp
@@ -20,9 +20,6 @@ static_assert(EVMC_LATEST_STABLE_REVISION <= EVMC_MAX_REVISION,
 /// @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.
diff --git a/test/evmc/helpers.h b/test/evmc/helpers.h
index 683567ef13..a5f6c3637f 100644
--- a/test/evmc/helpers.h
+++ b/test/evmc/helpers.h
@@ -301,6 +301,8 @@ static inline const char* evmc_revision_to_string(enum evmc_revision rev)
         return "Cancun";
     case EVMC_PRAGUE:
         return "Prague";
+    case EVMC_OSAKA:
+        return "Osaka";
     }
     return "<unknown>";
 }
diff --git a/test/evmc/hex.hpp b/test/evmc/hex.hpp
index 31bbe51953..a2505b71fe 100644
--- a/test/evmc/hex.hpp
+++ b/test/evmc/hex.hpp
@@ -3,6 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 #pragma once
 
+#include <evmc/bytes.hpp>
 #include <evmc/filter_iterator.hpp>
 #include <cstdint>
 #include <optional>
@@ -11,13 +12,6 @@
 
 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
 {
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
index 205a136b38..2b37113ad1 100644
--- a/test/evmc/mocked_host.hpp
+++ b/test/evmc/mocked_host.hpp
@@ -6,16 +6,13 @@
 #include <evmc/evmc.hpp>
 #include <algorithm>
 #include <cassert>
-#include <map>
 #include <string>
+#include <map>
 #include <unordered_map>
 #include <vector>
 
 namespace evmc
 {
-/// The string of bytes.
-using bytes = std::basic_string<uint8_t>;
-
 /// Extended value (with original value and access flag) for account storage.
 struct StorageValue
 {

From 322d6561360eecf71ce39f6383bc1d95f3083d54 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Mon, 16 Sep 2024 18:20:44 +0530
Subject: [PATCH 1064/1140] Make it easier for users to discover that copying
 arrays and structs to storage is unimplemented only in legacy codegen and
 works via IR (#15432)

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

diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index e653239cfa..5dd94aebc4 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -224,7 +224,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 				else if (sourceBaseType->isValueType())
 					CompilerUtils(_context).loadFromMemoryDynamic(*sourceBaseType, fromCalldata, true, false);
 				else
-					solUnimplemented("Copying of type " + _sourceType.toString(false) + " to storage not yet supported.");
+					solUnimplemented("Copying of type " + _sourceType.toString(false) + " to storage is not supported in legacy (only supported by the IR pipeline). Hint: try compiling with `--via-ir` (CLI) or the equivalent `viaIR: true` (Standard JSON)");
 				// stack: target_ref target_data_end source_data_pos target_data_pos source_data_end [target_byte_offset] [source_byte_offset] <source_value>...
 				assertThrow(
 					2 + byteOffsetSize + sourceBaseType->sizeOnStack() <= 16,

From 2e6a2d2ba4f0c75c027a949ae57df73b7885c2b7 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 9 Sep 2024 10:26:22 +0200
Subject: [PATCH 1065/1140] Add SSACFG loop nesting forest

---
 libyul/CMakeLists.txt                         |   2 +
 .../backends/evm/SSACFGLoopNestingForest.cpp  |  90 +++++++
 libyul/backends/evm/SSACFGLoopNestingForest.h |  61 +++++
 libyul/backends/evm/SSACFGTopologicalSort.cpp |  39 ++-
 libyul/backends/evm/SSACFGTopologicalSort.h   |  22 +-
 .../yulSSAControlFlowGraph/nested_for.yul     | 231 ++++++++++++++++++
 6 files changed, 408 insertions(+), 37 deletions(-)
 create mode 100644 libyul/backends/evm/SSACFGLoopNestingForest.cpp
 create mode 100644 libyul/backends/evm/SSACFGLoopNestingForest.h
 create mode 100644 test/libyul/yulSSAControlFlowGraph/nested_for.yul

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 704e04921b..e790f6c179 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -65,6 +65,8 @@ add_library(yul
 	backends/evm/NoOutputAssembly.cpp
 	backends/evm/OptimizedEVMCodeTransform.cpp
 	backends/evm/OptimizedEVMCodeTransform.h
+	backends/evm/SSACFGLoopNestingForest.cpp
+	backends/evm/SSACFGLoopNestingForest.h
 	backends/evm/SSACFGTopologicalSort.cpp
 	backends/evm/SSACFGTopologicalSort.h
 	backends/evm/SSAControlFlowGraph.h
diff --git a/libyul/backends/evm/SSACFGLoopNestingForest.cpp b/libyul/backends/evm/SSACFGLoopNestingForest.cpp
new file mode 100644
index 0000000000..b285978134
--- /dev/null
+++ b/libyul/backends/evm/SSACFGLoopNestingForest.cpp
@@ -0,0 +1,90 @@
+/*
+	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/backends/evm/SSACFGLoopNestingForest.h>
+
+using namespace solidity::yul;
+
+SSACFGLoopNestingForest::SSACFGLoopNestingForest(ForwardSSACFGTopologicalSort const& _sort):
+	m_sort(_sort),
+	m_cfg(_sort.cfg()),
+	m_vertexPartition(m_cfg.numBlocks()),
+	m_loopParents(m_cfg.numBlocks(), std::numeric_limits<size_t>::max())
+{
+	auto dfsOrder = m_sort.preOrder();
+	// we go from innermost to outermost
+	std::reverse(dfsOrder.begin(), dfsOrder.end());
+
+	for (auto const& blockId: dfsOrder)
+		findLoop(blockId);
+
+	// get the root nodes
+	for (auto loopHeader: m_loopNodes)
+	{
+		while (m_loopParents[loopHeader] != std::numeric_limits<size_t>::max())
+			loopHeader = m_loopParents[loopHeader];
+		m_loopRootNodes.insert(loopHeader);
+	}
+}
+
+void SSACFGLoopNestingForest::findLoop(size_t const _potentialHeader)
+{
+	if (m_sort.backEdgeTargets().count(_potentialHeader) > 0)
+	{
+		std::set<size_t> loopBody;
+		std::set<size_t> workList;
+		for (auto const pred: m_cfg.block(SSACFG::BlockId{_potentialHeader}).entries)
+		{
+			auto const representative = m_vertexPartition.find(pred.value);
+			if (
+				representative != _potentialHeader &&
+				m_sort.backEdge(SSACFG::BlockId{pred}, SSACFG::BlockId{_potentialHeader})
+			)
+				workList.insert(representative);
+		}
+
+		while (!workList.empty())
+		{
+			auto const y = workList.extract(workList.begin()).value();
+			loopBody.insert(y);
+
+			for (auto const& predecessor: m_cfg.block(SSACFG::BlockId{y}).entries)
+			{
+				if (!m_sort.backEdge(SSACFG::BlockId{predecessor}, SSACFG::BlockId{y}))
+				{
+					auto const predecessorHeader = m_vertexPartition.find(predecessor.value);
+					if (predecessorHeader != _potentialHeader && loopBody.count(predecessorHeader) == 0)
+						workList.insert(predecessorHeader);
+				}
+			}
+		}
+
+		if (!loopBody.empty())
+			collapse(loopBody, _potentialHeader);
+	}
+}
+void SSACFGLoopNestingForest::collapse(std::set<size_t> const& _loopBody, size_t _loopHeader)
+{
+	for (auto const z: _loopBody)
+	{
+		m_loopParents[z] = _loopHeader;
+		m_vertexPartition.merge(_loopHeader, z, false);  // don't merge by size, loop header should be representative
+	}
+	yulAssert(m_vertexPartition.find(_loopHeader) == _loopHeader);  // representative was preserved
+	m_loopNodes.insert(_loopHeader);
+}
diff --git a/libyul/backends/evm/SSACFGLoopNestingForest.h b/libyul/backends/evm/SSACFGLoopNestingForest.h
new file mode 100644
index 0000000000..0aad6ab396
--- /dev/null
+++ b/libyul/backends/evm/SSACFGLoopNestingForest.h
@@ -0,0 +1,61 @@
+/*
+	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/backends/evm/SSACFGTopologicalSort.h>
+#include <libyul/backends/evm/SSAControlFlowGraph.h>
+
+#include <libsolutil/DisjointSet.h>
+
+#include <cstddef>
+#include <set>
+#include <vector>
+
+namespace solidity::yul
+{
+
+/// Constructs a loop nesting forest for an SSACFG using Tarjan's algorithm [1].
+///
+/// [1] Ramalingam, Ganesan. "Identifying loops in almost linear time."
+///     ACM Transactions on Programming Languages and Systems (TOPLAS) 21.2 (1999): 175-188.
+class SSACFGLoopNestingForest
+{
+public:
+	explicit SSACFGLoopNestingForest(ForwardSSACFGTopologicalSort const& _sort);
+
+	/// blocks which are not contained in a loop get assigned the loop parent numeric_limit<size_t>::max()
+	std::vector<size_t> const& loopParents() const { return m_loopParents; }
+	/// all loop nodes (entry blocks for loops), also nested ones
+	std::set<size_t> const& loopNodes() const { return m_loopNodes; }
+	/// root loop nodes in the forest for outer-most loops
+	std::set<size_t> const& loopRootNodes() const { return m_loopRootNodes; }
+private:
+	void findLoop(size_t _potentialHeader);
+	void collapse(std::set<size_t> const& _loopBody, size_t _loopHeader);
+
+	ForwardSSACFGTopologicalSort const& m_sort;
+	SSACFG const& m_cfg;
+
+	util::ContiguousDisjointSet m_vertexPartition;
+	std::vector<size_t> m_loopParents;
+	std::set<size_t> m_loopNodes;
+	std::set<size_t> m_loopRootNodes;
+};
+
+}
diff --git a/libyul/backends/evm/SSACFGTopologicalSort.cpp b/libyul/backends/evm/SSACFGTopologicalSort.cpp
index e0370aa275..5e3e0c0ec6 100644
--- a/libyul/backends/evm/SSACFGTopologicalSort.cpp
+++ b/libyul/backends/evm/SSACFGTopologicalSort.cpp
@@ -22,18 +22,17 @@ using namespace solidity::yul;
 
 ForwardSSACFGTopologicalSort::ForwardSSACFGTopologicalSort(SSACFG const& _cfg):
 	m_cfg(_cfg),
-	m_explored(m_cfg.numBlocks(), false),
-	m_reversedPostOrder(m_cfg.numBlocks(), std::numeric_limits<size_t>::max()),
-	m_preOrder(m_cfg.numBlocks(), std::numeric_limits<size_t>::max()),
-	m_maxSubtreePreOrder(m_cfg.numBlocks(), 0),
-	m_predecessors(m_cfg.numBlocks())
+	m_explored(m_cfg.numBlocks(), false), m_blockWisePreOrder(m_cfg.numBlocks(), 0),
+	m_blockWiseMaxSubtreePreOrder(m_cfg.numBlocks(), 0)
 {
+	yulAssert(m_cfg.entry.value == 0);
+	m_preOrder.reserve(m_cfg.numBlocks());
+	m_postOrder.reserve(m_cfg.numBlocks());
 	for (size_t id = 0; id < m_cfg.numBlocks(); ++id)
 	{
 		if (!m_explored[id])
 			dfs(id);
 	}
-	std::reverse(m_reversedPostOrder.begin(), m_reversedPostOrder.end());
 
 	for (auto const& [v1, v2]: m_potentialBackEdges)
 		if (ancestor(v2, v1))
@@ -43,40 +42,32 @@ ForwardSSACFGTopologicalSort::ForwardSSACFGTopologicalSort(SSACFG const& _cfg):
 void ForwardSSACFGTopologicalSort::dfs(size_t const _vertex) {
 	yulAssert(!m_explored[_vertex]);
 	m_explored[_vertex] = true;
-	m_preOrder[_vertex] = m_currentNode++;
-	m_maxSubtreePreOrder[_vertex] = m_preOrder[_vertex];
+	m_blockWisePreOrder[_vertex] = m_preOrder.size();
+	m_blockWiseMaxSubtreePreOrder[_vertex] = m_blockWisePreOrder[_vertex];
+	m_preOrder.push_back(_vertex);
 
 	m_cfg.block(SSACFG::BlockId{_vertex}).forEachExit([&](SSACFG::BlockId const& _exitBlock){
-		m_predecessors[_exitBlock.value].insert(_vertex);
 		if (!m_explored[_exitBlock.value])
 		{
 			dfs(_exitBlock.value);
-			m_maxSubtreePreOrder[_vertex] = std::max(m_maxSubtreePreOrder[_vertex], m_maxSubtreePreOrder[_exitBlock.value]);
+			m_blockWiseMaxSubtreePreOrder[_vertex] = std::max(m_blockWiseMaxSubtreePreOrder[_vertex], m_blockWiseMaxSubtreePreOrder[_exitBlock.value]);
 		}
 		else
 			m_potentialBackEdges.emplace_back(_vertex, _exitBlock.value);
 	});
 
-	m_reversedPostOrder[m_preOrder[_vertex]] = _vertex;
+	m_postOrder.push_back(_vertex);
 }
 
-std::vector<size_t> const& ForwardSSACFGTopologicalSort::sortedBlocks() const {  return m_reversedPostOrder; }
-std::vector<size_t> const& ForwardSSACFGTopologicalSort::preOrder() const { return m_preOrder; }
-std::vector<size_t> const& ForwardSSACFGTopologicalSort::reversedPostOrder() const { return m_reversedPostOrder; }
-std::vector<size_t> const& ForwardSSACFGTopologicalSort::maxSubtreePreOrder() const { return m_maxSubtreePreOrder; }
-std::set<size_t> const& ForwardSSACFGTopologicalSort::backEdgeTargets() const { return m_backEdgeTargets; }
-std::vector<std::set<size_t>> const& ForwardSSACFGTopologicalSort::predecessors() const { return m_predecessors; }
-SSACFG const& ForwardSSACFGTopologicalSort::cfg() const { return m_cfg; }
-
 bool ForwardSSACFGTopologicalSort::ancestor(size_t const _block1, size_t const _block2) const {
-	yulAssert(_block1 < m_preOrder.size());
-	yulAssert(_block2 < m_preOrder.size());
+	yulAssert(_block1 < m_blockWisePreOrder.size());
+	yulAssert(_block2 < m_blockWisePreOrder.size());
 
-	auto const preOrderIndex1 = m_preOrder[_block1];
-	auto const preOrderIndex2 = m_preOrder[_block2];
+	auto const preOrderIndex1 = m_blockWisePreOrder[_block1];
+	auto const preOrderIndex2 = m_blockWisePreOrder[_block2];
 
 	bool const node1VisitedBeforeNode2 = preOrderIndex1 <= preOrderIndex2;
-	bool const node2InSubtreeOfNode1 = preOrderIndex2 <= m_maxSubtreePreOrder[_block1];
+	bool const node2InSubtreeOfNode1 = preOrderIndex2 <= m_blockWiseMaxSubtreePreOrder[_block1];
 	return node1VisitedBeforeNode2 && node2InSubtreeOfNode1;
 }
 
diff --git a/libyul/backends/evm/SSACFGTopologicalSort.h b/libyul/backends/evm/SSACFGTopologicalSort.h
index ec62eb0137..973f286f28 100644
--- a/libyul/backends/evm/SSACFGTopologicalSort.h
+++ b/libyul/backends/evm/SSACFGTopologicalSort.h
@@ -33,28 +33,24 @@ class ForwardSSACFGTopologicalSort
 public:
 	explicit ForwardSSACFGTopologicalSort(SSACFG const& _cfg);
 
-	std::vector<size_t> const& sortedBlocks() const;
-	std::vector<size_t> const& preOrder() const;
-	std::vector<size_t> const& reversedPostOrder() const;
-	std::vector<size_t> const& maxSubtreePreOrder() const;
-	std::set<size_t> const& backEdgeTargets() const;
-	std::vector<std::set<size_t>> const& predecessors() const;
-	SSACFG const& cfg() const;
-	bool ancestor(size_t _block1, size_t _block2) const;
+	std::vector<size_t> const& preOrder() const { return m_preOrder; }
+	std::vector<size_t> const& postOrder() const { return m_postOrder; }
+	std::set<size_t> const& backEdgeTargets() const { return m_backEdgeTargets; }
+	SSACFG const& cfg() const { return m_cfg; }
 	bool backEdge(SSACFG::BlockId const& _block1, SSACFG::BlockId const& _block2) const;
 
 private:
 	void dfs(size_t _vertex);
+	/// Checks if block1 is an ancestor of block2, ie there's a path from block1 to block2 in the dfs tree
+	bool ancestor(size_t _block1, size_t _block2) const;
 
 	SSACFG const& m_cfg;
-
-	size_t m_currentNode {0};
 	std::vector<char> m_explored{};
-	std::vector<size_t> m_reversedPostOrder{};
+	std::vector<size_t> m_postOrder{};
 	std::vector<size_t> m_preOrder{};
-	std::vector<size_t> m_maxSubtreePreOrder{};
+	std::vector<size_t> m_blockWisePreOrder{};
+	std::vector<size_t> m_blockWiseMaxSubtreePreOrder{};
 	std::vector<std::tuple<size_t, size_t>> m_potentialBackEdges{};
 	std::set<size_t> m_backEdgeTargets{};
-	std::vector<std::set<size_t>> m_predecessors{};
 };
 }
diff --git a/test/libyul/yulSSAControlFlowGraph/nested_for.yul b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
new file mode 100644
index 0000000000..e078630a60
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
@@ -0,0 +1,231 @@
+{
+    for { let i := 0 } lt(i, 3) { i := add(i, 1) } {
+        for { let j := 0 } lt(j, 3) { j := add(j, 1) } {
+            for { let k := 0 } lt(k, 3) { k := add(k, 1) } {
+                if 0 {
+                    for { let l := 0 } lt(l, 3) { l := add(l, 1) } {
+                        sstore(l, add(add(i,j),k))
+                    }
+                }
+                if 1 {
+                    for { let l := 0 } lt(l, 3) { l := add(l, 1) } {
+                        sstore(l, add(add(i,j),k))
+                    }
+                }
+            }
+        }
+    }
+}
+
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\n"];
+// Block0_0 -> Block0_0Exit [arrowhead=none];
+// Block0_0Exit [label="Jump" shape=oval];
+// Block0_0Exit -> Block0_1;
+// Block0_1 [label="\
+// Block 1\nv2 := φ(\l\
+// 	Block 0 => 0,\l\
+// 	Block 3 => v36\l\
+// )\l\
+// v3 := lt(3, v2)\l\
+// "];
+// Block0_1 -> Block0_1Exit;
+// Block0_1Exit [label="{ If v3| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_1Exit:0 -> Block0_4;
+// Block0_1Exit:1 -> Block0_2;
+// Block0_2 [label="\
+// Block 2\n"];
+// Block0_2 -> Block0_2Exit [arrowhead=none];
+// Block0_2Exit [label="Jump" shape=oval];
+// Block0_2Exit -> Block0_5;
+// Block0_4 [label="\
+// Block 4\n"];
+// Block0_4Exit [label="MainExit"];
+// Block0_4 -> Block0_4Exit;
+// Block0_5 [label="\
+// Block 5\nv4 := φ(\l\
+// 	Block 2 => 0,\l\
+// 	Block 7 => v35\l\
+// )\l\
+// v33 := φ(\l\
+// 	Block 2 => v2,\l\
+// 	Block 7 => v18\l\
+// )\l\
+// v5 := lt(3, v4)\l\
+// "];
+// Block0_5 -> Block0_5Exit;
+// Block0_5Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_5Exit:0 -> Block0_8;
+// Block0_5Exit:1 -> Block0_6;
+// Block0_6 [label="\
+// Block 6\n"];
+// Block0_6 -> Block0_6Exit [arrowhead=none];
+// Block0_6Exit [label="Jump" shape=oval];
+// Block0_6Exit -> Block0_9;
+// Block0_8 [label="\
+// Block 8\n"];
+// Block0_8 -> Block0_8Exit [arrowhead=none];
+// Block0_8Exit [label="Jump" shape=oval];
+// Block0_8Exit -> Block0_3;
+// Block0_9 [label="\
+// Block 9\nv6 := φ(\l\
+// 	Block 6 => 0,\l\
+// 	Block 11 => v31\l\
+// )\l\
+// v17 := φ(\l\
+// 	Block 6 => v4,\l\
+// 	Block 11 => v32\l\
+// )\l\
+// v18 := φ(\l\
+// 	Block 6 => v33,\l\
+// 	Block 11 => v34\l\
+// )\l\
+// v7 := lt(3, v6)\l\
+// "];
+// Block0_9 -> Block0_9Exit;
+// Block0_9Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_9Exit:0 -> Block0_12;
+// Block0_9Exit:1 -> Block0_10;
+// Block0_3 [label="\
+// Block 3\nv36 := add(1, v33)\l\
+// "];
+// Block0_3 -> Block0_3Exit [arrowhead=none];
+// Block0_3Exit [label="Jump" shape=oval];
+// Block0_3Exit -> Block0_1;
+// Block0_10 [label="\
+// Block 10\n"];
+// Block0_10 -> Block0_10Exit;
+// Block0_10Exit [label="{ If 0| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_10Exit:0 -> Block0_14;
+// Block0_10Exit:1 -> Block0_13;
+// Block0_12 [label="\
+// Block 12\n"];
+// Block0_12 -> Block0_12Exit [arrowhead=none];
+// Block0_12Exit [label="Jump" shape=oval];
+// Block0_12Exit -> Block0_7;
+// Block0_13 [label="\
+// Block 13\n"];
+// Block0_13 -> Block0_13Exit [arrowhead=none];
+// Block0_13Exit [label="Jump" shape=oval];
+// Block0_13Exit -> Block0_15;
+// Block0_14 [label="\
+// Block 14\nv27 := φ(\l\
+// 	Block 10 => v6,\l\
+// 	Block 18 => v10\l\
+// )\l\
+// v28 := φ(\l\
+// 	Block 10 => v17,\l\
+// 	Block 18 => v11\l\
+// )\l\
+// v29 := φ(\l\
+// 	Block 10 => v18,\l\
+// 	Block 18 => v12\l\
+// )\l\
+// "];
+// Block0_14 -> Block0_14Exit;
+// Block0_14Exit [label="{ If 1| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_14Exit:0 -> Block0_20;
+// Block0_14Exit:1 -> Block0_19;
+// Block0_7 [label="\
+// Block 7\nv35 := add(1, v17)\l\
+// "];
+// Block0_7 -> Block0_7Exit [arrowhead=none];
+// Block0_7Exit [label="Jump" shape=oval];
+// Block0_7Exit -> Block0_5;
+// Block0_15 [label="\
+// Block 15\nv8 := φ(\l\
+// 	Block 13 => 0,\l\
+// 	Block 17 => v16\l\
+// )\l\
+// v9 := lt(3, v8)\l\
+// "];
+// Block0_15 -> Block0_15Exit;
+// Block0_15Exit [label="{ If v9| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_15Exit:0 -> Block0_18;
+// Block0_15Exit:1 -> Block0_16;
+// Block0_19 [label="\
+// Block 19\n"];
+// Block0_19 -> Block0_19Exit [arrowhead=none];
+// Block0_19Exit [label="Jump" shape=oval];
+// Block0_19Exit -> Block0_21;
+// Block0_20 [label="\
+// Block 20\nv30 := φ(\l\
+// 	Block 14 => v27,\l\
+// 	Block 24 => v21\l\
+// )\l\
+// v32 := φ(\l\
+// 	Block 14 => v28,\l\
+// 	Block 24 => v22\l\
+// )\l\
+// v34 := φ(\l\
+// 	Block 14 => v29,\l\
+// 	Block 24 => v23\l\
+// )\l\
+// "];
+// Block0_20 -> Block0_20Exit [arrowhead=none];
+// Block0_20Exit [label="Jump" shape=oval];
+// Block0_20Exit -> Block0_11;
+// Block0_16 [label="\
+// Block 16\nv13 := add(v17, v18)\l\
+// v14 := add(v6, v13)\l\
+// sstore(v14, v8)\l\
+// "];
+// Block0_16 -> Block0_16Exit [arrowhead=none];
+// Block0_16Exit [label="Jump" shape=oval];
+// Block0_16Exit -> Block0_17;
+// Block0_18 [label="\
+// Block 18\n"];
+// Block0_18 -> Block0_18Exit [arrowhead=none];
+// Block0_18Exit [label="Jump" shape=oval];
+// Block0_18Exit -> Block0_14;
+// Block0_21 [label="\
+// Block 21\nv19 := φ(\l\
+// 	Block 19 => 0,\l\
+// 	Block 23 => v26\l\
+// )\l\
+// v20 := lt(3, v19)\l\
+// "];
+// Block0_21 -> Block0_21Exit;
+// Block0_21Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_21Exit:0 -> Block0_24;
+// Block0_21Exit:1 -> Block0_22;
+// Block0_11 [label="\
+// Block 11\nv31 := add(1, v30)\l\
+// "];
+// Block0_11 -> Block0_11Exit [arrowhead=none];
+// Block0_11Exit [label="Jump" shape=oval];
+// Block0_11Exit -> Block0_9;
+// Block0_17 [label="\
+// Block 17\nv16 := add(1, v8)\l\
+// "];
+// Block0_17 -> Block0_17Exit [arrowhead=none];
+// Block0_17Exit [label="Jump" shape=oval];
+// Block0_17Exit -> Block0_15;
+// Block0_22 [label="\
+// Block 22\nv24 := add(v28, v29)\l\
+// v25 := add(v27, v24)\l\
+// sstore(v25, v19)\l\
+// "];
+// Block0_22 -> Block0_22Exit [arrowhead=none];
+// Block0_22Exit [label="Jump" shape=oval];
+// Block0_22Exit -> Block0_23;
+// Block0_24 [label="\
+// Block 24\n"];
+// Block0_24 -> Block0_24Exit [arrowhead=none];
+// Block0_24Exit [label="Jump" shape=oval];
+// Block0_24Exit -> Block0_20;
+// Block0_23 [label="\
+// Block 23\nv26 := add(1, v19)\l\
+// "];
+// Block0_23 -> Block0_23Exit [arrowhead=none];
+// Block0_23Exit [label="Jump" shape=oval];
+// Block0_23Exit -> Block0_21;
+// }

From 2b0d08cb4ef121ee975b76a4af737d4a1ce2c1fa Mon Sep 17 00:00:00 2001
From: Anandu Raveendran <77606647+anandhuRaveendran@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:42:07 +0530
Subject: [PATCH 1066/1140] Apostrophe added in README.md (#15431)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Apostrophe corrected - Update README.md

Apostrophe corrected

* Update README.md

---------

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e64f8cbfd3..197259998f 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ The Solidity documentation is hosted using [Read the Docs](https://docs.solidity
 
 Solidity is still under development. Contributions are always welcome!
 Please follow the
-[Developers Guide](https://docs.soliditylang.org/en/latest/contributing.html)
+[Developer's Guide](https://docs.soliditylang.org/en/latest/contributing.html)
 if you want to help.
 
 You can find our current feature and bug priorities for forthcoming

From 963d70ba6c7ca0008147cc533eb7fd5060a30f9f Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:12:38 +0200
Subject: [PATCH 1067/1140] Yul: Add toDot to SSACFG

---
 libyul/CMakeLists.txt                       |   1 +
 libyul/backends/evm/SSAControlFlowGraph.cpp | 242 ++++++++++++++++++++
 libyul/backends/evm/SSAControlFlowGraph.h   |   2 +
 test/libyul/SSAControlFlowGraphTest.cpp     | 208 +----------------
 4 files changed, 247 insertions(+), 206 deletions(-)
 create mode 100644 libyul/backends/evm/SSAControlFlowGraph.cpp

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index e790f6c179..f621b2089e 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -69,6 +69,7 @@ add_library(yul
 	backends/evm/SSACFGLoopNestingForest.h
 	backends/evm/SSACFGTopologicalSort.cpp
 	backends/evm/SSACFGTopologicalSort.h
+	backends/evm/SSAControlFlowGraph.cpp
 	backends/evm/SSAControlFlowGraph.h
 	backends/evm/SSAControlFlowGraphBuilder.cpp
 	backends/evm/SSAControlFlowGraphBuilder.h
diff --git a/libyul/backends/evm/SSAControlFlowGraph.cpp b/libyul/backends/evm/SSAControlFlowGraph.cpp
new file mode 100644
index 0000000000..e98936aaab
--- /dev/null
+++ b/libyul/backends/evm/SSAControlFlowGraph.cpp
@@ -0,0 +1,242 @@
+/*
+	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/backends/evm/SSAControlFlowGraph.h>
+
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/Visitor.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtautological-compare"
+#include <fmt/ranges.h>
+#pragma GCC diagnostic pop
+
+#include <range/v3/view/zip.hpp>
+
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::yul;
+
+namespace
+{
+class SSACFGPrinter
+{
+public:
+	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId)
+	{
+		printBlock(_cfg, _blockId, 0);
+	}
+	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function)
+	{
+		printFunction(_cfg, _functionIndex, _function);
+	}
+	friend std::ostream& operator<<(std::ostream& stream, SSACFGPrinter const& printer) {
+		stream << printer.m_result.str();
+		return stream;
+	}
+private:
+	static std::string varToString(SSACFG const& _cfg, SSACFG::ValueId _var) {
+		if (_var.value == std::numeric_limits<size_t>::max())
+			return "INVALID";
+		auto const& info = _cfg.valueInfo(_var);
+		return std::visit(
+			GenericVisitor{
+				[&](SSACFG::UnreachableValue const&) -> std::string {
+					return "[unreachable]";
+				},
+				[&](SSACFG::PhiValue const&) -> std::string {
+					return fmt::format("v{}", _var.value);
+				},
+				[&](SSACFG::VariableValue const&) -> std::string {
+					return fmt::format("v{}", _var.value);
+				},
+				[&](SSACFG::LiteralValue const& _literal) -> std::string {
+					return formatNumberReadable(_literal.value);
+				}
+			},
+			info
+		);
+	}
+
+	static std::string formatPhi(SSACFG const& _cfg, SSACFG::PhiValue const& _phiValue)
+	{
+		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
+		std::vector<std::string> formattedArgs;
+		formattedArgs.reserve(_phiValue.arguments.size());
+		for (auto const& [arg, entry]: ranges::zip_view(_phiValue.arguments | ranges::views::transform(transform), _cfg.block(_phiValue.block).entries))
+			formattedArgs.push_back(fmt::format("Block {} => {}", entry.value, arg));
+		if (!formattedArgs.empty())
+			return fmt::format("φ(\\l\\\n\t{}\\l\\\n)", fmt::join(formattedArgs, ",\\l\\\n\t"));
+		else
+			return "φ()";
+	}
+
+	void writeBlock(SSACFG const& _cfg, SSACFG::BlockId const& _id, SSACFG::BasicBlock const& _block, size_t const _functionIndex)
+	{
+		auto const valueToString = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
+		bool entryBlock = _id.value == 0 && _functionIndex == 0;
+		if (entryBlock)
+		{
+			m_result << fmt::format("Entry{} [label=\"Entry\"];\n", _functionIndex);
+			m_result << fmt::format("Entry{} -> Block{}_{};\n", _functionIndex, _functionIndex, _id.value);
+		}
+		{
+			m_result << fmt::format("Block{1}_{0} [label=\"\\\nBlock {0}\\n", _id.value, _functionIndex);
+			for (auto const& phi: _block.phis)
+			{
+				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
+				solAssert(phiValue);
+				m_result << fmt::format("v{} := {}\\l\\\n", phi.value, formatPhi(_cfg, *phiValue));
+			}
+			for (auto const& operation: _block.operations)
+			{
+				std::string const label = std::visit(GenericVisitor{
+					[&](SSACFG::Call const& _call) {
+						return _call.function.get().name.str();
+					},
+					[&](SSACFG::BuiltinCall const& _call) {
+						return _call.builtin.get().name.str();
+					},
+				}, operation.kind);
+				if (!operation.outputs.empty())
+					m_result << fmt::format(
+						"{} := ",
+						fmt::join(operation.outputs | ranges::views::transform(valueToString), ", ")
+					);
+				m_result << fmt::format(
+					"{}({})\\l\\\n",
+					label,
+					fmt::join(operation.inputs | ranges::views::transform(valueToString), ", ")
+				);
+			}
+			m_result << "\"];\n";
+			std::visit(GenericVisitor{
+				[&](SSACFG::BasicBlock::MainExit const&)
+				{
+					m_result << fmt::format("Block{}_{}Exit [label=\"MainExit\"];\n", _functionIndex, _id.value);
+					m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit;\n", _id.value, _functionIndex);
+				},
+				[&](SSACFG::BasicBlock::Jump const& _jump)
+				{
+					m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit [arrowhead=none];\n", _id.value, _functionIndex);
+					m_result << fmt::format("Block{}_{}Exit [label=\"Jump\" shape=oval];\n", _functionIndex, _id.value);
+					m_result << fmt::format("Block{}_{}Exit -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, _jump.target.value);
+				},
+				[&](SSACFG::BasicBlock::ConditionalJump const& _conditionalJump)
+				{
+					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"{ If ";
+					m_result << varToString(_cfg, _conditionalJump.condition);
+					m_result << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
+					m_result << "Block" << _functionIndex << "_" << _id.value;
+					m_result << "Exit:0 -> Block" << _functionIndex << "_" << _conditionalJump.zero.value << ";\n";
+					m_result << "Block" << _functionIndex << "_" << _id.value;
+					m_result << "Exit:1 -> Block" << _functionIndex << "_" << _conditionalJump.nonZero.value << ";\n";
+				},
+				[&](SSACFG::BasicBlock::JumpTable const& jt)
+				{
+					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+					std::string options;
+					for (auto const& jumpCase: jt.cases)
+					{
+						if (!options.empty())
+							options += " | ";
+						options += fmt::format("<{0}> {0}", formatNumber(jumpCase.first));
+					}
+					if (!options.empty())
+						options += " | ";
+					options += "<default> default";
+					m_result << fmt::format("Block{}_{}Exit [label=\"{{ JT | {{ {} }} }}\" shape=Mrecord];\n", _functionIndex, _id.value, options);
+					for (auto const& jumpCase: jt.cases)
+						m_result << fmt::format("Block{}_{}Exit:{} -> Block{}_{};\n", _functionIndex, _id.value, formatNumber(jumpCase.first), _functionIndex, jumpCase.second.value);
+					m_result << fmt::format("Block{}_{}Exit:default -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, jt.defaultCase.value);
+				},
+				[&](SSACFG::BasicBlock::FunctionReturn const& fr)
+				{
+					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"FunctionReturn["
+							<< fmt::format("{}", fmt::join(fr.returnValues | ranges::views::transform(valueToString), ", "))
+							<< "]\"];\n";
+					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+				},
+				[&](SSACFG::BasicBlock::Terminated const&)
+				{
+					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"Terminated\"];\n";
+					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+				}
+			}, _block.exit);
+		}
+	}
+
+	void printBlock(SSACFG const& _cfg, SSACFG::BlockId const& _rootId, size_t const _functionIndex)
+	{
+		std::set<SSACFG::BlockId> explored{};
+		explored.insert(_rootId);
+
+		std::deque<SSACFG::BlockId> toVisit{};
+		toVisit.emplace_back(_rootId);
+
+		while (!toVisit.empty())
+		{
+			auto const id = toVisit.front();
+			toVisit.pop_front();
+			auto const& block = _cfg.block(id);
+			writeBlock(_cfg, id, block, _functionIndex);
+			block.forEachExit(
+				[&](SSACFG::BlockId const& _exitBlock)
+				{
+					if (explored.count(_exitBlock) == 0)
+					{
+						explored.insert(_exitBlock);
+						toVisit.emplace_back(_exitBlock);
+					}
+				}
+			);
+		}
+	}
+
+	void printFunction(SSACFG const& _cfg, size_t const _functionIndex, Scope::Function const& _fun)
+	{
+		static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return functionReturnValue.get().name.str(); };
+		static auto constexpr argsTransform = [](auto const& arg) { return fmt::format("v{}", std::get<1>(arg).value); };
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " [label=\"";
+		if (!_cfg.returns.empty())
+			m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+		else
+			m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+		m_result << "\"];\n";
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " -> Block" << _functionIndex << "_" << _cfg.entry.value << ";\n";
+		printBlock(_cfg, _cfg.entry, _functionIndex);
+	}
+
+	std::stringstream m_result{};
+};
+}
+
+std::string SSACFG::toDot(bool _includeDiGraphDefinition, std::optional<size_t> _functionIndex) const
+{
+	std::ostringstream output;
+	if (_includeDiGraphDefinition)
+		output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
+	if (function)
+		output << SSACFGPrinter(*this, _functionIndex ? *_functionIndex : static_cast<size_t>(1), *function);
+	else
+		output << SSACFGPrinter(*this, entry);
+	if (_includeDiGraphDefinition)
+		output << "}\n";
+	return output.str();
+}
diff --git a/libyul/backends/evm/SSAControlFlowGraph.h b/libyul/backends/evm/SSAControlFlowGraph.h
index f4d0ec2423..fd24f06cbb 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.h
+++ b/libyul/backends/evm/SSAControlFlowGraph.h
@@ -206,6 +206,8 @@ class SSACFG
 		yulAssert(it->second.value < m_valueInfos.size());
 		return it->second;
 	}
+
+	std::string toDot(bool _includeDiGraphDefinition=true, std::optional<size_t> _functionIndex=std::nullopt) const;
 private:
 	std::deque<ValueInfo> m_valueInfos;
 	std::map<u256, ValueId> m_literals;
diff --git a/test/libyul/SSAControlFlowGraphTest.cpp b/test/libyul/SSAControlFlowGraphTest.cpp
index e12751411c..1deaaa7f64 100644
--- a/test/libyul/SSAControlFlowGraphTest.cpp
+++ b/test/libyul/SSAControlFlowGraphTest.cpp
@@ -27,12 +27,6 @@
 #include <libyul/Object.h>
 
 #include <libsolutil/AnsiColorized.h>
-#include <libsolutil/Visitor.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtautological-compare"
-#include <fmt/ranges.h>
-#pragma GCC diagnostic pop
 
 #ifdef ISOLTEST
 #include <boost/process.hpp>
@@ -58,203 +52,6 @@ SSAControlFlowGraphTest::SSAControlFlowGraphTest(std::string const& _filename):
 	m_expectation = m_reader.simpleExpectations();
 }
 
-class SSACFGPrinter
-{
-public:
-	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId)
-	{
-		printBlock(_cfg, _blockId, 0);
-	}
-	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function)
-	{
-		printFunction(_cfg, _functionIndex, _function);
-	}
-	friend std::ostream& operator<<(std::ostream& stream, SSACFGPrinter const& printer) {
-		stream << printer.m_result.str();
-		return stream;
-	}
-private:
-	std::string varToString(SSACFG const& _cfg, SSACFG::ValueId _var) {
-		if (_var.value == std::numeric_limits<size_t>::max())
-			return "INVALID";
-		auto const& info = _cfg.valueInfo(_var);
-		return std::visit(
-			util::GenericVisitor{
-				[&](SSACFG::UnreachableValue const&) -> std::string {
-					return "[unreachable]";
-				},
-				[&](SSACFG::PhiValue const&) -> std::string {
-					return fmt::format("v{}", _var.value);
-				},
-				[&](SSACFG::VariableValue const&) -> std::string {
-					return fmt::format("v{}", _var.value);
-				},
-				[&](SSACFG::LiteralValue const& _literal) -> std::string {
-					return util::formatNumberReadable(_literal.value);
-				}
-			},
-			info
-		);
-	}
-
-	std::string formatPhi(SSACFG const& _cfg, SSACFG::PhiValue const& _phiValue)
-	{
-		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
-		std::vector<std::string> formattedArgs;
-		formattedArgs.reserve(_phiValue.arguments.size());
-		for(auto const& [arg, entry] : ranges::zip_view(_phiValue.arguments | ranges::views::transform(transform), _cfg.block(_phiValue.block).entries))
-		{
-			formattedArgs.push_back(fmt::format("Block {} => {}", entry.value, arg));
-		}
-		return fmt::format("φ(\\l\\\n\t{}\\l\\\n)", fmt::join(formattedArgs, ",\\l\\\n\t"));
-	}
-
-	void writeBlock(SSACFG const& _cfg, SSACFG::BlockId const& _id, SSACFG::BasicBlock const& _block, size_t _functionIndex)
-	{
-		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
-		bool entryBlock = _id.value == 0 && _functionIndex == 0;
-		if (entryBlock)
-		{
-			m_result << fmt::format("Entry{} [label=\"Entry\"];\n", _functionIndex);
-			m_result << fmt::format("Entry{} -> Block{}_{};\n", _functionIndex, _functionIndex, _id.value);
-		}
-		{
-			m_result << fmt::format("Block{1}_{0} [label=\"\\\nBlock {0}\\n", _id.value, _functionIndex);
-			for (auto const& phi : _block.phis)
-			{
-				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
-				solAssert(phiValue);
-				m_result << fmt::format("v{} := {}\\l\\\n", phi.value, formatPhi(_cfg, *phiValue));
-			}
-			for (auto const& operation : _block.operations)
-			{
-				std::string const label = std::visit(util::GenericVisitor{
-					[&](SSACFG::Call const& _call) {
-					   return _call.function.get().name.str();
-					},
-					[&](SSACFG::BuiltinCall const& _call) {
-					   return _call.builtin.get().name.str();
-					},
-				}, operation.kind);
-				if (operation.outputs.empty())
-					m_result << fmt::format(
-						"{}({})\\l\\\n",
-						label,
-						fmt::join(operation.inputs | ranges::views::transform(transform), ", ")
-					);
-				else
-					m_result << fmt::format(
-						"{} := {}({})\\l\\\n",
-						fmt::join(operation.outputs | ranges::views::transform(transform), ", "),
-						label,
-						fmt::join(operation.inputs | ranges::views::transform(transform), ", ")
-					);
-			}
-			m_result << "\"];\n";
-			std::visit(util::GenericVisitor{
-			   [&](SSACFG::BasicBlock::MainExit const&)
-			   {
-				   m_result << fmt::format("Block{}_{}Exit [label=\"MainExit\"];\n", _functionIndex, _id.value);
-				   m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit;\n", _id.value, _functionIndex);
-			   },
-			   [&](SSACFG::BasicBlock::Jump const& _jump)
-			   {
-				   m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit [arrowhead=none];\n", _id.value, _functionIndex);
-				   m_result << fmt::format("Block{}_{}Exit [label=\"Jump\" shape=oval];\n", _functionIndex, _id.value);
-				   m_result << fmt::format("Block{}_{}Exit -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, _jump.target.value);
-			   },
-			   [&](SSACFG::BasicBlock::ConditionalJump const& _conditionalJump)
-			   {
-				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
-				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"{ If ";
-				   m_result << varToString(_cfg, _conditionalJump.condition);
-				   m_result << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
-				   m_result << "Block" << _functionIndex << "_" << _id.value;
-				   m_result << "Exit:0 -> Block" << _functionIndex << "_" << _conditionalJump.zero.value << ";\n";
-				   m_result << "Block" << _functionIndex << "_" << _id.value;
-				   m_result << "Exit:1 -> Block" << _functionIndex << "_" << _conditionalJump.nonZero.value << ";\n";
-			   },
-			   [&](SSACFG::BasicBlock::JumpTable const& jt)
-			   {
-				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
-				   std::string options;
-				   for(const auto& jumpCase : jt.cases)
-				   {
-					   if (!options.empty())
-						   options += " | ";
-					   options += fmt::format("<{0}> {0}", formatNumber(jumpCase.first));
-				   }
-				   if (!options.empty())
-					   options += " | ";
-				   options += "<default> default";
-				   m_result << fmt::format("Block{}_{}Exit [label=\"{{ JT | {{ {} }} }}\" shape=Mrecord];\n", _functionIndex, _id.value, options);
-				   for(const auto& jumpCase : jt.cases)
-				   {
-					   m_result << fmt::format("Block{}_{}Exit:{} -> Block{}_{};\n", _functionIndex, _id.value, formatNumber(jumpCase.first), _functionIndex, jumpCase.second.value);
-				   }
-				   m_result << fmt::format("Block{}_{}Exit:default -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, jt.defaultCase.value);
-			   },
-			   [&](SSACFG::BasicBlock::FunctionReturn const& fr)
-			   {
-				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"FunctionReturn["
-						  << fmt::format("{}", fmt::join(fr.returnValues | ranges::views::transform(transform), ", "))
-						  << "]\"];\n";
-				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
-			   },
-			   [&](SSACFG::BasicBlock::Terminated const&)
-			   {
-				   m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"Terminated\"];\n";
-				   m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
-			   }
-		   }, _block.exit);
-		}
-
-	}
-
-	void printBlock(SSACFG const& _cfg, SSACFG::BlockId const& _rootId, size_t _functionIndex)
-	{
-		std::set<SSACFG::BlockId> explored{};
-		explored.insert(_rootId);
-
-		std::deque<SSACFG::BlockId> toVisit{};
-		toVisit.emplace_back(_rootId);
-
-		while(!toVisit.empty())
-		{
-			auto const id = toVisit.front();
-			toVisit.pop_front();
-			auto const& block = _cfg.block(id);
-			writeBlock(_cfg, id, block, _functionIndex);
-			block.forEachExit(
-				[&](SSACFG::BlockId const& _exitBlock)
-				{
-					if (explored.count(_exitBlock) == 0)
-					{
-						explored.insert(_exitBlock);
-						toVisit.emplace_back(_exitBlock);
-					}
-				}
-			);
-		}
-	}
-
-	void printFunction(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _fun)
-	{
-		static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return functionReturnValue.get().name.str(); };
-		static auto constexpr argsTransform = [](auto const& arg) { return fmt::format("v{}", std::get<1>(arg).value); };
-		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " [label=\"";
-		if (!_cfg.returns.empty())
-			m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
-		else
-			m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
-		m_result << "\"];\n";
-		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " -> Block" << _functionIndex << "_" << _cfg.entry.value << ";\n";
-		printBlock(_cfg, _cfg.entry, _functionIndex);
-	}
-
-	std::stringstream m_result{};
-};
-
 TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	ErrorList errors;
@@ -275,10 +72,10 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 	);
 
 	output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
-	output << SSACFGPrinter(*controlFlow->mainGraph, SSACFG::BlockId{0});
+	output << controlFlow->mainGraph->toDot(false);
 	size_t index = 1;
 	for (auto const& [function, functionGraph]: controlFlow->functionGraphMapping)
-		output << SSACFGPrinter(*functionGraph, index++, *function);
+		output << functionGraph->toDot(false, index++);
 	output << "}\n";
 
 	m_obtainedResult = output.str();
@@ -314,5 +111,4 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 #endif
 
 	return result;
-
 }

From 573d7d8f31c59096925e46c01b69348bc124b7ff Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:16:32 +0200
Subject: [PATCH 1068/1140] Yul: Add toDot to ControlFlow

---
 libyul/backends/evm/ControlFlow.h       | 12 ++++++++++++
 test/libyul/SSAControlFlowGraphTest.cpp | 13 ++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/libyul/backends/evm/ControlFlow.h b/libyul/backends/evm/ControlFlow.h
index 18b43431a1..59bc1b677b 100644
--- a/libyul/backends/evm/ControlFlow.h
+++ b/libyul/backends/evm/ControlFlow.h
@@ -38,6 +38,18 @@ struct ControlFlow
 			return std::get<1>(*it);
 		return nullptr;
 	}
+
+	std::string toDot() const
+	{
+		std::ostringstream output;
+		output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
+		output << mainGraph->toDot(false);
+		size_t index = 1;
+		for (auto const& [function, functionGraph]: functionGraphMapping)
+			output << functionGraph->toDot(false, index++);
+		output << "}\n";
+		return output.str();
+	}
 };
 
 }
diff --git a/test/libyul/SSAControlFlowGraphTest.cpp b/test/libyul/SSAControlFlowGraphTest.cpp
index 1deaaa7f64..a316356dbf 100644
--- a/test/libyul/SSAControlFlowGraphTest.cpp
+++ b/test/libyul/SSAControlFlowGraphTest.cpp
@@ -62,8 +62,6 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 		return TestResult::FatalError;
 	}
 
-	std::ostringstream output;
-
 	auto info = AsmAnalyzer::analyzeStrictAssertCorrect(*m_dialect, *object);
 	std::unique_ptr<ControlFlow> controlFlow = SSAControlFlowGraphBuilder::build(
 		info,
@@ -71,14 +69,7 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 		object->code()->root()
 	);
 
-	output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
-	output << controlFlow->mainGraph->toDot(false);
-	size_t index = 1;
-	for (auto const& [function, functionGraph]: controlFlow->functionGraphMapping)
-		output << functionGraph->toDot(false, index++);
-	output << "}\n";
-
-	m_obtainedResult = output.str();
+	m_obtainedResult = controlFlow->toDot();
 
 	auto result = checkResult(_stream, _linePrefix, _formatted);
 
@@ -100,7 +91,7 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 		boost::process::opstream pipe;
 		boost::process::child child(graphDisplayer, boost::process::std_in < pipe);
 
-		pipe << output.str();
+		pipe << m_obtainedResult;
 		pipe.flush();
 		pipe.pipe().close();
 		if (result == TestResult::Success)

From 515f8ab6c5d9c01203e2499ea5c91a5bb0324b9c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 18 Sep 2024 09:26:19 +0200
Subject: [PATCH 1069/1140] Bump all CI jobs to use Ubuntu 22.04 images

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 931ce476a3..d93fc20c05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -973,7 +973,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   chk_pylint:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - run: pylint --version
@@ -1012,21 +1012,21 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   chk_proofs:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - run_proofs
       - matrix_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - run_docs_pragma_min_version
       - matrix_notify_failure_unless_pr
 
   t_ubu_pyscripts:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - run:
@@ -1053,25 +1053,25 @@ 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_ubuntu2204_xlarge
+    <<: *base_ubuntu2404_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_ubuntu2204
+    <<: *base_ubuntu2404
     environment:
-      <<: *base_ubuntu2204_env
+      <<: *base_ubuntu2404_env
       CMAKE_OPTIONS: -DSANITIZE=address
       CMAKE_BUILD_TYPE: Release
     steps:
       - build
 
   b_ubu_clang: &b_ubu_clang
-    <<: *base_ubuntu2204_clang_large
+    <<: *base_ubuntu2404_clang_large
     environment:
-      <<: *base_ubuntu2204_clang_large_env
+      <<: *base_ubuntu2404_clang_large_env
       MAKEFLAGS: -j 10
     steps:
       - build
@@ -1081,9 +1081,9 @@ jobs:
     parameters:
       cmake_options:
         type: string
-    <<: *base_ubuntu2204_clang
+    <<: *base_ubuntu2404_clang
     environment:
-      <<: *base_ubuntu2204_clang_env
+      <<: *base_ubuntu2404_clang_env
       CMAKE_OPTIONS: << parameters.cmake_options >>
     steps:
       - build
@@ -1091,7 +1091,7 @@ jobs:
   b_ubu_force_release: &b_ubu_force_release
     <<: *b_ubu
     environment:
-      <<: *base_ubuntu2204_xlarge_env
+      <<: *base_ubuntu2404_xlarge_env
       FORCE_RELEASE: ON
 
   b_ubu_static:
@@ -1101,7 +1101,7 @@ jobs:
     # On large runs 2x faster than on medium. 3x on xlarge.
     <<: *base_ubuntu2004_xlarge
     environment:
-      <<: *base_ubuntu2204_xlarge_env
+      <<: *base_ubuntu2004_xlarge_env
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
@@ -1121,9 +1121,9 @@ jobs:
 
   b_ubu_codecov:
     # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2204
+    <<: *base_ubuntu2404
     environment:
-      <<: *base_ubuntu2204_env
+      <<: *base_ubuntu2404_env
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
     steps:
@@ -1133,9 +1133,9 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_ubu_codecov:
-    <<: *base_ubuntu2204_large
+    <<: *base_ubuntu2404_large
     environment:
-      <<: *base_ubuntu2204_large_env
+      <<: *base_ubuntu2404_large_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
     steps:
@@ -1158,9 +1158,9 @@ 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_ubuntu2204_large
+    <<: *base_ubuntu2404_large
     environment:
-      <<: *base_ubuntu2204_large_env
+      <<: *base_ubuntu2404_large_env
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20
       MAKEFLAGS: -j 10
@@ -1280,7 +1280,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   b_docs:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - setup_prerelease_commit_hash
@@ -1299,7 +1299,7 @@ jobs:
       - soltest_all
 
   t_ubu_soltest_deprecated_evm_versions: &t_ubu_soltest_deprecated_evm_versions
-    <<: *base_ubuntu2204_large
+    <<: *base_ubuntu2404_large
     parallelism: 50
     steps:
       - checkout
@@ -1313,7 +1313,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_ubu_lsp: &t_ubu_lsp
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - test_lsp
 
@@ -1362,7 +1362,7 @@ jobs:
     <<: *t_ubu_cli
 
   t_ubu_locale:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - attach_workspace:
@@ -1372,10 +1372,10 @@ jobs:
 
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2204
+    <<: *base_ubuntu2404
     parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     environment:
-      <<: *base_ubuntu2204_env
+      <<: *base_ubuntu2404_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.
@@ -1384,10 +1384,10 @@ jobs:
       - cmdline_tests
 
   t_ubu_asan_soltest:
-    <<: *base_ubuntu2204
+    <<: *base_ubuntu2404
     parallelism: 20
     environment:
-      <<: *base_ubuntu2204_env
+      <<: *base_ubuntu2404_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
@@ -1399,10 +1399,10 @@ jobs:
       - soltest
 
   t_ubu_asan_clang_soltest:
-    <<: *base_ubuntu2204_clang
+    <<: *base_ubuntu2404_clang
     parallelism: 20
     environment:
-      <<: *base_ubuntu2204_clang_env
+      <<: *base_ubuntu2404_clang_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
@@ -1411,24 +1411,24 @@ jobs:
       - soltest
 
   t_ubu_ubsan_clang_soltest:
-    <<: *base_ubuntu2204_clang
+    <<: *base_ubuntu2404_clang
     parallelism: 20
     environment:
-      <<: *base_ubuntu2204_clang_env
+      <<: *base_ubuntu2404_clang_env
       EVM: << pipeline.parameters.evm-version >>
       SOLTEST_FLAGS: --no-smt
     steps:
       - soltest
 
   t_ubu_ubsan_clang_cli:
-    <<: *base_ubuntu2204_clang
+    <<: *base_ubuntu2404_clang
     parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     steps:
       - cmdline_tests
 
   t_ems_solcjs:
     # Unlike other t_ems jobs this one actually runs 2x faster on medium (compared to small).
-    <<: *base_ubuntu2204
+    <<: *base_ubuntu2404
     steps:
       - checkout
       - attach_workspace:
@@ -1747,7 +1747,7 @@ jobs:
     parameters:
       preset:
         type: string
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
@@ -1832,9 +1832,9 @@ jobs:
           preset: "<< parameters.preset >>"
 
   t_bytecode_compare:
-    <<: *base_ubuntu2204_small
+    <<: *base_ubuntu2404_small
     environment:
-      <<: *base_ubuntu2204_small_env
+      <<: *base_ubuntu2404_small_env
       <<: *bytecode_compare_env_presets
     steps:
       - checkout
@@ -1848,7 +1848,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   c_release_binaries:
-    <<: *base_ubuntu2204
+    <<: *base_ubuntu2404
     steps:
       - checkout
       - attach_workspace:

From 38fd087a91340c888f7262f84c3c039facd06679 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 18 Sep 2024 10:06:44 +0200
Subject: [PATCH 1070/1140] Fix pip issues for 24.04

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

diff --git a/docs/docs.sh b/docs/docs.sh
index f2c5667612..abe4921e30 100755
--- a/docs/docs.sh
+++ b/docs/docs.sh
@@ -31,5 +31,8 @@ set -euo pipefail
 script_dir="$(dirname "$0")"
 
 cd "${script_dir}"
-pip3 install -r requirements.txt --upgrade --upgrade-strategy eager
+# TODO `--ignore-installed` now fixes an issue where pip tries to uninstall a Debian installed package, but is unable to
+# TODO since Debian has decided to not use the RECORD file, which then breaks pip.
+# TODO https://github.com/pypa/pip/issues/11631 and https://bugs.launchpad.net/ubuntu/+source/wheel/+bug/2063151
+pip3 install -r requirements.txt --ignore-installed --upgrade --upgrade-strategy eager
 sphinx-build -nW -b html -d _build/doctrees . _build/html

From 10f2e601de02b32dd89033baa315fdc44b849ca5 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 12 Sep 2024 13:27:52 +0200
Subject: [PATCH 1071/1140] Yul: Fix removal of trivial phi functions in SSA
 CFG Builder

---
 .../evm/SSAControlFlowGraphBuilder.cpp        | 280 ++++++------------
 .../backends/evm/SSAControlFlowGraphBuilder.h |   3 +-
 .../libyul/yulSSAControlFlowGraph/complex.yul |   6 +-
 .../yulSSAControlFlowGraph/complex2.yul       |   4 +-
 4 files changed, 94 insertions(+), 199 deletions(-)

diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index d9dc7663cc..2579b9064d 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -33,30 +33,54 @@
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/drop_last.hpp>
 #include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/iota.hpp>
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/transform.hpp>
 #include <range/v3/view/zip.hpp>
-#include <range/v3/view/drop_last.hpp>
 
 using namespace solidity;
 using namespace solidity::yul;
 
-namespace
+namespace solidity::yul
 {
-SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
+
+SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
+	SSACFG& _graph,
+	AsmAnalysisInfo const& _analysisInfo,
+	Dialect const& _dialect
+):
+	m_graph(_graph),
+	m_info(_analysisInfo),
+	m_dialect(_dialect)
+{
+}
+
+std::unique_ptr<ControlFlow> SSAControlFlowGraphBuilder::build(
+	AsmAnalysisInfo const& _analysisInfo,
+	Dialect const& _dialect,
+	Block const& _block
+)
+{
+	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
+
+	auto result = std::make_unique<ControlFlow>();
+	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, _dialect, _block);
+	buildFunctionGraphs(*result, _analysisInfo, sideEffects, _dialect, functions);
+	return result;
+}
+
+SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId _phi)
 {
 	// TODO: double-check if this is sane
-	auto* phiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(_phi));
+	auto const* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
 	yulAssert(phiInfo);
 
 	SSACFG::ValueId same;
 	for (SSACFG::ValueId arg: phiInfo->arguments)
 	{
 		if (arg == same || arg == _phi)
-			continue;
+			continue;  // unique value or self-reference
 		if (same.hasValue())
-			return _phi;
+			return _phi;  // phi merges at least two distinct values -> not trivial
 		same = arg;
 	}
 
@@ -65,30 +89,26 @@ SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
 		size_t inputIndex = std::numeric_limits<size_t>::max();
 	};
 	std::vector<Use> uses;
-	std::vector<bool> visited;
 	std::vector<SSACFG::ValueId> phiUses;
-	auto isVisited = [&](SSACFG::BlockId _block) -> bool {
-		if (_block.value < visited.size())
-			return visited.at(_block.value);
-		else
-			return false;
-	};
-	auto markVisited = [&](SSACFG::BlockId _block) {
-		if (visited.size() <= _block.value)
-			visited.resize(_block.value + 1);
-		visited[_block.value] = true;
-	};
-	// does this even need to be recursive? or can uses only be in the same or neighbouring blocks?
-	auto findUses = [&](SSACFG::BlockId _blockId, auto _recurse) -> void {
-		if (isVisited(_blockId))
-			return;
-		markVisited(_blockId);
-		auto& block = _cfg.block(_blockId);
+
+	if (!same.hasValue())
+	{
+		// This will happen for unreachable paths.
+		// TODO: check how best to deal with this
+		same = m_graph.unreachableValue();
+	}
+
+	auto phiBlock = phiInfo->block;
+	m_graph.block(phiBlock).phis.erase(_phi);
+
+	for (size_t blockIdValue = 0; blockIdValue < m_graph.numBlocks(); ++blockIdValue)
+	{
+		auto& block = m_graph.block(SSACFG::BlockId{blockIdValue});
 		for (auto blockPhi: block.phis)
 		{
 			if (blockPhi == _phi)
 				continue;
-			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(blockPhi));
+			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(blockPhi));
 			yulAssert(blockPhiInfo);
 			bool usedInPhi = false;
 			for (auto input: blockPhiInfo->arguments)
@@ -112,45 +132,45 @@ SSACFG::ValueId tryRemoveTrivialPhi(SSACFG& _cfg, SSACFG::ValueId _phi)
 				if (input == _phi)
 					uses.emplace_back(Use{std::ref(op), n});
 		}
-		block.forEachExit([&](SSACFG::BlockId _block) {
-			_recurse(_block, _recurse);
-		});
-	};
-	auto phiBlock = phiInfo->block;
-	_cfg.block(phiBlock).phis.erase(_phi);
-	findUses(phiBlock, findUses);
-
-	if (!same.hasValue())
-	{
-		// This will happen for unreachable paths.
-		// TODO: check how best to deal with this
-		same = _cfg.unreachableValue();
+		// todo check if it is sound to set "unreachable" return values to literal 0
+		if (auto* functionReturn = std::get_if<SSACFG::BasicBlock::FunctionReturn>(&block.exit))
+			std::replace(
+				functionReturn->returnValues.begin(),
+				functionReturn->returnValues.end(),
+				_phi,
+				same == m_graph.unreachableValue() ? m_graph.newLiteral(block.debugData, 0) : same
+			);
 	}
-
 	for (auto& use: uses)
 		use.operation.get().inputs.at(use.inputIndex) = same;
 	for (auto phiUse: phiUses)
 	{
-		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phiUse));
+		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phiUse));
 		yulAssert(blockPhiInfo);
 		for (auto& arg: blockPhiInfo->arguments)
 			if (arg == _phi)
 				arg = same;
 	}
+	for (auto& [_, currentVariableDefs]: m_currentDef)
+	{
+		for (auto& def: currentVariableDefs)
+			if (def && *def == _phi)
+				def = same;
+	}
 
 	for (auto phiUse: phiUses)
-		tryRemoveTrivialPhi(_cfg, phiUse);
+		tryRemoveTrivialPhi(phiUse);
 
 	return same;
 }
 
 /// Removes edges to blocks that are not reachable.
-void cleanUnreachable(SSACFG& _cfg)
+void SSAControlFlowGraphBuilder::cleanUnreachable()
 {
 	// Determine which blocks are reachable from the entry.
-	util::BreadthFirstSearch<SSACFG::BlockId> reachabilityCheck{{_cfg.entry}};
+	util::BreadthFirstSearch<SSACFG::BlockId> reachabilityCheck{{m_graph.entry}};
 	reachabilityCheck.run([&](SSACFG::BlockId _blockId, auto&& _addChild) {
-		auto const& block = _cfg.block(_blockId);
+		auto const& block = m_graph.block(_blockId);
 		visit(util::GenericVisitor{
 				[&](SSACFG::BasicBlock::Jump const& _jump) {
 					_addChild(_jump.target);
@@ -167,14 +187,14 @@ void cleanUnreachable(SSACFG& _cfg)
 	});
 
 	auto isUnreachableValue = [&](SSACFG::ValueId const& _value) -> bool {
-		auto* valueInfo = std::get_if<SSACFG::UnreachableValue>(&_cfg.valueInfo(_value));
+		auto* valueInfo = std::get_if<SSACFG::UnreachableValue>(&m_graph.valueInfo(_value));
 		return (valueInfo) ? true : false;
 	};
 
 	// Remove all entries from unreachable nodes from the graph.
 	for (SSACFG::BlockId blockId: reachabilityCheck.visited)
 	{
-		auto& block = _cfg.block(blockId);
+		auto& block = m_graph.block(blockId);
 
 		std::set<SSACFG::ValueId> maybeTrivialPhi;
 		for (auto it = block.entries.begin(); it != block.entries.end();)
@@ -183,7 +203,7 @@ void cleanUnreachable(SSACFG& _cfg)
 			else
 				it = block.entries.erase(it);
 		for (auto phi: block.phis)
-			if (auto* phiInfo = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi)))
+			if (auto* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phi)))
 				cxx20::erase_if(phiInfo->arguments, [&](SSACFG::ValueId _arg) {
 					if (isUnreachableValue(_arg))
 					{
@@ -195,44 +215,10 @@ void cleanUnreachable(SSACFG& _cfg)
 
 		// After removing a phi argument, we might end up with a trivial phi that can be removed.
 		for (auto phi: maybeTrivialPhi)
-			tryRemoveTrivialPhi(_cfg, phi);
+			tryRemoveTrivialPhi(phi);
 	}
 }
 
-}
-
-namespace solidity::yul
-{
-
-SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
-	SSACFG& _graph,
-	AsmAnalysisInfo const& _analysisInfo,
-	Dialect const& _dialect
-):
-	m_graph(_graph),
-	m_info(_analysisInfo),
-	m_dialect(_dialect)
-{
-}
-
-std::unique_ptr<ControlFlow> SSAControlFlowGraphBuilder::build(
-	AsmAnalysisInfo const& _analysisInfo,
-	Dialect const& _dialect,
-	Block const& _block
-)
-{
-	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
-
-	auto result = std::make_unique<ControlFlow>();
-	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, _dialect, _block);
-	buildFunctionGraphs(*result, _analysisInfo, sideEffects, _dialect, functions);
-
-	cleanUnreachable(*result->mainGraph);
-	for (auto& functionGraph: result->functionGraphs)
-		cleanUnreachable(*functionGraph);
-	return result;
-}
-
 void SSAControlFlowGraphBuilder::buildFunctionGraphs(
 	ControlFlow& _controlFlow,
 	AsmAnalysisInfo const& _info,
@@ -276,6 +262,7 @@ void SSAControlFlowGraphBuilder::buildFunctionGraphs(
 		cfg.exits.insert(builder.m_currentBlock);
 		// Artificial explicit function exit (`leave`) at the end of the body.
 		builder(Leave{debugDataOf(*functionDefinition)});
+		builder.cleanUnreachable();
 	}
 }
 
@@ -293,7 +280,7 @@ std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> SSACo
 	if (!builder.blockInfo(builder.m_currentBlock).sealed)
 		builder.sealBlock(builder.m_currentBlock);
 	_cfg.block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
-
+	builder.cleanUnreachable();
 	return builder.m_functionDefinitions;
 }
 
@@ -626,22 +613,27 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::readVariableRecursive(Scope::Variabl
 	auto& block = m_graph.block(_block);
 	auto& info = blockInfo(_block);
 
-	if (info.sealed && block.entries.size() == 1)
-		return readVariable(_variable, *block.entries.begin());
-
-	SSACFG::ValueId phi = m_graph.newPhi(_block);
-	block.phis.insert(phi);
-	if (info.sealed)
+	SSACFG::ValueId val;
+	if (!info.sealed)
 	{
-		writeVariable(_variable, _block, phi);
-		phi = addPhiOperands(_variable, phi);
+		// incomplete block
+		val = m_graph.newPhi(_block);
+		block.phis.insert(val);
+		info.incompletePhis.emplace_back(val, std::ref(_variable));
 	}
+	else if (block.entries.size() == 1)
+		// one predecessor: no phi needed
+		val = readVariable(_variable, *block.entries.begin());
 	else
 	{
-		info.incompletePhis.emplace_back(phi, std::ref(_variable));
+		// Break potential cycles with operandless phi
+		val = m_graph.newPhi(_block);
+		block.phis.insert(val);
+		writeVariable(_variable, _block, val);
+		val = addPhiOperands(_variable, val);
 	}
-	writeVariable(_variable, _block, phi);
-	return phi;
+	writeVariable(_variable, _block, val);
+	return val;
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi)
@@ -653,104 +645,6 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::addPhiOperands(Scope::Variable const
 	return tryRemoveTrivialPhi(_phi);
 }
 
-SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId _phi)
-{
-	// TODO: double-check if this is sane
-	yulAssert(std::holds_alternative<SSACFG::PhiValue>(m_graph.valueInfo(_phi)));
-	auto& phiInfo = std::get<SSACFG::PhiValue>(m_graph.valueInfo(_phi));
-
-	SSACFG::ValueId same;
-	for (SSACFG::ValueId arg: phiInfo.arguments)
-	{
-		if (arg == same || arg == _phi)
-			continue;
-		if (same.hasValue())
-			return _phi;
-		same = arg;
-	}
-
-	struct Use {
-		std::reference_wrapper<SSACFG::Operation> operation;
-		size_t inputIndex = std::numeric_limits<size_t>::max();
-	};
-	std::vector<Use> uses;
-	std::vector<bool> visited;
-	std::vector<SSACFG::ValueId> phiUses;
-	auto isVisited = [&](SSACFG::BlockId _block) -> bool {
-		if (_block.value < visited.size())
-			return visited.at(_block.value);
-		else
-			return false;
-	};
-	auto markVisited = [&](SSACFG::BlockId _block) {
-		if (visited.size() <= _block.value)
-			visited.resize(_block.value + 1);
-		visited[_block.value] = true;
-	};
-	// does this even need to be recursive? or can uses only be in the same or neighbouring blocks?
-	auto findUses = [&](SSACFG::BlockId _blockId, auto _recurse) -> void {
-		if (isVisited(_blockId))
-			return;
-		markVisited(_blockId);
-		auto& block = m_graph.block(_blockId);
-		for (auto blockPhi: block.phis)
-		{
-			if (blockPhi == _phi)
-				continue;
-			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(blockPhi));
-			yulAssert(blockPhiInfo);
-			bool usedInPhi = false;
-			for (auto input: blockPhiInfo->arguments)
-			{
-				if (input == _phi)
-					usedInPhi = true;
-			}
-			if (usedInPhi)
-				phiUses.emplace_back(blockPhi);
-		}
-		for (auto& op: block.operations)
-		{
-			// TODO: double check when phiVar occurs in outputs here and what to do about it.
-			if (op.outputs.size() == 1 && op.outputs.front() == _phi)
-				continue;
-			// TODO: check if this always hold - and if so if the assertion is really valuable.
-			for (auto& output: op.outputs)
-				yulAssert(output != _phi);
-
-			for (auto&& [n, input]: op.inputs | ranges::views::enumerate)
-				if (input == _phi)
-					uses.emplace_back(Use{std::ref(op), n});
-		}
-		block.forEachExit([&](SSACFG::BlockId _block) {
-			_recurse(_block, _recurse);
-		});
-	};
-	auto phiBlock = phiInfo.block;
-	m_graph.block(phiBlock).phis.erase(_phi);
-	findUses(phiBlock, findUses);
-
-	if (!same.hasValue())
-		// This will happen for unreachable paths.
-		// TODO: check how best to deal with this
-		same = m_graph.unreachableValue();
-
-	for (auto& use: uses)
-		use.operation.get().inputs.at(use.inputIndex) = same;
-	for (auto phiUse: phiUses)
-	{
-		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phiUse));
-		yulAssert(blockPhiInfo);
-		for (auto& arg: blockPhiInfo->arguments)
-			if (arg == _phi)
-				arg = same;
-	}
-
-	for (auto phiUse: phiUses)
-		tryRemoveTrivialPhi(phiUse);
-
-	return same;
-}
-
 void SSAControlFlowGraphBuilder::writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value)
 {
 	currentDef(_variable, _block) = _value;
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
index 031016219c..0a2ca8064e 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -73,6 +73,8 @@ class SSAControlFlowGraphBuilder
 	SSACFG::ValueId operator()(Literal const& _literal);
 
 private:
+	void cleanUnreachable();
+	SSACFG::ValueId tryRemoveTrivialPhi(SSACFG::ValueId _phi);
 	void assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression);
 	std::vector<SSACFG::ValueId> visitFunctionCall(FunctionCall const& _call);
 
@@ -80,7 +82,6 @@ class SSAControlFlowGraphBuilder
 	SSACFG::ValueId readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block);
 	SSACFG::ValueId readVariableRecursive(Scope::Variable const& _variable, SSACFG::BlockId _block);
 	SSACFG::ValueId addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi);
-	SSACFG::ValueId tryRemoveTrivialPhi(SSACFG::ValueId _phi);
 	void writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value);
 
 	SSACFG& m_graph;
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
index d7e16c9f6f..0d2c958fd0 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -87,7 +87,7 @@
 // Block1_4 [label="\
 // Block 4\nsstore(3084, 12)\l\
 // "];
-// Block1_4Exit [label="FunctionReturn[v17]"];
+// Block1_4Exit [label="FunctionReturn[0]"];
 // Block1_4 -> Block1_4Exit;
 // Block1_6 [label="\
 // Block 6\nsstore(514, 2)\l\
@@ -105,7 +105,7 @@
 // Block1_9 [label="\
 // Block 9\nsstore(1028, 4)\l\
 // "];
-// Block1_9Exit [label="FunctionReturn[v17]"];
+// Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
 // Block 10\nv20 := eq(2, v6)\l\
@@ -168,7 +168,7 @@
 // Block1_20 [label="\
 // Block 20\nsstore(v43, 0)\l\
 // "];
-// Block1_20Exit [label="FunctionReturn[v45]"];
+// Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
 // Block 21\nsstore(65535, 255)\l\
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
index 863b021d1e..8f3b1bd3f6 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex2.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -121,7 +121,7 @@
 // Block1_9 [label="\
 // Block 9\nsstore(1028, 4)\l\
 // "];
-// Block1_9Exit [label="FunctionReturn[v17]"];
+// Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
 // Block 10\nv20 := eq(2, v6)\l\
@@ -184,7 +184,7 @@
 // Block1_20 [label="\
 // Block 20\nsstore(v43, 0)\l\
 // "];
-// Block1_20Exit [label="FunctionReturn[v45]"];
+// Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
 // Block 21\nsstore(65535, 255)\l\

From 5fc72695bca7533e1c08981ab7e8bce5f6d58a2b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 18 Sep 2024 12:54:34 +0200
Subject: [PATCH 1072/1140] Remove 22.04 images and docker buildpack deps

---
 .circleci/README.md                           |  10 +-
 .circleci/config.yml                          |  58 ----------
 .github/workflows/buildpack-deps.yml          |   4 +-
 scripts/ci/buildpack-deps_test_ubuntu1804.sh  |   1 -
 .../buildpack-deps_test_ubuntu2204.clang.sh   |   1 -
 scripts/ci/buildpack-deps_test_ubuntu2204.sh  |   1 -
 .../buildpack-deps/Dockerfile.ubuntu2204      | 102 -----------------
 .../Dockerfile.ubuntu2204.clang               | 103 ------------------
 8 files changed, 6 insertions(+), 274 deletions(-)
 delete mode 120000 scripts/ci/buildpack-deps_test_ubuntu1804.sh
 delete mode 120000 scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
 delete mode 120000 scripts/ci/buildpack-deps_test_ubuntu2204.sh
 delete mode 100644 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
 delete mode 100644 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang

diff --git a/.circleci/README.md b/.circleci/README.md
index 6af7fd45cc..22b20bc8c2 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:ubuntu2204-<revision> -f Dockerfile.ubuntu2204 .
-docker push ethereum/solidity-buildpack-deps:ubuntu2204-<revision>
+docker build -t ethereum/solidity-buildpack-deps:ubuntu2404-<revision> -f Dockerfile.ubuntu2404 .
+docker push ethereum/solidity-buildpack-deps:ubuntu2404-<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-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.
+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-2404-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:ubuntu2204-<revision>
+    https://hub.docker.com/r/ethereum/solidity-buildpack-deps:ubuntu2404-<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:ubuntu2204-<revision> /bin/bash
+docker run -v `pwd`:/src/solidity -ti ethereum/solidity-buildpack-deps:ubuntu2404-<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 d93fc20c05..18ca18f3c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,14 +11,6 @@ parameters:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-25
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b3f321fb2d8e7a41ca9328672061c1840e5cd3fb5be503aa158d1c508deacf0a"
-  ubuntu-2204-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-10
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ba2d878c26d681a7d6c1922258b47c2e5dd61d0e46ab4c6a4862b473e61997b6"
-  ubuntu-2204-clang-docker-image:
-    type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-9
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:703cdad5fa5c8686a3080ebb1aea1485ded2446561bf56e2945a87f2fa20a446"
   ubuntu-2404-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-1
@@ -560,56 +552,6 @@ defaults:
         MAKEFLAGS: -j 10
         CPUs: 10
 
-  - base_ubuntu2204: &base_ubuntu2204
-      docker:
-        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
-      environment: &base_ubuntu2204_env
-        TERM: xterm
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu2204_clang: &base_ubuntu2204_clang
-      docker:
-        - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
-      environment: &base_ubuntu2204_clang_env
-        TERM: xterm
-        CC: clang
-        CXX: clang++
-        MAKEFLAGS: -j 3
-        CPUs: 3
-
-  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
-      <<: *base_ubuntu2204_clang
-      resource_class: large
-      environment: &base_ubuntu2204_clang_large_env
-        <<: *base_ubuntu2204_clang_env
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_ubuntu2204_small: &base_ubuntu2204_small
-      <<: *base_ubuntu2204
-      resource_class: small
-      environment: &base_ubuntu2204_small_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
-  - base_ubuntu2204_large: &base_ubuntu2204_large
-      <<: *base_ubuntu2204
-      resource_class: large
-      environment: &base_ubuntu2204_large_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 5
-        CPUs: 5
-
-  - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
-      <<: *base_ubuntu2204
-      resource_class: xlarge
-      environment: &base_ubuntu2204_xlarge_env
-        <<: *base_ubuntu2204_env
-        MAKEFLAGS: -j 10
-        CPUs: 10
-
   - base_ubuntu2404: &base_ubuntu2404
       docker:
         - image: << pipeline.parameters.ubuntu-2404-docker-image >>
diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 1b9555ddc2..fe6da11e16 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -7,8 +7,6 @@ on:
       - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
       - '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'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2404'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang'
 
@@ -25,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204, ubuntu2404, ubuntu2404.clang]
+        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2404, ubuntu2404.clang]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/scripts/ci/buildpack-deps_test_ubuntu1804.sh b/scripts/ci/buildpack-deps_test_ubuntu1804.sh
deleted file mode 120000
index c07a74de4f..0000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu1804.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
deleted file mode 120000
index c07a74de4f..0000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2204.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.sh
deleted file mode 120000
index c07a74de4f..0000000000
--- a/scripts/ci/buildpack-deps_test_ubuntu2204.sh
+++ /dev/null
@@ -1 +0,0 @@
-build.sh
\ No newline at end of file
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
deleted file mode 100644
index add03bb003..0000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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:jammy AS base
-LABEL version="10"
-
-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 \
-		cmake \
-		jq \
-		libboost-filesystem-dev \
-		libboost-program-options-dev \
-		libboost-system-dev \
-		libboost-test-dev \
-		libcln-dev \
-		libz3-static-dev \
-		locales-all \
-		lsof \
-		ninja-build \
-		python3-pip \
-		python3-sphinx \
-		software-properties-common \
-		sudo \
-		unzip \
-		z3-static \
-		zip; \
-	pip3 install \
-		codecov \
-		colorama \
-		deepdiff \
-		parsec \
-		pygments-lexer-solidity \
-		pylint \
-		requests \
-		tabulate \
-		z3-solver;
-
-# Eldarica
-RUN set -ex; \
-	apt-get update; \
-	apt-get install -qqy \
-		openjdk-11-jre; \
-	eldarica_version="2.1"; \
-	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
-	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
-	unzip /opt/eld_binaries.zip -d /opt; \
-	rm -f /opt/eld_binaries.zip;
-
-# CVC5
-RUN set -ex; \
-	cvc5_version="1.1.2"; \
-	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
-	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
-	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
-	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
-	mv /opt/cvc5-Linux-static/include/* /usr/include; \
-	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
-	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
-
-FROM base AS libraries
-
-# EVMONE
-RUN set -ex; \
-	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
-	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
-COPY --from=libraries /opt/eldarica /opt/eldarica
-ENV PATH="$PATH:/opt/eldarica"
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
deleted file mode 100644
index b9c9158381..0000000000
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ /dev/null
@@ -1,103 +0,0 @@
-# vim:syntax=dockerfile
-#------------------------------------------------------------------------------
-# Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu 19.04 (Disco Dingo) Clang variant
-# 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:jammy AS base
-LABEL version="9"
-
-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 \
-		clang \
-		cmake \
-		jq \
-		lsof \
-		libboost-filesystem-dev \
-		libboost-program-options-dev \
-		libboost-system-dev \
-		libboost-test-dev \
-		libcln-dev \
-		libz3-static-dev \
-		ninja-build \
-		python3-pip \
-		software-properties-common \
-		sudo \
-		z3-static; \
-	pip3 install \
-		codecov \
-		colorama \
-		deepdiff \
-		parsec \
-		pygments-lexer-solidity \
-		pylint \
-		requests \
-		tabulate \
-		z3-solver;
-
-# Eldarica
-RUN set -ex; \
-	apt-get update; \
-	apt-get install -qy \
-		openjdk-11-jre \
-		unzip; \
-	eldarica_version="2.1"; \
-	wget "https://github.com/uuverifiers/eldarica/releases/download/v${eldarica_version}/eldarica-bin-${eldarica_version}.zip" -O /opt/eld_binaries.zip; \
-	test "$(sha256sum /opt/eld_binaries.zip)" = "0ac43f45c0925383c9d2077f62bbb515fd792375f3b2b101b30c9e81dcd7785c  /opt/eld_binaries.zip"; \
-	unzip /opt/eld_binaries.zip -d /opt; \
-	rm -f /opt/eld_binaries.zip;
-
-# CVC5
-RUN set -ex; \
-	cvc5_version="1.1.2"; \
-	wget "https://github.com/cvc5/cvc5/releases/download/cvc5-${cvc5_version}/cvc5-Linux-static.zip" -O /opt/cvc5.zip; \
-	test "$(sha256sum /opt/cvc5.zip)" = "cf291aef67da8eaa8d425a51f67f3f72f36db8b1040655dc799b64e3d69e6086  /opt/cvc5.zip"; \
-	unzip /opt/cvc5.zip -x "cvc5-Linux-static/lib/cmake/*" -d /opt; \
-	mv /opt/cvc5-Linux-static/bin/* /usr/bin; \
-	mv /opt/cvc5-Linux-static/lib/* /usr/lib; \
-	mv /opt/cvc5-Linux-static/include/* /usr/include; \
-	rm -rf /opt/cvc5-Linux-static /opt/cvc5.zip;
-
-FROM base AS libraries
-
-ENV CC clang
-ENV CXX clang++
-
-# EVMONE
-RUN set -ex; \
-	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz; \
-	test "$(sha256sum /usr/src/evmone.tar.gz)" = "1c7b5eba0c8c3b3b2a7a05101e2d01a13a2f84b323989a29be66285dba4136ce  /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
-COPY --from=libraries /usr/bin /usr/bin
-COPY --from=libraries /usr/include /usr/include
-COPY --from=libraries /opt/eldarica /opt/eldarica
-ENV PATH="$PATH:/opt/eldarica"

From 7e9ac48c5c227d305a924f11aec11abdb5f0f62d Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 17 Sep 2024 18:21:45 +0200
Subject: [PATCH 1073/1140] SSACFGBuilder: Only eliminate trivial phi of sealed
 blocks and add return variables to entry definitions

---
 .../evm/SSAControlFlowGraphBuilder.cpp        | 43 +++++++++++----
 .../backends/evm/SSAControlFlowGraphBuilder.h |  9 ++++
 .../libyul/yulSSAControlFlowGraph/complex.yul | 20 +++----
 .../yulSSAControlFlowGraph/complex2.yul       | 20 +++----
 .../yulSSAControlFlowGraph/function.yul       |  6 +--
 .../yulSSAControlFlowGraph/nested_for.yul     | 52 +++----------------
 6 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index 2579b9064d..26635124ed 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -73,6 +73,7 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 	// TODO: double-check if this is sane
 	auto const* phiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(_phi));
 	yulAssert(phiInfo);
+	yulAssert(blockInfo(phiInfo->block).sealed);
 
 	SSACFG::ValueId same;
 	for (SSACFG::ValueId arg: phiInfo->arguments)
@@ -132,14 +133,27 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 				if (input == _phi)
 					uses.emplace_back(Use{std::ref(op), n});
 		}
-		// todo check if it is sound to set "unreachable" return values to literal 0
-		if (auto* functionReturn = std::get_if<SSACFG::BasicBlock::FunctionReturn>(&block.exit))
-			std::replace(
-				functionReturn->returnValues.begin(),
-				functionReturn->returnValues.end(),
-				_phi,
-				same == m_graph.unreachableValue() ? m_graph.newLiteral(block.debugData, 0) : same
-			);
+		std::visit(util::GenericVisitor{
+			[_phi, same](SSACFG::BasicBlock::FunctionReturn& _functionReturn) {
+				std::replace(
+					_functionReturn.returnValues.begin(),
+					_functionReturn.returnValues.end(),
+					_phi,
+					same
+				);
+			},
+			[_phi, same](SSACFG::BasicBlock::ConditionalJump& _condJump) {
+				if (_condJump.condition == _phi)
+					_condJump.condition = same;
+			},
+			[_phi, same](SSACFG::BasicBlock::JumpTable& _jumpTable) {
+				if (_jumpTable.value == _phi)
+					_jumpTable.value = same;
+			},
+			[](SSACFG::BasicBlock::Jump&) {},
+			[](SSACFG::BasicBlock::MainExit&) {},
+			[](SSACFG::BasicBlock::Terminated&) {}
+		}, block.exit);
 	}
 	for (auto& use: uses)
 		use.operation.get().inputs.at(use.inputIndex) = same;
@@ -257,6 +271,8 @@ void SSAControlFlowGraphBuilder::buildFunctionGraphs(
 		builder.m_currentBlock = cfg.entry;
 		for (auto&& [var, varId]: cfg.arguments)
 			builder.currentDef(var, cfg.entry) = varId;
+		for (auto const& var: cfg.returns)
+			builder.currentDef(var.get(), cfg.entry) = builder.zero();
 		builder.sealBlock(cfg.entry);
 		builder(functionDefinition->body);
 		cfg.exits.insert(builder.m_currentBlock);
@@ -630,7 +646,9 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::readVariableRecursive(Scope::Variabl
 		val = m_graph.newPhi(_block);
 		block.phis.insert(val);
 		writeVariable(_variable, _block, val);
-		val = addPhiOperands(_variable, val);
+		// we call tryRemoveTrivialPhi explicitly opposed to what is presented in Algorithm 2, as our implementation
+		// does not call it in addPhiOperands to avoid removing phis in unsealed blocks
+		val = tryRemoveTrivialPhi(addPhiOperands(_variable, val));
 	}
 	writeVariable(_variable, _block, val);
 	return val;
@@ -642,7 +660,8 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::addPhiOperands(Scope::Variable const
 	auto& phi = std::get<SSACFG::PhiValue>(m_graph.valueInfo(_phi));
 	for (auto pred: m_graph.block(phi.block).entries)
 		phi.arguments.emplace_back(readVariable(_variable, pred));
-	return tryRemoveTrivialPhi(_phi);
+	// we call tryRemoveTrivialPhi explicitly to avoid removing trivial phis in unsealed blocks
+	return _phi;
 }
 
 void SSAControlFlowGraphBuilder::writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value)
@@ -681,11 +700,15 @@ Scope::Variable const& SSAControlFlowGraphBuilder::lookupVariable(YulName _name)
 
 void SSAControlFlowGraphBuilder::sealBlock(SSACFG::BlockId _block)
 {
+	// this method deviates from Algorithm 4 in the reference paper,
+	// as it would lead to tryRemoveTrivialPhi being called on unsealed blocks
 	auto& info = blockInfo(_block);
 	yulAssert(!info.sealed, "Trying to seal already sealed block.");
 	for (auto&& [phi, variable] : info.incompletePhis)
 		addPhiOperands(variable, phi);
 	info.sealed = true;
+	for (auto& [phi, _]: info.incompletePhis)
+		phi = tryRemoveTrivialPhi(phi);
 }
 
 
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
index 0a2ca8064e..e4d0d6db61 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -17,6 +17,15 @@
 // SPDX-License-Identifier: GPL-3.0
 /**
 * Transformation of a Yul AST into a control flow graph.
+*
+* Based on https://doi.org/10.1007/978-3-642-37051-9_6
+* Braun, Matthias, et al. "Simple and efficient construction of static single assignment form."
+* Compiler Construction: 22nd International Conference, CC 2013,
+* ETAPS 2013, Rome, Italy, March 16-24, 2013. Proceedings 22. Springer Berlin Heidelberg, 2013.
+*
+* We have small deviations in Algorithms 2 and 4, as the paper's presentation leads to trivial phis being spuriously
+* removed from not yet sealed blocks via a call to addPhiOperands in Algorithm 4. Instead, we perform the deletion
+* of trivial phis only after a block has been sealed, i.e., all block's predecessors are present.
 */
 #pragma once
 
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
index 0d2c958fd0..eef0b29fa3 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -66,22 +66,22 @@
 // Block1_0Exit [label="Jump" shape=oval];
 // Block1_0Exit -> Block1_1;
 // Block1_1 [label="\
-// Block 1\nv4 := φ(\l\
+// Block 1\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
 // )\l\
-// v5 := lt(v0, v4)\l\
+// v6 := lt(v0, v5)\l\
 // "];
 // Block1_1 -> Block1_1Exit;
-// Block1_1Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit [label="{ If v6| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_1Exit:0 -> Block1_4;
 // Block1_1Exit:1 -> Block1_2;
 // Block1_2 [label="\
-// Block 2\nv6 := mload(v4)\l\
-// v7 := eq(0, v6)\l\
+// Block 2\nv7 := mload(v5)\l\
+// v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
-// Block1_2Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit [label="{ If v8| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_2Exit:0 -> Block1_7;
 // Block1_2Exit:1 -> Block1_6;
 // Block1_4 [label="\
@@ -96,7 +96,7 @@
 // Block1_6Exit [label="Jump" shape=oval];
 // Block1_6Exit -> Block1_4;
 // Block1_7 [label="\
-// Block 7\nv13 := eq(1, v6)\l\
+// Block 7\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
 // Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -108,7 +108,7 @@
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nv20 := eq(2, v6)\l\
+// Block 10\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
 // Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -121,7 +121,7 @@
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nv25 := eq(3, v6)\l\
+// Block 13\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
 // Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -158,7 +158,7 @@
 // Block1_18Exit [label="Jump" shape=oval];
 // Block1_18Exit -> Block1_5;
 // Block1_3 [label="\
-// Block 3\nv43 := add(1, v4)\l\
+// Block 3\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
index 8f3b1bd3f6..743b0513cc 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex2.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -82,22 +82,22 @@
 // Block1_0Exit [label="Jump" shape=oval];
 // Block1_0Exit -> Block1_1;
 // Block1_1 [label="\
-// Block 1\nv4 := φ(\l\
+// Block 1\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
 // )\l\
-// v5 := lt(v0, v4)\l\
+// v6 := lt(v0, v5)\l\
 // "];
 // Block1_1 -> Block1_1Exit;
-// Block1_1Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit [label="{ If v6| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_1Exit:0 -> Block1_4;
 // Block1_1Exit:1 -> Block1_2;
 // Block1_2 [label="\
-// Block 2\nv6 := mload(v4)\l\
-// v7 := eq(0, v6)\l\
+// Block 2\nv7 := mload(v5)\l\
+// v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
-// Block1_2Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit [label="{ If v8| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_2Exit:0 -> Block1_7;
 // Block1_2Exit:1 -> Block1_6;
 // Block1_4 [label="\
@@ -112,7 +112,7 @@
 // Block1_6Exit [label="Jump" shape=oval];
 // Block1_6Exit -> Block1_4;
 // Block1_7 [label="\
-// Block 7\nv13 := eq(1, v6)\l\
+// Block 7\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
 // Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -124,7 +124,7 @@
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nv20 := eq(2, v6)\l\
+// Block 10\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
 // Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -137,7 +137,7 @@
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nv25 := eq(3, v6)\l\
+// Block 13\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
 // Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
@@ -174,7 +174,7 @@
 // Block1_18Exit [label="Jump" shape=oval];
 // Block1_18Exit -> Block1_5;
 // Block1_3 [label="\
-// Block 3\nv43 := add(1, v4)\l\
+// Block 3\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
index aa4b6ac97f..436bcd4995 100644
--- a/test/libyul/yulSSAControlFlowGraph/function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -37,10 +37,10 @@
 //  r := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nv2 := add(v1, v0)\l\
-// v3 := sub(v0, v2)\l\
+// Block 0\nv3 := add(v1, v0)\l\
+// v4 := sub(v0, v3)\l\
 // "];
-// Block1_0Exit [label="FunctionReturn[v3]"];
+// Block1_0Exit [label="FunctionReturn[v4]"];
 // Block1_0 -> Block1_0Exit;
 // FunctionEntry_g_0 [label="function g:
 //  g()"];
diff --git a/test/libyul/yulSSAControlFlowGraph/nested_for.yul b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
index e078630a60..0ed17c870a 100644
--- a/test/libyul/yulSSAControlFlowGraph/nested_for.yul
+++ b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
@@ -55,10 +55,6 @@
 // 	Block 2 => 0,\l\
 // 	Block 7 => v35\l\
 // )\l\
-// v33 := φ(\l\
-// 	Block 2 => v2,\l\
-// 	Block 7 => v18\l\
-// )\l\
 // v5 := lt(3, v4)\l\
 // "];
 // Block0_5 -> Block0_5Exit;
@@ -80,14 +76,6 @@
 // 	Block 6 => 0,\l\
 // 	Block 11 => v31\l\
 // )\l\
-// v17 := φ(\l\
-// 	Block 6 => v4,\l\
-// 	Block 11 => v32\l\
-// )\l\
-// v18 := φ(\l\
-// 	Block 6 => v33,\l\
-// 	Block 11 => v34\l\
-// )\l\
 // v7 := lt(3, v6)\l\
 // "];
 // Block0_9 -> Block0_9Exit;
@@ -95,7 +83,7 @@
 // Block0_9Exit:0 -> Block0_12;
 // Block0_9Exit:1 -> Block0_10;
 // Block0_3 [label="\
-// Block 3\nv36 := add(1, v33)\l\
+// Block 3\nv36 := add(1, v2)\l\
 // "];
 // Block0_3 -> Block0_3Exit [arrowhead=none];
 // Block0_3Exit [label="Jump" shape=oval];
@@ -117,25 +105,13 @@
 // Block0_13Exit [label="Jump" shape=oval];
 // Block0_13Exit -> Block0_15;
 // Block0_14 [label="\
-// Block 14\nv27 := φ(\l\
-// 	Block 10 => v6,\l\
-// 	Block 18 => v10\l\
-// )\l\
-// v28 := φ(\l\
-// 	Block 10 => v17,\l\
-// 	Block 18 => v11\l\
-// )\l\
-// v29 := φ(\l\
-// 	Block 10 => v18,\l\
-// 	Block 18 => v12\l\
-// )\l\
-// "];
+// Block 14\n"];
 // Block0_14 -> Block0_14Exit;
 // Block0_14Exit [label="{ If 1| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block0_14Exit:0 -> Block0_20;
 // Block0_14Exit:1 -> Block0_19;
 // Block0_7 [label="\
-// Block 7\nv35 := add(1, v17)\l\
+// Block 7\nv35 := add(1, v4)\l\
 // "];
 // Block0_7 -> Block0_7Exit [arrowhead=none];
 // Block0_7Exit [label="Jump" shape=oval];
@@ -157,24 +133,12 @@
 // Block0_19Exit [label="Jump" shape=oval];
 // Block0_19Exit -> Block0_21;
 // Block0_20 [label="\
-// Block 20\nv30 := φ(\l\
-// 	Block 14 => v27,\l\
-// 	Block 24 => v21\l\
-// )\l\
-// v32 := φ(\l\
-// 	Block 14 => v28,\l\
-// 	Block 24 => v22\l\
-// )\l\
-// v34 := φ(\l\
-// 	Block 14 => v29,\l\
-// 	Block 24 => v23\l\
-// )\l\
-// "];
+// Block 20\n"];
 // Block0_20 -> Block0_20Exit [arrowhead=none];
 // Block0_20Exit [label="Jump" shape=oval];
 // Block0_20Exit -> Block0_11;
 // Block0_16 [label="\
-// Block 16\nv13 := add(v17, v18)\l\
+// Block 16\nv13 := add(v4, v2)\l\
 // v14 := add(v6, v13)\l\
 // sstore(v14, v8)\l\
 // "];
@@ -198,7 +162,7 @@
 // Block0_21Exit:0 -> Block0_24;
 // Block0_21Exit:1 -> Block0_22;
 // Block0_11 [label="\
-// Block 11\nv31 := add(1, v30)\l\
+// Block 11\nv31 := add(1, v6)\l\
 // "];
 // Block0_11 -> Block0_11Exit [arrowhead=none];
 // Block0_11Exit [label="Jump" shape=oval];
@@ -210,8 +174,8 @@
 // Block0_17Exit [label="Jump" shape=oval];
 // Block0_17Exit -> Block0_15;
 // Block0_22 [label="\
-// Block 22\nv24 := add(v28, v29)\l\
-// v25 := add(v27, v24)\l\
+// Block 22\nv24 := add(v4, v2)\l\
+// v25 := add(v6, v24)\l\
 // sstore(v25, v19)\l\
 // "];
 // Block0_22 -> Block0_22Exit [arrowhead=none];

From c4a199a253f958c13ba70dc9f702a37dfbd5f21c Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:21:35 +0200
Subject: [PATCH 1074/1140] SSACFGBuilder: clean up tryRemoveTrivialPhi

---
 .../evm/SSAControlFlowGraphBuilder.cpp        | 57 ++++---------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index 26635124ed..3735892c36 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -84,14 +84,6 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 			return _phi;  // phi merges at least two distinct values -> not trivial
 		same = arg;
 	}
-
-	struct Use {
-		std::reference_wrapper<SSACFG::Operation> operation;
-		size_t inputIndex = std::numeric_limits<size_t>::max();
-	};
-	std::vector<Use> uses;
-	std::vector<SSACFG::ValueId> phiUses;
-
 	if (!same.hasValue())
 	{
 		// This will happen for unreachable paths.
@@ -99,40 +91,29 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 		same = m_graph.unreachableValue();
 	}
 
-	auto phiBlock = phiInfo->block;
-	m_graph.block(phiBlock).phis.erase(_phi);
+	m_graph.block(phiInfo->block).phis.erase(_phi);
 
+	std::set<SSACFG::ValueId> phiUses;
 	for (size_t blockIdValue = 0; blockIdValue < m_graph.numBlocks(); ++blockIdValue)
 	{
 		auto& block = m_graph.block(SSACFG::BlockId{blockIdValue});
 		for (auto blockPhi: block.phis)
 		{
-			if (blockPhi == _phi)
-				continue;
-			auto const* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(blockPhi));
+			yulAssert(blockPhi != _phi, "Phis should be defined in exactly one block, _phi was erased.");
+			auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(blockPhi));
 			yulAssert(blockPhiInfo);
 			bool usedInPhi = false;
-			for (auto input: blockPhiInfo->arguments)
-			{
-				if (input == _phi)
+			for (auto& arg: blockPhiInfo->arguments)
+				if (arg == _phi)
+				{
+					arg = same;
 					usedInPhi = true;
-			}
+				}
 			if (usedInPhi)
-				phiUses.emplace_back(blockPhi);
+				phiUses.emplace(blockPhi);
 		}
 		for (auto& op: block.operations)
-		{
-			// TODO: double check when phiVar occurs in outputs here and what to do about it.
-			if (op.outputs.size() == 1 && op.outputs.front() == _phi)
-				continue;
-			// TODO: check if this always hold - and if so if the assertion is really valuable.
-			for (auto& output: op.outputs)
-				yulAssert(output != _phi);
-
-			for (auto&& [n, input]: op.inputs | ranges::views::enumerate)
-				if (input == _phi)
-					uses.emplace_back(Use{std::ref(op), n});
-		}
+			std::replace(op.inputs.begin(), op.inputs.end(), _phi, same);
 		std::visit(util::GenericVisitor{
 			[_phi, same](SSACFG::BasicBlock::FunctionReturn& _functionReturn) {
 				std::replace(
@@ -155,22 +136,8 @@ SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId
 			[](SSACFG::BasicBlock::Terminated&) {}
 		}, block.exit);
 	}
-	for (auto& use: uses)
-		use.operation.get().inputs.at(use.inputIndex) = same;
-	for (auto phiUse: phiUses)
-	{
-		auto* blockPhiInfo = std::get_if<SSACFG::PhiValue>(&m_graph.valueInfo(phiUse));
-		yulAssert(blockPhiInfo);
-		for (auto& arg: blockPhiInfo->arguments)
-			if (arg == _phi)
-				arg = same;
-	}
 	for (auto& [_, currentVariableDefs]: m_currentDef)
-	{
-		for (auto& def: currentVariableDefs)
-			if (def && *def == _phi)
-				def = same;
-	}
+		std::replace(currentVariableDefs.begin(), currentVariableDefs.end(), _phi, same);
 
 	for (auto phiUse: phiUses)
 		tryRemoveTrivialPhi(phiUse);

From 55f746b8c599b76afef97e1b63840b532d43a36c Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Thu, 19 Sep 2024 20:23:45 +0200
Subject: [PATCH 1075/1140] eof: Introduce EOF container format support in
 `Assembly::assemble` (EIP-3540)

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 libevmasm/Assembly.cpp                  | 441 +++++++++++++++++++-----
 libevmasm/Assembly.h                    |  52 ++-
 libevmasm/ConstantOptimiser.cpp         |  73 ++--
 libevmasm/EVMAssemblyStack.cpp          |   8 +-
 libsolidity/interface/CompilerStack.cpp |  13 +-
 libyul/YulStack.cpp                     |  10 +-
 test/libevmasm/Assembler.cpp            |   3 +-
 test/libevmasm/Optimiser.cpp            |   6 +-
 test/libsolidity/Assembly.cpp           |   3 +-
 9 files changed, 455 insertions(+), 154 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 7a28208c1b..df78f43ca5 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -58,11 +58,13 @@ AssemblyItem const& Assembly::append(AssemblyItem _i)
 {
 	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
 	m_deposit += static_cast<int>(_i.deposit());
-	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;
-	return m_items.back();
+	solAssert(m_currentCodeSection < m_codeSections.size());
+	auto& currentItems = m_codeSections.at(m_currentCodeSection).items;
+	currentItems.emplace_back(std::move(_i));
+	if (!currentItems.back().location().isValid() && m_currentSourceLocation.isValid())
+		currentItems.back().setLocation(m_currentSourceLocation);
+	currentItems.back().m_modifierDepth = m_currentModifierDepth;
+	return currentItems.back();
 }
 
 unsigned Assembly::codeSize(unsigned subTagSize) const
@@ -73,8 +75,9 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 		for (auto const& i: m_data)
 			ret += i.second.size();
 
-		for (AssemblyItem const& i: m_items)
-			ret += i.bytesRequired(tagSize, m_evmVersion, Precision::Precise);
+		for (auto const& codeSection: m_codeSections)
+			for (AssemblyItem const& i: codeSection.items)
+				ret += i.bytesRequired(tagSize, m_evmVersion, Precision::Precise);
 		if (numberEncodingSize(ret) <= tagSize)
 			return static_cast<unsigned>(ret);
 	}
@@ -82,11 +85,15 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 
 void Assembly::importAssemblyItemsFromJSON(Json const& _code, std::vector<std::string> const& _sourceList)
 {
-	solAssert(m_items.empty());
+	// Assembly constructor creates first code section with proper type and empty `items`
+	solAssert(m_codeSections.size() == 1);
+	solAssert(m_codeSections[0].items.empty());
+	// TODO: Add support for EOF and more than one code sections.
+	solUnimplementedAssert(!m_eofVersion.has_value(), "Assembly output for EOF is not yet implemented.");
 	solRequire(_code.is_array(), 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));
+		AssemblyItem const& newItem = m_codeSections[0].items.emplace_back(createAssemblyItemFromJSON(*jsonItemIter, _sourceList));
 		if (newItem == Instruction::JUMPDEST)
 			solThrow(AssemblyImportException, "JUMPDEST instruction without a tag");
 		else if (newItem.type() == AssemblyItemType::Tag)
@@ -396,7 +403,10 @@ void Assembly::assemblyStream(
 {
 	Functionalizer f(_out, _prefix, _sourceCodes, *this);
 
-	for (auto const& i: m_items)
+	// TODO: support EOF
+	solUnimplementedAssert(!m_eofVersion.has_value(), "Assembly output for EOF is not yet implemented.");
+	solAssert(m_codeSections.size() == 1);
+	for (auto const& i: m_codeSections.front().items)
 		f.feed(i, _debugInfoSelection);
 	f.flush();
 
@@ -434,7 +444,10 @@ Json Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndice
 	Json root;
 	root[".code"] = Json::array();
 	Json& code = root[".code"];
-	for (AssemblyItem const& item: m_items)
+    // TODO: support EOF
+	solUnimplementedAssert(!m_eofVersion.has_value(), "Assembly output for EOF is not yet implemented.");
+	solAssert(m_codeSections.size() == 1);
+	for (AssemblyItem const& item: m_codeSections.front().items)
 	{
 		int sourceIndex = -1;
 		if (item.location().sourceName)
@@ -518,7 +531,8 @@ Json Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndice
 std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(
 	Json const& _json,
 	std::vector<std::string> const& _sourceList,
-	size_t _level
+	size_t _level,
+	std::optional<uint8_t> _eofVersion
 )
 {
 	solRequire(_json.is_object(), AssemblyImportException, "Supplied JSON is not an object.");
@@ -549,7 +563,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			"Member 'sourceList' may only be present in the root JSON object."
 		);
 
-	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, std::nullopt, "" /* _name */);
+	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, _eofVersion, "" /* _name */);
 	std::vector<std::string> parsedSourceList;
 	if (_json.contains("sourceList"))
 	{
@@ -717,16 +731,21 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 		return *m_tagReplacements;
 
 	// Run optimisation for sub-assemblies.
+	// TODO: verify and double-check this for EOF.
 	for (size_t subId = 0; subId < m_subs.size(); ++subId)
 	{
 		OptimiserSettings settings = _settings;
 		Assembly& sub = *m_subs[subId];
+		std::set<size_t> referencedTags;
+		for (auto& codeSection: m_codeSections)
+			referencedTags += JumpdestRemover::referencedTags(codeSection.items, subId);
 		std::map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
 			settings,
-			JumpdestRemover::referencedTags(m_items, subId)
+			referencedTags
 		);
 		// Apply the replacements (can be empty).
-		BlockDeduplicator::applyTagReplacement(m_items, subTagReplacements, subId);
+		for (auto& codeSection: m_codeSections)
+			BlockDeduplicator::applyTagReplacement(codeSection.items, subTagReplacements, subId);
 	}
 
 	std::map<u256, u256> tagReplacements;
@@ -735,57 +754,70 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 	{
 		count = 0;
 
+		// TODO: verify this for EOF.
 		if (_settings.runInliner && !m_eofVersion.has_value())
+		{
+			solAssert(m_codeSections.size() == 1);
 			Inliner{
-				m_items,
+				m_codeSections.front().items,
 				_tagsReferencedFromOutside,
 				_settings.expectedExecutionsPerDeployment,
 				isCreation(),
-				_settings.evmVersion
-			}.optimise();
-
-		if (_settings.runJumpdestRemover)
+				_settings.evmVersion}
+				.optimise();
+		}
+		// TODO: verify this for EOF.
+		if (_settings.runJumpdestRemover && !m_eofVersion.has_value())
 		{
-			JumpdestRemover jumpdestOpt{m_items};
-			if (jumpdestOpt.optimise(_tagsReferencedFromOutside))
-				count++;
+			for (auto& codeSection: m_codeSections)
+			{
+				JumpdestRemover jumpdestOpt{codeSection.items};
+				if (jumpdestOpt.optimise(_tagsReferencedFromOutside))
+					count++;
+			}
 		}
 
-		if (_settings.runPeephole)
+		// TODO: verify this for EOF.
+		if (_settings.runPeephole && !m_eofVersion.has_value())
 		{
-			PeepholeOptimiser peepOpt{m_items, m_evmVersion};
-			while (peepOpt.optimise())
+			for (auto& codeSection: m_codeSections)
 			{
-				count++;
-				assertThrow(count < 64000, OptimizerException, "Peephole optimizer seems to be stuck.");
+				PeepholeOptimiser peepOpt{codeSection.items, m_evmVersion};
+				while (peepOpt.optimise())
+				{
+					count++;
+					assertThrow(count < 64000, OptimizerException, "Peephole optimizer seems to be stuck.");
+				}
 			}
 		}
 
 		// This only modifies PushTags, we have to run again to actually remove code.
+		// TODO: implement for EOF.
 		if (_settings.runDeduplicate && !m_eofVersion.has_value())
-		{
-			BlockDeduplicator deduplicator{m_items};
-			if (deduplicator.deduplicate())
+			for (auto& section: m_codeSections)
 			{
-				for (auto const& replacement: deduplicator.replacedTags())
+				BlockDeduplicator deduplicator{section.items};
+				if (deduplicator.deduplicate())
 				{
-					assertThrow(
-						replacement.first <= std::numeric_limits<size_t>::max() && replacement.second <= std::numeric_limits<size_t>::max(),
-						OptimizerException,
-						"Invalid tag replacement."
-					);
-					assertThrow(
-						!tagReplacements.count(replacement.first),
-						OptimizerException,
-						"Replacement already known."
-					);
-					tagReplacements[replacement.first] = replacement.second;
-					if (_tagsReferencedFromOutside.erase(static_cast<size_t>(replacement.first)))
-						_tagsReferencedFromOutside.insert(static_cast<size_t>(replacement.second));
+					for (auto const& replacement: deduplicator.replacedTags())
+					{
+						assertThrow(
+							replacement.first <= std::numeric_limits<size_t>::max() && replacement.second <= std::numeric_limits<size_t>::max(),
+							OptimizerException,
+							"Invalid tag replacement."
+						);
+						assertThrow(
+							!tagReplacements.count(replacement.first),
+							OptimizerException,
+							"Replacement already known."
+						);
+						tagReplacements[replacement.first] = replacement.second;
+						if (_tagsReferencedFromOutside.erase(static_cast<size_t>(replacement.first)))
+							_tagsReferencedFromOutside.insert(static_cast<size_t>(replacement.second));
+					}
+					count++;
 				}
-				count++;
 			}
-		}
 
 		// TODO: investigate for EOF
 		if (_settings.runCSE && !m_eofVersion.has_value())
@@ -795,17 +827,19 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 			// function types that can be stored in storage.
 			AssemblyItems optimisedItems;
 
-			bool usesMSize = ranges::any_of(m_items, [](AssemblyItem const& _i) {
+			solAssert(m_codeSections.size() == 1);
+			auto& items = m_codeSections.front().items;
+			bool usesMSize = ranges::any_of(items, [](AssemblyItem const& _i) {
 				return _i == AssemblyItem{Instruction::MSIZE} || _i.type() == VerbatimBytecode;
 			});
 
-			auto iter = m_items.begin();
-			while (iter != m_items.end())
+			auto iter = items.begin();
+			while (iter != items.end())
 			{
 				KnownState emptyState;
 				CommonSubexpressionEliminator eliminator{emptyState};
 				auto orig = iter;
-				iter = eliminator.feedItems(iter, m_items.end(), usesMSize);
+				iter = eliminator.feedItems(iter, items.end(), usesMSize);
 				bool shouldReplace = false;
 				AssemblyItems optimisedChunk;
 				try
@@ -832,9 +866,9 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 				else
 					copy(orig, iter, back_inserter(optimisedItems));
 			}
-			if (optimisedItems.size() < m_items.size())
+			if (optimisedItems.size() < items.size())
 			{
-				m_items = std::move(optimisedItems);
+				items = std::move(optimisedItems);
 				count++;
 			}
 		}
@@ -853,19 +887,115 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
 	return *m_tagReplacements;
 }
 
+namespace
+{
+template<typename ValueT>
+void setBigEndian(bytes& _dest, size_t _offset, size_t _size, ValueT _value)
+{
+	assertThrow(numberEncodingSize(_value) <= _size, AssemblyException, "");
+	toBigEndian(_value, bytesRef(_dest.data() + _offset, _size));
+}
+
+template<typename ValueT>
+void appendBigEndian(bytes& _dest, size_t _size, ValueT _value)
+{
+	_dest.resize(_dest.size() + _size);
+	setBigEndian(_dest, _dest.size() - _size, _size, _value);
+}
+
+template<typename ValueT>
+void setBigEndianUint16(bytes& _dest, size_t _offset, ValueT _value)
+{
+	setBigEndian(_dest, _offset, 2, _value);
+}
+
+template<typename ValueT>
+void appendBigEndianUint16(bytes& _dest, ValueT _value)
+{
+	static_assert(!std::numeric_limits<ValueT>::is_signed, "only unsigned types or bigint supported");
+	assertThrow(_value <= 0xFFFF, AssemblyException, "");
+	appendBigEndian(_dest, 2, static_cast<size_t>(_value));
+}
+}
+
+std::tuple<bytes, std::vector<size_t>, size_t> Assembly::createEOFHeader(std::set<uint16_t> const& _referencedSubIds) const
+{
+	bytes retBytecode;
+	std::vector<size_t> codeSectionSizeOffsets;
+	size_t dataSectionSizeOffset;
+
+	retBytecode.push_back(0xef);
+	retBytecode.push_back(0x00);
+	retBytecode.push_back(0x01);										// version 1
+
+	retBytecode.push_back(0x01);										// kind=type
+	appendBigEndianUint16(retBytecode, m_codeSections.size() * 4u);		// length of type section
+
+	retBytecode.push_back(0x02);										// kind=code
+	appendBigEndianUint16(retBytecode, m_codeSections.size());			// placeholder for number of code sections
+
+	for (auto const& codeSection: m_codeSections)
+	{
+		(void) codeSection;
+		codeSectionSizeOffsets.emplace_back(retBytecode.size());
+		appendBigEndianUint16(retBytecode, 0u);							// placeholder for length of code
+	}
+
+	if (!_referencedSubIds.empty())
+	{
+		retBytecode.push_back(0x03);
+		appendBigEndianUint16(retBytecode, _referencedSubIds.size());
+
+		for (auto subId: _referencedSubIds)
+			appendBigEndianUint16(retBytecode, m_subs[subId]->assemble().bytecode.size());
+	}
+
+	retBytecode.push_back(0x04);										// kind=data
+	dataSectionSizeOffset = retBytecode.size();
+	appendBigEndianUint16(retBytecode, 0u);								// length of data
+
+	retBytecode.push_back(0x00);										// terminator
+
+	for (auto const& codeSection: m_codeSections)
+	{
+		retBytecode.push_back(codeSection.inputs);
+		retBytecode.push_back(codeSection.outputs);
+		appendBigEndianUint16(retBytecode, 0xFFFFu);	// TODO: Add stack height calculation
+	}
+
+	return {retBytecode, codeSectionSizeOffsets, dataSectionSizeOffset};
+}
+
 LinkerObject const& Assembly::assemble() const
 {
-	assertThrow(!m_invalid, AssemblyException, "Attempted to assemble invalid Assembly object.");
+	solRequire(!m_invalid, AssemblyException, "Attempted to assemble invalid Assembly object.");
 	// Return the already assembled object, if present.
 	if (!m_assembledObject.bytecode.empty())
 		return m_assembledObject;
-	// Otherwise ensure the object is actually clear.
-	assertThrow(m_assembledObject.linkReferences.empty(), AssemblyException, "Unexpected link references.");
 
-	LinkerObject& ret = m_assembledObject;
+	// Otherwise ensure the object is actually clear.
+	solRequire(m_assembledObject.linkReferences.empty(), AssemblyException, "Unexpected link references.");
 
 	bool const eof = m_eofVersion.has_value();
-	solAssert(!eof || m_eofVersion == 1, "Invalid EOF version.");
+	solRequire(!eof || m_eofVersion == 1, AssemblyException, "Invalid EOF version.");
+
+	if (!eof)
+		return assembleLegacy();
+	else
+		return assembleEOF();
+}
+
+LinkerObject const& Assembly::assembleLegacy() const
+{
+	solAssert(!m_eofVersion.has_value());
+	solAssert(!m_invalid);
+	// Return the already assembled object, if present.
+	if (!m_assembledObject.bytecode.empty())
+		return m_assembledObject;
+	// Otherwise ensure the object is actually clear.
+	solAssert(m_assembledObject.linkReferences.empty());
+
+	LinkerObject& ret = m_assembledObject;
 
 	size_t subTagSize = 1;
 	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferencesBySub;
@@ -889,13 +1019,16 @@ LinkerObject const& Assembly::assemble() const
 	bool setsImmutables = false;
 	bool pushesImmutables = false;
 
-	for (auto const& i: m_items)
-		if (i.type() == AssignImmutable)
+	assertThrow(m_codeSections.size() == 1, AssemblyException, "Expected exactly one code section in non-EOF code.");
+	AssemblyItems const& items = m_codeSections.front().items;
+
+	for (auto const& item: items)
+		if (item.type() == AssignImmutable)
 		{
-			i.setImmutableOccurrences(immutableReferencesBySub[i.data()].second.size());
+			item.setImmutableOccurrences(immutableReferencesBySub[item.data()].second.size());
 			setsImmutables = true;
 		}
-		else if (i.type() == PushImmutable)
+		else if (item.type() == PushImmutable)
 			pushesImmutables = true;
 	if (setsImmutables || pushesImmutables)
 		assertThrow(
@@ -912,10 +1045,10 @@ LinkerObject const& Assembly::assemble() const
 	std::vector<unsigned> sizeRef; ///< Pointers to code locations where the size of the program is inserted
 	unsigned bytesPerTag = numberEncodingSize(bytesRequiredForCode);
 	// Adjust bytesPerTag for references to sub assemblies.
-	for (AssemblyItem const& i: m_items)
-		if (i.type() == PushTag)
+	for (AssemblyItem const& item: items)
+		if (item.type() == PushTag)
 		{
-			auto [subId, tagId] = i.splitForeignPushTag();
+			auto [subId, tagId] = item.splitForeignPushTag();
 			if (subId == std::numeric_limits<size_t>::max())
 				continue;
 			assertThrow(subId < m_subs.size(), AssemblyException, "Invalid sub id");
@@ -933,20 +1066,20 @@ LinkerObject const& Assembly::assemble() const
 	uint8_t dataRefPush = static_cast<uint8_t>(pushInstruction(bytesPerDataRef));
 	ret.bytecode.reserve(bytesRequiredIncludingData);
 
-	for (AssemblyItem const& i: m_items)
+	for (AssemblyItem const& item: items)
 	{
 		// store position of the invalid jump destination
-		if (i.type() != Tag && m_tagPositionsInBytecode[0] == std::numeric_limits<size_t>::max())
+		if (item.type() != Tag && m_tagPositionsInBytecode[0] == std::numeric_limits<size_t>::max())
 			m_tagPositionsInBytecode[0] = ret.bytecode.size();
 
-		switch (i.type())
+		switch (item.type())
 		{
 		case Operation:
-			ret.bytecode.push_back(static_cast<uint8_t>(i.instruction()));
+			ret.bytecode.push_back(static_cast<uint8_t>(item.instruction()));
 			break;
 		case Push:
 		{
-			unsigned b = numberEncodingSize(i.data());
+			unsigned b = numberEncodingSize(item.data());
 			if (b == 0 && !m_evmVersion.hasPush0())
 			{
 				b = 1;
@@ -956,36 +1089,33 @@ LinkerObject const& Assembly::assemble() const
 			{
 				ret.bytecode.resize(ret.bytecode.size() + b);
 				bytesRef byr(&ret.bytecode.back() + 1 - b, b);
-				toBigEndian(i.data(), byr);
+				toBigEndian(item.data(), byr);
 			}
 			break;
 		}
 		case PushTag:
 		{
-			assertThrow(!eof, AssemblyException, "PushTag in EOF code");
 			ret.bytecode.push_back(tagPush);
-			tagRef[ret.bytecode.size()] = i.splitForeignPushTag();
+			tagRef[ret.bytecode.size()] = item.splitForeignPushTag();
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerTag);
 			break;
 		}
 		case PushData:
 			ret.bytecode.push_back(dataRefPush);
-			dataRef.insert(std::make_pair(h256(i.data()), ret.bytecode.size()));
+			dataRef.insert(std::make_pair(h256(item.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSub:
-			assertThrow(!eof, AssemblyException, "PushSub in EOF code");
-			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
+			assertThrow(item.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
 			ret.bytecode.push_back(dataRefPush);
-			subRef.insert(std::make_pair(static_cast<size_t>(i.data()), ret.bytecode.size()));
+			subRef.insert(std::make_pair(static_cast<size_t>(item.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSubSize:
 		{
-			assertThrow(!eof, AssemblyException, "PushSubSize in EOF code");
-			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));
+			assertThrow(item.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
+			auto s = subAssemblyById(static_cast<size_t>(item.data()))->assemble().bytecode.size();
+			item.setPushedValue(u256(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);
@@ -995,7 +1125,6 @@ LinkerObject const& Assembly::assemble() const
 		}
 		case PushProgramSize:
 		{
-			assertThrow(!eof, AssemblyException, "PushProgramSize in EOF code");
 			ret.bytecode.push_back(dataRefPush);
 			sizeRef.push_back(static_cast<unsigned>(ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
@@ -1003,27 +1132,25 @@ LinkerObject const& Assembly::assemble() const
 		}
 		case PushLibraryAddress:
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-			ret.linkReferences[ret.bytecode.size()] = m_libraries.at(i.data());
+			ret.linkReferences[ret.bytecode.size()] = m_libraries.at(item.data());
 			ret.bytecode.resize(ret.bytecode.size() + 20);
 			break;
 		case PushImmutable:
-			assertThrow(!eof, AssemblyException, "PushImmutable in EOF code");
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH32));
 			// Maps keccak back to the "identifier" std::string of that immutable.
-			ret.immutableReferences[i.data()].first = m_immutables.at(i.data());
+			ret.immutableReferences[item.data()].first = m_immutables.at(item.data());
 			// Record the bytecode offset of the PUSH32 argument.
-			ret.immutableReferences[i.data()].second.emplace_back(ret.bytecode.size());
+			ret.immutableReferences[item.data()].second.emplace_back(ret.bytecode.size());
 			// Advance bytecode by 32 bytes (default initialized).
 			ret.bytecode.resize(ret.bytecode.size() + 32);
 			break;
 		case VerbatimBytecode:
-			ret.bytecode += i.verbatimData();
+			ret.bytecode += item.verbatimData();
 			break;
 		case AssignImmutable:
 		{
-			assertThrow(!eof, AssemblyException, "AssignImmutable in EOF code");
 			// Expect 2 elements on stack (source, dest_base)
-			auto const& offsets = immutableReferencesBySub[i.data()].second;
+			auto const& offsets = immutableReferencesBySub[item.data()].second;
 			for (size_t i = 0; i < offsets.size(); ++i)
 			{
 				if (i != offsets.size() - 1)
@@ -1043,7 +1170,7 @@ LinkerObject const& Assembly::assemble() const
 				ret.bytecode.push_back(uint8_t(Instruction::POP));
 				ret.bytecode.push_back(uint8_t(Instruction::POP));
 			}
-			immutableReferencesBySub.erase(i.data());
+			immutableReferencesBySub.erase(item.data());
 			break;
 		}
 		case PushDeployTimeAddress:
@@ -1052,9 +1179,9 @@ LinkerObject const& Assembly::assemble() const
 			break;
 		case Tag:
 		{
-			assertThrow(i.data() != 0, AssemblyException, "Invalid tag position.");
-			assertThrow(i.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
-			size_t tagId = static_cast<size_t>(i.data());
+			assertThrow(item.data() != 0, AssemblyException, "Invalid tag position.");
+			assertThrow(item.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
+			size_t tagId = static_cast<size_t>(item.data());
 			assertThrow(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
 			assertThrow(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
 			m_tagPositionsInBytecode[tagId] = ret.bytecode.size();
@@ -1074,7 +1201,7 @@ LinkerObject const& Assembly::assemble() const
 				"Some immutables were read from but never assigned, possibly because of optimization."
 			);
 
-	if (!eof && (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty()))
+	if (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty())
 		// Append an INVALID here to help tests find miscompilation.
 		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
 
@@ -1118,7 +1245,7 @@ LinkerObject const& Assembly::assemble() const
 	{
 		size_t position = m_tagPositionsInBytecode.at(tagInfo.id);
 		std::optional<size_t> tagIndex;
-		for (auto&& [index, item]: m_items | ranges::views::enumerate)
+		for (auto&& [index, item]: items | ranges::views::enumerate)
 			if (item.type() == Tag && static_cast<size_t>(item.data()) == tagInfo.id)
 			{
 				tagIndex = index;
@@ -1156,6 +1283,130 @@ LinkerObject const& Assembly::assemble() const
 	return ret;
 }
 
+std::map<uint16_t, uint16_t> Assembly::findReferencedContainers() const
+{
+	std::set<uint16_t> referencedSubcontainersIds;
+	solAssert(m_subs.size() <= 0x100); // According to EOF spec
+
+	// TODO: Implement properly when opcodes referring sub containers added.
+	for (uint16_t i = 0; i < m_subs.size(); ++i)
+		referencedSubcontainersIds.insert(static_cast<uint16_t>(i));
+	// END TODO
+
+	std::map<uint16_t, uint16_t> replacements;
+	uint8_t nUnreferenced = 0;
+	for (uint8_t i = 0; i < static_cast<uint16_t>(m_subs.size()); ++i)
+	{
+		if (referencedSubcontainersIds.count(i) > 0)
+			replacements[i] = static_cast<uint16_t>(i - nUnreferenced);
+		else
+			nUnreferenced++;
+	}
+
+	return replacements;
+}
+
+LinkerObject const& Assembly::assembleEOF() const
+{
+	solAssert(m_eofVersion.has_value() && m_eofVersion == 1);
+	LinkerObject& ret = m_assembledObject;
+
+	auto const subIdsReplacements = findReferencedContainers();
+	auto const referencedSubIds = keys(subIdsReplacements);
+
+	solRequire(!m_codeSections.empty(), AssemblyException, "Expected at least one code section.");
+	solRequire(
+		m_codeSections.front().inputs == 0 && m_codeSections.front().outputs == 0x80, AssemblyException,
+		"Expected the first code section to have zero inputs and be non-returning."
+	);
+
+	// Insert EOF1 header.
+	auto [bytecode, codeSectionSizeOffsets, dataSectionSizeOffset] = createEOFHeader(referencedSubIds);
+	ret.bytecode = bytecode;
+
+	m_tagPositionsInBytecode = std::vector<size_t>(m_usedTags, std::numeric_limits<size_t>::max());
+
+	for (auto&& [codeSectionIndex, codeSection]: m_codeSections | ranges::views::enumerate)
+	{
+		auto const sectionStart = ret.bytecode.size();
+
+		for (AssemblyItem const& item: codeSection.items)
+		{
+			// store position of the invalid jump destination
+			if (item.type() != Tag && m_tagPositionsInBytecode[0] == std::numeric_limits<size_t>::max())
+				m_tagPositionsInBytecode[0] = ret.bytecode.size();
+
+			switch (item.type())
+			{
+				case Operation:
+					ret.bytecode.push_back(static_cast<uint8_t>(item.instruction()));
+					break;
+				case Push:
+				{
+					unsigned pushValueSize = numberEncodingSize(item.data());
+					if (pushValueSize == 0 && !m_evmVersion.hasPush0())
+					{
+						pushValueSize = 1;
+					}
+					ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(pushValueSize)));
+					if (pushValueSize > 0)
+					{
+						ret.bytecode.resize(ret.bytecode.size() + pushValueSize);
+						bytesRef pushValueBytecodeRef(&ret.bytecode.back() + 1 - pushValueSize, pushValueSize);
+						toBigEndian(item.data(), pushValueBytecodeRef);
+					}
+					break;
+				}
+				case PushLibraryAddress:
+					ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
+					ret.linkReferences[ret.bytecode.size()] = m_libraries.at(item.data());
+					ret.bytecode.resize(ret.bytecode.size() + 20);
+					break;
+				case VerbatimBytecode:
+					ret.bytecode += item.verbatimData();
+					break;
+				case PushDeployTimeAddress:
+					ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
+					ret.bytecode.resize(ret.bytecode.size() + 20);
+					break;
+				case Tag:
+				{
+					solRequire(item.data() != 0, AssemblyException, "Invalid tag position.");
+					solRequire(item.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
+					size_t tagId = static_cast<size_t>(item.data());
+					solRequire(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
+					solRequire(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
+					m_tagPositionsInBytecode[tagId] = ret.bytecode.size();
+					break;
+				}
+				default:
+					solRequire(false, InvalidOpcode, "Unexpected opcode while assembling.");
+			}
+		}
+
+		auto sectionEnd = ret.bytecode.size();
+		setBigEndianUint16(ret.bytecode, codeSectionSizeOffsets[codeSectionIndex], sectionEnd - sectionStart);
+	}
+
+	for (auto i: referencedSubIds)
+		ret.bytecode += m_subs[i]->assemble().bytecode;
+
+	// TODO: Fill functionDebugData for EOF. It probably should be handled for new code section in the loop above.
+	solRequire(m_namedTags.empty(), AssemblyException, "Named tags must be empty in EOF context.");
+
+	auto const dataStart = ret.bytecode.size();
+
+	for (auto const& dataItem: m_data)
+		ret.bytecode += dataItem.second;
+
+	ret.bytecode += m_auxiliaryData;
+
+	auto dataLength = ret.bytecode.size() - dataStart;
+	setBigEndianUint16(ret.bytecode, dataSectionSizeOffset, dataLength);
+
+	return ret;
+}
+
 std::vector<size_t> Assembly::decodeSubPath(size_t _subObjectId) const
 {
 	if (_subObjectId < m_subs.size())
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 2b0ef93df2..41e735db61 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -49,11 +49,14 @@ class Assembly
 {
 public:
 	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::optional<uint8_t> _eofVersion, std::string _name):
-	m_evmVersion(_evmVersion),
-	m_creation(_creation),
-	m_eofVersion(_eofVersion),
-	m_name(std::move(_name))
-	{}
+		m_evmVersion(_evmVersion),
+		m_creation(_creation),
+		m_eofVersion(_eofVersion),
+		m_name(std::move(_name))
+	{
+		// Code section number 0 has to be non-returning.
+		m_codeSections.emplace_back(CodeSection{0, 0x80, {}});
+	}
 
 	std::optional<uint8_t> eofVersion() const { return m_eofVersion; }
 	AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); }
@@ -103,12 +106,6 @@ class Assembly
 	/// Appends @a _data literally to the very end of the bytecode.
 	void appendToAuxiliaryData(bytes const& _data) { m_auxiliaryData += _data; }
 
-	/// Returns the assembly items.
-	AssemblyItems const& items() const { return m_items; }
-
-	/// Returns the mutable assembly items. Use with care!
-	AssemblyItems& items() { return m_items; }
-
 	int deposit() const { return m_deposit; }
 	void adjustDeposit(int _adjustment) { m_deposit += _adjustment; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
 	void setDeposit(int _deposit) { m_deposit = _deposit; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
@@ -170,7 +167,8 @@ class Assembly
 	static std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> fromJSON(
 		Json const& _json,
 		std::vector<std::string> const& _sourceList = {},
-		size_t _level = 0
+		size_t _level = 0,
+		std::optional<uint8_t> _eofVersion = std::nullopt
 	);
 
 	/// Mark this assembly as invalid. Calling ``assemble`` on it will throw.
@@ -181,12 +179,30 @@ class Assembly
 
 	bool isCreation() const { return m_creation; }
 
+	struct CodeSection
+	{
+		uint8_t inputs = 0;
+		uint8_t outputs = 0;
+		AssemblyItems items{};
+	};
+
+	std::vector<CodeSection>& codeSections()
+	{
+		return m_codeSections;
+	}
+
+	std::vector<CodeSection> const& codeSections() const
+	{
+		return m_codeSections;
+	}
+
 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
 	/// that are referenced in a super-assembly.
 	std::map<u256, u256> const& optimiseInternal(OptimiserSettings const& _settings, std::set<size_t> _tagsReferencedFromOutside);
 
+	/// For EOF and legacy it calculates approximate size of "pure" code without data.
 	unsigned codeSize(unsigned subTagSize) const;
 
 	/// Add all assembly items from given JSON array. This function imports the items by iterating through
@@ -210,6 +226,15 @@ class Assembly
 
 	std::shared_ptr<std::string const> sharedSourceName(std::string const& _name) const;
 
+	/// Returns EOF header bytecode | code section sizes offsets | data section size offset
+	std::tuple<bytes, std::vector<size_t>, size_t> createEOFHeader(std::set<uint16_t> const& _referencedSubIds) const;
+
+	LinkerObject const& assembleLegacy() const;
+	LinkerObject const& assembleEOF() const;
+
+	/// Returns map from m_subs to an index of subcontainer in the final EOF bytecode
+	std::map<uint16_t, uint16_t> findReferencedContainers() const;
+
 protected:
 	/// 0 is reserved for exception
 	unsigned m_usedTags = 1;
@@ -223,11 +248,12 @@ class Assembly
 	};
 
 	std::map<std::string, NamedTagInfo> m_namedTags;
-	AssemblyItems m_items;
 	std::map<util::h256, bytes> m_data;
 	/// Data that is appended to the very end of the contract.
 	bytes m_auxiliaryData;
 	std::vector<std::shared_ptr<Assembly>> m_subs;
+	std::vector<CodeSection> m_codeSections;
+	uint16_t m_currentCodeSection = 0;
 	std::map<util::h256, std::string> m_strings;
 	std::map<util::h256, std::string> m_libraries; ///< Identifiers of libraries to be linked.
 	std::map<util::h256, std::string> m_immutables; ///< Identifiers of immutables.
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index 360fb781f4..6fdb42bd76 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -35,46 +35,49 @@ unsigned ConstantOptimisationMethod::optimiseConstants(
 )
 {
 	// TODO: design the optimiser in a way this is not needed
-	AssemblyItems& _items = _assembly.items();
-
 	unsigned optimisations = 0;
-	std::map<AssemblyItem, size_t> pushes;
-	for (AssemblyItem const& item: _items)
-		if (item.type() == Push)
-			pushes[item]++;
-	std::map<u256, AssemblyItems> pendingReplacements;
-	for (auto it: pushes)
+	for (auto& codeSection: _assembly.codeSections())
 	{
-		AssemblyItem const& item = it.first;
-		if (item.data() < 0x100)
-			continue;
-		Params params;
-		params.multiplicity = it.second;
-		params.isCreation = _isCreation;
-		params.runs = _runs;
-		params.evmVersion = _evmVersion;
-		LiteralMethod lit(params, item.data());
-		bigint literalGas = lit.gasNeeded();
-		CodeCopyMethod copy(params, item.data());
-		bigint copyGas = copy.gasNeeded();
-		ComputeMethod compute(params, item.data());
-		bigint computeGas = compute.gasNeeded();
-		AssemblyItems replacement;
-		if (copyGas < literalGas && copyGas < computeGas)
-		{
-			replacement = copy.execute(_assembly);
-			optimisations++;
-		}
-		else if (computeGas < literalGas && computeGas <= copyGas)
+		AssemblyItems& _items = codeSection.items;
+
+		std::map<AssemblyItem, size_t> pushes;
+		for (AssemblyItem const& item: _items)
+			if (item.type() == Push)
+				pushes[item]++;
+		std::map<u256, AssemblyItems> pendingReplacements;
+		for (auto it: pushes)
 		{
-			replacement = compute.execute(_assembly);
-			optimisations++;
+			AssemblyItem const& item = it.first;
+			if (item.data() < 0x100)
+				continue;
+			Params params;
+			params.multiplicity = it.second;
+			params.isCreation = _isCreation;
+			params.runs = _runs;
+			params.evmVersion = _evmVersion;
+			LiteralMethod lit(params, item.data());
+			bigint literalGas = lit.gasNeeded();
+			CodeCopyMethod copy(params, item.data());
+			bigint copyGas = copy.gasNeeded();
+			ComputeMethod compute(params, item.data());
+			bigint computeGas = compute.gasNeeded();
+			AssemblyItems replacement;
+			if (copyGas < literalGas && copyGas < computeGas)
+			{
+				replacement = copy.execute(_assembly);
+				optimisations++;
+			}
+			else if (computeGas < literalGas && computeGas <= copyGas)
+			{
+				replacement = compute.execute(_assembly);
+				optimisations++;
+			}
+			if (!replacement.empty())
+				pendingReplacements[item.data()] = replacement;
 		}
-		if (!replacement.empty())
-			pendingReplacements[item.data()] = replacement;
+		if (!pendingReplacements.empty())
+			replaceConstants(_items, pendingReplacements);
 	}
-	if (!pendingReplacements.empty())
-		replaceConstants(_items, pendingReplacements);
 	return optimisations;
 }
 
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
index 20605ee354..afe67c5fc8 100644
--- a/libevmasm/EVMAssemblyStack.cpp
+++ b/libevmasm/EVMAssemblyStack.cpp
@@ -56,12 +56,16 @@ void EVMAssemblyStack::assemble()
 	solAssert(!m_evmRuntimeAssembly);
 
 	m_object = m_evmAssembly->assemble();
-	m_sourceMapping = AssemblyItem::computeSourceMapping(m_evmAssembly->items(), sourceIndices());
+	// TODO: Check for EOF
+	solAssert(m_evmAssembly->codeSections().size() == 1);
+	m_sourceMapping = AssemblyItem::computeSourceMapping(m_evmAssembly->codeSections().front().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());
+		// TODO: Check for EOF
+		solAssert(m_evmRuntimeAssembly->codeSections().size() == 1);
+		m_runtimeSourceMapping = AssemblyItem::computeSourceMapping(m_evmRuntimeAssembly->codeSections().front().items, sourceIndices());
 		m_runtimeObject = m_evmRuntimeAssembly->assemble();
 	}
 }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 3389e7eca9..e538823f13 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -808,7 +808,11 @@ evmasm::AssemblyItems const* CompilerStack::assemblyItems(std::string const& _co
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& currentContract = contract(_contractName);
-	return currentContract.evmAssembly ? &currentContract.evmAssembly->items() : nullptr;
+	if (!currentContract.evmAssembly)
+		return nullptr;
+	solUnimplementedAssert(!m_eofVersion.has_value(), "EVM assembly output not implemented for EOF yet.");
+	solAssert(currentContract.evmAssembly->codeSections().size() == 1, "Expected a single code section in legacy codegen.");
+	return &currentContract.evmAssembly->codeSections().front().items;
 }
 
 evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string const& _contractName) const
@@ -816,7 +820,12 @@ evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string con
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& currentContract = contract(_contractName);
-	return currentContract.evmRuntimeAssembly ? &currentContract.evmRuntimeAssembly->items() : nullptr;
+
+	if (!currentContract.evmRuntimeAssembly)
+		return nullptr;
+	solUnimplementedAssert(!m_eofVersion.has_value(), "EVM assembly output not implemented for EOF yet.");
+	solAssert(currentContract.evmRuntimeAssembly->codeSections().size() == 1, "Expected a single code section in legacy codegen.");
+	return &currentContract.evmRuntimeAssembly->codeSections().front().items;
 }
 
 Json CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 01eb5b7383..a8e19a69a1 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -262,9 +262,12 @@ YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 		creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
 		yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
 		creationObject.assembly = creationAssembly;
+		solUnimplementedAssert(!m_eofVersion.has_value(), "EVM assembly output not implemented for EOF yet.");
+		solAssert(creationAssembly->codeSections().size() == 1);
 		creationObject.sourceMappings = std::make_unique<std::string>(
+			// TODO: fix for EOF
 			evmasm::AssemblyItem::computeSourceMapping(
-				creationAssembly->items(),
+				creationAssembly->codeSections().front().items,
 				{{m_charStream->name(), 0}}
 			)
 		);
@@ -273,11 +276,12 @@ YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 		{
 			deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
 			deployedObject.assembly = deployedAssembly;
+			solAssert(deployedAssembly->codeSections().size() == 1);
 			deployedObject.sourceMappings = std::make_unique<std::string>(
 				evmasm::AssemblyItem::computeSourceMapping(
-					deployedAssembly->items(),
+					deployedAssembly->codeSections().front().items,
 					{{m_charStream->name(), 0}}
-				)
+					)
 			);
 		}
 	}
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 06c7fb6a97..b1222b49d1 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -270,7 +270,8 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 
 			checkCompilation(assembly);
 
-			std::string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
+			BOOST_REQUIRE(assembly.codeSections().size() == 1);
+			std::string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.codeSections().at(0).items, indices);
 			auto const numberOfMappings = std::count(sourceMappings.begin(), sourceMappings.end(), ';');
 
 			LinkerObject const& obj = assembly.assemble();
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 13d9d6f2bb..8ed413cfe1 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1381,16 +1381,18 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 		t1.toSubAssemblyTag(subId).pushTag(),
 		u256(8)
 	};
+	BOOST_REQUIRE(main.codeSections().size() == 1);
 	BOOST_CHECK_EQUAL_COLLECTIONS(
-		main.items().begin(), main.items().end(),
+		main.codeSections().at(0).items.begin(),main.codeSections().at(0).items.end(),
 		expectationMain.begin(), expectationMain.end()
 	);
 
 	AssemblyItems expectationSub{
 		u256(1), t1.tag(), u256(2), Instruction::JUMP, t4.tag(), u256(7), t4.pushTag(), Instruction::JUMP
 	};
+	BOOST_REQUIRE(sub->codeSections().size() == 1);
 	BOOST_CHECK_EQUAL_COLLECTIONS(
-		sub->items().begin(), sub->items().end(),
+		sub->codeSections().at(0).items.begin(), sub->codeSections().at(0).items.end(),
 		expectationSub.begin(), expectationSub.end()
 	);
 }
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 7def76e69f..03897c454c 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -91,7 +91,8 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 			);
 			compiler.compileContract(*contract, std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>{}, bytes());
 
-			return compiler.runtimeAssembly().items();
+			BOOST_REQUIRE(compiler.runtimeAssembly().codeSections().size() == 1);
+			return compiler.runtimeAssembly().codeSections().at(0).items;
 		}
 	BOOST_FAIL("No contract found in source.");
 	return AssemblyItems();

From 603d9ded7f9e708e67542f0644d65cdba05c681e Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Fri, 20 Sep 2024 10:30:56 +0200
Subject: [PATCH 1076/1140] eof: pass EOF flag to `Assembly::fromJSON`

---
 libevmasm/Assembly.cpp                     | 2 +-
 libevmasm/EVMAssemblyStack.cpp             | 2 +-
 libevmasm/EVMAssemblyStack.h               | 4 +++-
 libsolidity/interface/StandardCompiler.cpp | 2 +-
 solc/CommandLineInterface.cpp              | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index df78f43ca5..0d5468e267 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -630,7 +630,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 					solThrow(AssemblyImportException, "The key '" + key + "' inside '.data' is out of the supported integer range.");
 				}
 
-				auto [subAssembly, emptySourceList] = Assembly::fromJSON(value, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
+				auto [subAssembly, emptySourceList] = Assembly::fromJSON(value, _level == 0 ? parsedSourceList : _sourceList, _level + 1, _eofVersion);
 				solAssert(subAssembly);
 				solAssert(emptySourceList.empty());
 				solAssert(subAssemblies.count(index) == 0);
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
index afe67c5fc8..df4517fc52 100644
--- a/libevmasm/EVMAssemblyStack.cpp
+++ b/libevmasm/EVMAssemblyStack.cpp
@@ -45,7 +45,7 @@ void EVMAssemblyStack::analyze(std::string const& _sourceName, Json const& _asse
 {
 	solAssert(!m_evmAssembly);
 	m_name = _sourceName;
-	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(_assemblyJson);
+	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(_assemblyJson, {}, 0, m_eofVersion);
 	solRequire(m_evmAssembly != nullptr, AssemblyImportException, "Could not create evm assembly object.");
 }
 
diff --git a/libevmasm/EVMAssemblyStack.h b/libevmasm/EVMAssemblyStack.h
index f2516c0b8a..cf959de79c 100644
--- a/libevmasm/EVMAssemblyStack.h
+++ b/libevmasm/EVMAssemblyStack.h
@@ -33,7 +33,8 @@ namespace solidity::evmasm
 class EVMAssemblyStack: public AbstractAssemblyStack
 {
 public:
-	explicit EVMAssemblyStack(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) {}
+	explicit EVMAssemblyStack(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion):
+		m_evmVersion(_evmVersion), m_eofVersion(_eofVersion) {}
 
 	/// Runs parsing and analysis steps.
 	/// Multiple calls overwrite the previous state.
@@ -76,6 +77,7 @@ class EVMAssemblyStack: public AbstractAssemblyStack
 
 private:
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	std::string m_name;
 	std::shared_ptr<evmasm::Assembly> m_evmAssembly;
 	std::shared_ptr<evmasm::Assembly> m_evmRuntimeAssembly;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 7271cce8be..cd00caf073 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1204,7 +1204,7 @@ Json StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSettings _in
 	if (!isBinaryRequested(_inputsAndSettings.outputSelection))
 		return Json::object();
 
-	evmasm::EVMAssemblyStack stack(_inputsAndSettings.evmVersion);
+	evmasm::EVMAssemblyStack stack(_inputsAndSettings.evmVersion, _inputsAndSettings.eofVersion);
 	std::string const& sourceName = _inputsAndSettings.jsonSources.begin()->first; // result of structured binding can only be used within lambda from C++20 on.
 	Json const& sourceJson = _inputsAndSettings.jsonSources.begin()->second;
 	try
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index f78fdfeb81..2d815facc1 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -843,7 +843,7 @@ void CommandLineInterface::assembleFromEVMAssemblyJSON()
 	solAssert(m_fileReader.sourceUnits().size() == 1);
 	auto&& [sourceUnitName, source] = *m_fileReader.sourceUnits().begin();
 
-	auto evmAssemblyStack = std::make_unique<evmasm::EVMAssemblyStack>(m_options.output.evmVersion);
+	auto evmAssemblyStack = std::make_unique<evmasm::EVMAssemblyStack>(m_options.output.evmVersion, m_options.output.eofVersion);
 	try
 	{
 		evmAssemblyStack->parseAndAnalyze(sourceUnitName, source);

From bc9f3e0c20224f9d3b9c8847b6f3c0f4a6f526d3 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Fri, 20 Sep 2024 15:35:49 +0200
Subject: [PATCH 1077/1140] eof: Add container format test

---
 .../strict_asm_eof_container_prague/args      |  1 +
 .../strict_asm_eof_container_prague/input.yul | 36 +++++++++++++++++++
 .../strict_asm_eof_container_prague/output    |  5 +++
 3 files changed, 42 insertions(+)
 create mode 100644 test/cmdlineTests/strict_asm_eof_container_prague/args
 create mode 100644 test/cmdlineTests/strict_asm_eof_container_prague/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_eof_container_prague/output

diff --git a/test/cmdlineTests/strict_asm_eof_container_prague/args b/test/cmdlineTests/strict_asm_eof_container_prague/args
new file mode 100644
index 0000000000..b8cc1ab182
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_eof_container_prague/args
@@ -0,0 +1 @@
+ --strict-assembly --experimental-eof-version 1 --evm-version prague --bin
diff --git a/test/cmdlineTests/strict_asm_eof_container_prague/input.yul b/test/cmdlineTests/strict_asm_eof_container_prague/input.yul
new file mode 100644
index 0000000000..09306772c9
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_eof_container_prague/input.yul
@@ -0,0 +1,36 @@
+object "object" {
+    code {
+        revert(0, 0)
+    }
+
+    object "sub0" {
+        code {
+            mstore(0, 0)
+            revert(0, 32)
+        }
+    }
+    object "sub1" {
+        code {
+            mstore(0, 1)
+            revert(0, 32)
+        }
+    }
+    object "sub2" {
+        code {
+            mstore(0, 2)
+            revert(0, 32)
+        }
+        object "sub20" {
+            code {
+                mstore(0, 0x20)
+                revert(0, 32)
+            }
+        }
+    }
+    object "sub3" {
+        code {
+            mstore(0, 3)
+            revert(0, 32)
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/strict_asm_eof_container_prague/output b/test/cmdlineTests/strict_asm_eof_container_prague/output
new file mode 100644
index 0000000000..caf28d91d8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_eof_container_prague/output
@@ -0,0 +1,5 @@
+
+======= strict_asm_eof_container_prague/input.yul (EVM) =======
+
+Binary representation:
+ef00010100040200010003030004001a001b003b001b040000000080ffff5f80fdef00010100040200010007040000000080ffff5f805260205ffdef00010100040200010008040000000080ffff60015f5260205ffdef00010100040200010008030001001b040000000080ffff60025f5260205ffdef00010100040200010008040000000080ffff60205f5260205ffdef00010100040200010008040000000080ffff60035f5260205ffd

From 1ba4349f859d53cd9fea7d7a66475b193d3d5538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 23 Sep 2024 12:58:16 +0200
Subject: [PATCH 1078/1140] Rename Standard JSON output selection tests CLI to
 match the naming convention

---
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 .../input.json                                                    | 0
 .../output.json                                                   | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename test/cmdlineTests/{output_selection_all_blank => standard_output_selection_all_blank}/input.json (100%)
 rename test/cmdlineTests/{output_selection_all_blank => standard_output_selection_all_blank}/output.json (100%)
 rename test/cmdlineTests/{output_selection_all_A2 => standard_output_selection_all_sources_single_contract_multiple_matches}/input.json (100%)
 rename test/cmdlineTests/{output_selection_all_A2 => standard_output_selection_all_sources_single_contract_multiple_matches}/output.json (100%)
 rename test/cmdlineTests/{output_selection_all_A1 => standard_output_selection_all_sources_single_contract_single_match}/input.json (100%)
 rename test/cmdlineTests/{output_selection_all_A1 => standard_output_selection_all_sources_single_contract_single_match}/output.json (100%)
 rename test/cmdlineTests/{output_selection_all_star => standard_output_selection_all_star}/input.json (100%)
 rename test/cmdlineTests/{output_selection_all_star => standard_output_selection_all_star}/output.json (100%)
 rename test/cmdlineTests/{output_selection_single_all => standard_output_selection_single_all}/input.json (100%)
 rename test/cmdlineTests/{output_selection_single_all => standard_output_selection_single_all}/output.json (100%)
 rename test/cmdlineTests/{output_selection_single_A1 => standard_output_selection_single_source_single_contract_multiple_matches}/input.json (100%)
 rename test/cmdlineTests/{output_selection_single_A1 => standard_output_selection_single_source_single_contract_multiple_matches}/output.json (100%)
 rename test/cmdlineTests/{output_selection_single_B1 => standard_output_selection_single_source_single_contract_single_match}/input.json (100%)
 rename test/cmdlineTests/{output_selection_single_B1 => standard_output_selection_single_source_single_contract_single_match}/output.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection => standard_output_selection_wrong_type}/input.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection => standard_output_selection_wrong_type}/output.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_contract => standard_output_selection_wrong_type_contract}/input.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_contract => standard_output_selection_wrong_type_contract}/output.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_output => standard_output_selection_wrong_type_output}/input.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_output => standard_output_selection_wrong_type_output}/output.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_file => standard_output_selection_wrong_type_source}/input.json (100%)
 rename test/cmdlineTests/{standard_wrong_type_output_selection_file => standard_output_selection_wrong_type_source}/output.json (100%)

diff --git a/test/cmdlineTests/output_selection_all_blank/input.json b/test/cmdlineTests/standard_output_selection_all_blank/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_blank/input.json
rename to test/cmdlineTests/standard_output_selection_all_blank/input.json
diff --git a/test/cmdlineTests/output_selection_all_blank/output.json b/test/cmdlineTests/standard_output_selection_all_blank/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_blank/output.json
rename to test/cmdlineTests/standard_output_selection_all_blank/output.json
diff --git a/test/cmdlineTests/output_selection_all_A2/input.json b/test/cmdlineTests/standard_output_selection_all_sources_single_contract_multiple_matches/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_A2/input.json
rename to test/cmdlineTests/standard_output_selection_all_sources_single_contract_multiple_matches/input.json
diff --git a/test/cmdlineTests/output_selection_all_A2/output.json b/test/cmdlineTests/standard_output_selection_all_sources_single_contract_multiple_matches/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_A2/output.json
rename to test/cmdlineTests/standard_output_selection_all_sources_single_contract_multiple_matches/output.json
diff --git a/test/cmdlineTests/output_selection_all_A1/input.json b/test/cmdlineTests/standard_output_selection_all_sources_single_contract_single_match/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_A1/input.json
rename to test/cmdlineTests/standard_output_selection_all_sources_single_contract_single_match/input.json
diff --git a/test/cmdlineTests/output_selection_all_A1/output.json b/test/cmdlineTests/standard_output_selection_all_sources_single_contract_single_match/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_A1/output.json
rename to test/cmdlineTests/standard_output_selection_all_sources_single_contract_single_match/output.json
diff --git a/test/cmdlineTests/output_selection_all_star/input.json b/test/cmdlineTests/standard_output_selection_all_star/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_star/input.json
rename to test/cmdlineTests/standard_output_selection_all_star/input.json
diff --git a/test/cmdlineTests/output_selection_all_star/output.json b/test/cmdlineTests/standard_output_selection_all_star/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_all_star/output.json
rename to test/cmdlineTests/standard_output_selection_all_star/output.json
diff --git a/test/cmdlineTests/output_selection_single_all/input.json b/test/cmdlineTests/standard_output_selection_single_all/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_all/input.json
rename to test/cmdlineTests/standard_output_selection_single_all/input.json
diff --git a/test/cmdlineTests/output_selection_single_all/output.json b/test/cmdlineTests/standard_output_selection_single_all/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_all/output.json
rename to test/cmdlineTests/standard_output_selection_single_all/output.json
diff --git a/test/cmdlineTests/output_selection_single_A1/input.json b/test/cmdlineTests/standard_output_selection_single_source_single_contract_multiple_matches/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_A1/input.json
rename to test/cmdlineTests/standard_output_selection_single_source_single_contract_multiple_matches/input.json
diff --git a/test/cmdlineTests/output_selection_single_A1/output.json b/test/cmdlineTests/standard_output_selection_single_source_single_contract_multiple_matches/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_A1/output.json
rename to test/cmdlineTests/standard_output_selection_single_source_single_contract_multiple_matches/output.json
diff --git a/test/cmdlineTests/output_selection_single_B1/input.json b/test/cmdlineTests/standard_output_selection_single_source_single_contract_single_match/input.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_B1/input.json
rename to test/cmdlineTests/standard_output_selection_single_source_single_contract_single_match/input.json
diff --git a/test/cmdlineTests/output_selection_single_B1/output.json b/test/cmdlineTests/standard_output_selection_single_source_single_contract_single_match/output.json
similarity index 100%
rename from test/cmdlineTests/output_selection_single_B1/output.json
rename to test/cmdlineTests/standard_output_selection_single_source_single_contract_single_match/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/input.json b/test/cmdlineTests/standard_output_selection_wrong_type/input.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection/input.json
rename to test/cmdlineTests/standard_output_selection_wrong_type/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/output.json b/test/cmdlineTests/standard_output_selection_wrong_type/output.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection/output.json
rename to test/cmdlineTests/standard_output_selection_wrong_type/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json b/test/cmdlineTests/standard_output_selection_wrong_type_contract/input.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_contract/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json b/test/cmdlineTests/standard_output_selection_wrong_type_contract/output.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_contract/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json b/test/cmdlineTests/standard_output_selection_wrong_type_output/input.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_output/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json b/test/cmdlineTests/standard_output_selection_wrong_type_output/output.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_output/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json b/test/cmdlineTests/standard_output_selection_wrong_type_source/input.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_source/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json b/test/cmdlineTests/standard_output_selection_wrong_type_source/output.json
similarity index 100%
rename from test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
rename to test/cmdlineTests/standard_output_selection_wrong_type_source/output.json

From 3452ba0189f0a086d2a0926a757226bfeb23fb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 23 Sep 2024 14:04:53 +0200
Subject: [PATCH 1079/1140] More CLI tests for output selection in Standard
 JSON

---
 .../input.json                                |  13 ++
 .../output.json                               |  24 +++
 .../input.json                                |  13 ++
 .../output.json                               |  42 ++++++
 .../input.json                                |  29 ++++
 .../output.json                               |  35 +++++
 .../input.json                                |   9 ++
 .../output.json                               |   7 +
 .../input.json                                |  29 ++++
 .../output.json                               | 109 ++++++++++++++
 .../input.json                                |  23 +++
 .../output.json                               | 141 ++++++++++++++++++
 .../input.json                                |  16 ++
 .../output.json                               |  13 ++
 .../input.json                                |  24 +++
 .../output.json                               |  18 +++
 .../input.json                                |  21 +++
 .../output.json                               |  21 +++
 18 files changed, 587 insertions(+)
 create mode 100644 test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_empty/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_empty/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_no_output_selected/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_no_output_selected/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_unrecognized_output/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_unrecognized_output/output.json
 create mode 100644 test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/input.json
 create mode 100644 test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/output.json

diff --git a/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/input.json b/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/input.json
new file mode 100644
index 0000000000..9a2634aa71
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/input.json
@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "":  {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "*": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "C": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            "": {"D": ["userdoc"]}
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/output.json b/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/output.json
new file mode 100644
index 0000000000..ff82564fcf
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/output.json
@@ -0,0 +1,24 @@
+{
+    "contracts": {
+        "": {
+            "D": {
+                "userdoc": {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        }
+    },
+    "sources": {
+        "": {
+            "id": 0
+        },
+        "*": {
+            "id": 1
+        },
+        "C": {
+            "id": 2
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/input.json b/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/input.json
new file mode 100644
index 0000000000..950218048e
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/input.json
@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "":  {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "*": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "C": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {"D": ["userdoc"]}
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/output.json b/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/output.json
new file mode 100644
index 0000000000..b5dda3d597
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/output.json
@@ -0,0 +1,42 @@
+{
+    "contracts": {
+        "": {
+            "D": {
+                "userdoc": {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        },
+        "*": {
+            "D": {
+                "userdoc": {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        },
+        "C": {
+            "D": {
+                "userdoc": {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        }
+    },
+    "sources": {
+        "": {
+            "id": 0
+        },
+        "*": {
+            "id": 1
+        },
+        "C": {
+            "id": 2
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/input.json b/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/input.json
new file mode 100644
index 0000000000..70b7b079a4
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/input.json
@@ -0,0 +1,29 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "*": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            // Outputs from duplicate keys are not combined. Last value wins.
+            "*": {
+                "*": ["userdoc"],  // Ignored
+                "*": ["devdoc"]    // Ignored
+            },
+            "C": {
+                "*": ["storageLayout"],          // Ignored
+                "*": ["transientStorageLayout"]  // Ignored
+            },
+            "C": {
+                "A": ["evm.bytecode.linkReferences"], // Ignored
+                "A": ["evm.bytecode.object"]
+            },
+            "*": {
+                "A": ["evm.deployedBytecode.immutableReferences"],  // Ignored
+                "A": ["abi"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/output.json b/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/output.json
new file mode 100644
index 0000000000..2743eb870a
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_duplicate_matching_source_and_contract_selectors/output.json
@@ -0,0 +1,35 @@
+{
+    "contracts": {
+        "*": {
+            "A": {
+                "abi": []
+            }
+        },
+        "C": {
+            "A": {
+                "abi": [],
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "D": {
+            "A": {
+                "abi": []
+            }
+        }
+    },
+    "sources": {
+        "*": {
+            "id": 0
+        },
+        "C": {
+            "id": 1
+        },
+        "D": {
+            "id": 2
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_empty/input.json b/test/cmdlineTests/standard_output_selection_empty/input.json
new file mode 100644
index 0000000000..76cc0fb48d
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_empty/input.json
@@ -0,0 +1,9 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C": {"content": "contract A {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {}
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_empty/output.json b/test/cmdlineTests/standard_output_selection_empty/output.json
new file mode 100644
index 0000000000..264cd37be9
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_empty/output.json
@@ -0,0 +1,7 @@
+{
+    "sources": {
+        "C": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/input.json b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/input.json
new file mode 100644
index 0000000000..276869377c
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/input.json
@@ -0,0 +1,29 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "":  {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "*": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            // FIXME: Behavior of "" is inconsistent. Sometimes it matches everything, sometimes only empty name.
+            "": {
+                "":  ["metadata"],                                 // No matches
+                "*": ["transientStorageLayout"],                   // All sources, all contracts
+                "A": ["abi"]                                       // source "", contract A
+            },
+            "*": {
+                "":  ["evm.deployedBytecode.immutableReferences"], // No matches
+                "*": ["evm.bytecode.object"],                      // All sources, all contracts
+                "A": ["evm.bytecode.linkReferences"]               // All sources, contract A
+            },
+            "C": {
+                "":  ["userdoc"],                                  // No matches
+                "*": ["devdoc"],                                   // All contracts in source "C"
+                "A": ["storageLayout"]                             // source "C", contract A
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/output.json b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/output.json
new file mode 100644
index 0000000000..6558a57596
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors/output.json
@@ -0,0 +1,109 @@
+{
+    "contracts": {
+        "": {
+            "A": {
+                "abi": [],
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "transientStorageLayout": {
+                    "storage": [],
+                    "types": null
+                }
+            },
+            "B": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "transientStorageLayout": {
+                    "storage": [],
+                    "types": null
+                }
+            }
+        },
+        "*": {
+            "A": {
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            },
+            "B": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "C": {
+            "A": {
+                "devdoc": {
+                    "kind": "dev",
+                    "methods": {},
+                    "version": 1
+                },
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "storageLayout": {
+                    "storage": [],
+                    "types": null
+                }
+            },
+            "B": {
+                "devdoc": {
+                    "kind": "dev",
+                    "methods": {},
+                    "version": 1
+                },
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "D": {
+            "A": {
+                "evm": {
+                    "bytecode": {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            },
+            "B": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "": {
+            "id": 0
+        },
+        "*": {
+            "id": 1
+        },
+        "C": {
+            "id": 2
+        },
+        "D": {
+            "id": 3
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/input.json b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/input.json
new file mode 100644
index 0000000000..22884c9f82
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/input.json
@@ -0,0 +1,23 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "optimizer": {"enabled": true},
+        "debug": {"debugInfo": []},
+        "outputSelection": {
+            // This test uses outputs that require all stages of the pipeline to run, possibly via
+            // multiple paths, to make sure the later stages handle more complex output selection correctly.
+            // Currently there are only distinct paths (IR, optimized IR and bytecode generation).
+            "*": {
+                "*": ["evm.bytecode.object"],
+                "A": ["irOptimized"]
+            },
+            "C": {
+                "A": ["ir"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/output.json b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/output.json
new file mode 100644
index 0000000000..3ff2b451e2
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/output.json
@@ -0,0 +1,141 @@
+{
+    "contracts": {
+        "C": {
+            "A": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "ir": "
+/// @use-src 0:\"C\"
+object \"A_1\" {
+    code {
+
+        mstore(64, memoryguard(128))
+        if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+
+        constructor_A_1()
+
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset(\"A_1_deployed\"), datasize(\"A_1_deployed\"))
+
+        return(_1, datasize(\"A_1_deployed\"))
+
+        function allocate_unbounded() -> memPtr {
+            memPtr := mload(64)
+        }
+
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() {
+            revert(0, 0)
+        }
+
+        function constructor_A_1() {
+
+        }
+
+    }
+    /// @use-src 0:\"C\"
+    object \"A_1_deployed\" {
+        code {
+
+            mstore(64, memoryguard(128))
+
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+
+            function shift_right_224_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>\"
+    }
+
+}
+
+",
+                "irOptimized": "/// @use-src 0:\"C\"
+object \"A_1\" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize(\"A_1_deployed\")
+            codecopy(_1, dataoffset(\"A_1_deployed\"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:\"C\"
+    object \"A_1_deployed\" {
+        code { { revert(0, 0) } }
+        data \".metadata\" hex\"<BYTECODE REMOVED>\"
+    }
+}
+"
+            },
+            "B": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "D": {
+            "A": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "irOptimized": "/// @use-src 1:\"D\"
+object \"A_5\" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize(\"A_5_deployed\")
+            codecopy(_1, dataoffset(\"A_5_deployed\"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 1:\"D\"
+    object \"A_5_deployed\" {
+        code { { revert(0, 0) } }
+        data \".metadata\" hex\"<BYTECODE REMOVED>\"
+    }
+}
+"
+            },
+            "B": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "C": {
+            "id": 0
+        },
+        "D": {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_no_output_selected/input.json b/test/cmdlineTests/standard_output_selection_no_output_selected/input.json
new file mode 100644
index 0000000000..4e0fd1c0d0
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_no_output_selected/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "E": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            "C": {},
+            "D": {"A": []},
+            "*": {"B": []},
+            "": {}
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_no_output_selected/output.json b/test/cmdlineTests/standard_output_selection_no_output_selected/output.json
new file mode 100644
index 0000000000..2cea05dcff
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_no_output_selected/output.json
@@ -0,0 +1,13 @@
+{
+    "sources": {
+        "C": {
+            "id": 0
+        },
+        "D": {
+            "id": 1
+        },
+        "E": {
+            "id": 2
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_unrecognized_output/input.json b/test/cmdlineTests/standard_output_selection_unrecognized_output/input.json
new file mode 100644
index 0000000000..072d9916e2
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_unrecognized_output/input.json
@@ -0,0 +1,24 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            // Unrecognized outputs are ignored.
+            "C": {
+                "A": [
+                    "X",
+                    "METADATA",
+                    "abi.encode",
+                    "userdoc",  // The only valid one here.
+                    ".",
+                    "evm.",
+                    "evm.bytecodeObject",
+                    "evm.bytecode.object.ir",
+                    "evm.bytecode.*"
+                ]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_unrecognized_output/output.json b/test/cmdlineTests/standard_output_selection_unrecognized_output/output.json
new file mode 100644
index 0000000000..7fbddd8571
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_unrecognized_output/output.json
@@ -0,0 +1,18 @@
+{
+    "contracts": {
+        "C": {
+            "A": {
+                "userdoc": {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        }
+    },
+    "sources": {
+        "C": {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/input.json b/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/input.json
new file mode 100644
index 0000000000..b1b4e1bef8
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/input.json
@@ -0,0 +1,21 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "*": {"content": "contract A {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"},
+        "C": {"content": "contract A {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "X": ["userdoc"] // No contract X, but no error, just ignored.
+            },
+            "Y": {
+                "*": ["devdoc"], // No source "Y", but no error, just ignored.
+                "Z": ["abi"]     // No source "Y", but no error, just ignored.
+            },
+            "C": {
+                "A": ["evm.bytecode.object"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/output.json b/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/output.json
new file mode 100644
index 0000000000..20ab65450f
--- /dev/null
+++ b/test/cmdlineTests/standard_output_selection_unrecognized_source_and_contract_selectors/output.json
@@ -0,0 +1,21 @@
+{
+    "contracts": {
+        "C": {
+            "A": {
+                "evm": {
+                    "bytecode": {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources": {
+        "*": {
+            "id": 0
+        },
+        "C": {
+            "id": 1
+        }
+    }
+}

From 9b4a07bbb46cd4cba23f7dbf406a38dc199a6177 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:51:49 +0200
Subject: [PATCH 1080/1140] SSACFG: Fix canContinue in user-defined function
 calls

---
 .../evm/SSAControlFlowGraphBuilder.cpp        | 55 ++++++++++++++-----
 .../backends/evm/SSAControlFlowGraphBuilder.h | 15 +++--
 .../yulSSAControlFlowGraph/function.yul       |  4 +-
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index 26635124ed..dc183a085a 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -33,6 +33,7 @@
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/drop_last.hpp>
 #include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/filter.hpp>
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/transform.hpp>
 #include <range/v3/view/zip.hpp>
@@ -46,10 +47,12 @@ namespace solidity::yul
 SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
 	SSACFG& _graph,
 	AsmAnalysisInfo const& _analysisInfo,
+	ControlFlowSideEffectsCollector const& _sideEffects,
 	Dialect const& _dialect
 ):
 	m_graph(_graph),
 	m_info(_analysisInfo),
+	m_sideEffects(_sideEffects),
 	m_dialect(_dialect)
 {
 }
@@ -63,7 +66,7 @@ std::unique_ptr<ControlFlow> SSAControlFlowGraphBuilder::build(
 	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
 
 	auto result = std::make_unique<ControlFlow>();
-	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, _dialect, _block);
+	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, sideEffects, _dialect, _block);
 	buildFunctionGraphs(*result, _analysisInfo, sideEffects, _dialect, functions);
 	return result;
 }
@@ -267,8 +270,9 @@ void SSAControlFlowGraphBuilder::buildFunctionGraphs(
 		cfg.arguments = arguments;
 		cfg.returns = returns;
 
-		SSAControlFlowGraphBuilder builder(cfg, _info, _dialect);
+		SSAControlFlowGraphBuilder builder(cfg, _info, _sideEffects, _dialect);
 		builder.m_currentBlock = cfg.entry;
+		builder.m_functionDefinitions = _functions;
 		for (auto&& [var, varId]: cfg.arguments)
 			builder.currentDef(var, cfg.entry) = varId;
 		for (auto const& var: cfg.returns)
@@ -285,11 +289,12 @@ void SSAControlFlowGraphBuilder::buildFunctionGraphs(
 std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> SSAControlFlowGraphBuilder::buildMainGraph(
 	SSACFG& _cfg,
 	AsmAnalysisInfo const& _analysisInfo,
+	ControlFlowSideEffectsCollector const& _sideEffects,
 	Dialect const& _dialect,
 	Block const& _block
 )
 {
-	SSAControlFlowGraphBuilder builder(_cfg, _analysisInfo, _dialect);
+	SSAControlFlowGraphBuilder builder(_cfg, _analysisInfo, _sideEffects, _dialect);
 	builder.m_currentBlock = _cfg.makeBlock(debugDataOf(_block));
 	builder.sealBlock(builder.m_currentBlock);
 	builder(_block);
@@ -535,8 +540,22 @@ void SSAControlFlowGraphBuilder::operator()(Leave const& _leaveStatement)
 void SSAControlFlowGraphBuilder::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
-	for (auto const& statement: _block.statements)
-		std::visit(*this, statement);
+	if (m_currentBlock == m_graph.entry)
+	{
+		auto const filterFunctionDefinitions = [](bool _yieldDefinitionsOnly)
+		{
+			return [b=_yieldDefinitionsOnly](Statement const& _statement) -> bool { return !b ^ std::holds_alternative<FunctionDefinition>(_statement);};
+		};
+		for (auto const& statement: _block.statements | ranges::views::filter(filterFunctionDefinitions(true)))
+			std::visit(*this, statement);
+		for (auto const& statement: _block.statements | ranges::views::filter(filterFunctionDefinitions(false)))
+			std::visit(*this, statement);
+	}
+	else
+	{
+		for (auto const& statement: _block.statements)
+			std::visit(*this, statement);
+	}
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(FunctionCall const& _call)
@@ -592,7 +611,9 @@ std::vector<SSACFG::ValueId> SSAControlFlowGraphBuilder::visitFunctionCall(Funct
 		else
 		{
 			Scope::Function const& function = lookupFunction(_call.functionName.name);
-			canContinue = m_graph.canContinue;
+			auto const* definition = findFunctionDefinition(&function);
+			yulAssert(definition);
+			canContinue = m_sideEffects.functionSideEffects().at(definition).canContinue;
 			SSACFG::Operation result{{}, SSACFG::Call{debugDataOf(_call), function, _call, canContinue}, {}};
 			for (auto const& arg: _call.arguments | ranges::views::reverse)
 				result.inputs.emplace_back(std::visit(*this, arg));
@@ -745,8 +766,7 @@ void SSAControlFlowGraphBuilder::tableJump(
 	langutil::DebugData::ConstPtr _debugData,
 	SSACFG::ValueId _value,
 	std::map<u256, SSACFG::BlockId> _cases,
-	SSACFG::BlockId _defaultCase
-)
+	SSACFG::BlockId _defaultCase)
 {
 	for (auto caseBlock: _cases | ranges::views::values)
 	{
@@ -755,13 +775,20 @@ void SSAControlFlowGraphBuilder::tableJump(
 	}
 	yulAssert(!blockInfo(_defaultCase).sealed);
 	m_graph.block(_defaultCase).entries.insert(m_currentBlock);
-	currentBlock().exit = SSACFG::BasicBlock::JumpTable{
-		std::move(_debugData),
-		_value,
-		std::move(_cases),
-		_defaultCase
-	};
+	currentBlock().exit = SSACFG::BasicBlock::JumpTable{std::move(_debugData), _value, std::move(_cases), _defaultCase};
 	m_currentBlock = {};
 }
 
+FunctionDefinition const* SSAControlFlowGraphBuilder::findFunctionDefinition(Scope::Function const* _function) const
+{
+	auto it = std::find_if(
+			m_functionDefinitions.begin(),
+			m_functionDefinitions.end(),
+			[&_function](auto const& _entry) { return std::get<0>(_entry) == _function; }
+		);
+	if (it != m_functionDefinitions.end())
+		return std::get<1>(*it);
+	return nullptr;
+}
+
 }
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
index e4d0d6db61..8fc537c14e 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -29,9 +29,8 @@
 */
 #pragma once
 
-#include <libyul/backends/evm/ControlFlow.h>
-#include <libyul/ControlFlowSideEffects.h>
 #include <libyul/ControlFlowSideEffectsCollector.h>
+#include <libyul/backends/evm/ControlFlow.h>
 #include <libyul/backends/evm/SSAControlFlowGraph.h>
 #include <stack>
 
@@ -43,12 +42,17 @@ class SSAControlFlowGraphBuilder
 	SSAControlFlowGraphBuilder(
 		SSACFG& _graph,
 		AsmAnalysisInfo const& _analysisInfo,
+		ControlFlowSideEffectsCollector const& _sideEffects,
 		Dialect const& _dialect
 	);
 public:
 	SSAControlFlowGraphBuilder(SSAControlFlowGraphBuilder const&) = delete;
 	SSAControlFlowGraphBuilder& operator=(SSAControlFlowGraphBuilder const&) = delete;
-	static std::unique_ptr<ControlFlow> build(AsmAnalysisInfo const& _analysisInfo, Dialect const& _dialect, Block const& _block);
+	static std::unique_ptr<ControlFlow> build(
+		AsmAnalysisInfo const& _analysisInfo,
+		Dialect const& _dialect,
+		Block const& _block
+	);
 	static void buildFunctionGraphs(
 		ControlFlow& _controlFlow,
 		AsmAnalysisInfo const& _info,
@@ -59,6 +63,7 @@ class SSAControlFlowGraphBuilder
 	static std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> buildMainGraph(
 		SSACFG& _cfg,
 		AsmAnalysisInfo const& _analysisInfo,
+		ControlFlowSideEffectsCollector const& _sideEffects,
 		Dialect const& _dialect,
 		Block const& _block
 	);
@@ -95,7 +100,9 @@ class SSAControlFlowGraphBuilder
 
 	SSACFG& m_graph;
 	AsmAnalysisInfo const& m_info;
+	ControlFlowSideEffectsCollector const& m_sideEffects;
 	Dialect const& m_dialect;
+	std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> m_functionDefinitions;
 	SSACFG::BlockId m_currentBlock;
 	SSACFG::BasicBlock& currentBlock() { return m_graph.block(m_currentBlock); }
 	Scope* m_scope = nullptr;
@@ -154,7 +161,7 @@ class SSAControlFlowGraphBuilder
 		SSACFG::BlockId _defaultCase
 	);
 
-	std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> m_functionDefinitions;
+	FunctionDefinition const* findFunctionDefinition(Scope::Function const* _function) const;
 };
 
 }
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
index 436bcd4995..20a536b5e5 100644
--- a/test/libyul/yulSSAControlFlowGraph/function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -29,9 +29,8 @@
 // Block0_0 [label="\
 // Block 0\nv0, v1 := i()\l\
 // h(v0)\l\
-// h(v1)\l\
 // "];
-// Block0_0Exit [label="MainExit"];
+// Block0_0Exit [label="Terminated"];
 // Block0_0 -> Block0_0Exit;
 // FunctionEntry_f_0 [label="function f:
 //  r := f(v0, v1)"];
@@ -55,6 +54,7 @@
 // FunctionEntry_h_0 -> Block3_0;
 // Block3_0 [label="\
 // Block 0\nv2 := f(0, v0)\l\
+// h(v2)\l\
 // "];
 // Block3_0Exit [label="Terminated"];
 // Block3_0 -> Block3_0Exit;

From 4461699a33f7a78df8c28313cd6e76bb9655279c Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 24 Sep 2024 15:35:34 +0200
Subject: [PATCH 1081/1140] SSACFG: Handle nested function definitions

---
 .../evm/SSAControlFlowGraphBuilder.cpp        | 160 ++++++++----------
 .../backends/evm/SSAControlFlowGraphBuilder.h |  18 +-
 .../nested_function.yul                       | 142 ++++++++++++++++
 3 files changed, 217 insertions(+), 103 deletions(-)
 create mode 100644 test/libyul/yulSSAControlFlowGraph/nested_function.yul

diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
index dc183a085a..ceaa8acbd7 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.cpp
@@ -45,11 +45,13 @@ namespace solidity::yul
 {
 
 SSAControlFlowGraphBuilder::SSAControlFlowGraphBuilder(
+	ControlFlow& _controlFlow,
 	SSACFG& _graph,
 	AsmAnalysisInfo const& _analysisInfo,
 	ControlFlowSideEffectsCollector const& _sideEffects,
 	Dialect const& _dialect
 ):
+	m_controlFlow(_controlFlow),
 	m_graph(_graph),
 	m_info(_analysisInfo),
 	m_sideEffects(_sideEffects),
@@ -65,10 +67,16 @@ std::unique_ptr<ControlFlow> SSAControlFlowGraphBuilder::build(
 {
 	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
 
-	auto result = std::make_unique<ControlFlow>();
-	auto functions = buildMainGraph(*result->mainGraph, _analysisInfo, sideEffects, _dialect, _block);
-	buildFunctionGraphs(*result, _analysisInfo, sideEffects, _dialect, functions);
-	return result;
+	auto controlFlow = std::make_unique<ControlFlow>();
+	SSAControlFlowGraphBuilder builder(*controlFlow, *controlFlow->mainGraph, _analysisInfo, sideEffects, _dialect);
+	builder.m_currentBlock = controlFlow->mainGraph->makeBlock(debugDataOf(_block));
+	builder.sealBlock(builder.m_currentBlock);
+	builder(_block);
+	if (!builder.blockInfo(builder.m_currentBlock).sealed)
+		builder.sealBlock(builder.m_currentBlock);
+	controlFlow->mainGraph->block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
+	builder.cleanUnreachable();
+	return controlFlow;
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::tryRemoveTrivialPhi(SSACFG::ValueId _phi)
@@ -236,73 +244,48 @@ void SSAControlFlowGraphBuilder::cleanUnreachable()
 	}
 }
 
-void SSAControlFlowGraphBuilder::buildFunctionGraphs(
-	ControlFlow& _controlFlow,
-	AsmAnalysisInfo const& _info,
-	ControlFlowSideEffectsCollector const& _sideEffects,
-	Dialect const& _dialect,
-	std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> const& _functions
-)
-{
-	for (auto const& [function, functionDefinition]: _functions)
-	{
-		_controlFlow.functionGraphs.emplace_back(std::make_unique<SSACFG>());
-		auto& cfg = *_controlFlow.functionGraphs.back();
-		_controlFlow.functionGraphMapping.emplace_back(function, &cfg);
-
-		yulAssert(_info.scopes.at(&functionDefinition->body), "");
-		Scope* virtualFunctionScope = _info.scopes.at(_info.virtualBlocks.at(functionDefinition).get()).get();
-		yulAssert(virtualFunctionScope, "");
-
-		cfg.entry = cfg.makeBlock(debugDataOf(functionDefinition->body));
-		auto arguments = functionDefinition->parameters | ranges::views::transform([&](auto const& _param) {
-			auto const& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name));
-			// Note: cannot use std::make_tuple since it unwraps reference wrappers.
-			return std::tuple{std::cref(var), cfg.newVariable(cfg.entry)};
-		}) | ranges::to<std::vector>;
-		auto returns = functionDefinition->returnVariables | ranges::views::transform([&](auto const& _param) {
-			return std::cref(std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)));
-		}) | ranges::to<std::vector>;
-
-		cfg.debugData = functionDefinition->debugData;
-		cfg.function = function;
-		cfg.canContinue = _sideEffects.functionSideEffects().at(functionDefinition).canContinue;
-		cfg.arguments = arguments;
-		cfg.returns = returns;
-
-		SSAControlFlowGraphBuilder builder(cfg, _info, _sideEffects, _dialect);
-		builder.m_currentBlock = cfg.entry;
-		builder.m_functionDefinitions = _functions;
-		for (auto&& [var, varId]: cfg.arguments)
-			builder.currentDef(var, cfg.entry) = varId;
-		for (auto const& var: cfg.returns)
-			builder.currentDef(var.get(), cfg.entry) = builder.zero();
-		builder.sealBlock(cfg.entry);
-		builder(functionDefinition->body);
-		cfg.exits.insert(builder.m_currentBlock);
-		// Artificial explicit function exit (`leave`) at the end of the body.
-		builder(Leave{debugDataOf(*functionDefinition)});
-		builder.cleanUnreachable();
-	}
-}
-
-std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> SSAControlFlowGraphBuilder::buildMainGraph(
-	SSACFG& _cfg,
-	AsmAnalysisInfo const& _analysisInfo,
-	ControlFlowSideEffectsCollector const& _sideEffects,
-	Dialect const& _dialect,
-	Block const& _block
+void SSAControlFlowGraphBuilder::buildFunctionGraph(
+	Scope::Function const* _function,
+	FunctionDefinition const* _functionDefinition
 )
 {
-	SSAControlFlowGraphBuilder builder(_cfg, _analysisInfo, _sideEffects, _dialect);
-	builder.m_currentBlock = _cfg.makeBlock(debugDataOf(_block));
-	builder.sealBlock(builder.m_currentBlock);
-	builder(_block);
-	if (!builder.blockInfo(builder.m_currentBlock).sealed)
-		builder.sealBlock(builder.m_currentBlock);
-	_cfg.block(builder.m_currentBlock).exit = SSACFG::BasicBlock::MainExit{};
+	m_controlFlow.functionGraphs.emplace_back(std::make_unique<SSACFG>());
+	auto& cfg = *m_controlFlow.functionGraphs.back();
+	m_controlFlow.functionGraphMapping.emplace_back(_function, &cfg);
+
+	yulAssert(m_info.scopes.at(&_functionDefinition->body), "");
+	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(_functionDefinition).get()).get();
+	yulAssert(virtualFunctionScope, "");
+
+	cfg.entry = cfg.makeBlock(debugDataOf(_functionDefinition->body));
+	auto arguments = _functionDefinition->parameters | ranges::views::transform([&](auto const& _param) {
+		auto const& var = std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name));
+		// Note: cannot use std::make_tuple since it unwraps reference wrappers.
+		return std::tuple{std::cref(var), cfg.newVariable(cfg.entry)};
+	}) | ranges::to<std::vector>;
+	auto returns = _functionDefinition->returnVariables | ranges::views::transform([&](auto const& _param) {
+		return std::cref(std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)));
+	}) | ranges::to<std::vector>;
+
+	cfg.debugData = _functionDefinition->debugData;
+	cfg.function = _function;
+	cfg.canContinue = m_sideEffects.functionSideEffects().at(_functionDefinition).canContinue;
+	cfg.arguments = arguments;
+	cfg.returns = returns;
+
+	SSAControlFlowGraphBuilder builder(m_controlFlow, cfg, m_info, m_sideEffects, m_dialect);
+	builder.m_currentBlock = cfg.entry;
+	builder.m_functionDefinitions = m_functionDefinitions;
+	for (auto&& [var, varId]: cfg.arguments)
+		builder.currentDef(var, cfg.entry) = varId;
+	for (auto const& var: cfg.returns)
+		builder.currentDef(var.get(), cfg.entry) = builder.zero();
+	builder.sealBlock(cfg.entry);
+	builder(_functionDefinition->body);
+	cfg.exits.insert(builder.m_currentBlock);
+	// Artificial explicit function exit (`leave`) at the end of the body.
+	builder(Leave{debugDataOf(*_functionDefinition)});
 	builder.cleanUnreachable();
-	return builder.m_functionDefinitions;
 }
 
 void SSAControlFlowGraphBuilder::operator()(ExpressionStatement const& _expressionStatement)
@@ -331,11 +314,8 @@ void SSAControlFlowGraphBuilder::operator()(VariableDeclaration const& _variable
 
 void SSAControlFlowGraphBuilder::operator()(FunctionDefinition const& _functionDefinition)
 {
-	yulAssert(m_scope, "");
-	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
-	auto& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
-	m_graph.functions.emplace_back(function);
-	m_functionDefinitions.emplace_back(&function, &_functionDefinition);
+	Scope::Function const& function = lookupFunction(_functionDefinition.name);
+	buildFunctionGraph(&function, &_functionDefinition);
 }
 
 void SSAControlFlowGraphBuilder::operator()(If const& _if)
@@ -537,25 +517,27 @@ void SSAControlFlowGraphBuilder::operator()(Leave const& _leaveStatement)
 	sealBlock(m_currentBlock);
 }
 
+void SSAControlFlowGraphBuilder::registerFunctionDefinition(FunctionDefinition const& _functionDefinition)
+{
+	yulAssert(m_scope, "");
+	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
+	auto& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
+	m_graph.functions.emplace_back(function);
+	m_functionDefinitions.emplace_back(&function, &_functionDefinition);
+}
+
 void SSAControlFlowGraphBuilder::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
-	if (m_currentBlock == m_graph.entry)
-	{
-		auto const filterFunctionDefinitions = [](bool _yieldDefinitionsOnly)
-		{
-			return [b=_yieldDefinitionsOnly](Statement const& _statement) -> bool { return !b ^ std::holds_alternative<FunctionDefinition>(_statement);};
-		};
-		for (auto const& statement: _block.statements | ranges::views::filter(filterFunctionDefinitions(true)))
-			std::visit(*this, statement);
-		for (auto const& statement: _block.statements | ranges::views::filter(filterFunctionDefinitions(false)))
-			std::visit(*this, statement);
-	}
-	else
-	{
-		for (auto const& statement: _block.statements)
-			std::visit(*this, statement);
-	}
+	// gather all function definitions so that they are visible to each other's subgraphs
+	static constexpr auto functionDefinitionFilter = ranges::views::filter(
+		[](auto const& _statement) { return std::holds_alternative<FunctionDefinition>(_statement); }
+	);
+	for (auto const& statement: _block.statements | functionDefinitionFilter)
+		registerFunctionDefinition(std::get<FunctionDefinition>(statement));
+	// now visit the rest
+	for (auto const& statement: _block.statements)
+		std::visit(*this, statement);
 }
 
 SSACFG::ValueId SSAControlFlowGraphBuilder::operator()(FunctionCall const& _call)
diff --git a/libyul/backends/evm/SSAControlFlowGraphBuilder.h b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
index 8fc537c14e..a3a723f67c 100644
--- a/libyul/backends/evm/SSAControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/SSAControlFlowGraphBuilder.h
@@ -40,6 +40,7 @@ namespace solidity::yul
 class SSAControlFlowGraphBuilder
 {
 	SSAControlFlowGraphBuilder(
+		ControlFlow& _controlFlow,
 		SSACFG& _graph,
 		AsmAnalysisInfo const& _analysisInfo,
 		ControlFlowSideEffectsCollector const& _sideEffects,
@@ -53,20 +54,6 @@ class SSAControlFlowGraphBuilder
 		Dialect const& _dialect,
 		Block const& _block
 	);
-	static void buildFunctionGraphs(
-		ControlFlow& _controlFlow,
-		AsmAnalysisInfo const& _info,
-		ControlFlowSideEffectsCollector const& _sideEffects,
-		Dialect const& _dialect,
-		std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> const& _functions
-	);
-	static std::vector<std::tuple<Scope::Function const*, FunctionDefinition const*>> buildMainGraph(
-		SSACFG& _cfg,
-		AsmAnalysisInfo const& _analysisInfo,
-		ControlFlowSideEffectsCollector const& _sideEffects,
-		Dialect const& _dialect,
-		Block const& _block
-	);
 
 	void operator()(ExpressionStatement const& _statement);
 	void operator()(Assignment const& _assignment);
@@ -91,6 +78,8 @@ class SSAControlFlowGraphBuilder
 	SSACFG::ValueId tryRemoveTrivialPhi(SSACFG::ValueId _phi);
 	void assign(std::vector<std::reference_wrapper<Scope::Variable const>> _variables, Expression const* _expression);
 	std::vector<SSACFG::ValueId> visitFunctionCall(FunctionCall const& _call);
+	void registerFunctionDefinition(FunctionDefinition const& _functionDefinition);
+	void buildFunctionGraph(Scope::Function const* _function, FunctionDefinition const* _functionDefinition);
 
 	SSACFG::ValueId zero();
 	SSACFG::ValueId readVariable(Scope::Variable const& _variable, SSACFG::BlockId _block);
@@ -98,6 +87,7 @@ class SSAControlFlowGraphBuilder
 	SSACFG::ValueId addPhiOperands(Scope::Variable const& _variable, SSACFG::ValueId _phi);
 	void writeVariable(Scope::Variable const& _variable, SSACFG::BlockId _block, SSACFG::ValueId _value);
 
+	ControlFlow& m_controlFlow;
 	SSACFG& m_graph;
 	AsmAnalysisInfo const& m_info;
 	ControlFlowSideEffectsCollector const& m_sideEffects;
diff --git a/test/libyul/yulSSAControlFlowGraph/nested_function.yul b/test/libyul/yulSSAControlFlowGraph/nested_function.yul
new file mode 100644
index 0000000000..859b241515
--- /dev/null
+++ b/test/libyul/yulSSAControlFlowGraph/nested_function.yul
@@ -0,0 +1,142 @@
+{
+    function f(a, b) -> r {
+        let x := add(a,b)
+        r := sub(x,a)
+    }
+    function g() {
+        function z() -> r {
+            function w() -> rw1 {
+                rw1 := 0x01
+            }
+            r := w()
+        }
+        function v() -> r {
+            function w() -> rw2 {
+                rw2 := 0x11
+            }
+            r := w()
+        }
+        sstore(z(), f(v(),2))
+    }
+    function cycle1() -> r {
+        if mload(3) {
+            r := cycle2()
+        }
+    }
+    function cycle2() -> r {
+        if mload(4) {
+            r := cycle1()
+        }
+    }
+}
+// ----
+// digraph SSACFG {
+// nodesep=0.7;
+// graph[fontname="DejaVu Sans"]
+// node[shape=box,fontname="DejaVu Sans"];
+//
+// Entry0 [label="Entry"];
+// Entry0 -> Block0_0;
+// Block0_0 [label="\
+// Block 0\n"];
+// Block0_0Exit [label="MainExit"];
+// Block0_0 -> Block0_0Exit;
+// FunctionEntry_f_0 [label="function f:
+//  r := f(v0, v1)"];
+// FunctionEntry_f_0 -> Block1_0;
+// Block1_0 [label="\
+// Block 0\nv3 := add(v1, v0)\l\
+// v4 := sub(v0, v3)\l\
+// "];
+// Block1_0Exit [label="FunctionReturn[v4]"];
+// Block1_0 -> Block1_0Exit;
+// FunctionEntry_g_0 [label="function g:
+//  g()"];
+// FunctionEntry_g_0 -> Block2_0;
+// Block2_0 [label="\
+// Block 0\nv1 := v()\l\
+// v2 := f(2, v1)\l\
+// v3 := z()\l\
+// sstore(v2, v3)\l\
+// "];
+// Block2_0Exit [label="FunctionReturn[]"];
+// Block2_0 -> Block2_0Exit;
+// FunctionEntry_z_0 [label="function z:
+//  r := z()"];
+// FunctionEntry_z_0 -> Block3_0;
+// Block3_0 [label="\
+// Block 0\nv1 := w()\l\
+// "];
+// Block3_0Exit [label="FunctionReturn[v1]"];
+// Block3_0 -> Block3_0Exit;
+// FunctionEntry_w_0 [label="function w:
+//  rw1 := w()"];
+// FunctionEntry_w_0 -> Block4_0;
+// Block4_0 [label="\
+// Block 0\n"];
+// Block4_0Exit [label="FunctionReturn[1]"];
+// Block4_0 -> Block4_0Exit;
+// FunctionEntry_v_0 [label="function v:
+//  r := v()"];
+// FunctionEntry_v_0 -> Block5_0;
+// Block5_0 [label="\
+// Block 0\nv1 := w()\l\
+// "];
+// Block5_0Exit [label="FunctionReturn[v1]"];
+// Block5_0 -> Block5_0Exit;
+// FunctionEntry_w_0 [label="function w:
+//  rw2 := w()"];
+// FunctionEntry_w_0 -> Block6_0;
+// Block6_0 [label="\
+// Block 0\n"];
+// Block6_0Exit [label="FunctionReturn[17]"];
+// Block6_0 -> Block6_0Exit;
+// FunctionEntry_cycle1_0 [label="function cycle1:
+//  r := cycle1()"];
+// FunctionEntry_cycle1_0 -> Block7_0;
+// Block7_0 [label="\
+// Block 0\nv2 := mload(3)\l\
+// "];
+// Block7_0 -> Block7_0Exit;
+// Block7_0Exit [label="{ If v2| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block7_0Exit:0 -> Block7_2;
+// Block7_0Exit:1 -> Block7_1;
+// Block7_1 [label="\
+// Block 1\nv3 := cycle2()\l\
+// "];
+// Block7_1 -> Block7_1Exit [arrowhead=none];
+// Block7_1Exit [label="Jump" shape=oval];
+// Block7_1Exit -> Block7_2;
+// Block7_2 [label="\
+// Block 2\nv4 := φ(\l\
+// 	Block 0 => 0,\l\
+// 	Block 1 => v3\l\
+// )\l\
+// "];
+// Block7_2Exit [label="FunctionReturn[v4]"];
+// Block7_2 -> Block7_2Exit;
+// FunctionEntry_cycle2_0 [label="function cycle2:
+//  r := cycle2()"];
+// FunctionEntry_cycle2_0 -> Block8_0;
+// Block8_0 [label="\
+// Block 0\nv2 := mload(4)\l\
+// "];
+// Block8_0 -> Block8_0Exit;
+// Block8_0Exit [label="{ If v2| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block8_0Exit:0 -> Block8_2;
+// Block8_0Exit:1 -> Block8_1;
+// Block8_1 [label="\
+// Block 1\nv3 := cycle1()\l\
+// "];
+// Block8_1 -> Block8_1Exit [arrowhead=none];
+// Block8_1Exit [label="Jump" shape=oval];
+// Block8_1Exit -> Block8_2;
+// Block8_2 [label="\
+// Block 2\nv4 := φ(\l\
+// 	Block 0 => 0,\l\
+// 	Block 1 => v3\l\
+// )\l\
+// "];
+// Block8_2Exit [label="FunctionReturn[v4]"];
+// Block8_2 -> Block8_2Exit;
+// }

From 47ba76f14018e1570c9ad47ab15760883e2c2dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 16:07:46 +0200
Subject: [PATCH 1082/1140] benchmarks: Move shared code using /usr/bin/time
 into a helper with JSON output

---
 scripts/common.sh           | 20 ++++++++++++++++++--
 test/benchmarks/external.sh | 18 ++++++++----------
 test/benchmarks/local.sh    | 12 ++++++------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 81dd2ec491..2061649f76 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -327,7 +327,7 @@ function gnu_grep
 
 function time_to_json_file
 {
-    local output_file="$1"
+    local time_file="$1"
     local cmd=("${@:2}")
     (( $# >= 2 )) || assertFail
 
@@ -340,9 +340,25 @@ function time_to_json_file
     {
         {
             time { "${cmd[@]}" 1>&3 2>&4; }
-        } 2> "$output_file"
+        } 2> "$time_file"
     } 3>&1 4>&2
 
     # Restore original format so that it does not spill outside of the function.
     TIMEFORMAT="$original_timeformat"
 }
+
+function gnu_time_to_json_file
+{
+    local time_file="$1"
+    local cmd=("${@:2}")
+    (( $# >= 2 )) || assertFail
+
+    local gnu_time_path
+    gnu_time_path=$(type -P time)
+
+    "$gnu_time_path" \
+        --output "$time_file" \
+        --quiet \
+        --format '{"real": %e, "user": %U, "sys": %S, "exit": %x}' \
+            "${cmd[@]}"
+}
diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh
index b37c9105d6..cf75a0c9f2 100755
--- a/test/benchmarks/external.sh
+++ b/test/benchmarks/external.sh
@@ -46,6 +46,7 @@ source "${repo_root}/scripts/common_cmdline.sh"
 
 solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
 command_available "$solc" --version
+command_available "$(type -P time)" --version
 
 function benchmark_project {
     local pipeline="$1"
@@ -59,18 +60,16 @@ function benchmark_project {
 
     # NOTE: The pipeline may fail with "Stack too deep" in some cases. That's fine.
     # We note the exit code and will later show full output.
-    "$time_bin_path" \
-        --output "$time_file" \
-        --quiet \
-        --format '%e s |         %x' \
-            "${foundry_command[@]}" \
-            > /dev/null \
-            2> "../stderr-${project}-${pipeline}.log" || true
+    gnu_time_to_json_file "$time_file" \
+        "${foundry_command[@]}" \
+        > /dev/null \
+        2> "../stderr-${project}-${pipeline}.log" || true
 
-    printf '| %-20s | %8s | %21s |\n' \
+    printf '| %-20s | %8s | %7s s | %9d |\n' \
         "$project" \
         "$pipeline" \
-        "$(cat "$time_file")"
+        "$(jq '.real' "$time_file")" \
+        "$(jq '.exit' "$time_file")"
     cd ..
 }
 
@@ -82,7 +81,6 @@ benchmarks=(
     seaport
     sablier-v2
 )
-time_bin_path=$(type -P time)
 
 mkdir -p "$BENCHMARK_DIR"
 cd "$BENCHMARK_DIR"
diff --git a/test/benchmarks/local.sh b/test/benchmarks/local.sh
index 16a0c3afe3..42018e7a1f 100755
--- a/test/benchmarks/local.sh
+++ b/test/benchmarks/local.sh
@@ -35,6 +35,7 @@ source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 solc="${1:-${SOLIDITY_BUILD_DIR}/solc/solc}"
 command_available "$solc" --version
+command_available "$(type -P time)" --version
 
 output_dir=$(mktemp -d -t solc-benchmark-XXXXXX)
 
@@ -51,24 +52,23 @@ function benchmark_contract {
 
     local solc_command=("${solc}" --optimize --bin --color "${input_path}")
     [[ $pipeline == via-ir ]] && solc_command+=(--via-ir)
-    local time_args=(--output "${output_dir}/time-and-status-${pipeline}.txt" --quiet --format '%e s |         %x')
+    local time_file="${output_dir}/time-and-status-${pipeline}.txt"
 
     # NOTE: Legacy pipeline may fail with "Stack too deep" in some cases. That's fine.
-    "$time_bin_path" \
-        "${time_args[@]}" \
+    gnu_time_to_json_file "$time_file" \
         "${solc_command[@]}" \
         > "${output_dir}/bytecode-${pipeline}.bin" \
         2>> "${output_dir}/benchmark-warn-err.txt" || [[ $pipeline == legacy ]]
 
-    printf '| %-20s | %s   | %7d bytes | %20s |\n' \
+    printf '| %-20s | %s   | %7d bytes | %6s s | %9d |\n' \
         '`'"$input_file"'`' \
         "$pipeline" \
         "$(bytecode_size < "${output_dir}/bytecode-${pipeline}.bin")" \
-        "$(< "${output_dir}/time-and-status-${pipeline}.txt")"
+        "$(jq '.real' "$time_file")" \
+        "$(jq '.exit' "$time_file")"
 }
 
 benchmarks=("verifier.sol" "OptimizorClub.sol" "chains.sol")
-time_bin_path=$(type -P time)
 
 echo "| File                 | Pipeline | Bytecode size | Time     | Exit code |"
 echo "|----------------------|----------|--------------:|---------:|----------:|"

From 8bb279bed90fc7eb494fe2389fc95abe8f4486de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 16:21:51 +0200
Subject: [PATCH 1083/1140] benchmarks: Switch to displaying CPU time rather
 than wall clock time and round it for external projects

---
 test/benchmarks/external.sh | 4 ++--
 test/benchmarks/local.sh    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh
index cf75a0c9f2..5188d23d85 100755
--- a/test/benchmarks/external.sh
+++ b/test/benchmarks/external.sh
@@ -65,10 +65,10 @@ function benchmark_project {
         > /dev/null \
         2> "../stderr-${project}-${pipeline}.log" || true
 
-    printf '| %-20s | %8s | %7s s | %9d |\n' \
+    printf '| %-20s | %8s | %7d s | %9d |\n' \
         "$project" \
         "$pipeline" \
-        "$(jq '.real' "$time_file")" \
+        "$(jq '(.user + .sys) | round' "$time_file")" \
         "$(jq '.exit' "$time_file")"
     cd ..
 }
diff --git a/test/benchmarks/local.sh b/test/benchmarks/local.sh
index 42018e7a1f..f250251b16 100755
--- a/test/benchmarks/local.sh
+++ b/test/benchmarks/local.sh
@@ -60,11 +60,11 @@ function benchmark_contract {
         > "${output_dir}/bytecode-${pipeline}.bin" \
         2>> "${output_dir}/benchmark-warn-err.txt" || [[ $pipeline == legacy ]]
 
-    printf '| %-20s | %s   | %7d bytes | %6s s | %9d |\n' \
+    printf '| %-20s | %s   | %7d bytes | %6.2f s | %9d |\n' \
         '`'"$input_file"'`' \
         "$pipeline" \
         "$(bytecode_size < "${output_dir}/bytecode-${pipeline}.bin")" \
-        "$(jq '.real' "$time_file")" \
+        "$(jq '(.user + .sys) * 100 | round / 100' "$time_file")" \
         "$(jq '.exit' "$time_file")"
 }
 

From 95534b6b200c49bfa5f7d801a2cc7f8b4b402666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 16:24:00 +0200
Subject: [PATCH 1084/1140] benchmarks: Show peak memory usage

---
 scripts/common.sh           | 2 +-
 test/benchmarks/external.sh | 7 ++++---
 test/benchmarks/local.sh    | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 2061649f76..0ca602ee6a 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -359,6 +359,6 @@ function gnu_time_to_json_file
     "$gnu_time_path" \
         --output "$time_file" \
         --quiet \
-        --format '{"real": %e, "user": %U, "sys": %S, "exit": %x}' \
+        --format '{"real": %e, "user": %U, "sys": %S, "mem": %M, "exit": %x}' \
             "${cmd[@]}"
 }
diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh
index 5188d23d85..e93c485fac 100755
--- a/test/benchmarks/external.sh
+++ b/test/benchmarks/external.sh
@@ -65,10 +65,11 @@ function benchmark_project {
         > /dev/null \
         2> "../stderr-${project}-${pipeline}.log" || true
 
-    printf '| %-20s | %8s | %7d s | %9d |\n' \
+    printf '| %-20s | %8s | %7d s | %9d MiB | %9d |\n' \
         "$project" \
         "$pipeline" \
         "$(jq '(.user + .sys) | round' "$time_file")" \
+        "$(jq '.mem / 1024 | round' "$time_file")" \
         "$(jq '.exit' "$time_file")"
     cd ..
 }
@@ -85,8 +86,8 @@ benchmarks=(
 mkdir -p "$BENCHMARK_DIR"
 cd "$BENCHMARK_DIR"
 
-echo "| Project              | Pipeline | Time      | Exit code |"
-echo "|----------------------|----------|----------:|----------:|"
+echo "| Project              | Pipeline | Time      | Memory (peak) | Exit code |"
+echo "|----------------------|----------|----------:|--------------:|----------:|"
 
 for project in "${benchmarks[@]}"; do
     benchmark_project legacy "$project"
diff --git a/test/benchmarks/local.sh b/test/benchmarks/local.sh
index f250251b16..c86eb49526 100755
--- a/test/benchmarks/local.sh
+++ b/test/benchmarks/local.sh
@@ -60,18 +60,19 @@ function benchmark_contract {
         > "${output_dir}/bytecode-${pipeline}.bin" \
         2>> "${output_dir}/benchmark-warn-err.txt" || [[ $pipeline == legacy ]]
 
-    printf '| %-20s | %s   | %7d bytes | %6.2f s | %9d |\n' \
+    printf '| %-20s | %s   | %7d bytes | %6.2f s | %9d MiB | %9d |\n' \
         '`'"$input_file"'`' \
         "$pipeline" \
         "$(bytecode_size < "${output_dir}/bytecode-${pipeline}.bin")" \
         "$(jq '(.user + .sys) * 100 | round / 100' "$time_file")" \
+        "$(jq '.mem / 1024 | round' "$time_file")" \
         "$(jq '.exit' "$time_file")"
 }
 
 benchmarks=("verifier.sol" "OptimizorClub.sol" "chains.sol")
 
-echo "| File                 | Pipeline | Bytecode size | Time     | Exit code |"
-echo "|----------------------|----------|--------------:|---------:|----------:|"
+echo "| File                 | Pipeline | Bytecode size | Time     | Memory (peak) | Exit code |"
+echo "|----------------------|----------|--------------:|---------:|--------------:|----------:|"
 
 for input_file in "${benchmarks[@]}"
 do

From 9bf850bf8887be2558cf9bf9f6e282658d25cb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 16:26:26 +0200
Subject: [PATCH 1085/1140] benchmarks: Cosmetic tweaks to how results are
 displayed

- via-ir -> ir
- Centered headers
---
 test/benchmarks/external.sh | 6 +++---
 test/benchmarks/local.sh    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh
index e93c485fac..9acaccb67f 100755
--- a/test/benchmarks/external.sh
+++ b/test/benchmarks/external.sh
@@ -65,7 +65,7 @@ function benchmark_project {
         > /dev/null \
         2> "../stderr-${project}-${pipeline}.log" || true
 
-    printf '| %-20s | %8s | %7d s | %9d MiB | %9d |\n' \
+    printf '| %-20s | %8s | %6d s | %9d MiB | %9d |\n' \
         "$project" \
         "$pipeline" \
         "$(jq '(.user + .sys) | round' "$time_file")" \
@@ -86,8 +86,8 @@ benchmarks=(
 mkdir -p "$BENCHMARK_DIR"
 cd "$BENCHMARK_DIR"
 
-echo "| Project              | Pipeline | Time      | Memory (peak) | Exit code |"
-echo "|----------------------|----------|----------:|--------------:|----------:|"
+echo "|         File         | Pipeline |   Time   | Memory (peak) | Exit code |"
+echo "|----------------------|----------|---------:|--------------:|----------:|"
 
 for project in "${benchmarks[@]}"; do
     benchmark_project legacy "$project"
diff --git a/test/benchmarks/local.sh b/test/benchmarks/local.sh
index c86eb49526..0696443019 100755
--- a/test/benchmarks/local.sh
+++ b/test/benchmarks/local.sh
@@ -51,7 +51,7 @@ function benchmark_contract {
     local input_path="$2"
 
     local solc_command=("${solc}" --optimize --bin --color "${input_path}")
-    [[ $pipeline == via-ir ]] && solc_command+=(--via-ir)
+    [[ $pipeline == ir ]] && solc_command+=(--via-ir)
     local time_file="${output_dir}/time-and-status-${pipeline}.txt"
 
     # NOTE: Legacy pipeline may fail with "Stack too deep" in some cases. That's fine.
@@ -60,7 +60,7 @@ function benchmark_contract {
         > "${output_dir}/bytecode-${pipeline}.bin" \
         2>> "${output_dir}/benchmark-warn-err.txt" || [[ $pipeline == legacy ]]
 
-    printf '| %-20s | %s   | %7d bytes | %6.2f s | %9d MiB | %9d |\n' \
+    printf '| %-20s | %8s | %7d bytes | %6.2f s | %9d MiB | %9d |\n' \
         '`'"$input_file"'`' \
         "$pipeline" \
         "$(bytecode_size < "${output_dir}/bytecode-${pipeline}.bin")" \
@@ -71,13 +71,13 @@ function benchmark_contract {
 
 benchmarks=("verifier.sol" "OptimizorClub.sol" "chains.sol")
 
-echo "| File                 | Pipeline | Bytecode size | Time     | Memory (peak) | Exit code |"
+echo "|         File         | Pipeline | Bytecode size |   Time   | Memory (peak) | Exit code |"
 echo "|----------------------|----------|--------------:|---------:|--------------:|----------:|"
 
 for input_file in "${benchmarks[@]}"
 do
     benchmark_contract legacy "${REPO_ROOT}/test/benchmarks/${input_file}"
-    benchmark_contract via-ir "${REPO_ROOT}/test/benchmarks/${input_file}"
+    benchmark_contract ir     "${REPO_ROOT}/test/benchmarks/${input_file}"
 done
 
 echo

From 545cab32de0e1c09dcbe489f002bae285e220fd8 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Wed, 25 Sep 2024 09:49:16 +0200
Subject: [PATCH 1086/1140] eof: Refactor `assemble` functions in
 `evmasm::Assembly``
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 libevmasm/Assembly.cpp                     | 226 +++++++++++----------
 libevmasm/Assembly.h                       |  14 ++
 libevmasm/LinkerObject.h                   |   3 +-
 libsolidity/interface/StandardCompiler.cpp |   2 +-
 4 files changed, 140 insertions(+), 105 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 0d5468e267..f993095540 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -926,19 +926,19 @@ std::tuple<bytes, std::vector<size_t>, size_t> Assembly::createEOFHeader(std::se
 
 	retBytecode.push_back(0xef);
 	retBytecode.push_back(0x00);
-	retBytecode.push_back(0x01);										// version 1
+	retBytecode.push_back(0x01);                                        // version 1
 
-	retBytecode.push_back(0x01);										// kind=type
-	appendBigEndianUint16(retBytecode, m_codeSections.size() * 4u);		// length of type section
+	retBytecode.push_back(0x01);                                        // kind=type
+	appendBigEndianUint16(retBytecode, m_codeSections.size() * 4u);     // length of type section
 
-	retBytecode.push_back(0x02);										// kind=code
-	appendBigEndianUint16(retBytecode, m_codeSections.size());			// placeholder for number of code sections
+	retBytecode.push_back(0x02);                                        // kind=code
+	appendBigEndianUint16(retBytecode, m_codeSections.size());          // placeholder for number of code sections
 
 	for (auto const& codeSection: m_codeSections)
 	{
 		(void) codeSection;
 		codeSectionSizeOffsets.emplace_back(retBytecode.size());
-		appendBigEndianUint16(retBytecode, 0u);							// placeholder for length of code
+		appendBigEndianUint16(retBytecode, 0u);                         // placeholder for length of code
 	}
 
 	if (!_referencedSubIds.empty())
@@ -950,17 +950,18 @@ std::tuple<bytes, std::vector<size_t>, size_t> Assembly::createEOFHeader(std::se
 			appendBigEndianUint16(retBytecode, m_subs[subId]->assemble().bytecode.size());
 	}
 
-	retBytecode.push_back(0x04);										// kind=data
+	retBytecode.push_back(0x04);                                        // kind=data
 	dataSectionSizeOffset = retBytecode.size();
-	appendBigEndianUint16(retBytecode, 0u);								// length of data
+	appendBigEndianUint16(retBytecode, 0u);                             // length of data
 
-	retBytecode.push_back(0x00);										// terminator
+	retBytecode.push_back(0x00);                                        // terminator
 
 	for (auto const& codeSection: m_codeSections)
 	{
 		retBytecode.push_back(codeSection.inputs);
 		retBytecode.push_back(codeSection.outputs);
-		appendBigEndianUint16(retBytecode, 0xFFFFu);	// TODO: Add stack height calculation
+		// TODO: Add stack height calculation
+		appendBigEndianUint16(retBytecode, 0xFFFFu);
 	}
 
 	return {retBytecode, codeSectionSizeOffsets, dataSectionSizeOffset};
@@ -985,6 +986,65 @@ LinkerObject const& Assembly::assemble() const
 		return assembleEOF();
 }
 
+[[nodiscard]] bytes Assembly::assembleOperation(AssemblyItem const& _item) const
+{
+	// solidity::evmasm::Instructions underlying type is uint8_t
+	// TODO: Change to std::to_underlying since C++23
+	return {static_cast<uint8_t>(_item.instruction())};
+}
+
+[[nodiscard]] bytes Assembly::assemblePush(AssemblyItem const& _item) const
+{
+	bytes ret;
+	unsigned pushValueSize = numberEncodingSize(_item.data());
+	if (pushValueSize == 0 && !m_evmVersion.hasPush0())
+		pushValueSize = 1;
+
+	// solidity::evmasm::Instructions underlying type is uint8_t
+	// TODO: Change to std::to_underlying since C++23
+	ret.push_back(static_cast<uint8_t>(pushInstruction(pushValueSize)));
+	if (pushValueSize > 0)
+		appendBigEndian(ret, pushValueSize, _item.data());
+
+	return ret;
+}
+
+[[nodiscard]] std::pair<bytes, Assembly::LinkRef> Assembly::assemblePushLibraryAddress(AssemblyItem const& _item, size_t _pos) const
+{
+	return {
+		// solidity::evmasm::Instructions underlying type is uint8_t
+		// TODO: Change to std::to_underlying since C++23
+		bytes(1, static_cast<uint8_t>(Instruction::PUSH20)) + bytes(20),
+		{_pos + 1, m_libraries.at(_item.data())}
+	};
+}
+
+[[nodiscard]] bytes Assembly::assembleVerbatimBytecode(AssemblyItem const& item) const
+{
+	return item.verbatimData();
+}
+
+[[nodiscard]] bytes Assembly::assemblePushDeployTimeAddress() const
+{
+	// solidity::evmasm::Instructions underlying type is uint8_t
+	// TODO: Change to std::to_underlying since C++23
+	return bytes(1, static_cast<uint8_t>(Instruction::PUSH20)) + bytes(20);
+}
+
+[[nodiscard]] bytes Assembly::assembleTag(AssemblyItem const& _item, size_t _pos, bool _addJumpDest) const
+{
+	solRequire(_item.data() != 0, AssemblyException, "Invalid tag position.");
+	solRequire(_item.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
+	solRequire(_pos < 0xffffffffL, AssemblyException, "Tag too large.");
+	size_t tagId = static_cast<size_t>(_item.data());
+	solRequire(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
+	m_tagPositionsInBytecode[tagId] = _pos;
+
+	// solidity::evmasm::Instructions underlying type is uint8_t
+	// TODO: Change to std::to_underlying since C++23
+	return _addJumpDest ? bytes(1, static_cast<uint8_t>(Instruction::JUMPDEST)) : bytes();
+}
+
 LinkerObject const& Assembly::assembleLegacy() const
 {
 	solAssert(!m_eofVersion.has_value());
@@ -998,7 +1058,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 	LinkerObject& ret = m_assembledObject;
 
 	size_t subTagSize = 1;
-	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferencesBySub;
+	std::map<u256, LinkerObject::ImmutableRefs> immutableReferencesBySub;
 	for (auto const& sub: m_subs)
 	{
 		auto const& linkerObject = sub->assemble();
@@ -1039,10 +1099,6 @@ LinkerObject const& Assembly::assembleLegacy() const
 
 	unsigned bytesRequiredForCode = codeSize(static_cast<unsigned>(subTagSize));
 	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);
 	// Adjust bytesPerTag for references to sub assemblies.
 	for (AssemblyItem const& item: items)
@@ -1056,16 +1112,21 @@ LinkerObject const& Assembly::assembleLegacy() const
 			assertThrow(subTagPosition != std::numeric_limits<size_t>::max(), AssemblyException, "Reference to tag without position.");
 			bytesPerTag = std::max(bytesPerTag, numberEncodingSize(subTagPosition));
 		}
-	uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
 
 	unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1 + static_cast<unsigned>(m_auxiliaryData.size());
 	for (auto const& sub: m_subs)
 		bytesRequiredIncludingData += static_cast<unsigned>(sub->assemble().bytecode.size());
 
 	unsigned bytesPerDataRef = numberEncodingSize(bytesRequiredIncludingData);
-	uint8_t dataRefPush = static_cast<uint8_t>(pushInstruction(bytesPerDataRef));
 	ret.bytecode.reserve(bytesRequiredIncludingData);
 
+	TagRefs tagRefs;
+	DataRefs dataRefs;
+	SubAssemblyRefs subRefs;
+	ProgramSizeRefs sizeRefs;
+	uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
+	uint8_t dataRefPush = static_cast<uint8_t>(pushInstruction(bytesPerDataRef));
+
 	for (AssemblyItem const& item: items)
 	{
 		// store position of the invalid jump destination
@@ -1075,40 +1136,27 @@ LinkerObject const& Assembly::assembleLegacy() const
 		switch (item.type())
 		{
 		case Operation:
-			ret.bytecode.push_back(static_cast<uint8_t>(item.instruction()));
+			ret.bytecode += assembleOperation(item);
 			break;
 		case Push:
-		{
-			unsigned b = numberEncodingSize(item.data());
-			if (b == 0 && !m_evmVersion.hasPush0())
-			{
-				b = 1;
-			}
-			ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(b)));
-			if (b > 0)
-			{
-				ret.bytecode.resize(ret.bytecode.size() + b);
-				bytesRef byr(&ret.bytecode.back() + 1 - b, b);
-				toBigEndian(item.data(), byr);
-			}
+			ret.bytecode += assemblePush(item);
 			break;
-		}
 		case PushTag:
 		{
 			ret.bytecode.push_back(tagPush);
-			tagRef[ret.bytecode.size()] = item.splitForeignPushTag();
+			tagRefs[ret.bytecode.size()] = item.splitForeignPushTag();
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerTag);
 			break;
 		}
 		case PushData:
 			ret.bytecode.push_back(dataRefPush);
-			dataRef.insert(std::make_pair(h256(item.data()), ret.bytecode.size()));
+			dataRefs.insert(std::make_pair(h256(item.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSub:
 			assertThrow(item.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
 			ret.bytecode.push_back(dataRefPush);
-			subRef.insert(std::make_pair(static_cast<size_t>(item.data()), ret.bytecode.size()));
+			subRefs.insert(std::make_pair(static_cast<size_t>(item.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSubSize:
@@ -1126,15 +1174,17 @@ LinkerObject const& Assembly::assembleLegacy() const
 		case PushProgramSize:
 		{
 			ret.bytecode.push_back(dataRefPush);
-			sizeRef.push_back(static_cast<unsigned>(ret.bytecode.size()));
+			sizeRefs.push_back(static_cast<unsigned>(ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		}
 		case PushLibraryAddress:
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-			ret.linkReferences[ret.bytecode.size()] = m_libraries.at(item.data());
-			ret.bytecode.resize(ret.bytecode.size() + 20);
+		{
+			auto const [bytecode, linkRef] = assemblePushLibraryAddress(item, ret.bytecode.size());
+			ret.bytecode += bytecode;
+			ret.linkReferences.insert(linkRef);
 			break;
+		}
 		case PushImmutable:
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH32));
 			// Maps keccak back to the "identifier" std::string of that immutable.
@@ -1145,7 +1195,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 			ret.bytecode.resize(ret.bytecode.size() + 32);
 			break;
 		case VerbatimBytecode:
-			ret.bytecode += item.verbatimData();
+			ret.bytecode += assembleVerbatimBytecode(item);
 			break;
 		case AssignImmutable:
 		{
@@ -1174,20 +1224,11 @@ LinkerObject const& Assembly::assembleLegacy() const
 			break;
 		}
 		case PushDeployTimeAddress:
-			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-			ret.bytecode.resize(ret.bytecode.size() + 20);
+			ret.bytecode += assemblePushDeployTimeAddress();
 			break;
 		case Tag:
-		{
-			assertThrow(item.data() != 0, AssemblyException, "Invalid tag position.");
-			assertThrow(item.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
-			size_t tagId = static_cast<size_t>(item.data());
-			assertThrow(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
-			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));
+			ret.bytecode += assembleTag(item, ret.bytecode.size(), true);
 			break;
-		}
 		default:
 			assertThrow(false, InvalidOpcode, "Unexpected opcode while assembling.");
 		}
@@ -1206,7 +1247,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
 
 	std::map<LinkerObject, size_t> subAssemblyOffsets;
-	for (auto const& [subIdPath, bytecodeOffset]: subRef)
+	for (auto const& [subIdPath, bytecodeOffset]: subRefs)
 	{
 		LinkerObject subObject = subAssemblyById(subIdPath)->assemble();
 		bytesRef r(ret.bytecode.data() + bytecodeOffset, bytesPerDataRef);
@@ -1224,7 +1265,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 		for (auto const& ref: subObject.linkReferences)
 			ret.linkReferences[ref.first + subAssemblyOffsets[subObject]] = ref.second;
 	}
-	for (auto const& i: tagRef)
+	for (auto const& i: tagRefs)
 	{
 		size_t subId;
 		size_t tagId;
@@ -1262,7 +1303,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 
 	for (auto const& dataItem: m_data)
 	{
-		auto references = dataRef.equal_range(dataItem.first);
+		auto references = dataRefs.equal_range(dataItem.first);
 		if (references.first == references.second)
 			continue;
 		for (auto ref = references.first; ref != references.second; ++ref)
@@ -1275,7 +1316,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 
 	ret.bytecode += m_auxiliaryData;
 
-	for (unsigned pos: sizeRef)
+	for (unsigned pos: sizeRefs)
 	{
 		bytesRef r(ret.bytecode.data() + pos, bytesPerDataRef);
 		toBigEndian(ret.bytecode.size(), r);
@@ -1321,15 +1362,14 @@ LinkerObject const& Assembly::assembleEOF() const
 	);
 
 	// Insert EOF1 header.
-	auto [bytecode, codeSectionSizeOffsets, dataSectionSizeOffset] = createEOFHeader(referencedSubIds);
-	ret.bytecode = bytecode;
+	auto [headerBytecode, codeSectionSizeOffsets, dataSectionSizeOffset] = createEOFHeader(referencedSubIds);
+	ret.bytecode = headerBytecode;
 
 	m_tagPositionsInBytecode = std::vector<size_t>(m_usedTags, std::numeric_limits<size_t>::max());
 
 	for (auto&& [codeSectionIndex, codeSection]: m_codeSections | ranges::views::enumerate)
 	{
 		auto const sectionStart = ret.bytecode.size();
-
 		for (AssemblyItem const& item: codeSection.items)
 		{
 			// store position of the invalid jump destination
@@ -1338,54 +1378,34 @@ LinkerObject const& Assembly::assembleEOF() const
 
 			switch (item.type())
 			{
-				case Operation:
-					ret.bytecode.push_back(static_cast<uint8_t>(item.instruction()));
-					break;
-				case Push:
-				{
-					unsigned pushValueSize = numberEncodingSize(item.data());
-					if (pushValueSize == 0 && !m_evmVersion.hasPush0())
-					{
-						pushValueSize = 1;
-					}
-					ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(pushValueSize)));
-					if (pushValueSize > 0)
-					{
-						ret.bytecode.resize(ret.bytecode.size() + pushValueSize);
-						bytesRef pushValueBytecodeRef(&ret.bytecode.back() + 1 - pushValueSize, pushValueSize);
-						toBigEndian(item.data(), pushValueBytecodeRef);
-					}
-					break;
-				}
-				case PushLibraryAddress:
-					ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-					ret.linkReferences[ret.bytecode.size()] = m_libraries.at(item.data());
-					ret.bytecode.resize(ret.bytecode.size() + 20);
-					break;
-				case VerbatimBytecode:
-					ret.bytecode += item.verbatimData();
-					break;
-				case PushDeployTimeAddress:
-					ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH20));
-					ret.bytecode.resize(ret.bytecode.size() + 20);
-					break;
-				case Tag:
-				{
-					solRequire(item.data() != 0, AssemblyException, "Invalid tag position.");
-					solRequire(item.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
-					size_t tagId = static_cast<size_t>(item.data());
-					solRequire(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
-					solRequire(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
-					m_tagPositionsInBytecode[tagId] = ret.bytecode.size();
-					break;
-				}
-				default:
-					solRequire(false, InvalidOpcode, "Unexpected opcode while assembling.");
+			case Operation:
+				ret.bytecode += assembleOperation(item);
+				break;
+			case Push:
+				ret.bytecode += assemblePush(item);
+				break;
+			case PushLibraryAddress:
+			{
+				auto const [pushLibraryAddressBytecode, linkRef] = assemblePushLibraryAddress(item, ret.bytecode.size());
+				ret.bytecode += pushLibraryAddressBytecode;
+				ret.linkReferences.insert(linkRef);
+				break;
+			}
+			case VerbatimBytecode:
+				ret.bytecode += assembleVerbatimBytecode(item);
+				break;
+			case PushDeployTimeAddress:
+				ret.bytecode += assemblePushDeployTimeAddress();
+				break;
+			case Tag:
+				ret.bytecode += assembleTag(item, ret.bytecode.size(), false);
+				break;
+			default:
+				solThrow(InvalidOpcode, "Unexpected opcode while assembling.");
 			}
 		}
 
-		auto sectionEnd = ret.bytecode.size();
-		setBigEndianUint16(ret.bytecode, codeSectionSizeOffsets[codeSectionIndex], sectionEnd - sectionStart);
+		setBigEndianUint16(ret.bytecode, codeSectionSizeOffsets[codeSectionIndex], ret.bytecode.size() - sectionStart);
 	}
 
 	for (auto i: referencedSubIds)
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 41e735db61..de1ac20f20 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -47,6 +47,12 @@ using AssemblyPointer = std::shared_ptr<Assembly>;
 
 class Assembly
 {
+	using TagRefs = std::map<size_t, std::pair<size_t, size_t>>;
+	using DataRefs = std::multimap<util::h256, unsigned>;
+	using SubAssemblyRefs = std::multimap<size_t, size_t>;
+	using ProgramSizeRefs = std::vector<unsigned>;
+	using LinkRef = std::pair<size_t, std::string>;
+
 public:
 	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::optional<uint8_t> _eofVersion, std::string _name):
 		m_evmVersion(_evmVersion),
@@ -235,6 +241,14 @@ class Assembly
 	/// Returns map from m_subs to an index of subcontainer in the final EOF bytecode
 	std::map<uint16_t, uint16_t> findReferencedContainers() const;
 
+	/// Assemble bytecode for AssemblyItem type.
+	[[nodiscard]] bytes assembleOperation(AssemblyItem const& _item) const;
+	[[nodiscard]] bytes assemblePush(AssemblyItem const& _item) const;
+	[[nodiscard]] std::pair<bytes, Assembly::LinkRef> assemblePushLibraryAddress(AssemblyItem const& _item, size_t _pos) const;
+	[[nodiscard]] bytes assembleVerbatimBytecode(AssemblyItem const& item) const;
+	[[nodiscard]] bytes assemblePushDeployTimeAddress() const;
+	[[nodiscard]] bytes assembleTag(AssemblyItem const& _item, size_t _pos, bool _addJumpDest) const;
+
 protected:
 	/// 0 is reserved for exception
 	unsigned m_usedTags = 1;
diff --git a/libevmasm/LinkerObject.h b/libevmasm/LinkerObject.h
index 90b519e3af..c103a565a0 100644
--- a/libevmasm/LinkerObject.h
+++ b/libevmasm/LinkerObject.h
@@ -34,6 +34,7 @@ namespace solidity::evmasm
  */
 struct LinkerObject
 {
+	using ImmutableRefs = std::pair<std::string, std::vector<size_t>>;
 	/// The bytecode.
 	bytes bytecode;
 
@@ -43,7 +44,7 @@ struct LinkerObject
 
 	/// Map from hashes of the identifiers of immutable variables to the full identifier of the immutable and
 	/// to a list of offsets into the bytecode that refer to their values.
-	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferences;
+	std::map<u256, ImmutableRefs> immutableReferences;
 
 	struct FunctionDebugData
 	{
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index cd00caf073..06df8a9408 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -349,7 +349,7 @@ Json formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
 	return ret;
 }
 
-Json formatImmutableReferences(std::map<u256, std::pair<std::string, std::vector<size_t>>> const& _immutableReferences)
+Json formatImmutableReferences(std::map<u256, evmasm::LinkerObject::ImmutableRefs> const& _immutableReferences)
 {
 	Json ret = Json::object();
 

From 09c48f57534d1da162409773954d8e98aeba178d Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Tue, 24 Sep 2024 15:22:18 +0200
Subject: [PATCH 1087/1140] eof: Support EOF in `assemblyStream`

---
 libevmasm/Assembly.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index f993095540..ab26526e14 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -403,13 +403,14 @@ void Assembly::assemblyStream(
 {
 	Functionalizer f(_out, _prefix, _sourceCodes, *this);
 
-	// TODO: support EOF
-	solUnimplementedAssert(!m_eofVersion.has_value(), "Assembly output for EOF is not yet implemented.");
-	solAssert(m_codeSections.size() == 1);
 	for (auto const& i: m_codeSections.front().items)
 		f.feed(i, _debugInfoSelection);
 	f.flush();
 
+	// Implementing this requires introduction of CALLF, RETF and JUMPF
+	if (m_codeSections.size() > 1)
+		solUnimplemented("Add support for more code sections");
+
 	if (!m_data.empty() || !m_subs.empty())
 	{
 		_out << _prefix << "stop" << std::endl;

From 9e65fffd58b63ee881f38cb955442b0828ed2ceb Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Tue, 24 Sep 2024 15:34:34 +0200
Subject: [PATCH 1088/1140] eof: Support EOF in `computeSourceMapping`

---
 libevmasm/AssemblyItem.cpp |  5 +++--
 libyul/YulStack.cpp        | 15 +++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index 837dad8afe..1bc8057801 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -450,9 +450,10 @@ std::string AssemblyItem::computeSourceMapping(
 			static_cast<int>(_sourceIndicesMap.at(*location.sourceName)) :
 			-1;
 		char jump = '-';
-		if (item.getJumpType() == evmasm::AssemblyItem::JumpType::IntoFunction)
+		// TODO: Uncomment when EOF functions introduced.
+		if (item.getJumpType() == evmasm::AssemblyItem::JumpType::IntoFunction /*|| item.type() == CallF || item.type() == JumpF*/)
 			jump = 'i';
-		else if (item.getJumpType() == evmasm::AssemblyItem::JumpType::OutOfFunction)
+		else if (item.getJumpType() == evmasm::AssemblyItem::JumpType::OutOfFunction /*|| item.type() == RetF*/)
 			jump = 'o';
 		int modifierDepth = static_cast<int>(item.m_modifierDepth);
 
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index a8e19a69a1..59766220cd 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -262,15 +262,14 @@ YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName)
 		creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
 		yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
 		creationObject.assembly = creationAssembly;
-		solUnimplementedAssert(!m_eofVersion.has_value(), "EVM assembly output not implemented for EOF yet.");
-		solAssert(creationAssembly->codeSections().size() == 1);
-		creationObject.sourceMappings = std::make_unique<std::string>(
-			// TODO: fix for EOF
-			evmasm::AssemblyItem::computeSourceMapping(
-				creationAssembly->codeSections().front().items,
+		creationObject.sourceMappings = std::make_unique<std::string>();
+		for (auto const& codeSection: creationAssembly->codeSections())
+		{
+			*creationObject.sourceMappings += evmasm::AssemblyItem::computeSourceMapping(
+				codeSection.items,
 				{{m_charStream->name(), 0}}
-			)
-		);
+			);
+		}
 
 		if (deployedAssembly)
 		{

From 415d2fca3692d676f007bfdd9f4acd4227de3c57 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Wed, 25 Sep 2024 10:27:58 +0200
Subject: [PATCH 1089/1140] eof: strict asm output test update

---
 .../strict_asm_eof_container_prague/args      |  2 +-
 .../strict_asm_eof_container_prague/output    | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/test/cmdlineTests/strict_asm_eof_container_prague/args b/test/cmdlineTests/strict_asm_eof_container_prague/args
index b8cc1ab182..0078e6e68e 100644
--- a/test/cmdlineTests/strict_asm_eof_container_prague/args
+++ b/test/cmdlineTests/strict_asm_eof_container_prague/args
@@ -1 +1 @@
- --strict-assembly --experimental-eof-version 1 --evm-version prague --bin
+ --strict-assembly --experimental-eof-version 1 --evm-version prague --asm --ir-optimized --bin --debug-info none
diff --git a/test/cmdlineTests/strict_asm_eof_container_prague/output b/test/cmdlineTests/strict_asm_eof_container_prague/output
index caf28d91d8..17f6df6755 100644
--- a/test/cmdlineTests/strict_asm_eof_container_prague/output
+++ b/test/cmdlineTests/strict_asm_eof_container_prague/output
@@ -1,5 +1,103 @@
 
 ======= strict_asm_eof_container_prague/input.yul (EVM) =======
 
+Pretty printed source:
+object "object" {
+    code { { revert(0, 0) } }
+    object "sub0" {
+        code {
+            {
+                mstore(0, 0)
+                revert(0, 32)
+            }
+        }
+    }
+    object "sub1" {
+        code {
+            {
+                mstore(0, 1)
+                revert(0, 32)
+            }
+        }
+    }
+    object "sub2" {
+        code {
+            {
+                mstore(0, 2)
+                revert(0, 32)
+            }
+        }
+        object "sub20" {
+            code {
+                {
+                    mstore(0, 0x20)
+                    revert(0, 32)
+                }
+            }
+        }
+    }
+    object "sub3" {
+        code {
+            {
+                mstore(0, 3)
+                revert(0, 32)
+            }
+        }
+    }
+}
+
+
 Binary representation:
 ef00010100040200010003030004001a001b003b001b040000000080ffff5f80fdef00010100040200010007040000000080ffff5f805260205ffdef00010100040200010008040000000080ffff60015f5260205ffdef00010100040200010008030001001b040000000080ffff60025f5260205ffdef00010100040200010008040000000080ffff60205f5260205ffdef00010100040200010008040000000080ffff60035f5260205ffd
+
+Text representation:
+  0x00
+  dup1
+  revert
+stop
+
+sub_0: assembly {
+      0x00
+      dup1
+      mstore
+      0x20
+      0x00
+      revert
+}
+
+sub_1: assembly {
+      0x01
+      0x00
+      mstore
+      0x20
+      0x00
+      revert
+}
+
+sub_2: assembly {
+      0x02
+      0x00
+      mstore
+      0x20
+      0x00
+      revert
+    stop
+
+    sub_0: assembly {
+          0x20
+          0x00
+          mstore
+          0x20
+          0x00
+          revert
+    }
+}
+
+sub_3: assembly {
+      0x03
+      0x00
+      mstore
+      0x20
+      0x00
+      revert
+}

From cffc4f86382de5d611bf81cc50dee1ce2199b93f Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 25 Sep 2024 15:33:22 +0200
Subject: [PATCH 1090/1140] Add missing ASAN runtime libraries

---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
index c6b1fd9707..21092e312a 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2024 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:noble AS base
-LABEL version="1"
+LABEL version="2"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -40,13 +40,14 @@ RUN set -ex; \
 		clang \
 		cmake \
 		jq \
-		lsof \
 		libboost-filesystem-dev \
 		libboost-program-options-dev \
 		libboost-system-dev \
 		libboost-test-dev \
+		libclang-rt-dev \
 		libcln-dev \
 		libz3-static-dev \
+		lsof \
 		ninja-build \
 		python3-pip \
 		software-properties-common \

From 4627827a44745406cc67e0a50916f918eadb552a Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 25 Sep 2024 16:40:02 +0200
Subject: [PATCH 1091/1140] Bump ubuntu 24.04 clang image

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18ca18f3c5..9afaa735fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,8 +17,8 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:5d6d27551104321a30326d6024bd4e96d9d899a97a78eb9feea364996f1d18b5"
   ubuntu-2404-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404.clang-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8df0086907cc1e57068ad48841f2284a87bfbd0a95006286a19a7132d84bb861"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404.clang-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bc99a858ba18e088c1cb889ce631e3e707bb3348f0ae452bfe69116dbb931173"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-6

From b7051362eeb816eca7dcf6d633b420663555cf65 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 25 Sep 2024 14:04:26 +0200
Subject: [PATCH 1092/1140] Do not treat all warnings as errors when building
 with sanitizers.

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18ca18f3c5..a714188339 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1005,7 +1005,11 @@ jobs:
     <<: *base_ubuntu2404
     environment:
       <<: *base_ubuntu2404_env
-      CMAKE_OPTIONS: -DSANITIZE=address
+      # NOTE: Sanitizers may alter the intermediate code, potentially causing false warnings.
+      # As a result, treating warnings as errors in instrumented builds can lead to build failures due to these false positives.
+      # Therefore, we disable pedantic builds in such cases.
+      # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562#c27
+      CMAKE_OPTIONS: -DSANITIZE=address -DPEDANTIC=OFF
       CMAKE_BUILD_TYPE: Release
     steps:
       - build
@@ -1026,7 +1030,8 @@ jobs:
     <<: *base_ubuntu2404_clang
     environment:
       <<: *base_ubuntu2404_clang_env
-      CMAKE_OPTIONS: << parameters.cmake_options >>
+      # NOTE: Disabled pedantic builds to avoid false positives, see b_ubu_asan for a more detailed explanation.
+      CMAKE_OPTIONS: -DPEDANTIC=OFF << parameters.cmake_options >>
     steps:
       - build
 

From 5643e8ee1dd14d9f2478c5c3306bfa8c580352b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 Sep 2024 18:24:46 +0200
Subject: [PATCH 1093/1140] Remove a few unused YulStack imports

---
 libsolidity/codegen/ir/IRGenerator.cpp                        | 2 +-
 libsolidity/experimental/codegen/IRGenerator.cpp              | 1 -
 libsolidity/experimental/codegen/IRGeneratorForStatements.cpp | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index f495d97abd..a80fb4c27f 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/YulStack.h>
+#include <libyul/Object.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/Algorithms.h>
diff --git a/libsolidity/experimental/codegen/IRGenerator.cpp b/libsolidity/experimental/codegen/IRGenerator.cpp
index 40deb38c39..60a93bbf01 100644
--- a/libsolidity/experimental/codegen/IRGenerator.cpp
+++ b/libsolidity/experimental/codegen/IRGenerator.cpp
@@ -27,7 +27,6 @@
 
 #include <libsolidity/experimental/ast/TypeSystemHelper.h>
 
-#include <libyul/YulStack.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
 #include <libyul/optimiser/ASTCopier.h>
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
index 6925a434d0..772e8575db 100644
--- a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -25,9 +25,9 @@
 
 #include <libsolidity/experimental/ast/TypeSystemHelper.h>
 
-#include <libyul/YulStack.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
+#include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTCopier.h>
 
 #include <libsolidity/experimental/codegen/Common.h>

From 372dab41c5dcf1087efa767f4b1ecd2ba3f2fb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 Sep 2024 18:26:22 +0200
Subject: [PATCH 1094/1140] Store a reference to a Solidity source provider in
 YulStack

---
 libsolidity/interface/CompilerStack.cpp |  4 +++-
 libyul/YulStack.cpp                     | 16 +++++++++++-----
 libyul/YulStack.h                       | 11 ++++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index e538823f13..9848b6b59c 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1522,6 +1522,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 		YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection,
+		this, // _soliditySourceProvider
 		m_objectOptimizer
 	);
 	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
@@ -1537,7 +1538,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 	if (!_unoptimizedOnly)
 	{
 		stack.optimize();
-		compiledContract.yulIROptimized = stack.print(this);
+		compiledContract.yulIROptimized = stack.print();
 		compiledContract.yulIROptimizedAst = stack.astJson();
 	}
 }
@@ -1561,6 +1562,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection,
+		this, // _soliditySourceProvider
 		m_objectOptimizer
 	);
 	bool analysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIROptimized);
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 59766220cd..f060a1e333 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -216,7 +216,15 @@ void YulStack::reparse()
 	// are not stored in the AST and the other info that is (location, AST ID, etc) will still be present.
 	std::string source = print(nullptr /* _soliditySourceProvider */);
 
-	YulStack cleanStack(m_evmVersion, m_eofVersion, m_language, m_optimiserSettings, m_debugInfoSelection, m_objectOptimizer);
+	YulStack cleanStack(
+		m_evmVersion,
+		m_eofVersion,
+		m_language,
+		m_optimiserSettings,
+		m_debugInfoSelection,
+		m_soliditySourceProvider,
+		m_objectOptimizer
+	);
 	bool reanalysisSuccessful = cleanStack.parseAndAnalyze(m_charStream->name(), source);
 	yulAssert(
 		reanalysisSuccessful,
@@ -348,16 +356,14 @@ YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName)
 	return {std::make_shared<evmasm::Assembly>(assembly), {}};
 }
 
-std::string YulStack::print(
-	CharStreamProvider const* _soliditySourceProvider
-) const
+std::string YulStack::print() const
 {
 	yulAssert(m_stackState >= Parsed);
 	yulAssert(m_parserResult, "");
 	yulAssert(m_parserResult->hasCode(), "");
 	return m_parserResult->toString(
 		m_debugInfoSelection,
-		_soliditySourceProvider
+		m_soliditySourceProvider
 	) + "\n";
 }
 
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 0dc90baf89..de391f5910 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -90,6 +90,7 @@ class YulStack: public langutil::CharStreamProvider
 		Language _language,
 		solidity::frontend::OptimiserSettings _optimiserSettings,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
+		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr,
 		std::shared_ptr<ObjectOptimizer> _objectOptimizer = nullptr
 	):
 		m_language(_language),
@@ -97,6 +98,7 @@ class YulStack: public langutil::CharStreamProvider
 		m_eofVersion(_eofVersion),
 		m_optimiserSettings(std::move(_optimiserSettings)),
 		m_debugInfoSelection(_debugInfoSelection),
+		m_soliditySourceProvider(_soliditySourceProvider),
 		m_errorReporter(m_errors),
 		m_objectOptimizer(_objectOptimizer ? std::move(_objectOptimizer) : std::make_shared<ObjectOptimizer>())
 	{}
@@ -137,9 +139,7 @@ class YulStack: public langutil::CharStreamProvider
 	bool hasErrors() const { return m_errorReporter.hasErrors(); }
 
 	/// Pretty-print the input after having parsed it.
-	std::string print(
-		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
-	) const;
+	std::string print() const;
 	Json astJson() const;
 
 	// return the JSON representation of the YuL CFG (experimental)
@@ -172,6 +172,11 @@ class YulStack: public langutil::CharStreamProvider
 	solidity::frontend::OptimiserSettings m_optimiserSettings;
 	langutil::DebugInfoSelection m_debugInfoSelection{};
 
+	/// Provider of the Solidity sources that the Yul code was generated from.
+	/// Necessary when code snippets are requested as a part of debug info. When null, code snippets are omitted.
+	/// NOTE: Not owned by YulStack, the user must ensure that it is not destroyed before the stack is.
+	langutil::CharStreamProvider const* m_soliditySourceProvider{};
+
 	std::unique_ptr<langutil::CharStream> m_charStream;
 
 	State m_stackState = Empty;

From 4216aa72df0ef1a6a1b9a20d72b6dd1b6078e931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 Sep 2024 18:40:39 +0200
Subject: [PATCH 1095/1140] Fix shifted native source locations in Yul AST in
 presence of code snippets

---
 Changelog.md                                  |   2 +
 libyul/YulStack.cpp                           |   8 +-
 test/cmdlineTests/ast_ir/output               |  92 ++++++------
 .../output.json                               | 142 +++++++++---------
 4 files changed, 123 insertions(+), 121 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9f531daea1..45ec293a15 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,8 @@ Compiler Features:
 
 Bugfixes:
  * SMTChecker: Fix SMT logic error when assigning to an array of addresses.
+ * Yul AST: Fix shifted native source locations when debug info selection included code snippets.
+
 
 ### 0.8.27 (2024-09-04)
 
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index f060a1e333..67bc6d11a5 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -211,10 +211,10 @@ void YulStack::reparse()
 	yulAssert(m_parserResult);
 	yulAssert(m_charStream);
 
-	// NOTE: Without passing in _soliditySourceProvider, printed debug info will not include code
-	// snippets, but it does not matter - we'll still get the same AST after we parse it. Snippets
-	// are not stored in the AST and the other info that is (location, AST ID, etc) will still be present.
-	std::string source = print(nullptr /* _soliditySourceProvider */);
+	// NOTE: it is important for the source printed here to exactly match what the compiler will
+	// eventually output to the user. In particular, debug info must be exactly the same.
+	// Otherwise source locations will be off.
+	std::string source = print();
 
 	YulStack cleanStack(
 		m_evmVersion,
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
index 3211ef49b3..76f1119908 100644
--- a/test/cmdlineTests/ast_ir/output
+++ b/test/cmdlineTests/ast_ir/output
@@ -637,24 +637,24 @@ Optimized IR AST:
 {
     "code": {
         "block": {
-            "nativeSrc": "58:298:0",
+            "nativeSrc": "58:315:0",
             "nodeType": "YulBlock",
             "src": "-1:-1:0",
             "statements": [
                 {
-                    "nativeSrc": "68:282:0",
+                    "nativeSrc": "68:299:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "111:27:0",
+                            "nativeSrc": "128:27:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "133:4:0",
+                                        "nativeSrc": "150:4:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -663,18 +663,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "memoryguard",
-                                    "nativeSrc": "121:11:0",
+                                    "nativeSrc": "138:11:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "121:17:0",
+                                "nativeSrc": "138:17:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_1",
-                                    "nativeSrc": "115:2:0",
+                                    "nativeSrc": "132:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -686,7 +686,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "kind": "number",
-                                        "nativeSrc": "158:2:0",
+                                        "nativeSrc": "175:2:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -694,28 +694,28 @@ Optimized IR AST:
                                     },
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "162:2:0",
+                                        "nativeSrc": "179:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "mstore",
-                                    "nativeSrc": "151:6:0",
+                                    "nativeSrc": "168:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "151:14:0",
+                                "nativeSrc": "168:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "151:14:0",
+                            "nativeSrc": "168:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
                         {
                             "body": {
-                                "nativeSrc": "193:16:0",
+                                "nativeSrc": "210:16:0",
                                 "nodeType": "YulBlock",
                                 "src": "60:13:0",
                                 "statements": [
@@ -724,7 +724,7 @@ Optimized IR AST:
                                             "arguments": [
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "202:1:0",
+                                                    "nativeSrc": "219:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -732,7 +732,7 @@ Optimized IR AST:
                                                 },
                                                 {
                                                     "kind": "number",
-                                                    "nativeSrc": "205:1:0",
+                                                    "nativeSrc": "222:1:0",
                                                     "nodeType": "YulLiteral",
                                                     "src": "60:13:0",
                                                     "type": "",
@@ -741,15 +741,15 @@ Optimized IR AST:
                                             ],
                                             "functionName": {
                                                 "name": "revert",
-                                                "nativeSrc": "195:6:0",
+                                                "nativeSrc": "212:6:0",
                                                 "nodeType": "YulIdentifier",
                                                 "src": "60:13:0"
                                             },
-                                            "nativeSrc": "195:12:0",
+                                            "nativeSrc": "212:12:0",
                                             "nodeType": "YulFunctionCall",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "195:12:0",
+                                        "nativeSrc": "212:12:0",
                                         "nodeType": "YulExpressionStatement",
                                         "src": "60:13:0"
                                     }
@@ -759,20 +759,20 @@ Optimized IR AST:
                                 "arguments": [],
                                 "functionName": {
                                     "name": "callvalue",
-                                    "nativeSrc": "181:9:0",
+                                    "nativeSrc": "198:9:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "181:11:0",
+                                "nativeSrc": "198:11:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "178:31:0",
+                            "nativeSrc": "195:31:0",
                             "nodeType": "YulIf",
                             "src": "60:13:0"
                         },
                         {
-                            "nativeSrc": "222:34:0",
+                            "nativeSrc": "239:34:0",
                             "nodeType": "YulVariableDeclaration",
                             "src": "60:13:0",
                             "value": {
@@ -780,7 +780,7 @@ Optimized IR AST:
                                     {
                                         "hexValue": "435f325f6465706c6f796564",
                                         "kind": "string",
-                                        "nativeSrc": "241:14:0",
+                                        "nativeSrc": "258:14:0",
                                         "nodeType": "YulLiteral",
                                         "src": "60:13:0",
                                         "type": "",
@@ -789,18 +789,18 @@ Optimized IR AST:
                                 ],
                                 "functionName": {
                                     "name": "datasize",
-                                    "nativeSrc": "232:8:0",
+                                    "nativeSrc": "249:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "232:24:0",
+                                "nativeSrc": "249:24:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
                             "variables": [
                                 {
                                     "name": "_2",
-                                    "nativeSrc": "226:2:0",
+                                    "nativeSrc": "243:2:0",
                                     "nodeType": "YulTypedName",
                                     "src": "60:13:0",
                                     "type": ""
@@ -812,7 +812,7 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "278:2:0",
+                                        "nativeSrc": "295:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
@@ -821,7 +821,7 @@ Optimized IR AST:
                                             {
                                                 "hexValue": "435f325f6465706c6f796564",
                                                 "kind": "string",
-                                                "nativeSrc": "293:14:0",
+                                                "nativeSrc": "310:14:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -830,32 +830,32 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "dataoffset",
-                                            "nativeSrc": "282:10:0",
+                                            "nativeSrc": "299:10:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "282:26:0",
+                                        "nativeSrc": "299:26:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "310:2:0",
+                                        "nativeSrc": "327:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "codecopy",
-                                    "nativeSrc": "269:8:0",
+                                    "nativeSrc": "286:8:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "269:44:0",
+                                "nativeSrc": "286:44:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "269:44:0",
+                            "nativeSrc": "286:44:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         },
@@ -864,28 +864,28 @@ Optimized IR AST:
                                 "arguments": [
                                     {
                                         "name": "_1",
-                                        "nativeSrc": "333:2:0",
+                                        "nativeSrc": "350:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     },
                                     {
                                         "name": "_2",
-                                        "nativeSrc": "337:2:0",
+                                        "nativeSrc": "354:2:0",
                                         "nodeType": "YulIdentifier",
                                         "src": "60:13:0"
                                     }
                                 ],
                                 "functionName": {
                                     "name": "return",
-                                    "nativeSrc": "326:6:0",
+                                    "nativeSrc": "343:6:0",
                                     "nodeType": "YulIdentifier",
                                     "src": "60:13:0"
                                 },
-                                "nativeSrc": "326:14:0",
+                                "nativeSrc": "343:14:0",
                                 "nodeType": "YulFunctionCall",
                                 "src": "60:13:0"
                             },
-                            "nativeSrc": "326:14:0",
+                            "nativeSrc": "343:14:0",
                             "nodeType": "YulExpressionStatement",
                             "src": "60:13:0"
                         }
@@ -901,12 +901,12 @@ Optimized IR AST:
         {
             "code": {
                 "block": {
-                    "nativeSrc": "436:101:0",
+                    "nativeSrc": "453:118:0",
                     "nodeType": "YulBlock",
                     "src": "-1:-1:0",
                     "statements": [
                         {
-                            "nativeSrc": "450:77:0",
+                            "nativeSrc": "467:94:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
@@ -915,7 +915,7 @@ Optimized IR AST:
                                         "arguments": [
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "508:1:0",
+                                                "nativeSrc": "542:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -923,7 +923,7 @@ Optimized IR AST:
                                             },
                                             {
                                                 "kind": "number",
-                                                "nativeSrc": "511:1:0",
+                                                "nativeSrc": "545:1:0",
                                                 "nodeType": "YulLiteral",
                                                 "src": "60:13:0",
                                                 "type": "",
@@ -932,15 +932,15 @@ Optimized IR AST:
                                         ],
                                         "functionName": {
                                             "name": "revert",
-                                            "nativeSrc": "501:6:0",
+                                            "nativeSrc": "535:6:0",
                                             "nodeType": "YulIdentifier",
                                             "src": "60:13:0"
                                         },
-                                        "nativeSrc": "501:12:0",
+                                        "nativeSrc": "535:12:0",
                                         "nodeType": "YulFunctionCall",
                                         "src": "60:13:0"
                                     },
-                                    "nativeSrc": "501:12:0",
+                                    "nativeSrc": "535:12:0",
                                     "nodeType": "YulExpressionStatement",
                                     "src": "60:13:0"
                                 }
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
index f80f4466ca..5c6762ac99 100644
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -5,12 +5,12 @@
                 "irOptimizedAst": {
                     "code": {
                         "block": {
-                            "nativeSrc": "43:622:0",
+                            "nativeSrc": "43:639:0",
                             "nodeType": "YulBlock",
                             "src": "-1:-1:0",
                             "statements": [
                                 {
-                                    "nativeSrc": "53:404:0",
+                                    "nativeSrc": "53:421:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
@@ -19,7 +19,7 @@
                                                 "arguments": [
                                                     {
                                                         "kind": "number",
-                                                        "nativeSrc": "103:2:0",
+                                                        "nativeSrc": "120:2:0",
                                                         "nodeType": "YulLiteral",
                                                         "src": "56:13:0",
                                                         "type": "",
@@ -29,7 +29,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "119:4:0",
+                                                                "nativeSrc": "136:4:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -38,32 +38,32 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "memoryguard",
-                                                            "nativeSrc": "107:11:0",
+                                                            "nativeSrc": "124:11:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "107:17:0",
+                                                        "nativeSrc": "124:17:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "mstore",
-                                                    "nativeSrc": "96:6:0",
+                                                    "nativeSrc": "113:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "96:29:0",
+                                                "nativeSrc": "113:29:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "96:29:0",
+                                            "nativeSrc": "113:29:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "165:111:0",
+                                                "nativeSrc": "182:111:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -72,15 +72,15 @@
                                                             "arguments": [],
                                                             "functionName": {
                                                                 "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                                "nativeSrc": "183:77:0",
+                                                                "nativeSrc": "200:77:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "183:79:0",
+                                                            "nativeSrc": "200:79:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "183:79:0",
+                                                        "nativeSrc": "200:79:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
@@ -90,38 +90,38 @@
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "callvalue",
-                                                    "nativeSrc": "141:9:0",
+                                                    "nativeSrc": "158:9:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "141:11:0",
+                                                "nativeSrc": "158:11:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "138:138:0",
+                                            "nativeSrc": "155:138:0",
                                             "nodeType": "YulIf",
                                             "src": "56:13:0"
                                         },
                                         {
-                                            "nativeSrc": "289:30:0",
+                                            "nativeSrc": "306:30:0",
                                             "nodeType": "YulVariableDeclaration",
                                             "src": "56:13:0",
                                             "value": {
                                                 "arguments": [],
                                                 "functionName": {
                                                     "name": "allocate_unbounded",
-                                                    "nativeSrc": "299:18:0",
+                                                    "nativeSrc": "316:18:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "299:20:0",
+                                                "nativeSrc": "316:20:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
                                             "variables": [
                                                 {
                                                     "name": "_1",
-                                                    "nativeSrc": "293:2:0",
+                                                    "nativeSrc": "310:2:0",
                                                     "nodeType": "YulTypedName",
                                                     "src": "56:13:0",
                                                     "type": ""
@@ -133,7 +133,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "341:2:0",
+                                                        "nativeSrc": "358:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -142,7 +142,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "356:14:0",
+                                                                "nativeSrc": "373:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -151,11 +151,11 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "dataoffset",
-                                                            "nativeSrc": "345:10:0",
+                                                            "nativeSrc": "362:10:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "345:26:0",
+                                                        "nativeSrc": "362:26:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
@@ -164,7 +164,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "382:14:0",
+                                                                "nativeSrc": "399:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -173,26 +173,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "373:8:0",
+                                                            "nativeSrc": "390:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "373:24:0",
+                                                        "nativeSrc": "390:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "codecopy",
-                                                    "nativeSrc": "332:8:0",
+                                                    "nativeSrc": "349:8:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "332:66:0",
+                                                "nativeSrc": "349:66:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "332:66:0",
+                                            "nativeSrc": "349:66:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
@@ -201,7 +201,7 @@
                                                 "arguments": [
                                                     {
                                                         "name": "_1",
-                                                        "nativeSrc": "418:2:0",
+                                                        "nativeSrc": "435:2:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
@@ -210,7 +210,7 @@
                                                             {
                                                                 "hexValue": "435f325f6465706c6f796564",
                                                                 "kind": "string",
-                                                                "nativeSrc": "431:14:0",
+                                                                "nativeSrc": "448:14:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -219,26 +219,26 @@
                                                         ],
                                                         "functionName": {
                                                             "name": "datasize",
-                                                            "nativeSrc": "422:8:0",
+                                                            "nativeSrc": "439:8:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "422:24:0",
+                                                        "nativeSrc": "439:24:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName": {
                                                     "name": "return",
-                                                    "nativeSrc": "411:6:0",
+                                                    "nativeSrc": "428:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "411:36:0",
+                                                "nativeSrc": "428:36:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
-                                            "nativeSrc": "411:36:0",
+                                            "nativeSrc": "428:36:0",
                                             "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         }
@@ -246,19 +246,19 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "514:23:0",
+                                        "nativeSrc": "531:23:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
                                             {
-                                                "nativeSrc": "516:19:0",
+                                                "nativeSrc": "533:19:0",
                                                 "nodeType": "YulAssignment",
                                                 "src": "56:13:0",
                                                 "value": {
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "532:2:0",
+                                                            "nativeSrc": "549:2:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -267,18 +267,18 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "mload",
-                                                        "nativeSrc": "526:5:0",
+                                                        "nativeSrc": "543:5:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "526:9:0",
+                                                    "nativeSrc": "543:9:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
                                                 "variableNames": [
                                                     {
                                                         "name": "memPtr",
-                                                        "nativeSrc": "516:6:0",
+                                                        "nativeSrc": "533:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     }
@@ -287,12 +287,12 @@
                                         ]
                                     },
                                     "name": "allocate_unbounded",
-                                    "nativeSrc": "466:71:0",
+                                    "nativeSrc": "483:71:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "returnVariables": [
                                         {
                                             "name": "memPtr",
-                                            "nativeSrc": "499:6:0",
+                                            "nativeSrc": "516:6:0",
                                             "nodeType": "YulTypedName",
                                             "src": "56:13:0",
                                             "type": ""
@@ -302,7 +302,7 @@
                                 },
                                 {
                                     "body": {
-                                        "nativeSrc": "643:16:0",
+                                        "nativeSrc": "660:16:0",
                                         "nodeType": "YulBlock",
                                         "src": "56:13:0",
                                         "statements": [
@@ -311,7 +311,7 @@
                                                     "arguments": [
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "652:1:0",
+                                                            "nativeSrc": "669:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -319,7 +319,7 @@
                                                         },
                                                         {
                                                             "kind": "number",
-                                                            "nativeSrc": "655:1:0",
+                                                            "nativeSrc": "672:1:0",
                                                             "nodeType": "YulLiteral",
                                                             "src": "56:13:0",
                                                             "type": "",
@@ -328,22 +328,22 @@
                                                     ],
                                                     "functionName": {
                                                         "name": "revert",
-                                                        "nativeSrc": "645:6:0",
+                                                        "nativeSrc": "662:6:0",
                                                         "nodeType": "YulIdentifier",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "645:12:0",
+                                                    "nativeSrc": "662:12:0",
                                                     "nodeType": "YulFunctionCall",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "645:12:0",
+                                                "nativeSrc": "662:12:0",
                                                 "nodeType": "YulExpressionStatement",
                                                 "src": "56:13:0"
                                             }
                                         ]
                                     },
                                     "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                    "nativeSrc": "546:113:0",
+                                    "nativeSrc": "563:113:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "src": "56:13:0"
                                 }
@@ -357,12 +357,12 @@
                         {
                             "code": {
                                 "block": {
-                                    "nativeSrc": "730:344:0",
+                                    "nativeSrc": "747:361:0",
                                     "nodeType": "YulBlock",
                                     "src": "-1:-1:0",
                                     "statements": [
                                         {
-                                            "nativeSrc": "744:190:0",
+                                            "nativeSrc": "761:207:0",
                                             "nodeType": "YulBlock",
                                             "src": "-1:-1:0",
                                             "statements": [
@@ -371,7 +371,7 @@
                                                         "arguments": [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "802:2:0",
+                                                                "nativeSrc": "836:2:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
@@ -381,7 +381,7 @@
                                                                 "arguments": [
                                                                     {
                                                                         "kind": "number",
-                                                                        "nativeSrc": "818:4:0",
+                                                                        "nativeSrc": "852:4:0",
                                                                         "nodeType": "YulLiteral",
                                                                         "src": "56:13:0",
                                                                         "type": "",
@@ -390,26 +390,26 @@
                                                                 ],
                                                                 "functionName": {
                                                                     "name": "memoryguard",
-                                                                    "nativeSrc": "806:11:0",
+                                                                    "nativeSrc": "840:11:0",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "56:13:0"
                                                                 },
-                                                                "nativeSrc": "806:17:0",
+                                                                "nativeSrc": "840:17:0",
                                                                 "nodeType": "YulFunctionCall",
                                                                 "src": "56:13:0"
                                                             }
                                                         ],
                                                         "functionName": {
                                                             "name": "mstore",
-                                                            "nativeSrc": "795:6:0",
+                                                            "nativeSrc": "829:6:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "795:29:0",
+                                                        "nativeSrc": "829:29:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "795:29:0",
+                                                    "nativeSrc": "829:29:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 },
@@ -418,15 +418,15 @@
                                                         "arguments": [],
                                                         "functionName": {
                                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                            "nativeSrc": "841:77:0",
+                                                            "nativeSrc": "875:77:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "841:79:0",
+                                                        "nativeSrc": "875:79:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
                                                     },
-                                                    "nativeSrc": "841:79:0",
+                                                    "nativeSrc": "875:79:0",
                                                     "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 }
@@ -434,7 +434,7 @@
                                         },
                                         {
                                             "body": {
-                                                "nativeSrc": "1048:16:0",
+                                                "nativeSrc": "1082:16:0",
                                                 "nodeType": "YulBlock",
                                                 "src": "56:13:0",
                                                 "statements": [
@@ -443,7 +443,7 @@
                                                             "arguments": [
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1057:1:0",
+                                                                    "nativeSrc": "1091:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -451,7 +451,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
-                                                                    "nativeSrc": "1060:1:0",
+                                                                    "nativeSrc": "1094:1:0",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "56:13:0",
                                                                     "type": "",
@@ -460,22 +460,22 @@
                                                             ],
                                                             "functionName": {
                                                                 "name": "revert",
-                                                                "nativeSrc": "1050:6:0",
+                                                                "nativeSrc": "1084:6:0",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:13:0"
                                                             },
-                                                            "nativeSrc": "1050:12:0",
+                                                            "nativeSrc": "1084:12:0",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "1050:12:0",
+                                                        "nativeSrc": "1084:12:0",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                            "nativeSrc": "947:117:0",
+                                            "nativeSrc": "981:117:0",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "56:13:0"
                                         }

From 578e1bb850a5a339ab7ada50022b8dd2388204cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 14:53:45 +0200
Subject: [PATCH 1096/1140] CompilerStack: Helper for Yul parsing

---
 libsolidity/interface/CompilerStack.cpp | 52 ++++++++++++-------------
 libsolidity/interface/CompilerStack.h   | 10 +++++
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 9848b6b59c..deb748fbe7 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -782,6 +782,28 @@ void CompilerStack::link()
 	}
 }
 
+YulStack CompilerStack::loadGeneratedIR(std::string const& _ir) const
+{
+	YulStack stack(
+		m_evmVersion,
+		m_eofVersion,
+		YulStack::Language::StrictAssembly,
+		m_optimiserSettings,
+		m_debugInfoSelection,
+		this, // _soliditySourceProvider
+		m_objectOptimizer
+	);
+	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", _ir);
+	solAssert(
+		yulAnalysisSuccessful,
+		_ir + "\n\n"
+		"Invalid IR generated:\n" +
+		SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
+	);
+
+	return stack;
+}
+
 std::vector<std::string> CompilerStack::contractNames() const
 {
 	solAssert(m_stackState >= Parsed, "Parsing was not successful.");
@@ -1516,23 +1538,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 		);
 	}
 
-	YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection,
-		this, // _soliditySourceProvider
-		m_objectOptimizer
-	);
-	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
-	solAssert(
-		yulAnalysisSuccessful,
-		compiledContract.yulIR + "\n\n"
-		"Invalid IR generated:\n" +
-		SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
-	);
-
+	YulStack stack = loadGeneratedIR(compiledContract.yulIR);
 	compiledContract.yulIRAst = stack.astJson();
 	compiledContract.yulCFGJson = stack.cfgJson();
 	if (!_unoptimizedOnly)
@@ -1556,17 +1562,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 		return;
 
 	// Re-parse the Yul IR in EVM dialect
-	yul::YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection,
-		this, // _soliditySourceProvider
-		m_objectOptimizer
-	);
-	bool analysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIROptimized);
-	solAssert(analysisSuccessful);
+	YulStack stack = loadGeneratedIR(compiledContract.yulIROptimized);
 
 	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 0a62cbf7ef..8854384753 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -71,6 +71,11 @@ class AssemblyItem;
 using AssemblyItems = std::vector<AssemblyItem>;
 }
 
+namespace solidity::yul
+{
+class YulStack;
+}
+
 namespace solidity::frontend
 {
 
@@ -490,6 +495,11 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// library will still be kept as an unlinked placeholder in the objects.
 	void link();
 
+	/// Parses and analyzes specified Yul source and returns the YulStack that can be used to manipulate it.
+	/// Assumes that the IR was generated from sources loaded currently into CompilerStack, which
+	/// means that it is error-free and uses the same settings.
+	yul::YulStack loadGeneratedIR(std::string const& _ir) const;
+
 	/// @returns the contract object for the given @a _contractName.
 	/// Can only be called after state is CompilationSuccessful.
 	Contract const& contract(std::string const& _contractName) const;

From 9ccc44a9bac77aa0c75944bd93d57a1ea66d5a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Sep 2024 15:19:02 +0200
Subject: [PATCH 1097/1140] CompilerStack: Yul AST generation only on demand

- The JSON artifacts take a lot of memory so always generating them is very wasteful.
- Even when requested, they are only relevant while the current contract is being copmiled. We only really want to store the serialized JSON that will be returned to the user.
- This actually also speeds up compilation quite a bit.
---
 Changelog.md                            |  1 +
 libsolidity/interface/CompilerStack.cpp | 27 ++++++++++++++-----------
 libsolidity/interface/CompilerStack.h   |  9 +++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 45ec293a15..7d9af1cdbf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 Compiler Features:
  * Code Generator: Transient storage value type state variables are now supported by the legacy pipeline.
+ * General: Generate JSON representations of Yul ASTs only on demand to reduce memory usage.
 
 
 Bugfixes:
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index deb748fbe7..bac358a939 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -956,21 +956,24 @@ std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 	return contract(_contractName).yulIR;
 }
 
-Json const& CompilerStack::yulIRAst(std::string const& _contractName) const
+Json CompilerStack::yulIRAst(std::string const& _contractName) const
 {
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
-	return contract(_contractName).yulIRAst;
+
+	// NOTE: Intentionally not using LazyInit. The artifact can get very large and we don't want to
+	// keep it around when compiling a large project containing many contracts.
+	return loadGeneratedIR(contract(_contractName).yulIR).astJson();
 }
 
-Json const& CompilerStack::yulCFGJson(std::string const& _contractName) const
+Json CompilerStack::yulCFGJson(std::string const& _contractName) const
 {
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
+	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
 
-	return contract(_contractName).yulCFGJson;
+	// NOTE: Intentionally not using LazyInit. The artifact can get very large and we don't want to
+	// keep it around when compiling a large project containing many contracts.
+	return loadGeneratedIR(contract(_contractName).yulIR).cfgJson();
 }
 
 std::string const& CompilerStack::yulIROptimized(std::string const& _contractName) const
@@ -979,11 +982,14 @@ std::string const& CompilerStack::yulIROptimized(std::string const& _contractNam
 	return contract(_contractName).yulIROptimized;
 }
 
-Json const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
+Json CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
 {
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 	solUnimplementedAssert(!isExperimentalSolidity());
-	return contract(_contractName).yulIROptimizedAst;
+
+	// NOTE: Intentionally not using LazyInit. The artifact can get very large and we don't want to
+	// keep it around when compiling a large project containing many contracts.
+	return loadGeneratedIR(contract(_contractName).yulIROptimized).astJson();
 }
 
 evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractName) const
@@ -1539,13 +1545,10 @@ void CompilerStack::generateIR(ContractDefinition const& _contract, bool _unopti
 	}
 
 	YulStack stack = loadGeneratedIR(compiledContract.yulIR);
-	compiledContract.yulIRAst = stack.astJson();
-	compiledContract.yulCFGJson = stack.cfgJson();
 	if (!_unoptimizedOnly)
 	{
 		stack.optimize();
 		compiledContract.yulIROptimized = stack.print();
-		compiledContract.yulIROptimizedAst = stack.astJson();
 	}
 }
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 8854384753..c0166af96d 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -295,15 +295,15 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	std::string const& yulIR(std::string const& _contractName) const;
 
 	/// @returns the IR representation of a contract AST in format.
-	Json const& yulIRAst(std::string const& _contractName) const;
+	Json 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 const& yulIROptimizedAst(std::string const& _contractName) const;
+	Json yulIROptimizedAst(std::string const& _contractName) const;
 
-	Json const& yulCFGJson(std::string const& _contractName) const;
+	Json yulCFGJson(std::string const& _contractName) const;
 
 	/// @returns the assembled object for a contract.
 	virtual evmasm::LinkerObject const& object(std::string const& _contractName) const override;
@@ -416,9 +416,6 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
 		std::string yulIR; ///< Yul IR code straight from the code generator.
 		std::string yulIROptimized; ///< Reparsed and possibly optimized Yul IR code.
-		Json yulIRAst; ///< JSON AST of Yul IR code.
-		Json yulIROptimizedAst; ///< JSON AST of optimized Yul IR code.
-		Json yulCFGJson; ///< JSON CFG of Yul IR code.
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
 		util::LazyInit<Json const> abi;
 		util::LazyInit<Json const> storageLayout;

From 5cbfd0d1985aab589c8501998a4459c79e42171d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 22 Jul 2024 12:43:17 +0200
Subject: [PATCH 1098/1140] Via-IR code-gen for transient state variables

Alternative approach

Set variable declaration location explicitly
---
 libsolidity/codegen/ABIFunctions.cpp          |  2 +-
 libsolidity/codegen/LValue.cpp                |  2 +-
 libsolidity/codegen/YulUtilFunctions.cpp      | 94 +++++++++++++------
 libsolidity/codegen/YulUtilFunctions.h        | 26 ++++-
 libsolidity/codegen/ir/IRGenerator.cpp        | 15 +--
 .../codegen/ir/IRGeneratorForStatements.cpp   | 70 +++++++++++---
 .../codegen/ir/IRGeneratorForStatements.h     |  1 +
 libsolidity/codegen/ir/IRLValue.h             |  6 +-
 8 files changed, 153 insertions(+), 63 deletions(-)

diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index bbcdb395b3..474848760c 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -616,7 +616,7 @@ std::string ABIFunctions::abiEncodingFunctionSimpleArray(
 				break;
 			case DataLocation::Storage:
 				if (_from.baseType()->isValueType())
-					templ("arrayElementAccess", m_utils.readFromStorage(*_from.baseType(), 0, false) + "(srcPtr)");
+					templ("arrayElementAccess", m_utils.readFromStorage(*_from.baseType(), 0, false, VariableDeclaration::Location::Unspecified) + "(srcPtr)");
 				else
 					templ("arrayElementAccess", "srcPtr");
 				break;
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index 78efb9f811..a1537f01f4 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -401,7 +401,7 @@ void GenericStorageItem<IsTransient>::storeValue(Type const& _sourceType, langut
 				solAssert(sourceType.sizeOnStack() == 1, "");
 				solAssert(structType.sizeOnStack() == 1, "");
 				m_context << Instruction::DUP2 << Instruction::DUP2;
-				m_context.callYulFunction(m_context.utilFunctions().updateStorageValueFunction(sourceType, structType, 0), 2, 0);
+				m_context.callYulFunction(m_context.utilFunctions().updateStorageValueFunction(sourceType, structType, VariableDeclaration::Location::Unspecified, 0), 2, 0);
 			}
 			else
 			{
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index ebf1d384aa..fc6de832be 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -1646,7 +1646,7 @@ std::string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
 			("indexAccess", storageArrayIndexAccessFunction(_type))
 			(
 				"setToZero",
-				_type.baseType()->category() != Type::Category::Mapping ? storageSetToZeroFunction(*_type.baseType()) : ""
+				_type.baseType()->category() != Type::Category::Mapping ? storageSetToZeroFunction(*_type.baseType(), VariableDeclaration::Location::Unspecified) : ""
 			)
 			.render();
 	});
@@ -1691,7 +1691,7 @@ std::string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type
 			("transitLongToShort", byteArrayTransitLongToShortFunction(_type))
 			("encodeUsedSetLen", shortByteArrayEncodeUsedAreaSetLengthFunction())
 			("indexAccessNoChecks", longByteArrayStorageIndexAccessNoCheckFunction())
-			("setToZero", storageSetToZeroFunction(*_type.baseType()))
+			("setToZero", storageSetToZeroFunction(*_type.baseType(), VariableDeclaration::Location::Unspecified))
 			.render();
 	});
 }
@@ -1760,7 +1760,7 @@ std::string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, T
 			("dataAreaFunction", arrayDataAreaFunction(_type))
 			("isByteArrayOrString", _type.isByteArrayOrString())
 			("indexAccess", storageArrayIndexAccessFunction(_type))
-			("storeValue", updateStorageValueFunction(*_fromType, *_type.baseType()))
+			("storeValue", updateStorageValueFunction(*_fromType, *_type.baseType(), VariableDeclaration::Location::Unspecified))
 			("maxArrayLength", (u256(1) << 64).str())
 			("shl", shiftLeftFunctionDynamic())
 			.render();
@@ -1834,7 +1834,7 @@ std::string YulUtilFunctions::clearStorageRangeFunction(Type const& _type)
 			}
 		)")
 		("functionName", functionName)
-		("setToZero", storageSetToZeroFunction(_type.storageBytes() < 32 ? *TypeProvider::uint256() : _type))
+		("setToZero", storageSetToZeroFunction(_type.storageBytes() < 32 ? *TypeProvider::uint256() : _type, VariableDeclaration::Location::Unspecified))
 		("increment", _type.storageSize().str())
 		.render();
 	});
@@ -1912,7 +1912,7 @@ std::string YulUtilFunctions::clearStorageStructFunction(StructType const& _type
 				memberSetValues.emplace_back().emplace("clearMember", Whiskers(R"(
 						<setZero>(add(slot, <memberSlotDiff>), <memberStorageOffset>)
 					)")
-					("setZero", storageSetToZeroFunction(*member.type))
+					("setZero", storageSetToZeroFunction(*member.type, VariableDeclaration::Location::Unspecified))
 					("memberSlotDiff",  memberSlotDiff.str())
 					("memberStorageOffset", std::to_string(memberStorageOffset))
 					.render()
@@ -2015,7 +2015,7 @@ std::string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromT
 			0,
 			_fromType.baseType()->stackItems().size()
 		));
-		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType(), 0));
+		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType(), VariableDeclaration::Location::Unspecified, 0));
 		templ("srcStride",
 			fromCalldata ?
 			std::to_string(_fromType.calldataStride()) :
@@ -2746,21 +2746,33 @@ std::string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _map
 	});
 }
 
-std::string YulUtilFunctions::readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorage(
+	Type const& _type,
+	size_t _offset,
+	bool _splitFunctionTypes,
+	VariableDeclaration::Location _location
+)
 {
 	if (_type.isValueType())
-		return readFromStorageValueType(_type, _offset, _splitFunctionTypes);
+		return readFromStorageValueType(_type, _offset, _splitFunctionTypes, _location);
 	else
 	{
+		solAssert(_location != VariableDeclaration::Location::Transient);
 		solAssert(_offset == 0, "");
 		return readFromStorageReferenceType(_type);
 	}
 }
 
-std::string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorageDynamic(
+	Type const& _type,
+	bool _splitFunctionTypes,
+	VariableDeclaration::Location _location
+)
 {
 	if (_type.isValueType())
-		return readFromStorageValueType(_type, {}, _splitFunctionTypes);
+		return readFromStorageValueType(_type, {}, _splitFunctionTypes, _location);
+
+	solAssert(_location != VariableDeclaration::Location::Transient);
 	std::string functionName =
 		"read_from_storage__dynamic_" +
 		std::string(_splitFunctionTypes ? "split_" : "") +
@@ -2780,24 +2792,36 @@ std::string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _sp
 	});
 }
 
-std::string YulUtilFunctions::readFromStorageValueType(Type const& _type, std::optional<size_t> _offset, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorageValueType(
+	Type const& _type,
+	std::optional<size_t> _offset,
+	bool _splitFunctionTypes,
+	VariableDeclaration::Location _location
+)
 {
 	solAssert(_type.isValueType(), "");
+	solAssert(
+		_location == VariableDeclaration::Location::Transient ||
+		_location == VariableDeclaration::Location::Unspecified,
+		"Variable location can only be transient or plain storage"
+	);
 
 	std::string functionName =
-			"read_from_storage_" +
-			std::string(_splitFunctionTypes ? "split_" : "") + (
-				_offset.has_value() ?
-				"offset_" + std::to_string(*_offset) :
-				"dynamic"
-			) +
-			"_" +
-			_type.identifier();
+		"read_from_" +
+		(_location == VariableDeclaration::Location::Transient ? "transient_"s : "") +
+		"storage_" +
+		std::string(_splitFunctionTypes ? "split_" : "") + (
+			_offset.has_value() ?
+			"offset_" + std::to_string(*_offset) :
+			"dynamic"
+		) +
+		"_" +
+		_type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&] {
 		Whiskers templ(R"(
 			function <functionName>(slot<?dynamic>, offset</dynamic>) -> <?split>addr, selector<!split>value</split> {
-				<?split>let</split> value := <extract>(sload(slot)<?dynamic>, offset</dynamic>)
+				<?split>let</split> value := <extract>(<loadOpcode>(slot)<?dynamic>, offset</dynamic>)
 				<?split>
 					addr, selector := <splitFunction>(value)
 				</split>
@@ -2805,6 +2829,7 @@ std::string YulUtilFunctions::readFromStorageValueType(Type const& _type, std::o
 		)");
 		templ("functionName", functionName);
 		templ("dynamic", !_offset.has_value());
+		templ("loadOpcode", _location == VariableDeclaration::Location::Transient ? "tload" : "sload");
 		if (_offset.has_value())
 			templ("extract", extractFromStorageValue(_type, *_offset));
 		else
@@ -2850,7 +2875,7 @@ std::string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
 		("memberValues", suffixedVariableNameList("memberValue_", 0, structMembers[i].type->stackItems().size()))
 		("memberMemoryOffset", structType.memoryOffsetOfMember(structMembers[i].name).str())
 		("memberSlotDiff",  memberSlotDiff.str())
-		("readFromStorage", readFromStorage(*structMembers[i].type, memberStorageOffset, true))
+		("readFromStorage", readFromStorage(*structMembers[i].type, memberStorageOffset, true, VariableDeclaration::Location::Unspecified))
 		("writeToMemory", writeToMemoryFunction(*structMembers[i].type))
 		.render();
 	}
@@ -2884,11 +2909,20 @@ std::string YulUtilFunctions::readFromCalldata(Type const& _type)
 std::string YulUtilFunctions::updateStorageValueFunction(
 	Type const& _fromType,
 	Type const& _toType,
+	VariableDeclaration::Location _location,
 	std::optional<unsigned> const& _offset
 )
 {
+	solAssert(
+		_location == VariableDeclaration::Location::Transient ||
+		_location == VariableDeclaration::Location::Unspecified,
+		"Variable location can only be transient or plain storage"
+	);
+
 	std::string const functionName =
-		"update_storage_value_" +
+		"update_" +
+		(_location == VariableDeclaration::Location::Transient ? "transient_"s : "") +
+		"storage_value_" +
 		(_offset.has_value() ? ("offset_" + std::to_string(*_offset)) : "") +
 		_fromType.identifier() +
 		"_to_" +
@@ -2904,7 +2938,7 @@ std::string YulUtilFunctions::updateStorageValueFunction(
 			return Whiskers(R"(
 				function <functionName>(slot, <offset><fromValues>) {
 					let <toValues> := <convert>(<fromValues>)
-					sstore(slot, <update>(sload(slot), <offset><prepare>(<toValues>)))
+					<storeOpcode>(slot, <update>(<loadOpcode>(slot), <offset><prepare>(<toValues>)))
 				}
 
 			)")
@@ -2918,10 +2952,13 @@ std::string YulUtilFunctions::updateStorageValueFunction(
 			("convert", conversionFunction(_fromType, _toType))
 			("fromValues", suffixedVariableNameList("value_", 0, _fromType.sizeOnStack()))
 			("toValues", suffixedVariableNameList("convertedValue_", 0, _toType.sizeOnStack()))
+			("storeOpcode", _location == VariableDeclaration::Location::Transient ? "tstore" : "sstore")
+			("loadOpcode", _location == VariableDeclaration::Location::Transient ? "tload" : "sload")
 			("prepare", prepareStoreFunction(_toType))
 			.render();
 		}
 
+		solAssert(_location != VariableDeclaration::Location::Transient);
 		auto const* toReferenceType = dynamic_cast<ReferenceType const*>(&_toType);
 		auto const* fromReferenceType = dynamic_cast<ReferenceType const*>(&_fromType);
 		solAssert(toReferenceType, "");
@@ -3553,7 +3590,7 @@ std::string YulUtilFunctions::conversionFunction(Type const& _from, Type const&
 					body = Whiskers(R"(
 						converted := <readFromStorage>(value)
 					)")
-					("readFromStorage", readFromStorage(toStructType, 0, true))
+					("readFromStorage", readFromStorage(toStructType, 0, true, VariableDeclaration::Location::Unspecified))
 					.render();
 				}
 			}
@@ -3683,7 +3720,7 @@ std::string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType cons
 			templ(
 				"extractValue",
 				_from.dataStoredIn(DataLocation::Storage) ?
-				readFromStorage(_to, 32 - _to.numBytes(), false) :
+				readFromStorage(_to, 32 - _to.numBytes(), false, VariableDeclaration::Location::Unspecified) :
 				readFromMemory(_to)
 			);
 		templ("shl", shiftLeftFunctionDynamic());
@@ -3787,7 +3824,7 @@ std::string YulUtilFunctions::copyStructToStorageFunction(StructType const& _fro
 				auto const& [srcSlotOffset, srcOffset] = _from.storageOffsetsOfMember(structMembers[i].name);
 				t("memberOffset", formatNumber(srcSlotOffset));
 				if (memberType.isValueType())
-					t("read", readFromStorageValueType(memberType, srcOffset, true));
+					t("read", readFromStorageValueType(memberType, srcOffset, true, VariableDeclaration::Location::Unspecified));
 				else
 					solAssert(srcOffset == 0, "");
 
@@ -3795,6 +3832,7 @@ std::string YulUtilFunctions::copyStructToStorageFunction(StructType const& _fro
 			t("updateStorageValue", updateStorageValueFunction(
 				memberType,
 				*toStructMembers[i].type,
+				VariableDeclaration::Location::Unspecified,
 				std::optional<unsigned>{offset}
 			));
 			memberParams[i]["updateMemberCall"] = t.render();
@@ -4300,7 +4338,7 @@ std::string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFu
 	});
 }
 
-std::string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
+std::string YulUtilFunctions::storageSetToZeroFunction(Type const& _type, VariableDeclaration::Location _location)
 {
 	std::string const functionName = "storage_set_to_zero_" + _type.identifier();
 
@@ -4313,7 +4351,7 @@ std::string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
 				}
 			)")
 			("functionName", functionName)
-			("store", updateStorageValueFunction(_type, _type))
+			("store", updateStorageValueFunction(_type, _type, _location))
 			("values", suffixedVariableNameList("zero_", 0, _type.sizeOnStack()))
 			("zeroValue", zeroValueFunction(_type))
 			.render();
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index a1b45b656f..6c06cdcc94 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -24,6 +24,7 @@
 #include <liblangutil/EVMVersion.h>
 
 #include <libsolidity/ast/Types.h>
+#include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
 
 #include <libsolidity/interface/DebugSettings.h>
@@ -349,8 +350,17 @@ class YulUtilFunctions
 	/// @returns a function that reads a type from storage.
 	/// @param _splitFunctionTypes if false, returns the address and function signature in a
 	/// single variable.
-	std::string readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes);
-	std::string readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes);
+	std::string readFromStorage(
+		Type const& _type,
+		size_t _offset,
+		bool _splitFunctionTypes,
+		VariableDeclaration::Location _location
+	);
+	std::string readFromStorageDynamic(
+		Type const& _type,
+		bool _splitFunctionTypes,
+		VariableDeclaration::Location _location
+	);
 
 	/// @returns a function that reads a value type from memory. Performs cleanup.
 	/// signature: (addr) -> value
@@ -376,6 +386,7 @@ class YulUtilFunctions
 	std::string updateStorageValueFunction(
 		Type const& _fromType,
 		Type const& _toType,
+		VariableDeclaration::Location _location,
 		std::optional<unsigned> const& _offset = std::optional<unsigned>()
 	);
 
@@ -496,7 +507,7 @@ class YulUtilFunctions
 	/// @returns the name of a function that will set the given storage item to
 	/// zero
 	/// signature: (slot, offset) ->
-	std::string storageSetToZeroFunction(Type const& _type);
+	std::string storageSetToZeroFunction(Type const& _type, VariableDeclaration::Location _location);
 
 	/// If revertStrings is debug, @returns the name of a function that
 	/// stores @param _message in memory position 0 and reverts.
@@ -573,8 +584,13 @@ class YulUtilFunctions
 	/// @param _splitFunctionTypes if false, returns the address and function signature in a
 	/// single variable.
 	/// @param _offset if provided, read from static offset, otherwise offset is a parameter of the Yul function.
-	std::string readFromStorageValueType(Type const& _type, std::optional<size_t> _offset, bool _splitFunctionTypes);
-
+	/// @param _location if provided, indicates whether we're reading from storage our transient storage.
+	std::string readFromStorageValueType(
+		Type const& _type,
+		std::optional<size_t> _offset,
+		bool _splitFunctionTypes,
+		VariableDeclaration::Location _location
+	);
 	/// @returns a function that reads a reference type from storage to memory (performing a deep copy).
 	std::string readFromStorageReferenceType(Type const& _type);
 
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index a80fb4c27f..44fc5a935a 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -103,16 +103,6 @@ std::string IRGenerator::generate(
 	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
 )
 {
-	auto notTransient = [](VariableDeclaration const* _varDeclaration) {
-		solAssert(_varDeclaration);
-		return _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient;
-	};
-
-	solUnimplementedAssert(
-		ranges::all_of(_contract.stateVariables(), notTransient),
-		"Transient storage variables are not supported when compiling via IR."
-	);
-
 	auto subObjectSources = [&_otherYulSources](UniqueVector<ContractDefinition const*> const& _subObjects) -> std::string
 	{
 		std::string subObjectsSources;
@@ -674,7 +664,7 @@ std::string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 					<ret> := <readStorage>(add(slot, <slotOffset>))
 				)")
 				("ret", joinHumanReadable(retVars))
-				("readStorage", m_utils.readFromStorage(*returnTypes[i], offsets.second, true))
+				("readStorage", m_utils.readFromStorage(*returnTypes[i], offsets.second, true, _varDecl.referenceLocation()))
 				("slotOffset", offsets.first.str())
 				.render();
 			}
@@ -691,7 +681,7 @@ std::string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 				<ret> := <readStorage>(slot, offset)
 			)")
 			("ret", joinHumanReadable(retVars))
-			("readStorage", m_utils.readFromStorageDynamic(*returnTypes.front(), true))
+			("readStorage", m_utils.readFromStorageDynamic(*returnTypes.front(), true, _varDecl.referenceLocation()))
 			.render();
 		}
 
@@ -834,7 +824,6 @@ std::string IRGenerator::initStateVariables(ContractDefinition const& _contract)
 	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
 	for (VariableDeclaration const* variable: _contract.stateVariables())
 	{
-		solUnimplementedAssert(variable->referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage variables not supported.");
 		if (!variable->isConstant())
 			generator.initializeStateVar(*variable);
 	}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index c3cd69f43e..283cc4b6b3 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -271,6 +271,7 @@ void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _va
 		solAssert(!_varDecl.isConstant());
 		if (!_varDecl.value())
 			return;
+		solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient, "State variables cannot be initialized in place.");
 
 		_varDecl.value()->accept(*this);
 
@@ -376,15 +377,6 @@ void IRGeneratorForStatements::endVisit(VariableDeclarationStatement const& _var
 {
 	setLocation(_varDeclStatement);
 
-	auto static notTransient = [](std::shared_ptr<VariableDeclaration> const& _varDeclaration) {
-		return (_varDeclaration ? _varDeclaration->referenceLocation() != VariableDeclaration::Location::Transient : true);
-	};
-
-	solUnimplementedAssert(
-		ranges::all_of(_varDeclStatement.declarations(), notTransient),
-		"Transient storage variables are not supported."
-	);
-
 	if (Expression const* expression = _varDeclStatement.initialValue())
 	{
 		if (_varDeclStatement.declarations().size() > 1)
@@ -727,7 +719,7 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 			util::GenericVisitor{
 				[&](IRLValue::Storage const& _storage) {
 					appendCode() <<
-						m_utils.storageSetToZeroFunction(m_currentLValue->type) <<
+						m_utils.storageSetToZeroFunction(m_currentLValue->type, VariableDeclaration::Location::Unspecified) <<
 						"(" <<
 						_storage.slot <<
 						", " <<
@@ -735,6 +727,16 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 						")\n";
 					m_currentLValue.reset();
 				},
+				[&](IRLValue::TransientStorage const& _transientStorage) {
+					appendCode() <<
+						m_utils.storageSetToZeroFunction(m_currentLValue->type, VariableDeclaration::Location::Transient) <<
+						"(" <<
+						_transientStorage.slot <<
+						", " <<
+						_transientStorage.offsetString() <<
+						")\n";
+					m_currentLValue.reset();
+				},
 				[&](auto const&) {
 					IRVariable zeroValue(m_context.newYulVariable(), m_currentLValue->type);
 					define(zeroValue) << m_utils.zeroValueFunction(m_currentLValue->type) << "()\n";
@@ -2558,6 +2560,14 @@ void IRGeneratorForStatements::handleVariableReference(
 			*_variable.annotation().type,
 			IRLValue::Stack{m_context.localVariable(_variable)}
 		});
+	else if (m_context.isStateVariable(_variable) && _variable.referenceLocation() == VariableDeclaration::Location::Transient)
+		setLValue(_referencingExpression, IRLValue{
+			*_variable.annotation().type,
+			IRLValue::TransientStorage{
+				toCompactHexWithPrefix(m_context.storageLocationOfStateVariable(_variable).first),
+				m_context.storageLocationOfStateVariable(_variable).second
+			}
+		});
 	else if (m_context.isStateVariable(_variable))
 		setLValue(_referencingExpression, IRLValue{
 			*_variable.annotation().type,
@@ -3073,13 +3083,29 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 				}, _storage.offset);
 
 				appendCode() <<
-					m_utils.updateStorageValueFunction(_value.type(), _lvalue.type, offsetStatic) <<
+					m_utils.updateStorageValueFunction(_value.type(), _lvalue.type, VariableDeclaration::Location::Unspecified, offsetStatic) <<
 					"(" <<
 					_storage.slot <<
 					offsetArgument <<
 					_value.commaSeparatedListPrefixed() <<
 					")\n";
+			},
+			[&](IRLValue::TransientStorage const& _transientStorage) {
+				std::string offsetArgument;
+				std::optional<unsigned> offsetStatic;
 
+				std::visit(GenericVisitor{
+					[&](unsigned _offset) { offsetStatic = _offset; },
+					[&](std::string const& _offset) { offsetArgument = ", " + _offset; }
+				}, _transientStorage.offset);
+
+				appendCode() <<
+					m_utils.updateStorageValueFunction(_value.type(), _lvalue.type, VariableDeclaration::Location::Transient, offsetStatic) <<
+					"(" <<
+					_transientStorage.slot <<
+					offsetArgument <<
+					_value.commaSeparatedListPrefixed() <<
+					")\n";
 			},
 			[&](IRLValue::Memory const& _memory) {
 				if (_lvalue.type.isValueType())
@@ -3158,7 +3184,7 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 				define(result) << _storage.slot << "\n";
 			else if (std::holds_alternative<std::string>(_storage.offset))
 				define(result) <<
-					m_utils.readFromStorageDynamic(_lvalue.type, true) <<
+					m_utils.readFromStorageDynamic(_lvalue.type, true, VariableDeclaration::Location::Unspecified) <<
 					"(" <<
 					_storage.slot <<
 					", " <<
@@ -3166,11 +3192,29 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 					")\n";
 			else
 				define(result) <<
-					m_utils.readFromStorage(_lvalue.type, std::get<unsigned>(_storage.offset), true) <<
+					m_utils.readFromStorage(_lvalue.type, std::get<unsigned>(_storage.offset), true, VariableDeclaration::Location::Unspecified) <<
 					"(" <<
 					_storage.slot <<
 					")\n";
 		},
+		[&](IRLValue::TransientStorage const& _transientStorage) {
+			if (!_lvalue.type.isValueType())
+				define(result) << _transientStorage.slot << "\n";
+			else if (std::holds_alternative<std::string>(_transientStorage.offset))
+				define(result) <<
+					m_utils.readFromStorageDynamic(_lvalue.type, true, VariableDeclaration::Location::Transient) <<
+					"(" <<
+					_transientStorage.slot <<
+					", " <<
+					std::get<std::string>(_transientStorage.offset) <<
+					")\n";
+			else
+				define(result) <<
+					m_utils.readFromStorage(_lvalue.type, std::get<unsigned>(_transientStorage.offset), true, VariableDeclaration::Location::Transient) <<
+					"(" <<
+					_transientStorage.slot <<
+					")\n";
+		},
 		[&](IRLValue::Memory const& _memory) {
 			if (_lvalue.type.isValueType())
 				define(result) <<
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
index 15ef71f138..9537b1f8fa 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.h
@@ -228,6 +228,7 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 
 	/// Assigns the value of @a _value to the lvalue @a _lvalue.
 	void writeToLValue(IRLValue const& _lvalue, IRVariable const& _value);
+
 	/// @returns a fresh IR variable containing the value of the lvalue @a _lvalue.
 	IRVariable readFromLValue(IRLValue const& _lvalue);
 
diff --git a/libsolidity/codegen/ir/IRLValue.h b/libsolidity/codegen/ir/IRLValue.h
index fef390d4cb..3f77cdda3b 100644
--- a/libsolidity/codegen/ir/IRLValue.h
+++ b/libsolidity/codegen/ir/IRLValue.h
@@ -40,7 +40,7 @@ struct IRLValue
 	{
 		VariableDeclaration const* variable = nullptr;
 	};
-	struct Storage
+	struct GenericStorage
 	{
 		std::string const slot;
 		/// unsigned: Used when the offset is known at compile time, uses optimized
@@ -55,6 +55,8 @@ struct IRLValue
 				return std::get<std::string>(offset);
 		}
 	};
+	struct Storage : public GenericStorage {};
+	struct TransientStorage : public GenericStorage {};
 	struct Memory
 	{
 		std::string const address;
@@ -64,7 +66,7 @@ struct IRLValue
 	{
 		std::vector<std::optional<IRLValue>> components;
 	};
-	std::variant<Stack, Immutable, Storage, Memory, Tuple> kind;
+	std::variant<Stack, Immutable, Storage, TransientStorage, Memory, Tuple> kind;
 };
 
 }

From 0968a33d9c22f8fd673f7539f39ec2c5f925d9c8 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 13 Sep 2024 15:55:49 +0200
Subject: [PATCH 1099/1140] Update old tests

---
 .../err                                       |   1 -
 .../exit                                      |   1 -
 .../output                                    | 131 ++++++++++++++++++
 .../getters/transient_value_types.sol         |   1 -
 ...transient_value_types_multi_frame_call.sol |   1 -
 ...ansient_storage_access_inside_function.sol |   1 -
 .../compound_assign_transient_storage.sol     |   1 -
 ...t_storage_variable_increment_decrement.sol |   1 -
 .../delete_transient_state_variable.sol       |   1 -
 ...transient_function_type_state_variable.sol |   1 -
 ...ansient_state_address_variable_members.sol |   1 -
 .../transient_state_enum_variable.sol         |   1 -
 .../variables/transient_state_variable.sol    |   1 -
 ...ient_state_variable_cleanup_assignment.sol |   1 -
 ...ransient_state_variable_cleanup_tstore.sol |   1 -
 ...nt_state_variable_slot_inline_assembly.sol |   1 -
 ...nsient_state_variable_tuple_assignment.sol |   1 -
 .../transient_state_variable_udvt.sol         |   1 -
 .../transient_storage_reentrancy_lock.sol     |   1 -
 19 files changed, 131 insertions(+), 18 deletions(-)
 delete mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
 delete mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output

diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
deleted file mode 100644
index 2f81d6cd3d..0000000000
--- a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/err
+++ /dev/null
@@ -1 +0,0 @@
-Error: Transient storage variables are not supported when compiling via IR.
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output
new file mode 100644
index 0000000000..ec427fe371
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output
@@ -0,0 +1,131 @@
+Optimized IR:
+/// @use-src 0:"evmasm_transient_storage_state_variable_via_ir/input.sol"
+object "C_14" {
+    code {
+        {
+            mstore(64, memoryguard(0x80))
+            if callvalue()
+            {
+                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            }
+            let _1 := allocate_unbounded()
+            codecopy(_1, dataoffset("C_14_deployed"), datasize("C_14_deployed"))
+            return(_1, datasize("C_14_deployed"))
+        }
+        function allocate_unbounded() -> memPtr
+        { memPtr := mload(64) }
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        { revert(0, 0) }
+    }
+    /// @use-src 0:"evmasm_transient_storage_state_variable_via_ir/input.sol"
+    object "C_14_deployed" {
+        code {
+            {
+                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()
+            }
+            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 abi_encode_tuple(headStart) -> tail
+            { tail := add(headStart, 0) }
+            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) }
+            function shift_right_0_unsigned(value) -> newValue
+            { newValue := shr(0, value) }
+            function cleanup_from_storage_uint256(value) -> cleaned
+            { cleaned := value }
+            function extract_from_storage_value_offsett_uint256(slot_value) -> value
+            {
+                value := cleanup_from_storage_uint256(shift_right_0_unsigned(slot_value))
+            }
+            function read_from_transient_storage_split_offset_uint256(slot) -> value
+            {
+                value := extract_from_storage_value_offsett_uint256(tload(slot))
+            }
+            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)))
+            }
+            function panic_error_0x11()
+            {
+                mstore(0, shl(224, 0x4e487b71))
+                mstore(4, 0x11)
+                revert(0, 0x24)
+            }
+            function checked_add_uint256(x, y) -> sum
+            {
+                x := cleanup_uint256(x)
+                y := cleanup_uint256(y)
+                sum := add(x, y)
+                if gt(x, sum) { panic_error_0x11() }
+            }
+            function shift_left(value) -> newValue
+            { newValue := shl(0, value) }
+            function update_byte_slice_shift(value, toInsert) -> result
+            {
+                let mask := not(0)
+                toInsert := shift_left(toInsert)
+                value := and(value, not(mask))
+                result := or(value, and(toInsert, mask))
+            }
+            function convert_uint256_to_uint256(value) -> converted
+            {
+                converted := cleanup_uint256(identity(cleanup_uint256(value)))
+            }
+            function prepare_store_uint256(value) -> ret
+            { ret := value }
+            function update_transient_storage_value_offsett_uint256_to_uint256(slot, value)
+            {
+                let convertedValue := convert_uint256_to_uint256(value)
+                tstore(slot, update_byte_slice_shift(tload(slot), prepare_store_uint256(convertedValue)))
+            }
+            function fun_f()
+            {
+                let _1 := read_from_transient_storage_split_offset_uint256(0x00)
+                let expr := _1
+                let expr_1 := 0x01
+                let expr_2 := checked_add_uint256(expr, convert_rational_by_to_uint256(expr_1))
+                update_transient_storage_value_offsett_uint256_to_uint256(0x00, expr_2)
+            }
+        }
+        data ".metadata" hex""
+    }
+}
diff --git a/test/libsolidity/semanticTests/getters/transient_value_types.sol b/test/libsolidity/semanticTests/getters/transient_value_types.sol
index cc345cb912..852e96baf2 100644
--- a/test/libsolidity/semanticTests/getters/transient_value_types.sol
+++ b/test/libsolidity/semanticTests/getters/transient_value_types.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // x() -> 0
 // f() -> -1
diff --git a/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol b/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
index 5e6b3f0543..912fca4fc4 100644
--- a/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
+++ b/test/libsolidity/semanticTests/getters/transient_value_types_multi_frame_call.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // x() -> 0
 // f() -> -2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
index 86463473bd..489f1a4ca7 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_transient_storage_access_inside_function.sol
@@ -18,6 +18,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol b/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
index a20c8403ef..c3adf3a1c4 100644
--- a/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
+++ b/test/libsolidity/semanticTests/operators/compound_assign_transient_storage.sol
@@ -11,7 +11,6 @@ contract test {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f(uint256,uint256): 0, 6 -> 7
 // f(uint256,uint256): 1, 3 -> 11
diff --git a/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol b/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
index ac32eee1cd..889153014d 100644
--- a/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
+++ b/test/libsolidity/semanticTests/operators/transient_storage_variable_increment_decrement.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol b/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
index 5f584fc898..868149ebc6 100644
--- a/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
+++ b/test/libsolidity/semanticTests/variables/delete_transient_state_variable.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol b/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
index 56a69649ee..eb9d00fa08 100644
--- a/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
+++ b/test/libsolidity/semanticTests/variables/transient_function_type_state_variable.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
index 6a388b3ee1..22cc5db056 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // constructor() ->
 // gas legacy: 59027
diff --git a/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol b/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
index a472212d40..e260ebad62 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_enum_variable.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable.sol b/test/libsolidity/semanticTests/variables/transient_state_variable.sol
index 71ed212d0b..03163982de 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // x() -> 0
 // g() -> 8
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
index d1f0cc5797..a81572ec18 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_assignment.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 0xff
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
index 425be55009..8f3be7ae53 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_cleanup_tstore.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 0xff
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
index 6cf05068e3..0e7f29ed42 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_slot_inline_assembly.sol
@@ -25,7 +25,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 0, 0
 // g() -> 1, 0
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
index 1b5180635c..3791266211 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_tuple_assignment.sol
@@ -16,6 +16,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // f() -> 2, 3, 4
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
index 2f49a32b04..1829491f48 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_udvt.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // x() -> 0
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol b/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
index aa38286015..cc3a9d4a43 100644
--- a/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
+++ b/test/libsolidity/semanticTests/various/transient_storage_reentrancy_lock.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=cancun
-// compileViaYul: false
 // ----
 // test(address,bool): 0x1234abcd, true -> FAILURE, hex"08c379a0", 0x20, 0x12, "Reentrancy attempt"
 // test(address,bool): 0x1234abcd, false ->

From 8dfba6053f2a3d9640cd1452fff74aadf8b1b98b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 16 Sep 2024 12:03:57 +0200
Subject: [PATCH 1100/1140] New tests

---
 .../args                                      |   2 +-
 .../output                                    |  45 +++--
 .../args                                      |   1 +
 .../err                                       |   5 +
 .../input.sol                                 |  11 ++
 .../output                                    |  36 ++++
 .../args                                      |   2 +-
 .../output                                    | 184 +++++-------------
 .../args                                      |   1 +
 .../input.sol                                 |   9 +
 .../output                                    |  41 ++++
 ...ransient_state_variable_initialization.sol |  16 ++
 .../transient_storage_state_variable.sol      |  22 +++
 ...orage_state_variable_abstract_contract.sol |  26 +++
 .../transient_state_variable_value_type.sol   |  17 ++
 ...ansient_state_variable_non_zero_offset.sol |  14 ++
 ...sient_state_variable_slots_and_offsets.sol |  20 ++
 .../various/different_call_type_transient.sol |  51 +++++
 .../transient_storage_value_type.sol          |  15 ++
 19 files changed, 367 insertions(+), 151 deletions(-)
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/args
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
 create mode 100644 test/cmdlineTests/ir_optimized_transient_storage_value_type/args
 create mode 100644 test/cmdlineTests/ir_optimized_transient_storage_value_type/input.sol
 create mode 100644 test/cmdlineTests/ir_optimized_transient_storage_value_type/output
 create mode 100644 test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
 create mode 100644 test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
 create mode 100644 test/libsolidity/semanticTests/inheritance/transient_storage_state_variable_abstract_contract.sol
 create mode 100644 test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
 create mode 100644 test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
 create mode 100644 test/libsolidity/semanticTests/variables/transient_state_variable_slots_and_offsets.sol
 create mode 100644 test/libsolidity/semanticTests/various/different_call_type_transient.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/transient_storage_value_type.sol

diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
index 8430fd558f..b73ac2146d 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/args
@@ -1 +1 @@
---no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none
+--no-cbor-metadata --optimize --opcodes --asm --debug-info none
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
index 56dea1afb4..a02eca7d92 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
@@ -1,36 +1,43 @@
 
 ======= evmasm_transient_storage_inline_assembly/input.sol:C =======
 EVM assembly:
-  0x80
+  mstore(0x40, 0x80)
+  callvalue
   dup1
-  0x40
-  mstore
-  jumpi(tag_1, callvalue)
+  iszero
+  tag_1
+  jumpi
+  revert(0x00, 0x00)
+tag_1:
+  pop
   dataSize(sub_0)
-  swap1
-  dup2
+  dup1
   dataOffset(sub_0)
-  dup3
+  0x00
   codecopy
-  return
-tag_1:
   0x00
-  dup1
-  revert
+  return
 stop
 
 sub_0: assembly {
-      jumpi(tag_1, callvalue)
-      0x00
+      mstore(0x40, 0x80)
+      callvalue
       dup1
+      iszero
+      tag_3
+      jumpi
+      revert(0x00, 0x00)
+    tag_3:
+      pop
+      0x00
+      0x00
       tstore
-      sstore(0x00, tload(0x00))
-      stop
-    tag_1:
       0x00
-      dup1
-      revert
+      tload
+      0x00
+      sstore
+      stop
 }
 
 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 
+PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH1 0x18 DUP1 PUSH1 0x1A PUSH0 CODECOPY PUSH0 RETURN INVALID PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH0 PUSH0 TSTORE PUSH0 TLOAD PUSH0 SSTORE STOP 
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/args b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/args
new file mode 100644
index 0000000000..8430fd558f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/args
@@ -0,0 +1 @@
+--no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err
new file mode 100644
index 0000000000..b1ccd751c9
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/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_inline_assembly_via_ir/input.sol:7:13:
+  |
+7 |             tstore(0, 0)
+  |             ^^^^^^
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol
new file mode 100644
index 0000000000..94914ac4ee
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/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_inline_assembly_via_ir/output b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
new file mode 100644
index 0000000000..62bf1f456a
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
@@ -0,0 +1,36 @@
+
+======= evmasm_transient_storage_inline_assembly_via_ir/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/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
index 00dcc37773..e233e0855a 100644
--- a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
@@ -1 +1 @@
---no-cbor-metadata --ir-optimized --debug-info none
\ No newline at end of file
+--no-cbor-metadata --via-ir --optimize --asm --debug-info none
\ No newline at end of file
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output
index ec427fe371..5959fad952 100644
--- a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/output
@@ -1,131 +1,55 @@
-Optimized IR:
-/// @use-src 0:"evmasm_transient_storage_state_variable_via_ir/input.sol"
-object "C_14" {
-    code {
-        {
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset("C_14_deployed"), datasize("C_14_deployed"))
-            return(_1, datasize("C_14_deployed"))
-        }
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-    }
-    /// @use-src 0:"evmasm_transient_storage_state_variable_via_ir/input.sol"
-    object "C_14_deployed" {
-        code {
-            {
-                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()
-            }
-            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 abi_encode_tuple(headStart) -> tail
-            { tail := add(headStart, 0) }
-            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) }
-            function shift_right_0_unsigned(value) -> newValue
-            { newValue := shr(0, value) }
-            function cleanup_from_storage_uint256(value) -> cleaned
-            { cleaned := value }
-            function extract_from_storage_value_offsett_uint256(slot_value) -> value
-            {
-                value := cleanup_from_storage_uint256(shift_right_0_unsigned(slot_value))
-            }
-            function read_from_transient_storage_split_offset_uint256(slot) -> value
-            {
-                value := extract_from_storage_value_offsett_uint256(tload(slot))
-            }
-            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)))
-            }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-            function checked_add_uint256(x, y) -> sum
-            {
-                x := cleanup_uint256(x)
-                y := cleanup_uint256(y)
-                sum := add(x, y)
-                if gt(x, sum) { panic_error_0x11() }
-            }
-            function shift_left(value) -> newValue
-            { newValue := shl(0, value) }
-            function update_byte_slice_shift(value, toInsert) -> result
-            {
-                let mask := not(0)
-                toInsert := shift_left(toInsert)
-                value := and(value, not(mask))
-                result := or(value, and(toInsert, mask))
-            }
-            function convert_uint256_to_uint256(value) -> converted
-            {
-                converted := cleanup_uint256(identity(cleanup_uint256(value)))
-            }
-            function prepare_store_uint256(value) -> ret
-            { ret := value }
-            function update_transient_storage_value_offsett_uint256_to_uint256(slot, value)
-            {
-                let convertedValue := convert_uint256_to_uint256(value)
-                tstore(slot, update_byte_slice_shift(tload(slot), prepare_store_uint256(convertedValue)))
-            }
-            function fun_f()
-            {
-                let _1 := read_from_transient_storage_split_offset_uint256(0x00)
-                let expr := _1
-                let expr_1 := 0x01
-                let expr_2 := checked_add_uint256(expr, convert_rational_by_to_uint256(expr_1))
-                update_transient_storage_value_offsett_uint256_to_uint256(0x00, expr_2)
-            }
-        }
-        data ".metadata" hex""
-    }
+
+======= evmasm_transient_storage_state_variable_via_ir/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, iszero(lt(calldatasize, 0x04)))
+      0x00
+      dup1
+      revert
+    tag_1:
+      jumpi(tag_3, eq(0x26121ff0, shr(0xe0, calldataload(0x00))))
+      0x00
+      dup1
+      revert
+    tag_3:
+      jumpi(tag_7, callvalue)
+      jumpi(tag_7, slt(add(not(0x03), calldatasize), 0x00))
+      tload(0x00)
+      0x01
+      dup2
+      add
+      dup1
+      swap2
+      gt
+      tag_9
+      jumpi
+      0x00
+      tstore
+      stop
+    tag_9:
+      mstore(0x00, shl(0xe0, 0x4e487b71))
+      mstore(0x04, 0x11)
+      revert(0x00, 0x24)
+    tag_7:
+      0x00
+      dup1
+      revert
 }
diff --git a/test/cmdlineTests/ir_optimized_transient_storage_value_type/args b/test/cmdlineTests/ir_optimized_transient_storage_value_type/args
new file mode 100644
index 0000000000..20e22da1ae
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_transient_storage_value_type/args
@@ -0,0 +1 @@
+--via-ir --no-cbor-metadata --ir-optimized --optimize --debug-info none
diff --git a/test/cmdlineTests/ir_optimized_transient_storage_value_type/input.sol b/test/cmdlineTests/ir_optimized_transient_storage_value_type/input.sol
new file mode 100644
index 0000000000..7177bdb64f
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_transient_storage_value_type/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    uint transient x;
+    function f() public {
+        x = x + 1;
+    }
+}
diff --git a/test/cmdlineTests/ir_optimized_transient_storage_value_type/output b/test/cmdlineTests/ir_optimized_transient_storage_value_type/output
new file mode 100644
index 0000000000..61d289e3f9
--- /dev/null
+++ b/test/cmdlineTests/ir_optimized_transient_storage_value_type/output
@@ -0,0 +1,41 @@
+Optimized IR:
+/// @use-src 0:"ir_optimized_transient_storage_value_type/input.sol"
+object "C_14" {
+    code {
+        {
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
+            if callvalue() { revert(0, 0) }
+            let _2 := datasize("C_14_deployed")
+            codecopy(_1, dataoffset("C_14_deployed"), _2)
+            return(_1, _2)
+        }
+    }
+    /// @use-src 0:"ir_optimized_transient_storage_value_type/input.sol"
+    object "C_14_deployed" {
+        code {
+            {
+                if iszero(lt(calldatasize(), 4))
+                {
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
+                    {
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _1 := tload(0)
+                        let sum := add(_1, 0x01)
+                        if gt(_1, sum)
+                        {
+                            mstore(0, shl(224, 0x4e487b71))
+                            mstore(4, 0x11)
+                            revert(0, 0x24)
+                        }
+                        tstore(0, sum)
+                        return(0, 0)
+                    }
+                }
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex""
+    }
+}
diff --git a/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol b/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
new file mode 100644
index 0000000000..4c69b58f83
--- /dev/null
+++ b/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
@@ -0,0 +1,16 @@
+contract C {
+    uint256 transient x;
+
+    constructor() {
+        x = 100;
+    }
+
+    function f() external view returns (uint256 x) {
+        x;
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
new file mode 100644
index 0000000000..56c686f825
--- /dev/null
+++ b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
@@ -0,0 +1,22 @@
+contract A {
+    uint transient x;
+    int y;
+}
+
+contract C is A {
+    uint w;
+    int transient z;
+
+    function f() public returns (uint, int, uint, int) {
+        x += 1;
+        y += 2;
+        w += 3;
+        z += 4;
+
+        return (x, y, w, z);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable_abstract_contract.sol b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable_abstract_contract.sol
new file mode 100644
index 0000000000..5db209f161
--- /dev/null
+++ b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable_abstract_contract.sol
@@ -0,0 +1,26 @@
+abstract contract A {
+    uint transient x;
+    int y;
+    function f() public virtual returns (uint, int, uint, int);
+}
+
+contract C is A {
+    uint w;
+    int transient z;
+
+    function g() public {
+        w += 2;
+        z += 2;
+    }
+
+    function f() public override returns (uint, int, uint, int) {
+        x += 1;
+        y += 1;
+        g();
+        return (x, y, w, z);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 1, 1, 2, 2
diff --git a/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol b/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
new file mode 100644
index 0000000000..4c60ee1a89
--- /dev/null
+++ b/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
@@ -0,0 +1,17 @@
+contract C {
+    uint16 transient x;
+
+    modifier m(uint16) {
+        x += 10;
+        _;
+    }
+
+    function f() public m(x) returns (uint16 x) {
+        x *= 10;
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol b/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
new file mode 100644
index 0000000000..45860599e6
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
@@ -0,0 +1,14 @@
+contract C {
+    uint128 transient x;
+    uint128 transient y;
+
+    function f() public returns (uint) {
+        y = 10;
+        delete y;
+        return y;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/variables/transient_state_variable_slots_and_offsets.sol b/test/libsolidity/semanticTests/variables/transient_state_variable_slots_and_offsets.sol
new file mode 100644
index 0000000000..63f23e1857
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/transient_state_variable_slots_and_offsets.sol
@@ -0,0 +1,20 @@
+contract C {
+    uint128 transient x;
+    uint64 transient y;
+    uint64 transient w;
+    uint256 transient z;
+
+    function f() external returns (uint128, uint64, uint64, uint256) {
+        x = 1;
+        y = 2;
+        w = 3;
+        z = 4;
+
+        return (x, y, w, z);
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/various/different_call_type_transient.sol b/test/libsolidity/semanticTests/various/different_call_type_transient.sol
new file mode 100644
index 0000000000..b71e8b2525
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/different_call_type_transient.sol
@@ -0,0 +1,51 @@
+contract B {
+    uint256 transient public value;
+
+    function setValue(uint256 v) public {
+        value += v;
+    }
+}
+
+contract A {
+    uint256 transient public value;
+
+    function delegateSetValue(address otherContract, uint256 v) public {
+        (bool success, ) = otherContract.delegatecall(abi.encodeWithSignature("setValue(uint256)", v));
+        require(success);
+    }
+    function callSetValue(address otherContract, uint256 v) public {
+        (bool success, ) = otherContract.call(abi.encodeWithSignature("setValue(uint256)", v));
+        require(success);
+    }
+    function staticSetValue(address otherContract, uint256 v) view public returns (bool) {
+        (bool success, ) = otherContract.staticcall(abi.encodeWithSignature("setValue(uint256)", v));
+        return success;
+    }
+}
+
+contract Test {
+    A a = new A();
+    B b = new B();
+
+    function testDelegate() public returns (uint256, uint256) {
+        a.delegateSetValue(address(b), 7);
+        return (a.value(), b.value());
+    }
+    function testCall() public returns (uint256, uint256) {
+        a.callSetValue(address(b), 8);
+        return (a.value(), b.value());
+    }
+        function testStatic() view public returns (bool) {
+        return a.staticSetValue(address(b), 0);
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// testDelegate() -> 7, 0
+// testCall() -> 0, 8
+// testStatic() -> false
+// gas irOptimized: 96900694
+// gas legacy: 96901136
+// gas legacyOptimized: 96900725
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/transient_storage_value_type.sol b/test/libsolidity/syntaxTests/viewPureChecker/transient_storage_value_type.sol
new file mode 100644
index 0000000000..9c48f17f13
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/transient_storage_value_type.sol
@@ -0,0 +1,15 @@
+contract C {
+    uint transient x;
+
+    function f() public view {
+        x = 1;
+    }
+    function g() public pure returns (uint a) {
+        a = x + 1;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 8961: (75-76): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (148-149): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".

From 6398cb271fe1dfdd8a237bb7cb9625155afa4150 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 16 Sep 2024 14:04:36 +0200
Subject: [PATCH 1101/1140] Changelog

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

diff --git a/Changelog.md b/Changelog.md
index 7d9af1cdbf..b23b5ff9e4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
- * Code Generator: Transient storage value type state variables are now supported by the legacy pipeline.
+ * Code Generator: Transient storage value type state variables are now supported.
  * General: Generate JSON representations of Yul ASTs only on demand to reduce memory usage.
 
 

From 98fdc44b2600b3e7236803b627544ee20eddc6ef Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 25 Sep 2024 19:39:00 +0200
Subject: [PATCH 1102/1140] Fix missing underscore in Yul function names

---
 libsolidity/codegen/YulUtilFunctions.cpp      |  4 +--
 .../codegen/ir/IRGeneratorForStatements.cpp   |  5 +++-
 .../err                                       |  2 +-
 .../input.sol                                 |  2 +-
 .../output                                    |  4 +--
 .../err                                       |  2 +-
 .../input.sol                                 |  2 +-
 .../output                                    |  6 ++--
 .../args                                      |  2 +-
 .../output                                    |  2 +-
 .../output.json                               | 30 +++++++++----------
 ...ransient_state_variable_initialization.sol | 10 ++++---
 .../transient_storage_state_variable.sol      | 10 +++----
 .../transient_state_variable_value_type.sol   |  5 ++--
 ...ansient_state_variable_non_zero_offset.sol | 15 ++++++----
 ...ansient_state_address_variable_members.sol |  2 +-
 .../various/different_call_type_transient.sol |  2 +-
 17 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index fc6de832be..c908c7ae09 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -2923,7 +2923,7 @@ std::string YulUtilFunctions::updateStorageValueFunction(
 		"update_" +
 		(_location == VariableDeclaration::Location::Transient ? "transient_"s : "") +
 		"storage_value_" +
-		(_offset.has_value() ? ("offset_" + std::to_string(*_offset)) : "") +
+		(_offset.has_value() ? ("offset_" + std::to_string(*_offset)) + "_" : "") +
 		_fromType.identifier() +
 		"_to_" +
 		_toType.identifier();
@@ -3106,7 +3106,7 @@ std::string YulUtilFunctions::extractFromStorageValueDynamic(Type const& _type)
 
 std::string YulUtilFunctions::extractFromStorageValue(Type const& _type, size_t _offset)
 {
-	std::string functionName = "extract_from_storage_value_offset_" + std::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 {
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 283cc4b6b3..911230d224 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -271,7 +271,7 @@ void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _va
 		solAssert(!_varDecl.isConstant());
 		if (!_varDecl.value())
 			return;
-		solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient, "State variables cannot be initialized in place.");
+		solAssert(_varDecl.referenceLocation() != VariableDeclaration::Location::Transient, "Transient storage state variables cannot be initialized in place.");
 
 		_varDecl.value()->accept(*this);
 
@@ -2569,6 +2569,8 @@ void IRGeneratorForStatements::handleVariableReference(
 			}
 		});
 	else if (m_context.isStateVariable(_variable))
+	{
+		solAssert(_variable.referenceLocation() == VariableDeclaration::Location::Unspecified, "Must have storage location.");
 		setLValue(_referencingExpression, IRLValue{
 			*_variable.annotation().type,
 			IRLValue::Storage{
@@ -2576,6 +2578,7 @@ void IRGeneratorForStatements::handleVariableReference(
 				m_context.storageLocationOfStateVariable(_variable).second
 			}
 		});
+	}
 	else
 		solAssert(false, "Invalid variable kind.");
 }
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/err b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/err
index 5071bc457b..2e52d9ced0 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/err
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/err
@@ -1,5 +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_inline_assembly/input.sol:7:13:
   |
-7 |             tstore(0, 0)
+7 |             tstore(0, 123)
   |             ^^^^^^
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/input.sol b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/input.sol
index 94914ac4ee..5504944fe4 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/input.sol
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/input.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.0.0;
 contract C {
     fallback() external {
         assembly {
-            tstore(0, 0)
+            tstore(0, 123)
             sstore(0, tload(0))
         }
     }
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
index a02eca7d92..0b4c516bae 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly/output
@@ -29,7 +29,7 @@ sub_0: assembly {
       revert(0x00, 0x00)
     tag_3:
       pop
-      0x00
+      0x7b
       0x00
       tstore
       0x00
@@ -40,4 +40,4 @@ sub_0: assembly {
 }
 
 Opcodes:
-PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH1 0x18 DUP1 PUSH1 0x1A PUSH0 CODECOPY PUSH0 RETURN INVALID PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH0 PUSH0 TSTORE PUSH0 TLOAD PUSH0 SSTORE STOP 
+PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH1 0x19 DUP1 PUSH1 0x1A PUSH0 CODECOPY PUSH0 RETURN INVALID PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xE JUMPI PUSH0 PUSH0 REVERT JUMPDEST POP PUSH1 0x7B PUSH0 TSTORE PUSH0 TLOAD PUSH0 SSTORE STOP 
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err
index b1ccd751c9..154da21b65 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/err
@@ -1,5 +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_inline_assembly_via_ir/input.sol:7:13:
   |
-7 |             tstore(0, 0)
+7 |             tstore(0, 123)
   |             ^^^^^^
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol
index 94914ac4ee..5504944fe4 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/input.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.0.0;
 contract C {
     fallback() external {
         assembly {
-            tstore(0, 0)
+            tstore(0, 123)
             sstore(0, tload(0))
         }
     }
diff --git a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
index 62bf1f456a..673bdd0a05 100644
--- a/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
+++ b/test/cmdlineTests/evmasm_transient_storage_inline_assembly_via_ir/output
@@ -21,9 +21,7 @@ stop
 
 sub_0: assembly {
       jumpi(tag_1, callvalue)
-      0x00
-      dup1
-      tstore
+      tstore(0x00, 0x7b)
       sstore(0x00, tload(0x00))
       stop
     tag_1:
@@ -33,4 +31,4 @@ sub_0: assembly {
 }
 
 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 
+PUSH1 0x80 DUP1 PUSH1 0x40 MSTORE CALLVALUE PUSH1 0x13 JUMPI PUSH1 0x11 SWAP1 DUP2 PUSH1 0x18 DUP3 CODECOPY RETURN JUMPDEST PUSH0 DUP1 REVERT INVALID CALLVALUE PUSH1 0xD JUMPI PUSH1 0x7B PUSH0 TSTORE PUSH0 TLOAD PUSH0 SSTORE STOP JUMPDEST PUSH0 DUP1 REVERT 
diff --git a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
index e233e0855a..163b19ef4c 100644
--- a/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
+++ b/test/cmdlineTests/evmasm_transient_storage_state_variable_via_ir/args
@@ -1 +1 @@
---no-cbor-metadata --via-ir --optimize --asm --debug-info none
\ No newline at end of file
+--no-cbor-metadata --via-ir --optimize --asm --debug-info none
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
index d7c7bf9e09..2fd6ff1f55 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -128,7 +128,7 @@
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
-                "update_storage_value_offsett_uint256_to_uint256": {
+                "update_storage_value_offset_uint256_to_uint256": {
                     "entryPoint": 307,
                     "parameterSlots": 2,
                     "returnSlots": 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 8f0d5b5b5d..5ff4e7a190 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -127,7 +127,7 @@ object \"C_54\" {
             ret := value
         }
 
-        function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
+        function update_storage_value_offset_0_t_int256_to_t_int256(slot, value_0) {
             let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
             sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
         }
@@ -147,7 +147,7 @@ object \"C_54\" {
             let _4 := var__init_12
             let expr_16 := _4
             /// @src 0:231:247  \"stateVar = _init\"
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
+            update_storage_value_offset_0_t_int256_to_t_int256(0x00, expr_16)
             let expr_17 := expr_16
 
         }
@@ -398,12 +398,12 @@ object \"C_54\" {
 
             }
 
-            function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
+            function extract_from_storage_value_offset_0_t_int256(slot_value) -> value {
                 value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
             }
 
             function read_from_storage_split_offset_0_t_int256(slot) -> value {
-                value := extract_from_storage_value_offset_0t_int256(sload(slot))
+                value := extract_from_storage_value_offset_0_t_int256(sload(slot))
 
             }
 
@@ -435,7 +435,7 @@ object \"C_54\" {
                 ret := value
             }
 
-            function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
+            function update_storage_value_offset_0_t_int256_to_t_int256(slot, value_0) {
                 let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
                 sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
             }
@@ -448,7 +448,7 @@ object \"C_54\" {
                 /// @src 0:380:390  \"stateVar++\"
                 let _7 := read_from_storage_split_offset_0_t_int256(0x00)
                 let _6 := increment_t_int256(_7)
-                update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
+                update_storage_value_offset_0_t_int256_to_t_int256(0x00, _6)
                 let expr_33 := _7
                 /// @src 0:400:401  \"_\"
                 _5 := fun_f2_53_inner(var__42)
@@ -882,12 +882,12 @@ object \"D_72\" {
             cleaned := value
         }
 
-        function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
+        function extract_from_storage_value_offset_0_t_int256(slot_value) -> value {
             value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
         }
 
         function read_from_storage_split_offset_0_t_int256(slot) -> value {
-            value := extract_from_storage_value_offset_0t_int256(sload(slot))
+            value := extract_from_storage_value_offset_0_t_int256(sload(slot))
 
         }
 
@@ -933,7 +933,7 @@ object \"D_72\" {
             ret := value
         }
 
-        function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
+        function update_storage_value_offset_0_t_int256_to_t_int256(slot, value_0) {
             let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
             sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
         }
@@ -955,7 +955,7 @@ object \"D_72\" {
             let _5 := read_from_storage_split_offset_0_t_int256(0x00)
             let expr_68 := checked_add_t_int256(_5, expr_67)
 
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_68)
+            update_storage_value_offset_0_t_int256_to_t_int256(0x00, expr_68)
 
         }
         /// @src 1:91:181  \"contract D is C(3)...\"
@@ -983,7 +983,7 @@ object \"D_72\" {
             let _7 := var__init_12
             let expr_16 := _7
             /// @src 0:231:247  \"stateVar = _init\"
-            update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
+            update_storage_value_offset_0_t_int256_to_t_int256(0x00, expr_16)
             let expr_17 := expr_16
 
         }
@@ -1234,12 +1234,12 @@ object \"D_72\" {
 
             }
 
-            function extract_from_storage_value_offset_0t_int256(slot_value) -> value {
+            function extract_from_storage_value_offset_0_t_int256(slot_value) -> value {
                 value := cleanup_from_storage_t_int256(shift_right_0_unsigned(slot_value))
             }
 
             function read_from_storage_split_offset_0_t_int256(slot) -> value {
-                value := extract_from_storage_value_offset_0t_int256(sload(slot))
+                value := extract_from_storage_value_offset_0_t_int256(sload(slot))
 
             }
 
@@ -1271,7 +1271,7 @@ object \"D_72\" {
                 ret := value
             }
 
-            function update_storage_value_offset_0t_int256_to_t_int256(slot, value_0) {
+            function update_storage_value_offset_0_t_int256_to_t_int256(slot, value_0) {
                 let convertedValue_0 := convert_t_int256_to_t_int256(value_0)
                 sstore(slot, update_byte_slice_32_shift_0(sload(slot), prepare_store_t_int256(convertedValue_0)))
             }
@@ -1284,7 +1284,7 @@ object \"D_72\" {
                 /// @src 0:380:390  \"stateVar++\"
                 let _7 := read_from_storage_split_offset_0_t_int256(0x00)
                 let _6 := increment_t_int256(_7)
-                update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
+                update_storage_value_offset_0_t_int256_to_t_int256(0x00, _6)
                 let expr_33 := _7
                 /// @src 0:400:401  \"_\"
                 _5 := fun_f2_53_inner(var__42)
diff --git a/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol b/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
index 4c69b58f83..3260fa30ff 100644
--- a/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
+++ b/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
@@ -1,16 +1,18 @@
 contract C {
-    uint256 transient x;
+    uint128 transient x;
+    uint128 y;
 
     constructor() {
         x = 100;
+        y = x;
     }
 
-    function f() external view returns (uint256 x) {
-        x;
+    function f() external view returns (uint128) {
+        return y;
     }
 }
 
 // ====
 // EVMVersion: >=cancun
 // ----
-// f() -> 0
+// f() -> 100
diff --git a/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
index 56c686f825..cef016bc0b 100644
--- a/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
+++ b/test/libsolidity/semanticTests/inheritance/transient_storage_state_variable.sol
@@ -1,13 +1,13 @@
 contract A {
-    uint transient x;
-    int y;
+    uint24 transient x;
+    int24 y;
 }
 
 contract C is A {
-    uint w;
-    int transient z;
+    uint24 w;
+    int24 transient z;
 
-    function f() public returns (uint, int, uint, int) {
+    function f() public returns (uint24, int24, uint24, int24) {
         x += 1;
         y += 2;
         w += 3;
diff --git a/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol b/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
index 4c60ee1a89..2d4157ec9b 100644
--- a/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
+++ b/test/libsolidity/semanticTests/modifiers/transient_state_variable_value_type.sol
@@ -6,12 +6,13 @@ contract C {
         _;
     }
 
-    function f() public m(x) returns (uint16 x) {
+    function f() public m(x) returns (uint16) {
         x *= 10;
+        return x;
     }
 }
 
 // ====
 // EVMVersion: >=cancun
 // ----
-// f() -> 0
+// f() -> 100
diff --git a/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol b/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
index 45860599e6..96dfce6026 100644
--- a/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
+++ b/test/libsolidity/semanticTests/variables/delete_transient_state_variable_non_zero_offset.sol
@@ -1,14 +1,17 @@
 contract C {
-    uint128 transient x;
-    uint128 transient y;
+    bytes14 transient x;
+    uint32  transient y;
+    uint112 transient z;
 
-    function f() public returns (uint) {
-        y = 10;
+    function f() public returns (bytes14, uint32, uint112) {
+        x = 0xffffffffffffffffffffffffffff;
+        y = 0xffffffff;
+        z = 0xffffffffffffffffffffffffffff;
         delete y;
-        return y;
+        return (x, y, z);
     }
 }
 // ====
 // EVMVersion: >=cancun
 // ----
-// f() -> 0
+// f() -> 0xffffffffffffffffffffffffffff000000000000000000000000000000000000, 0, 0xffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
index 22cc5db056..f609f9d4de 100644
--- a/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
+++ b/test/libsolidity/semanticTests/variables/transient_state_address_variable_members.sol
@@ -17,4 +17,4 @@ contract C {
 // account: 0 -> 0x1212121212121212121212121212120000000012
 // balance: 0x1212121212121212121212121212120000000012 -> 1267650600228229401496703205376
 // f() -> 1267650600228229401496703205376
-// g() -> 0
\ No newline at end of file
+// g() -> 0
diff --git a/test/libsolidity/semanticTests/various/different_call_type_transient.sol b/test/libsolidity/semanticTests/various/different_call_type_transient.sol
index b71e8b2525..399cbd02df 100644
--- a/test/libsolidity/semanticTests/various/different_call_type_transient.sol
+++ b/test/libsolidity/semanticTests/various/different_call_type_transient.sol
@@ -35,7 +35,7 @@ contract Test {
         a.callSetValue(address(b), 8);
         return (a.value(), b.value());
     }
-        function testStatic() view public returns (bool) {
+    function testStatic() view public returns (bool) {
         return a.staticSetValue(address(b), 0);
     }
 }

From b54074176a9b751d252650528252a8c8468976ca Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 5 Sep 2024 14:50:04 -0300
Subject: [PATCH 1103/1140] Transient storage docs

---
 docs/assembly.rst                           |   9 +-
 docs/contracts.rst                          |   2 +
 docs/contracts/constant-state-variables.rst |   5 +-
 docs/contracts/functions.rst                |   4 +-
 docs/contracts/transient-storage.rst        | 172 ++++++++++++++++++++
 docs/internals/layout_in_storage.rst        |  79 +++++++--
 docs/introduction-to-smart-contracts.rst    |  47 +++++-
 docs/structure-of-a-contract.rst            |   6 +-
 docs/types/reference-types.rst              |   3 +
 docs/types/value-types.rst                  |   6 +
 10 files changed, 305 insertions(+), 28 deletions(-)
 create mode 100644 docs/contracts/transient-storage.rst

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 34085bccb7..a0a9d06dc7 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -163,7 +163,7 @@ their calldata offset (in bytes) and length (number of elements) using ``x.offse
 Both expressions can also be assigned to, but as for the static case, no validation will be performed
 to ensure that the resulting data area is within the bounds of ``calldatasize()``.
 
-For local storage variables or state variables, a single Yul identifier
+For local storage variables or state variables (including transient storage) a single Yul identifier
 is not sufficient, since they do not necessarily occupy a single full storage slot.
 Therefore, their "address" is composed of a slot and a byte-offset
 inside that slot. To retrieve the slot pointed to by the variable ``x``, you
@@ -181,15 +181,18 @@ Local Solidity variables are available for assignments, for example:
     :force:
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.7.0 <0.9.0;
+    pragma solidity >=0.8.28 <0.9.0;
 
+    // This will report a warning
     contract C {
+        bool transient a;
         uint b;
-        function f(uint x) public view returns (uint r) {
+        function f(uint x) public returns (uint r) {
             assembly {
                 // We ignore the storage slot offset, we know it is zero
                 // in this special case.
                 r := mul(x, sload(b.slot))
+                tstore(a.slot, true)
             }
         }
     }
diff --git a/docs/contracts.rst b/docs/contracts.rst
index aee26c95af..588b1da00d 100644
--- a/docs/contracts.rst
+++ b/docs/contracts.rst
@@ -20,6 +20,8 @@ There is no "cron" concept in Ethereum to call a function at a particular event
 
 .. include:: contracts/function-modifiers.rst
 
+.. include:: contracts/transient-storage.rst
+
 .. include:: contracts/constant-state-variables.rst
 .. include:: contracts/functions.rst
 
diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index a1bc24f50c..4e96987354 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -13,8 +13,9 @@ for ``immutable``, it can still be assigned at construction time.
 
 It is also possible to define ``constant`` variables at the file level.
 
-The compiler does not reserve a storage slot for these variables, and every occurrence is
-replaced by the respective value.
+Every occurrence of such a variable in the source is replaced by its underlying value
+and the compiler does not reserve a storage slot for it.
+It cannot be assigned a slot in transient storage using the ``transient`` keyword either.
 
 Compared to regular state variables, the gas costs of constant and immutable variables
 are much lower. For a constant variable, the expression assigned to it is copied to
diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 5b82a93bcc..e653eb8f09 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -174,7 +174,7 @@ Functions can be declared ``view`` in which case they promise not to modify the
 
 The following statements are considered modifying the state:
 
-#. Writing to state variables.
+#. Writing to state variables (storage and transient storage).
 #. :ref:`Emitting events <events>`.
 #. :ref:`Creating other contracts <creating-contracts>`.
 #. Using ``selfdestruct``.
@@ -226,7 +226,7 @@ This means that reading from ``immutable`` variables can be a non-pure operation
 
 In addition to the list of state modifying statements explained above, the following are considered reading from the state:
 
-#. Reading from state variables.
+#. Reading from state variables (storage and transient storage).
 #. Accessing ``address(this).balance`` or ``<address>.balance``.
 #. Accessing any of the members of ``block``, ``tx``, ``msg`` (with the exception of ``msg.sig`` and ``msg.data``).
 #. Calling any function not marked ``pure``.
diff --git a/docs/contracts/transient-storage.rst b/docs/contracts/transient-storage.rst
new file mode 100644
index 0000000000..b2d0be2922
--- /dev/null
+++ b/docs/contracts/transient-storage.rst
@@ -0,0 +1,172 @@
+.. index:: ! transient storage, ! transient, tstore, tload
+
+.. _transient-storage:
+
+*****************
+Transient Storage
+*****************
+
+Transient storage is another data location besides memory, storage, calldata
+(and return-data and code) which was introduced alongside its respective opcodes
+``TSTORE`` and ``TLOAD`` by `EIP-1153 <https://eips.ethereum.org/EIPS/eip-1153>`_.
+This new data location behaves as a key-value store similar to storage with the main
+difference being that data in transient storage is not permanent, but is scoped to
+the current transaction only, after which it will be reset to zero.
+Since the content of transient storage has very limited lifetime and size,
+it does not need to be stored permanently as a part of state
+and the associated gas costs are much lower than in case of storage.
+EVM version ``cancun`` or newer is required for transient storage to be available.
+
+Transient storage variables cannot be initialized in place, i.e., they cannot be assigned
+to upon declaration, since the value would be cleared at the end of the creation transaction,
+rendering the initialization ineffective.
+Transient variables will be :ref:`default value<default-value>` initialized depending on
+their underlying type.
+``constant`` and ``immutable`` variables conflict with transient storage, since
+their values are either inlined or directly stored in code.
+
+Transient storage variables have completely independent address space from storage,
+so that the order of transient state variables does not affect the layout of storage
+state variables and vice-versa.
+They do need distinct names though because all state variables share the same namespace.
+It is also important to note that the values in transient storage are packed in the
+same fashion as those in persistent storage.
+See :ref:`Storage Layout <storage-inplace-encoding>` for more information.
+
+Besides that, transient variables can have visibility as well and ``public`` ones will
+have a getter function generated automatically as usual.
+
+Note that, currently, such use of ``transient`` as a data location is only allowed for
+:ref:`value type <value-types>` state variable declarations.
+Reference types, such as arrays, mappings and structs, as well as local or parameter
+variables are not yet supported.
+
+An expected canonical use case for transient storage is cheaper reentrancy locks,
+which can be readily implemented with the opcodes as showcased next.
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity ^0.8.28;
+
+    contract Generosity {
+        mapping(address => bool) sentGifts;
+        bool transient locked;
+
+        modifier nonReentrant {
+            require(!locked, "Reentrancy attempt");
+            locked = true;
+            _;
+            // Unlocks the guard, making the pattern composable.
+            // After the function exits, it can be called again, even in the same transaction.
+            locked = false;
+        }
+
+        function claimGift() nonReentrant public {
+            require(address(this).balance >= 1 ether);
+            require(!sentGifts[msg.sender]);
+            (bool success, ) = msg.sender.call{value: 1 ether}("");
+            require(success);
+
+            // In a reentrant function, doing this last would open up the vulnerability
+            sentGifts[msg.sender] = true;
+        }
+    }
+
+Transient storage is private to the contract that owns it, in the same way as persistent storage.
+Only owning contract frames may access their transient storage, and when they do, all the frames access the same transient store.
+
+Transient storage is part of the EVM state and is subject to the same mutability enforcements
+as persistent storage. As such, any read access to it is not ``pure`` and writing access is not ``view``.
+
+If the ``TSTORE`` opcode is called within the context of a ``STATICCALL``,
+it will result in an exception instead of performing the modification.
+``TLOAD`` is allowed within the context of a ``STATICCALL``.
+
+When transient storage is used in the context of ``DELEGATECALL`` or ``CALLCODE``,
+then the owning contract of the transient storage is the contract that issued ``DELEGATECALL``
+or ``CALLCODE`` instruction (the caller) as with persistent storage.
+When transient storage is used in the context of ``CALL`` or ``STATICCALL``,
+then the owning contract of the transient storage is the contract that is the target
+of the ``CALL`` or ``STATICCALL`` instruction (the callee).
+
+.. note::
+    In the case of ``DELEGATECALL``, since references to transient storage variables
+    are currently not supported, it is not possible to pass those into library calls.
+    In libraries, access to transient storage is only possible using inline assembly.
+
+If a frame reverts, all writes to transient storage that took place between entry
+to the frame and the return are reverted, including those that took place in inner calls.
+The caller of an external call may employ a ``try ... catch`` block to prevent reverts
+bubbling up from the inner calls.
+
+*********************************************************************
+Composability of Smart Contracts and the Caveats of Transient Storage
+*********************************************************************
+
+Given the caveats mentioned in the specification of EIP-1153,
+in order to preserve the composability of your smart contract,
+utmost care is recommended for more advanced use cases of transient storage.
+
+For smart contracts, composability is a very important design principle to achieve self-contained behaviour,
+such that multiple calls into individual smart contracts can be composed to more complex applications.
+So far the EVM largely guaranteed composable behaviour, since multiple calls into a smart contract
+within a complex transaction are virtually indistinguishable from multiple calls to the contract
+stretched over several transactions. However, transient storage allows a violation of this principle,
+and incorrect use may lead to complex bugs that only surface when used across several calls.
+
+Let's illustrate the problem with a simple example:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity ^0.8.28;
+
+    contract MulService {
+        uint transient multiplier;
+        function setMultiplier(uint mul) external {
+            multiplier = mul;
+        }
+
+        function multiply(uint value) external view returns (uint) {
+            return value * multiplier;
+        }
+    }
+
+and  a sequence of external calls:
+
+.. code-block:: solidity
+
+    setMultiplier(42);
+    multiply(1);
+    multiply(2);
+
+If the example used memory or storage to store the multiplier, it would be fully composable.
+It would not matter whether you split the sequence into separate transactions or grouped them in some way.
+You would always get the same result: after ``multiplier`` is set to ``42``, the subsequent calls
+would return ``42`` and ``84`` respectively.
+This enables use cases such as batching calls from multiple transactions
+together to reduce gas costs.
+Transient storage potentially breaks such use cases since composability can no longer be taken for granted.
+In the example, if the calls are not executed in the same transaction, then ``multiplier``
+is reset and the next calls to function ``multiply`` would always return ``0``.
+
+As another example, since transient storage is constructed as a relatively cheap key-value store,
+a smart contract author may be tempted to use transient storage as a replacement for in-memory mappings
+without keeping track of the modified keys in the mapping and thereby without clearing the mapping
+at the end of the call.
+This, however, can easily lead to unexpected behaviour in complex transactions,
+in which values set by a previous call into the contract within the same transaction remain.
+
+The use of transient storage for reentrancy locks that are cleared at the end of the call frame
+into the contract, is safe.
+However, be sure to resist the temptation to save the 100 gas used for resetting the
+reentrancy lock, since failing to do so, will restrict your contract to only one call
+within a transaction, preventing its use in complex composed transactions,
+which have been a cornerstone for complex applications on chain.
+
+It is recommend to generally always clear transient storage completely at the end of a call
+into your smart contract to avoid these kinds of issues and to simplify
+the analysis of the behaviour of your contract within complex transactions.
+Check the `Security Considerations section of EIP-1153 <https://eips.ethereum.org/EIPS/eip-1153#security-considerations>`_
+for further details.
\ No newline at end of file
diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index f6b10adeef..557a0a0e20 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -153,7 +153,7 @@ JSON Output
 
 .. _storage-layout-top-level:
 
-The storage layout of a contract can be requested via
+The storage (or transient storage) layout of a contract can be requested via
 the :ref:`standard JSON interface <compiler-api>`.  The output is a JSON object containing two keys,
 ``storage`` and ``types``.  The ``storage`` object is an array where each
 element has the following form:
@@ -218,14 +218,14 @@ the same format as the top-level ``storage`` (see :ref:`above
   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.
 
-The following example shows a contract and its storage layout, containing
-value and reference types, types that are encoded packed, and nested types.
+The following example shows a contract and both its storage and transient storage layout,
+containing value and reference types, types that are encoded packed, and nested types.
 
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.4.0 <0.9.0;
+    pragma solidity ^0.8.28;
     contract A {
         struct S {
             uint128 a;
@@ -235,15 +235,22 @@ value and reference types, types that are encoded packed, and nested types.
         }
 
         uint x;
-        uint y;
+        uint transient y;
+        uint w;
+        uint transient z;
+
         S s;
         address addr;
+        address transient taddr;
         mapping(uint => mapping(address => bool)) map;
         uint[] array;
         string s1;
         bytes b1;
     }
 
+Storage Layout
+--------------
+
 .. code-block:: json
 
     {
@@ -257,15 +264,15 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_uint256"
         },
         {
-          "astId": 17,
+          "astId": 19,
           "contract": "fileA:A",
-          "label": "y",
+          "label": "w",
           "offset": 0,
           "slot": "1",
           "type": "t_uint256"
         },
         {
-          "astId": 20,
+          "astId": 24,
           "contract": "fileA:A",
           "label": "s",
           "offset": 0,
@@ -273,7 +280,7 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_struct(S)13_storage"
         },
         {
-          "astId": 22,
+          "astId": 26,
           "contract": "fileA:A",
           "label": "addr",
           "offset": 0,
@@ -281,7 +288,7 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_address"
         },
         {
-          "astId": 28,
+          "astId": 34,
           "contract": "fileA:A",
           "label": "map",
           "offset": 0,
@@ -289,7 +296,7 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
         },
         {
-          "astId": 31,
+          "astId": 37,
           "contract": "fileA:A",
           "label": "array",
           "offset": 0,
@@ -297,7 +304,7 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_array(t_uint256)dyn_storage"
         },
         {
-          "astId": 33,
+          "astId": 39,
           "contract": "fileA:A",
           "label": "s1",
           "offset": 0,
@@ -305,7 +312,7 @@ value and reference types, types that are encoded packed, and nested types.
           "type": "t_string_storage"
         },
         {
-          "astId": 35,
+          "astId": 41,
           "contract": "fileA:A",
           "label": "b1",
           "offset": 0,
@@ -411,3 +418,49 @@ value and reference types, types that are encoded packed, and nested types.
         }
       }
     }
+
+Transient Storage Layout
+------------------------
+
+.. code-block:: json
+
+    {
+      "storage": [
+        {
+          "astId": 17,
+          "contract": "fileA:A",
+          "label": "y",
+          "offset": 0,
+          "slot": "0",
+          "type": "t_uint256"
+        },
+        {
+          "astId": 21,
+          "contract": "fileA:A",
+          "label": "z",
+          "offset": 0,
+          "slot": "1",
+          "type": "t_uint256"
+        },
+        {
+          "astId": 28,
+          "contract": "fileA:A",
+          "label": "taddr",
+          "offset": 0,
+          "slot": "2",
+          "type": "t_address"
+        }
+      ],
+      "types": {
+        "t_address": {
+          "encoding": "inplace",
+          "label": "address",
+          "numberOfBytes": "20"
+        },
+        "t_uint256": {
+          "encoding": "inplace",
+          "label": "uint256",
+          "numberOfBytes": "32"
+        }
+      }
+    }
\ No newline at end of file
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index c860057945..45857c3f89 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -415,13 +415,15 @@ In case of an exception that reverts changes, already used up gas is not refunde
 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
+.. index:: ! storage, ! memory, ! stack, ! transient storage
 
-Storage, Memory and the Stack
-=============================
+.. _locations:
+
+Storage, Transient Storage, Memory and the Stack
+================================================
 
-The Ethereum Virtual Machine has three areas where it can store data:
-storage, memory and the stack.
+The Ethereum Virtual Machine has different areas where it can store data with the most
+prominent being storage, transient storage, memory and the stack.
 
 Each account has a data area called **storage**, which is persistent between function calls
 and transactions.
@@ -432,7 +434,15 @@ you should minimize what you store in persistent storage to what the contract ne
 Store data like derived calculations, caching, and aggregates outside of the contract.
 A contract can neither read nor write to any storage apart from its own.
 
-The second data area is called **memory**, of which a contract obtains
+Similar to storage, there is another data area called **transient storage**,
+where the main difference is that it is reset at the end of each transaction.
+The values stored in this data location persist only across function calls originating
+from the first call of the transaction.
+When the transaction ends, the transient storage is reset and the values stored there
+become unavailable to calls in subsequent transactions.
+Despite this, the cost of reading and writing to transient storage is significantly lower than for storage.
+
+The third data area is called **memory**, of which a contract obtains
 a freshly cleared instance for each message call. Memory is linear and can be
 addressed at byte level, but reads are limited to a width of 256 bits, while writes
 can be either 8 bits or 256 bits wide. Memory is expanded by a word (256-bit), when
@@ -454,6 +464,31 @@ in order to get deeper access to the stack,
 but it is not possible to just access arbitrary elements deeper in the stack
 without first removing the top of the stack.
 
+Calldata, Returndata and Code
+=============================
+
+There are also other data areas which are not as apparent as those discussed previously.
+However, they are routinely used during the execution of smart contract transactions.
+
+The calldata region is the data sent to a transaction as part of a smart contract transaction.
+For example, when creating a contract, calldata would be the constructor code of the new contract.
+The parameters of external functions are always initially stored in calldata in an ABI-encoded form
+and only then decoded into the location specified in their declaration.
+If declared as ``memory``, the compiler will eagerly decode them into memory at the beginning of the function,
+while marking them as ``calldata`` means that this will be done lazily, only when accessed.
+Value types and ``storage`` pointers are decoded directly onto the stack.
+
+The returndata is the way a smart contract can return a value after a call.
+In general, external Solidity functions use the ``return`` keyword to ABI-encode values into the returndata area.
+
+The code is the region where the EVM instructions of a smart contract are stored.
+Code is the bytes read, interpreted, and executed by the EVM during smart contract execution.
+Instruction data stored in the code is persistent as part of a contract account state field.
+Immutable and constant variables are stored in the code region.
+All references to immutables are replaced with the values assigned to them.
+A similar process is performed for constants which have their expressions inlined
+in the places where they are referenced in the smart contract code.
+
 .. index:: ! instruction
 
 Instruction Set
diff --git a/docs/structure-of-a-contract.rst b/docs/structure-of-a-contract.rst
index 51d99a8036..eebef172f6 100644
--- a/docs/structure-of-a-contract.rst
+++ b/docs/structure-of-a-contract.rst
@@ -21,8 +21,10 @@ which serves to provide a quick overview.
 State Variables
 ===============
 
-State variables are variables whose values are permanently stored in contract
-storage.
+State variables are variables whose values are either permanently stored in contract
+storage or, alternatively, temporarily stored in transient storage which is cleaned at
+the end of each transaction.
+See :ref:`data locations <locations>` for more details.
 
 .. code-block:: solidity
 
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index a6c48d2416..4a053d51be 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -28,6 +28,9 @@ annotation, the "data location", about where it is stored. There are three data
 ``memory``, ``storage`` and ``calldata``. Calldata is a non-modifiable,
 non-persistent area where function arguments are stored, and behaves mostly like memory.
 
+.. note::
+    ``transient`` is not yet supported as a data location for reference types.
+
 .. note::
     If you can, try to use ``calldata`` as data location because it will avoid copies and
     also makes sure that the data cannot be modified. Arrays and structs with ``calldata``
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 12fcb0b171..27baf54851 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -7,6 +7,12 @@ Value Types
 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.
 
+Unlike :ref:`reference types <reference-types>`, value type declarations do not
+specify a data location since they are small enough to be stored on the stack.
+The only exception are :ref:`state variables <structure-state-variables>`.
+Those are by default located in storage, but can also be marked as
+:ref:`transient <transient-storage>`, :ref:`constant or immutable <constants>`.
+
 .. index:: ! bool, ! true, ! false
 
 Booleans

From 146e2bc1916c49cdc36a65c81272a65f2e62f50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 30 Sep 2024 10:37:58 +0200
Subject: [PATCH 1104/1140] outputPerformanceMetrics(): Add missing std::
 prefixes

---
 libyul/optimiser/Suite.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index d7043e42f3..0233a1cf07 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -99,13 +99,13 @@ namespace
 {
 
 #ifdef PROFILE_OPTIMIZER_STEPS
-void outputPerformanceMetrics(map<string, int64_t> const& _metrics)
+void outputPerformanceMetrics(std::map<std::string, int64_t> const& _metrics)
 {
-	vector<pair<string, int64_t>> durations(_metrics.begin(), _metrics.end());
+	std::vector<std::pair<std::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
+		[](std::pair<std::string, int64_t> const& _lhs, std::pair<std::string, int64_t> const& _rhs) -> bool
 		{
 			return _lhs.second < _rhs.second;
 		}
@@ -115,18 +115,18 @@ void outputPerformanceMetrics(map<string, int64_t> const& _metrics)
 	for (auto&& [step, durationInMicroseconds]: durations)
 		totalDurationInMicroseconds += durationInMicroseconds;
 
-	cerr << "Performance metrics of optimizer steps" << endl;
-	cerr << "======================================" << endl;
+	std::cerr << "Performance metrics of optimizer steps" << std::endl;
+	std::cerr << "======================================" << std::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;
+		std::cerr << fmt::format("{:>7.3f}% ({} s): {}", percentage, sec, step) << std::endl;
 	}
 	double totalDurationInSeconds = static_cast<double>(totalDurationInMicroseconds) / microsecondsInSecond;
-	cerr << "--------------------------------------" << endl;
-	cerr << fmt::format("{:>7}% ({:.3f} s)", 100, totalDurationInSeconds) << endl;
+	std::cerr << "--------------------------------------" << std::endl;
+	std::cerr << fmt::format("{:>7}% ({:.3f} s)", 100, totalDurationInSeconds) << std::endl;
 }
 #endif
 

From c6df88707f36bf94ffb62858bcabfdba7b80bbe7 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 30 Sep 2024 12:14:29 +0200
Subject: [PATCH 1105/1140] Fix evmone MacOS link

---
 test/Common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Common.h b/test/Common.h
index 3adb980a0d..409d6f6960 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -37,7 +37,7 @@ static constexpr auto evmoneFilename = "evmone.dll";
 static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.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.12.0/evmone-0.12.0-darwin-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-darwin-arm64.tar.gz";
 #else
 static constexpr auto evmoneFilename = "libevmone.so";
 static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.12.0/evmone-0.12.0-linux-x86_64.tar.gz";

From 891b7c83d7cbc551c8b3a74cb67bcd6ea26ad96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 26 Sep 2024 18:38:40 +0200
Subject: [PATCH 1106/1140] Do not cache instances of Compiler in CompilerStack

---
 libsolidity/interface/CompilerStack.cpp | 14 +++++++++-----
 libsolidity/interface/CompilerStack.h   |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index bac358a939..8dd390f5ed 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -861,15 +861,18 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 		c.generatedSources;
 	return sources.init([&]{
 		Json sources = Json::array();
-		// If there is no compiler, then no bytecode was generated and thus no
+
+		solAssert(c.generatedYulUtilityCode.has_value() == c.runtimeGeneratedYulUtilityCode.has_value());
+
+		// If there is no generated utility code, then no bytecode was generated and thus no
 		// sources were generated (or we compiled "via IR").
-		if (c.compiler)
+		if (c.runtimeGeneratedYulUtilityCode.has_value())
 		{
 			solAssert(!m_viaIR, "");
 			std::string source =
 				_runtime ?
-				c.compiler->runtimeGeneratedYulUtilityCode() :
-				c.compiler->generatedYulUtilityCode();
+				*c.runtimeGeneratedYulUtilityCode :
+				*c.generatedYulUtilityCode;
 			if (!source.empty())
 			{
 				std::string sourceName = CompilerContext::yulUtilityFileName();
@@ -1469,13 +1472,14 @@ void CompilerStack::compileContract(
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 
 	std::shared_ptr<Compiler> compiler = std::make_shared<Compiler>(m_evmVersion, m_revertStrings, m_optimiserSettings);
-	compiledContract.compiler = compiler;
 
 	solAssert(!m_viaIR, "");
 	bytes cborEncodedMetadata = createCBORMetadata(compiledContract, /* _forIR */ false);
 
 	// Run optimiser and compile the contract.
 	compiler->compileContract(_contract, _otherCompilers, cborEncodedMetadata);
+	compiledContract.generatedYulUtilityCode = compiler->generatedYulUtilityCode();
+	compiledContract.runtimeGeneratedYulUtilityCode = compiler->runtimeGeneratedYulUtilityCode();
 
 	_otherCompilers[compiledContract.contract] = compiler;
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index c0166af96d..f167477faf 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -409,9 +409,11 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	struct Contract
 	{
 		ContractDefinition const* contract = nullptr;
-		std::shared_ptr<Compiler> compiler;
+
 		std::shared_ptr<evmasm::Assembly> evmAssembly;
 		std::shared_ptr<evmasm::Assembly> evmRuntimeAssembly;
+		std::optional<std::string> generatedYulUtilityCode; ///< Extra Yul utility code that was used when compiling the creation assembly
+		std::optional<std::string> runtimeGeneratedYulUtilityCode; ///< Extra Yul utility code that was used when compiling the deployed assembly
 		evmasm::LinkerObject object; ///< Deployment object (includes the runtime sub-object).
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
 		std::string yulIR; ///< Yul IR code straight from the code generator.

From 3c5e46b7d75172114413c7c775c412ffc41d9d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 26 Sep 2024 23:16:19 +0200
Subject: [PATCH 1107/1140] CompilerStack: Do not cache the JSON representation
 of generated sources

---
 libsolidity/interface/CompilerStack.cpp | 60 +++++++++++--------------
 libsolidity/interface/CompilerStack.h   |  2 -
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 8dd390f5ed..a9f2708d80 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -855,43 +855,35 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 	solAssert(m_stackState == CompilationSuccessful, "Compilation was not successful.");
 
 	Contract const& c = contract(_contractName);
-	util::LazyInit<Json const> const& sources =
-		_runtime ?
-		c.runtimeGeneratedSources :
-		c.generatedSources;
-	return sources.init([&]{
-		Json sources = Json::array();
-
+	Json sources = Json::array();
+	// If there is no compiler, then no bytecode was generated and thus no
+	// sources were generated (or we compiled "via IR").
+	if (c.runtimeGeneratedYulUtilityCode.has_value())
+	{
 		solAssert(c.generatedYulUtilityCode.has_value() == c.runtimeGeneratedYulUtilityCode.has_value());
-
-		// If there is no generated utility code, then no bytecode was generated and thus no
-		// sources were generated (or we compiled "via IR").
-		if (c.runtimeGeneratedYulUtilityCode.has_value())
+		solAssert(!m_viaIR);
+		std::string source =
+			_runtime ?
+			*c.runtimeGeneratedYulUtilityCode :
+			*c.generatedYulUtilityCode;
+		if (!source.empty())
 		{
-			solAssert(!m_viaIR, "");
-			std::string source =
-				_runtime ?
-				*c.runtimeGeneratedYulUtilityCode :
-				*c.generatedYulUtilityCode;
-			if (!source.empty())
-			{
-				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);
-				std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
-				solAssert(parserResult, "");
-				sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(parserResult->root());
-				sources[0]["name"] = sourceName;
-				sources[0]["id"] = sourceIndex;
-				sources[0]["language"] = "Yul";
-				sources[0]["contents"] = std::move(source);
-			}
+			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);
+			std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
+			solAssert(parserResult);
+			sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(parserResult->root());
+			sources[0]["name"] = sourceName;
+			sources[0]["id"] = sourceIndex;
+			sources[0]["language"] = "Yul";
+			sources[0]["contents"] = std::move(source);
 		}
-		return sources;
-	});
+	}
+	return sources;
 }
 
 std::string const* CompilerStack::sourceMapping(std::string const& _contractName) const
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index f167477faf..2b891293b3 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -424,8 +424,6 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		util::LazyInit<Json const> transientStorageLayout;
 		util::LazyInit<Json const> userDocumentation;
 		util::LazyInit<Json const> devDocumentation;
-		util::LazyInit<Json const> generatedSources;
-		util::LazyInit<Json const> runtimeGeneratedSources;
 		mutable std::optional<std::string const> sourceMapping;
 		mutable std::optional<std::string const> runtimeSourceMapping;
 	};

From 6bee17d21c8d17ade1b459ea9c33141e79011534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 Sep 2024 10:35:49 +0200
Subject: [PATCH 1108/1140] CompilerStack: Add missing members to reset()

---
 libsolidity/interface/CompilerStack.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a9f2708d80..4d3bacabc9 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -313,7 +313,9 @@ void CompilerStack::reset(bool _keepSettings)
 		m_libraries.clear();
 		m_viaIR = false;
 		m_evmVersion = langutil::EVMVersion();
+		m_eofVersion.reset();
 		m_modelCheckerSettings = ModelCheckerSettings{};
+		m_requestedContractNames.clear();
 		m_irOutputSelection = IROutputSelection::None;
 		m_revertStrings = RevertStrings::Default;
 		m_optimiserSettings = OptimiserSettings::minimal();
@@ -321,6 +323,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_metadataFormat = defaultMetadataFormat();
 		m_metadataHash = MetadataHash::IPFS;
 		m_stopAfter = State::CompilationSuccessful;
+		m_compilationSourceType = CompilationSourceType::Solidity;
 	}
 	m_experimentalAnalysis.reset();
 	m_globalContext.reset();

From a4fa88646c1ec0a44f2a2b80ee7ae64a1d0de05b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 Sep 2024 13:58:39 +0200
Subject: [PATCH 1109/1140] StandardCompiler: Fix bad `if` indent triggering a
 warning

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

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 06df8a9408..34c9f21a00 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1434,7 +1434,7 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	Json output;
 
 	if (errors.size() > 0)
-	output["errors"] = std::move(errors);
+		output["errors"] = std::move(errors);
 
 	if (!compilerStack.unhandledSMTLib2Queries().empty())
 		for (std::string const& query: compilerStack.unhandledSMTLib2Queries())

From a9d9143007f6a5fb9aa16378b8cfec0a926d70ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 Sep 2024 14:36:38 +0200
Subject: [PATCH 1110/1140] Pass selected outputs down to CompilerStack to
 avoid generating them when not requested

---
 Changelog.md                                  |  1 +
 libsolidity/interface/CompilerStack.cpp       | 62 ++++++++-----
 libsolidity/interface/CompilerStack.h         | 86 +++++++++++++------
 libsolidity/interface/StandardCompiler.cpp    | 69 +++++++--------
 solc/CommandLineInterface.cpp                 | 23 ++---
 .../SolidityExecutionFramework.cpp            |  1 -
 6 files changed, 149 insertions(+), 93 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b23b5ff9e4..b171b6dd01 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Code Generator: Transient storage value type state variables are now supported.
  * General: Generate JSON representations of Yul ASTs only on demand to reduce memory usage.
+ * Standard JSON Interface: Bytecode or IR can now be requested for a subset of all contracts without triggering unnecessary code generation for other contracts.
 
 
 Bugfixes:
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 4d3bacabc9..39977629d6 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -250,6 +250,12 @@ void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
 	m_modelCheckerSettings = _settings;
 }
 
+void CompilerStack::selectContracts(ContractSelection const& _selectedContracts)
+{
+	solAssert(m_stackState < ParsedAndImported, "Must request outputs before parsing.");
+	m_selectedContracts = _selectedContracts;
+}
+
 void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libraries)
 {
 	solAssert(m_stackState < ParsedAndImported, "Must set libraries before parsing.");
@@ -315,8 +321,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_evmVersion = langutil::EVMVersion();
 		m_eofVersion.reset();
 		m_modelCheckerSettings = ModelCheckerSettings{};
-		m_requestedContractNames.clear();
-		m_irOutputSelection = IROutputSelection::None;
+		m_selectedContracts.clear();
 		m_revertStrings = RevertStrings::Default;
 		m_optimiserSettings = OptimiserSettings::minimal();
 		m_metadataLiteralSources = false;
@@ -690,21 +695,21 @@ bool CompilerStack::parseAndAnalyze(State _stopAfter)
 bool CompilerStack::isRequestedSource(std::string const& _sourceName) const
 {
 	return
-		m_requestedContractNames.empty() ||
-		m_requestedContractNames.count("") ||
-		m_requestedContractNames.count(_sourceName);
+		m_selectedContracts.empty() ||
+		m_selectedContracts.count("") ||
+		m_selectedContracts.count(_sourceName);
 }
 
 bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) const
 {
-	/// In case nothing was specified in outputSelection.
-	if (m_requestedContractNames.empty())
+	/// In case nothing was specified in selectedContracts.
+	if (m_selectedContracts.empty())
 		return true;
 
 	for (auto const& key: std::vector<std::string>{"", _contract.sourceUnitName()})
 	{
-		auto const& it = m_requestedContractNames.find(key);
-		if (it != m_requestedContractNames.end())
+		auto const& it = m_selectedContracts.find(key);
+		if (it != m_selectedContracts.end())
 			if (it->second.count(_contract.name()) || it->second.count(""))
 				return true;
 	}
@@ -712,6 +717,28 @@ bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) con
 	return false;
 }
 
+CompilerStack::PipelineConfig CompilerStack::requestedPipelineConfig(ContractDefinition const& _contract) const
+{
+	static PipelineConfig constexpr defaultPipelineConfig = PipelineConfig{
+		false, // irCodegen
+		false, // irOptimization
+		true,  // bytecode
+	};
+
+	// If nothing was explicitly selected, all contracts are selected by default.
+	if (m_selectedContracts.empty())
+		return defaultPipelineConfig;
+
+	PipelineConfig combinedConfig;
+	for (std::string const& sourceUnitName: {""s, _contract.sourceUnitName()})
+		if (m_selectedContracts.count(sourceUnitName) != 0)
+			for (std::string const& contractName: {""s, _contract.name()})
+				if (m_selectedContracts.at(sourceUnitName).count(contractName) != 0)
+					combinedConfig = combinedConfig | m_selectedContracts.at(sourceUnitName).at(contractName);
+
+	return combinedConfig;
+}
+
 bool CompilerStack::compile(State _stopAfter)
 {
 	m_stopAfter = _stopAfter;
@@ -730,20 +757,13 @@ bool CompilerStack::compile(State _stopAfter)
 			if (auto contract = dynamic_cast<ContractDefinition const*>(node.get()))
 				if (isRequestedContract(*contract))
 				{
+					PipelineConfig pipelineConfig = requestedPipelineConfig(*contract);
+
 					try
 					{
-						// NOTE: Bytecode generation via IR always uses Contract::yulIROptimized.
-						// When optimization is not enabled, that member simply contains unoptimized code.
-						bool needIROutput =
-							(m_generateEvmBytecode && m_viaIR) ||
-							m_irOutputSelection != IROutputSelection::None;
-						bool needUnoptimizedIROutputOnly =
-							!(m_generateEvmBytecode && m_viaIR) &&
-							m_irOutputSelection != IROutputSelection::UnoptimizedAndOptimized;
-
-						if (needIROutput)
-							generateIR(*contract, needUnoptimizedIROutputOnly);
-						if (m_generateEvmBytecode)
+						if (pipelineConfig.needIR(m_viaIR))
+							generateIR(*contract, pipelineConfig.needIRCodegenOnly(m_viaIR));
+						if (pipelineConfig.needBytecode())
 						{
 							if (m_viaIR)
 								generateEVMFromIR(*contract);
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 2b891293b3..8ce2c5d62d 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -133,12 +133,54 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 		SolidityAST,
 	};
 
-	enum class IROutputSelection {
-		None,
-		UnoptimizedOnly,
-		UnoptimizedAndOptimized,
+	/// Indicates which stages of the compilation pipeline were explicitly requested and provides
+	/// logic to determine which ones are effectively needed to accomplish that.
+	/// Note that parsing and analysis are not selectable, since they cannot be skipped.
+	struct PipelineConfig
+	{
+		bool irCodegen = false;      ///< Want IR output straight from code generator.
+		bool irOptimization = false; ///< Want reparsed IR that went through YulStack. May be optimized or not, depending on settings.
+		bool bytecode = false;       ///< Want EVM-level outputs, especially EVM assembly and bytecode. May be optimized or not, depending on settings.
+
+		bool needIR(bool _viaIR) const
+		{
+			return
+				irCodegen ||
+				irOptimization ||
+				(bytecode && _viaIR);
+		}
+
+		bool needIRCodegenOnly(bool _viaIR) const
+		{
+			return !(bytecode && _viaIR) && !irOptimization;
+		}
+
+		bool needBytecode() const
+		{
+			return bytecode;
+		}
+
+		PipelineConfig operator|(PipelineConfig const& _other) const
+		{
+			return {
+				irCodegen || _other.irCodegen,
+				irOptimization || _other.irOptimization,
+				bytecode || _other.bytecode,
+			};
+		}
+
+		bool operator!=(PipelineConfig const& _other) const { return !(*this == _other); }
+		bool operator==(PipelineConfig const& _other) const
+		{
+			return
+				irCodegen == _other.irCodegen &&
+				irOptimization == _other.irOptimization &&
+				bytecode == _other.bytecode;
+		}
 	};
 
+	using ContractSelection = std::map<std::string, std::map<std::string, CompilerStack::PipelineConfig>>;
+
 	/// Creates a new compiler stack.
 	/// @param _readFile callback used to read files for import statements. Must return
 	/// and must not emit exceptions.
@@ -193,26 +235,13 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// Set model checker settings.
 	void setModelCheckerSettings(ModelCheckerSettings _settings);
 
-	/// Sets the requested contract names by source.
-	/// If empty, no filtering is performed and every contract
-	/// found in the supplied sources is compiled.
-	/// Names are cleared iff @a _contractNames is missing.
-	void setRequestedContractNames(std::map<std::string, std::set<std::string>> const& _contractNames = std::map<std::string, std::set<std::string>>{})
-	{
-		m_requestedContractNames = _contractNames;
-	}
-
-	/// Enable EVM Bytecode generation. This is enabled by default.
-	void enableEvmBytecodeGeneration(bool _enable = true) { m_generateEvmBytecode = _enable; }
-
-	/// Enable generation of Yul IR code so that IR output can be safely requested for all contracts.
-	/// Note that IR may also be implicitly generated when not requested. In particular
-	/// @a setViaIR(true) requires access to the IR outputs for bytecode generation.
-	void requestIROutputs(IROutputSelection _selection = IROutputSelection::UnoptimizedAndOptimized)
-	{
-		solAssert(m_stackState < ParsedAndImported);
-		m_irOutputSelection = _selection;
-	}
+	/// Sets names of the contracts from each source that should be compiled.
+	/// If empty, no filtering is performed and every contract found in the supplied sources goes
+	/// through the default pipeline stages (bytecode-only, no IR).
+	/// Source/contract names are not validated - ones that do not exist are ignored.
+	/// The empty source/contract name can be used as a wildcard that matches all sources/contracts.
+	/// If a contract matches more than one entry, the pipeline selection from all matches is combined.
+	void selectContracts(ContractSelection const& _selectedContracts);
 
 	/// @arg _metadataLiteralSources When true, store sources as literals in the contract metadata.
 	/// Must be set before parsing.
@@ -450,6 +479,11 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// @returns true if the contract is requested to be compiled.
 	bool isRequestedContract(ContractDefinition const& _contract) const;
 
+	/// @returns The effective pipeline configuration for a given contract.
+	///     Applies defaults for contracts that were not explicitly selected and combines
+	///     multiple entries if the contact is matched by wildcards.
+	PipelineConfig requestedPipelineConfig(ContractDefinition const& _contract) const;
+
 	/// Perform the analysis steps of legacy language mode.
 	/// @returns false on error.
 	bool analyzeLegacy(bool _noErrorsSoFar);
@@ -554,9 +588,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	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;
-	IROutputSelection m_irOutputSelection = IROutputSelection::None;
+	ContractSelection m_selectedContracts;
 	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 34c9f21a00..d8ce4f2d0c 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -150,21 +150,6 @@ Json formatErrorWithException(
 	return error;
 }
 
-std::map<std::string, std::set<std::string>> requestedContractNames(Json const& _outputSelection)
-{
-	std::map<std::string, std::set<std::string>> contracts;
-	for (auto const& [sourceName, _]: _outputSelection.items())
-	{
-		std::string key = (sourceName == "*") ? "" : sourceName;
-		for (auto const& [contractName, _]: _outputSelection[sourceName].items())
-		{
-			std::string value = (contractName == "*") ? "" : contractName;
-			contracts[key].insert(value);
-		}
-	}
-	return contracts;
-}
-
 /// Returns true iff @a _hash (hex with 0x prefix) is the Keccak256 hash of the binary data in @a _content.
 bool hashMatchesContent(std::string const& _hash, std::string const& _content)
 {
@@ -298,26 +283,45 @@ bool isEvmBytecodeRequested(Json const& _outputSelection)
 	return false;
 }
 
-/// @returns The IR output selection for CompilerStack, based on outputs requested in the JSON.
+/// @returns The set of selected contracts, along with their compiler pipeline configuration, based
+/// on outputs requested in the JSON. Translates wildcards to the ones understood by CompilerStack.
 /// Note that as an exception, '*' does not yet match "ir", "irAst", "irOptimized" or "irOptimizedAst".
-CompilerStack::IROutputSelection irOutputSelection(Json const& _outputSelection)
+CompilerStack::ContractSelection pipelineConfig(
+	Json const& _jsonOutputSelection
+)
 {
-	if (!_outputSelection.is_object())
-		return CompilerStack::IROutputSelection::None;
+	if (!_jsonOutputSelection.is_object())
+		return {};
 
-	CompilerStack::IROutputSelection selection = CompilerStack::IROutputSelection::None;
-	for (auto const& fileRequests: _outputSelection)
-		for (auto const& requests: fileRequests)
-			for (auto const& request: requests)
+	CompilerStack::ContractSelection contractSelection;
+	for (auto const& [sourceUnitName, jsonOutputSelectionForSource]: _jsonOutputSelection.items())
+	{
+		solAssert(jsonOutputSelectionForSource.is_object());
+		for (auto const& [contractName, jsonOutputSelectionForContract]: jsonOutputSelectionForSource.items())
+		{
+			solAssert(jsonOutputSelectionForContract.is_array());
+			CompilerStack::PipelineConfig pipelineForContract;
+			for (Json const& request: jsonOutputSelectionForContract)
 			{
-				if (request == "irOptimized" || request == "irOptimizedAst" || request == "yulCFGJson")
-					return CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
-
-				if (request == "ir" || request == "irAst")
-					selection = CompilerStack::IROutputSelection::UnoptimizedOnly;
+				solAssert(request.is_string());
+				pipelineForContract.irOptimization =
+					pipelineForContract.irOptimization ||
+					request == "irOptimized" ||
+					request == "irOptimizedAst" ||
+					request == "yulCFGJson";
+				pipelineForContract.irCodegen =
+					pipelineForContract.irCodegen ||
+					pipelineForContract.irOptimization ||
+					request == "ir" ||
+					request == "irAst";
+				pipelineForContract.bytecode = isEvmBytecodeRequested(_jsonOutputSelection);
 			}
-
-	return selection;
+			std::string key = (sourceUnitName == "*") ? "" : sourceUnitName;
+			std::string value = (contractName == "*") ? "" : contractName;
+			contractSelection[key][value] = pipelineForContract;
+		}
+	}
+	return contractSelection;
 }
 
 Json formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
@@ -1321,12 +1325,9 @@ Json StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inpu
 	compilerStack.useMetadataLiteralSources(_inputsAndSettings.metadataLiteralSources);
 	compilerStack.setMetadataFormat(_inputsAndSettings.metadataFormat);
 	compilerStack.setMetadataHash(_inputsAndSettings.metadataHash);
-	compilerStack.setRequestedContractNames(requestedContractNames(_inputsAndSettings.outputSelection));
+	compilerStack.selectContracts(pipelineConfig(_inputsAndSettings.outputSelection));
 	compilerStack.setModelCheckerSettings(_inputsAndSettings.modelCheckerSettings);
 
-	compilerStack.enableEvmBytecodeGeneration(isEvmBytecodeRequested(_inputsAndSettings.outputSelection));
-	compilerStack.requestIROutputs(irOutputSelection(_inputsAndSettings.outputSelection));
-
 	Json errors = std::move(_inputsAndSettings.errors);
 
 	bool const binariesRequested = isBinaryRequested(_inputsAndSettings.outputSelection);
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 2d815facc1..b791de3ef3 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -889,14 +889,16 @@ void CommandLineInterface::compile()
 		if (m_options.output.debugInfoSelection.has_value())
 			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
 
-		CompilerStack::IROutputSelection irOutputSelection = CompilerStack::IROutputSelection::None;
-		if (m_options.compiler.outputs.irOptimized || m_options.compiler.outputs.irOptimizedAstJson || m_options.compiler.outputs.yulCFGJson)
-			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedAndOptimized;
-		else if (m_options.compiler.outputs.ir || m_options.compiler.outputs.irAstJson)
-			irOutputSelection = CompilerStack::IROutputSelection::UnoptimizedOnly;
-
-		m_compiler->requestIROutputs(irOutputSelection);
-		m_compiler->enableEvmBytecodeGeneration(
+		CompilerStack::PipelineConfig pipelineConfig;
+		pipelineConfig.irOptimization =
+			m_options.compiler.outputs.irOptimized ||
+			m_options.compiler.outputs.irOptimizedAstJson ||
+			m_options.compiler.outputs.yulCFGJson;
+		pipelineConfig.irCodegen =
+			pipelineConfig.irOptimization ||
+			m_options.compiler.outputs.ir ||
+			m_options.compiler.outputs.irAstJson;
+		pipelineConfig.bytecode =
 			m_options.compiler.estimateGas ||
 			m_options.compiler.outputs.asm_ ||
 			m_options.compiler.outputs.asmJson ||
@@ -914,8 +916,9 @@ void CommandLineInterface::compile()
 				m_options.compiler.combinedJsonRequests->srcMapRuntime ||
 				m_options.compiler.combinedJsonRequests->funDebug ||
 				m_options.compiler.combinedJsonRequests->funDebugRuntime
-			))
-		);
+			));
+
+		m_compiler->selectContracts({{"", {{"", pipelineConfig}}}});
 
 		m_compiler->setOptimiserSettings(m_options.optimiserSettings());
 
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 27fb39c121..57d4d9d9b7 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -60,7 +60,6 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	m_compiler.setEVMVersion(m_evmVersion);
 	m_compiler.setEOFVersion(m_eofVersion);
 	m_compiler.setOptimiserSettings(m_optimiserSettings);
-	m_compiler.enableEvmBytecodeGeneration(true);
 	m_compiler.setViaIR(m_compileViaYul);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
 	if (!m_appendCBORMetadata) {

From 8d8ac1c376c75ab1f5a9a1b8b6d0a3e18d0f47af Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Tue, 1 Oct 2024 22:29:34 +0200
Subject: [PATCH 1111/1140] eof: Pass `eofVersion` flag to `EVMDialect`

---
 liblangutil/EVMVersion.cpp                    |  26 +-
 liblangutil/EVMVersion.h                      |   2 +-
 libsolidity/ast/ASTJsonExporter.cpp           |  11 +-
 libsolidity/ast/ASTJsonImporter.cpp           |  11 +-
 libsolidity/ast/ASTJsonImporter.h             |   6 +-
 libsolidity/codegen/CompilerContext.cpp       |   3 +-
 libsolidity/codegen/ContractCompiler.cpp      |   1 +
 libsolidity/interface/CompilerStack.cpp       |   7 +-
 libsolidity/parsing/Parser.cpp                |   2 +-
 libsolidity/parsing/Parser.h                  |   7 +-
 libyul/AsmAnalysis.cpp                        |   3 +-
 libyul/ObjectOptimizer.cpp                    |   8 +-
 libyul/ObjectOptimizer.h                      |   3 +-
 libyul/YulStack.cpp                           |  13 +-
 libyul/backends/evm/AsmCodeGen.cpp            |   3 +-
 libyul/backends/evm/AsmCodeGen.h              |   1 +
 libyul/backends/evm/EVMDialect.cpp            | 232 +++++++++---------
 libyul/backends/evm/EVMDialect.h              |   8 +-
 libyul/backends/evm/NoOutputAssembly.cpp      |   2 +-
 test/libsolidity/Assembly.cpp                 |   6 +-
 test/libsolidity/MemoryGuardTest.cpp          |   2 +-
 .../SolidityExpressionCompiler.cpp            |   6 +-
 test/libsolidity/SolidityParser.cpp           |   3 +-
 test/libyul/Common.cpp                        |  15 +-
 test/libyul/Common.h                          |   2 +-
 test/libyul/CompilabilityChecker.cpp          |   6 +-
 test/libyul/ControlFlowGraphTest.cpp          |   6 +-
 test/libyul/ControlFlowSideEffectsTest.cpp    |   3 +-
 test/libyul/EVMCodeTransformTest.cpp          |   4 +-
 test/libyul/FunctionSideEffects.cpp           |   3 +-
 test/libyul/KnowledgeBaseTest.cpp             |   3 +-
 test/libyul/ObjectParser.cpp                  |   3 +-
 test/libyul/Parser.cpp                        | 129 ++++++----
 test/libyul/SSAControlFlowGraphTest.cpp       |   6 +-
 test/libyul/StackLayoutGeneratorTest.cpp      |   6 +-
 test/libyul/SyntaxTest.cpp                    |   6 +-
 test/libyul/YulInterpreterTest.cpp            |   2 +-
 test/libyul/YulOptimizerTest.cpp              |   6 +-
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |   3 +-
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |   5 +-
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |   3 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |   9 +-
 test/tools/yulopti.cpp                        |   2 +-
 test/tools/yulrun.cpp                         |   2 +-
 tools/yulPhaser/Program.cpp                   |   3 +-
 45 files changed, 371 insertions(+), 222 deletions(-)

diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 438932a1cd..6435e0f154 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -26,23 +26,26 @@ using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
-bool EVMVersion::hasOpcode(Instruction _opcode) const
+bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const
 {
+	// EOF version can be only defined since prague
+	assert(!_eofVersion.has_value() || this->m_version >= prague());
+
 	switch (_opcode)
 	{
 	case Instruction::RETURNDATACOPY:
 	case Instruction::RETURNDATASIZE:
 		return supportsReturndata();
 	case Instruction::STATICCALL:
-		return hasStaticCall();
+		return !_eofVersion.has_value() && hasStaticCall();
 	case Instruction::SHL:
 	case Instruction::SHR:
 	case Instruction::SAR:
 		return hasBitwiseShifting();
 	case Instruction::CREATE2:
-		return hasCreate2();
+		return !_eofVersion.has_value() && hasCreate2();
 	case Instruction::EXTCODEHASH:
-		return hasExtCodeHash();
+		return !_eofVersion.has_value() && hasExtCodeHash();
 	case Instruction::CHAINID:
 		return hasChainID();
 	case Instruction::SELFBALANCE:
@@ -58,6 +61,21 @@ bool EVMVersion::hasOpcode(Instruction _opcode) const
 	case Instruction::TSTORE:
 	case Instruction::TLOAD:
 		return supportsTransientStorage();
+	// Instructions below are deprecated in EOF
+	case Instruction::CALL:
+	case Instruction::CALLCODE:
+	case Instruction::DELEGATECALL:
+	case Instruction::SELFDESTRUCT:
+	case Instruction::JUMP:
+	case Instruction::JUMPI:
+	case Instruction::PC:
+	case Instruction::CREATE:
+	case Instruction::CODESIZE:
+	case Instruction::CODECOPY:
+	case Instruction::EXTCODESIZE:
+	case Instruction::EXTCODECOPY:
+	case Instruction::GAS:
+		return !_eofVersion.has_value();
 	default:
 		return true;
 	}
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 7742689174..3d58fed437 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -124,7 +124,7 @@ class EVMVersion:
 	bool hasMcopy() const { return *this >= cancun(); }
 	bool supportsTransientStorage() const { return *this >= cancun(); }
 
-	bool hasOpcode(evmasm::Instruction _opcode) const;
+	bool hasOpcode(evmasm::Instruction _opcode, std::optional<uint8_t> _eofVersion) const;
 
 	/// Whether we have to retain the costs for the call opcode itself (false),
 	/// or whether we can just forward easily all remaining gas (true).
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 910cc257eb..7183c64a3f 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -664,12 +664,21 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 	for (Json& it: externalReferences | ranges::views::values)
 		externalReferencesJson.emplace_back(std::move(it));
 
+	auto const& evmDialect = dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect());
+
 	std::vector<std::pair<std::string, Json>> attributes = {
 		std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations().root()))),
 		std::make_pair("externalReferences", std::move(externalReferencesJson)),
-		std::make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
+		std::make_pair("evmVersion", evmDialect.evmVersion().name())
 	};
 
+	// TODO: Add test in test/linsolidity/ASTJSON/assembly. This requires adding support for eofVersion in ASTJSONTest
+	if (evmDialect.eofVersion())
+	{
+		solAssert(*evmDialect.eofVersion() > 0);
+		attributes.push_back(std::make_pair("eofVersion", *evmDialect.eofVersion()));
+	}
+
 	if (_node.flags())
 	{
 		Json flags = Json::array();
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 8d72b41f75..ee52bf53c2 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -720,7 +720,16 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json const& _no
 	astAssert(evmVersion.has_value(), "Invalid EVM version!");
 	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
 
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
+	// TODO: Add test in test/linsolidity/ASTJSON/assembly. This requires adding support for eofVersion in ASTJSONTest
+	std::optional<uint8_t> eofVersion;
+	if (auto const it = _node.find("eofVersion"); it != _node.end())
+	{
+		eofVersion = it->get<uint8_t>();
+		astAssert(eofVersion > 0);
+	}
+	astAssert(m_eofVersion == eofVersion, "Imported tree EOF version differs from configured EOF version!");
+
+	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value(), eofVersion);
 	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
 	if (_node.contains("flags"))
 	{
diff --git a/libsolidity/ast/ASTJsonImporter.h b/libsolidity/ast/ASTJsonImporter.h
index 943415df93..e4a7c2da3f 100644
--- a/libsolidity/ast/ASTJsonImporter.h
+++ b/libsolidity/ast/ASTJsonImporter.h
@@ -40,8 +40,8 @@ namespace solidity::frontend
 class ASTJsonImporter
 {
 public:
-	ASTJsonImporter(langutil::EVMVersion _evmVersion)
-		:m_evmVersion(_evmVersion)
+	ASTJsonImporter(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
+		:m_evmVersion(_evmVersion), m_eofVersion(_eofVersion)
 	{}
 
 	/// Converts the AST from JSON-format to ASTPointer
@@ -166,6 +166,8 @@ class ASTJsonImporter
 	std::set<int64_t> m_usedIDs;
 	/// Configured EVM version
 	langutil::EVMVersion m_evmVersion;
+	/// Configured EOF version. Equals std::nullopt if non-EOF
+	std::optional<uint8_t> m_eofVersion;
 };
 
 }
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 83b4589fe9..4a0f636dc9 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -436,7 +436,7 @@ void CompilerContext::appendInlineAssembly(
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
 	langutil::CharStream charStream(_assembly, _sourceName);
-	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
+	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, std::nullopt);
 	std::optional<langutil::SourceLocation> locationOverride;
 	if (!_system)
 		locationOverride = m_asm->currentSourceLocation();
@@ -522,6 +522,7 @@ void CompilerContext::appendInlineAssembly(
 		analysisInfo,
 		*m_asm,
 		m_evmVersion,
+		std::nullopt,
 		identifierAccess.generateCode,
 		_system,
 		_optimiserSettings.optimizeStackAllocation
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 5ed6e8f964..96b1ea5482 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -958,6 +958,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		*analysisInfo,
 		*m_context.assemblyPtr(),
 		m_context.evmVersion(),
+		std::nullopt,
 		identifierAccessCodeGen,
 		false,
 		m_optimiserSettings.optimizeStackAllocation
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 39977629d6..c68df205f9 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -357,7 +357,7 @@ bool CompilerStack::parse()
 
 	try
 	{
-		Parser parser{m_errorReporter, m_evmVersion};
+		Parser parser{m_errorReporter, m_evmVersion, m_eofVersion};
 
 		std::vector<std::string> sourcesToParse;
 		for (auto const& s: m_sources)
@@ -427,7 +427,8 @@ bool CompilerStack::parse()
 void CompilerStack::importASTs(std::map<std::string, Json> const& _sources)
 {
 	solAssert(m_stackState == Empty, "Must call importASTs only before the SourcesSet state.");
-	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
+	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources =
+		ASTJsonImporter(m_evmVersion, m_eofVersion).jsonToSourceUnit(_sources);
 	for (auto& src: reconstructedSources)
 	{
 		solUnimplementedAssert(!src.second->experimentalSolidity());
@@ -896,7 +897,7 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 			ErrorList errors;
 			ErrorReporter errorReporter(errors);
 			CharStream charStream(source, sourceName);
-			yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
+			yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, m_eofVersion);
 			std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
 			solAssert(parserResult);
 			sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(parserResult->root());
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 208d744639..13303170d6 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1448,7 +1448,7 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 	SourceLocation location = currentLocation();
 
 	expectToken(Token::Assembly);
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
+	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, m_eofVersion);
 	if (m_scanner->currentToken() == Token::StringLiteral)
 	{
 		if (m_scanner->currentLiteral() != "evmasm")
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index 8f0868ac11..830df05c27 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -40,10 +40,12 @@ class Parser: public langutil::ParserBase
 public:
 	explicit Parser(
 		langutil::ErrorReporter& _errorReporter,
-		langutil::EVMVersion _evmVersion
+		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion
 	):
 		ParserBase(_errorReporter),
-		m_evmVersion(_evmVersion)
+		m_evmVersion(_evmVersion),
+		m_eofVersion(_eofVersion)
 	{}
 
 	ASTPointer<SourceUnit> parse(langutil::CharStream& _charStream);
@@ -247,6 +249,7 @@ class Parser: public langutil::ParserBase
 	/// Flag that signifies whether '_' is parsed as a PlaceholderStatement or a regular identifier.
 	bool m_insideModifier = false;
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	/// 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
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 64630fa2be..cf8c720f6b 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -625,7 +625,8 @@ void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation cons
 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(YulName(_instructionIdentifier));
+	// TODO: Add EOF support
+	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt).builtin(YulName(_instructionIdentifier));
 	if (builtin && builtin->instruction.has_value())
 		return validateInstructions(builtin->instruction.value(), _location);
 	else
diff --git a/libyul/ObjectOptimizer.cpp b/libyul/ObjectOptimizer.cpp
index 3694367c5e..511fc979dd 100644
--- a/libyul/ObjectOptimizer.cpp
+++ b/libyul/ObjectOptimizer.cpp
@@ -43,13 +43,13 @@ using namespace solidity::util;
 using namespace solidity::yul;
 
 
-Dialect const& yul::languageToDialect(Language _language, EVMVersion _version)
+Dialect const& yul::languageToDialect(Language _language, EVMVersion _version, std::optional<uint8_t> _eofVersion)
 {
 	switch (_language)
 	{
 	case Language::Assembly:
 	case Language::StrictAssembly:
-		return EVMDialect::strictAssemblyForEVMObjects(_version);
+		return EVMDialect::strictAssemblyForEVMObjects(_version, _eofVersion);
 	}
 	util::unreachable();
 }
@@ -77,7 +77,7 @@ void ObjectOptimizer::optimize(Object& _object, Settings const& _settings, bool
 			);
 		}
 
-	Dialect const& dialect = languageToDialect(_settings.language, _settings.evmVersion);
+	Dialect const& dialect = languageToDialect(_settings.language, _settings.evmVersion, _settings.eofVersion);
 	std::unique_ptr<GasMeter> meter;
 	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
 		meter = std::make_unique<GasMeter>(*evmDialect, _isCreation, _settings.expectedExecutionsPerDeployment);
@@ -158,6 +158,8 @@ std::optional<h256> ObjectOptimizer::calculateCacheKey(
 	rawKey += h256(u256(_settings.expectedExecutionsPerDeployment)).asBytes();
 	rawKey += FixedHash<1>(uint8_t(_isCreation ? 0 : 1)).asBytes();
 	rawKey += keccak256(_settings.evmVersion.name()).asBytes();
+	yulAssert(!_settings.eofVersion.has_value() || *_settings.eofVersion > 0);
+	rawKey += FixedHash<1>(uint8_t(_settings.eofVersion ? 0 : *_settings.eofVersion)).asBytes();
 	rawKey += keccak256(_settings.yulOptimiserSteps).asBytes();
 	rawKey += keccak256(_settings.yulOptimiserCleanupSteps).asBytes();
 
diff --git a/libyul/ObjectOptimizer.h b/libyul/ObjectOptimizer.h
index e570d69c4b..b2019d36b2 100644
--- a/libyul/ObjectOptimizer.h
+++ b/libyul/ObjectOptimizer.h
@@ -38,7 +38,7 @@ enum class Language
 	StrictAssembly,
 };
 
-Dialect const& languageToDialect(Language _language, langutil::EVMVersion _version);
+Dialect const& languageToDialect(Language _language, langutil::EVMVersion _version, std::optional<uint8_t> _eofVersion);
 
 /// Encapsulates logic for applying @a yul::OptimiserSuite to a whole hierarchy of Yul objects.
 /// Also, acts as a transparent cache for optimized objects.
@@ -58,6 +58,7 @@ class ObjectOptimizer
 	{
 		Language language;
 		langutil::EVMVersion evmVersion;
+		std::optional<uint8_t> eofVersion;
 		bool optimizeStackAllocation;
 		std::string yulOptimiserSteps;
 		std::string yulOptimiserCleanupSteps;
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 67bc6d11a5..8b559e23f4 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -57,7 +57,7 @@ bool YulStack::parse(std::string const& _sourceName, std::string const& _source)
 	{
 		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);
+		m_parserResult = ObjectParser(m_errorReporter, languageToDialect(m_language, m_evmVersion, m_eofVersion)).parse(scanner, false);
 	}
 	catch (UnimplementedFeatureError const& _error)
 	{
@@ -94,7 +94,7 @@ void YulStack::optimize()
 	{
 		if (
 			!m_optimiserSettings.runYulOptimiser &&
-			yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
+			yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion, m_eofVersion), *m_parserResult)
 		)
 			return;
 
@@ -130,6 +130,7 @@ void YulStack::optimize()
 			ObjectOptimizer::Settings{
 				m_language,
 				m_evmVersion,
+				m_eofVersion,
 				optimizeStackAllocation,
 				yulOptimiserSteps,
 				yulOptimiserCleanupSteps,
@@ -163,7 +164,7 @@ bool YulStack::analyzeParsed(Object& _object)
 	AsmAnalyzer analyzer(
 		*_object.analysisInfo,
 		m_errorReporter,
-		languageToDialect(m_language, m_evmVersion),
+		languageToDialect(m_language, m_evmVersion, m_eofVersion),
 		{},
 		_object.qualifiedDataNames()
 	);
@@ -196,7 +197,7 @@ void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 	{
 		case Language::Assembly:
 		case Language::StrictAssembly:
-			dialect = &EVMDialect::strictAssemblyForEVMObjects(m_evmVersion);
+			dialect = &EVMDialect::strictAssemblyForEVMObjects(m_evmVersion, m_eofVersion);
 			break;
 		default:
 			yulAssert(false, "Invalid language.");
@@ -316,7 +317,7 @@ YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName)
 	// 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)
+		!yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion, m_eofVersion), *m_parserResult)
 	);
 	try
 	{
@@ -385,7 +386,7 @@ Json YulStack::cfgJson() const
 		// NOTE: The block Ids are reset for each object
 		std::unique_ptr<ControlFlow> controlFlow = SSAControlFlowGraphBuilder::build(
 			*_object.analysisInfo.get(),
-			languageToDialect(m_language, m_evmVersion),
+			languageToDialect(m_language, m_evmVersion, m_eofVersion),
 			_object.code()->root()
 		);
 		YulControlFlowGraphExporter exporter(*controlFlow);
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index 645d1fd87b..91d06e2f08 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -38,6 +38,7 @@ void CodeGenerator::assemble(
 	AsmAnalysisInfo& _analysisInfo,
 	evmasm::Assembly& _assembly,
 	langutil::EVMVersion _evmVersion,
+	std::optional<uint8_t> _eofVersion,
 	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
 	bool _useNamedLabelsForFunctions,
 	bool _optimizeStackAllocation
@@ -49,7 +50,7 @@ void CodeGenerator::assemble(
 		assemblyAdapter,
 		_analysisInfo,
 		_parsedData,
-		EVMDialect::strictAssemblyForEVM(_evmVersion),
+		EVMDialect::strictAssemblyForEVM(_evmVersion, _eofVersion),
 		builtinContext,
 		_optimizeStackAllocation,
 		_identifierAccessCodeGen,
diff --git a/libyul/backends/evm/AsmCodeGen.h b/libyul/backends/evm/AsmCodeGen.h
index b793380749..d7a6b5c928 100644
--- a/libyul/backends/evm/AsmCodeGen.h
+++ b/libyul/backends/evm/AsmCodeGen.h
@@ -44,6 +44,7 @@ class CodeGenerator
 		AsmAnalysisInfo& _analysisInfo,
 		evmasm::Assembly& _assembly,
 		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		ExternalIdentifierAccess::CodeGenerator _identifierAccess = {},
 		bool _useNamedLabelsForFunctions = false,
 		bool _optimizeStackAllocation = false
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index dd5cad1dd7..6bfdc9cb9d 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -177,7 +177,7 @@ std::set<YulName> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 	return reserved;
 }
 
-std::map<YulName, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
+std::map<YulName, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion, bool _objectAccess)
 {
 
 	// Exclude prevrandao as builtin for VMs before paris and difficulty for VMs after paris.
@@ -199,7 +199,7 @@ std::map<YulName, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _ev
 			opcode != evmasm::Instruction::JUMP &&
 			opcode != evmasm::Instruction::JUMPI &&
 			opcode != evmasm::Instruction::JUMPDEST &&
-			_evmVersion.hasOpcode(opcode) &&
+			_evmVersion.hasOpcode(opcode, _eofVersion) &&
 			!prevRandaoException(name)
 		)
 			builtins.emplace(createEVMFunction(_evmVersion, name, opcode));
@@ -235,113 +235,116 @@ std::map<YulName, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _ev
 			})
 		);
 
-		builtins.emplace(createFunction("datasize", 1, 1, SideEffects{}, {LiteralKind::String}, [](
-			FunctionCall const& _call,
-			AbstractAssembly& _assembly,
-			BuiltinContext& _context
-		) {
-			yulAssert(_context.currentObject, "No object available.");
-			yulAssert(_call.arguments.size() == 1, "");
-			Expression const& arg = _call.arguments.front();
-			YulName const dataName (formatLiteral(std::get<Literal>(arg)));
-			if (_context.currentObject->name == dataName.str())
-				_assembly.appendAssemblySize();
-			else
-			{
-			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName.str()) == 0 ?
-						_context.currentObject->pathToSubObject(dataName.str()) :
-						std::vector<size_t>{_context.subIDs.at(dataName.str())};
-				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
-				_assembly.appendDataSize(subIdPath);
-			}
-		}));
-		builtins.emplace(createFunction("dataoffset", 1, 1, SideEffects{}, {LiteralKind::String}, [](
-			FunctionCall const& _call,
-			AbstractAssembly& _assembly,
-			BuiltinContext& _context
-		) {
-			yulAssert(_context.currentObject, "No object available.");
-			yulAssert(_call.arguments.size() == 1, "");
-			Expression const& arg = _call.arguments.front();
-			YulName const dataName (formatLiteral(std::get<Literal>(arg)));
-			if (_context.currentObject->name == dataName.str())
-				_assembly.appendConstant(0);
-			else
-			{
-			std::vector<size_t> subIdPath =
-					_context.subIDs.count(dataName.str()) == 0 ?
-						_context.currentObject->pathToSubObject(dataName.str()) :
-						std::vector<size_t>{_context.subIDs.at(dataName.str())};
-				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
-				_assembly.appendDataOffset(subIdPath);
-			}
-		}));
-		builtins.emplace(createFunction(
-			"datacopy",
-			3,
-			0,
-			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&,
-				AbstractAssembly& _assembly,
-				BuiltinContext&
-			) {
-				_assembly.appendInstruction(evmasm::Instruction::CODECOPY);
-			}
-		));
-		builtins.emplace(createFunction(
-			"setimmutable",
-			3,
-			0,
-			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},
-			[](
+		if (!_eofVersion.has_value())
+		{
+			builtins.emplace(createFunction("datasize", 1, 1, SideEffects{}, {LiteralKind::String}, [](
 				FunctionCall const& _call,
 				AbstractAssembly& _assembly,
-				BuiltinContext&
+				BuiltinContext& _context
 			) {
-				yulAssert(_call.arguments.size() == 3, "");
-				auto const identifier = (formatLiteral(std::get<Literal>(_call.arguments[1])));
-				_assembly.appendImmutableAssignment(identifier);
-			}
-		));
-		builtins.emplace(createFunction(
-			"loadimmutable",
-			1,
-			1,
-			SideEffects{},
-			{LiteralKind::String},
-			[](
+				yulAssert(_context.currentObject, "No object available.");
+				yulAssert(_call.arguments.size() == 1, "");
+				Expression const& arg = _call.arguments.front();
+				YulName const dataName (formatLiteral(std::get<Literal>(arg)));
+				if (_context.currentObject->name == dataName.str())
+					_assembly.appendAssemblySize();
+				else
+				{
+				std::vector<size_t> subIdPath =
+						_context.subIDs.count(dataName.str()) == 0 ?
+							_context.currentObject->pathToSubObject(dataName.str()) :
+							std::vector<size_t>{_context.subIDs.at(dataName.str())};
+					yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
+					_assembly.appendDataSize(subIdPath);
+				}
+			}));
+			builtins.emplace(createFunction("dataoffset", 1, 1, SideEffects{}, {LiteralKind::String}, [](
 				FunctionCall const& _call,
 				AbstractAssembly& _assembly,
-				BuiltinContext&
+				BuiltinContext& _context
 			) {
+				yulAssert(_context.currentObject, "No object available.");
 				yulAssert(_call.arguments.size() == 1, "");
-				_assembly.appendImmutable(formatLiteral(std::get<Literal>(_call.arguments.front())));
-			}
-		));
+				Expression const& arg = _call.arguments.front();
+				YulName const dataName (formatLiteral(std::get<Literal>(arg)));
+				if (_context.currentObject->name == dataName.str())
+					_assembly.appendConstant(0);
+				else
+				{
+				std::vector<size_t> subIdPath =
+						_context.subIDs.count(dataName.str()) == 0 ?
+							_context.currentObject->pathToSubObject(dataName.str()) :
+							std::vector<size_t>{_context.subIDs.at(dataName.str())};
+					yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
+					_assembly.appendDataOffset(subIdPath);
+				}
+			}));
+			builtins.emplace(createFunction(
+				"datacopy",
+				3,
+				0,
+				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&,
+					AbstractAssembly& _assembly,
+					BuiltinContext&
+				) {
+					_assembly.appendInstruction(evmasm::Instruction::CODECOPY);
+				}
+			));
+			builtins.emplace(createFunction(
+				"setimmutable",
+				3,
+				0,
+				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,
+					AbstractAssembly& _assembly,
+					BuiltinContext&
+				) {
+					yulAssert(_call.arguments.size() == 3, "");
+					auto const identifier = (formatLiteral(std::get<Literal>(_call.arguments[1])));
+					_assembly.appendImmutableAssignment(identifier);
+				}
+			));
+			builtins.emplace(createFunction(
+				"loadimmutable",
+				1,
+				1,
+				SideEffects{},
+				{LiteralKind::String},
+				[](
+					FunctionCall const& _call,
+					AbstractAssembly& _assembly,
+					BuiltinContext&
+				) {
+					yulAssert(_call.arguments.size() == 1, "");
+					_assembly.appendImmutable(formatLiteral(std::get<Literal>(_call.arguments.front())));
+				}
+			));
+		}
 	}
 	return builtins;
 }
@@ -355,10 +358,11 @@ std::regex const& verbatimPattern()
 }
 
 
-EVMDialect::EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess):
+EVMDialect::EVMDialect(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion, bool _objectAccess):
 	m_objectAccess(_objectAccess),
 	m_evmVersion(_evmVersion),
-	m_functions(createBuiltins(_evmVersion, _objectAccess)),
+	m_eofVersion(_eofVersion),
+	m_functions(createBuiltins(_evmVersion, _eofVersion, _objectAccess)),
 	m_reserved(createReservedIdentifiers(_evmVersion))
 {
 }
@@ -386,22 +390,22 @@ bool EVMDialect::reservedIdentifier(YulName _name) const
 	return m_reserved.count(_name) != 0;
 }
 
-EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _version)
+EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
 {
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
+	static std::map<std::pair<langutil::EVMVersion, std::optional<uint8_t>>, std::unique_ptr<EVMDialect const>> dialects;
 	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialect>(_version, false);
-	return *dialects[_version];
+	if (!dialects[{_evmVersion, _eofVersion}])
+		dialects[{_evmVersion, _eofVersion}] = std::make_unique<EVMDialect>(_evmVersion, _eofVersion, false);
+	return *dialects[{_evmVersion, _eofVersion}];
 }
 
-EVMDialect const& EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion _version)
+EVMDialect const& EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
 {
-	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
+	static std::map<std::pair<langutil::EVMVersion, std::optional<uint8_t>>, std::unique_ptr<EVMDialect const>> dialects;
 	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
-	if (!dialects[_version])
-		dialects[_version] = std::make_unique<EVMDialect>(_version, true);
-	return *dialects[_version];
+	if (!dialects[{_evmVersion, _eofVersion}])
+		dialects[{_evmVersion, _eofVersion}] = std::make_unique<EVMDialect>(_evmVersion, _eofVersion, true);
+	return *dialects[{_evmVersion, _eofVersion}];
 }
 
 SideEffects EVMDialect::sideEffectsOfInstruction(evmasm::Instruction _instruction)
diff --git a/libyul/backends/evm/EVMDialect.h b/libyul/backends/evm/EVMDialect.h
index 3627a7fea9..cc064c3a0f 100644
--- a/libyul/backends/evm/EVMDialect.h
+++ b/libyul/backends/evm/EVMDialect.h
@@ -65,7 +65,7 @@ struct BuiltinFunctionForEVM: public BuiltinFunction
 struct EVMDialect: public Dialect
 {
 	/// Constructor, should only be used internally. Use the factory functions below.
-	EVMDialect(langutil::EVMVersion _evmVersion, bool _objectAccess);
+	EVMDialect(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion, bool _objectAccess);
 
 	/// @returns the builtin function of the given name or a nullptr if it is not a builtin function.
 	BuiltinFunctionForEVM const* builtin(YulName _name) const override;
@@ -82,10 +82,11 @@ struct EVMDialect: public Dialect
 	BuiltinFunctionForEVM const* storageLoadFunction() const override { return builtin("sload"_yulname); }
 	YulName hashFunction() const override { return "keccak256"_yulname; }
 
-	static EVMDialect const& strictAssemblyForEVM(langutil::EVMVersion _version);
-	static EVMDialect const& strictAssemblyForEVMObjects(langutil::EVMVersion _version);
+	static EVMDialect const& strictAssemblyForEVM(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion);
+	static EVMDialect const& strictAssemblyForEVMObjects(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion);
 
 	langutil::EVMVersion evmVersion() const { return m_evmVersion; }
+	std::optional<uint8_t> eofVersion() const { return m_eofVersion; }
 
 	bool providesObjectAccess() const { return m_objectAccess; }
 
@@ -96,6 +97,7 @@ struct EVMDialect: public Dialect
 
 	bool const m_objectAccess;
 	langutil::EVMVersion const m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	std::map<YulName, BuiltinFunctionForEVM> m_functions;
 	std::map<std::pair<size_t, size_t>, std::shared_ptr<BuiltinFunctionForEVM const>> mutable m_verbatimFunctions;
 	std::set<YulName> m_reserved;
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index 04324fa062..c444a71435 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -130,7 +130,7 @@ void NoOutputAssembly::appendImmutableAssignment(std::string const&)
 }
 
 NoOutputEVMDialect::NoOutputEVMDialect(EVMDialect const& _copyFrom):
-	EVMDialect(_copyFrom.evmVersion(), _copyFrom.providesObjectAccess())
+	EVMDialect(_copyFrom.evmVersion(), _copyFrom.eofVersion(), _copyFrom.providesObjectAccess())
 {
 	for (auto& fun: m_functions)
 	{
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 03897c454c..bf1e5caf7c 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -56,7 +56,11 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	Parser parser(errorReporter, solidity::test::CommonOptions::get().evmVersion());
+	Parser parser(
+		errorReporter,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 	ASTPointer<SourceUnit> sourceUnit;
 	BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(*_sourceCode));
 	BOOST_CHECK(!!sourceUnit);
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index b2e0b75d36..08a2814c95 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -62,7 +62,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 		ErrorList errors;
 		auto [object, analysisInfo] = yul::test::parse(
 			compiler().yulIR(contractName),
-			EVMDialect::strictAssemblyForEVMObjects(CommonOptions::get().evmVersion()),
+			EVMDialect::strictAssemblyForEVMObjects(CommonOptions::get().evmVersion(), CommonOptions::get().eofVersion()),
 			errors
 		);
 
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 4810b01439..20983b6509 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -108,7 +108,11 @@ bytes compileFirstExpression(
 	{
 		ErrorList errors;
 		ErrorReporter errorReporter(errors);
-		sourceUnit = Parser(errorReporter, solidity::test::CommonOptions::get().evmVersion()).parse(stream);
+		sourceUnit = Parser(
+			errorReporter,
+			solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()
+		).parse(stream);
 		if (!sourceUnit)
 			return bytes();
 	}
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index e0f010c49e..a0fd1fe94b 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -44,7 +44,8 @@ ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList&
 	auto charStream = CharStream(_source, "");
 	ASTPointer<SourceUnit> sourceUnit = Parser(
 		errorReporter,
-		solidity::test::CommonOptions::get().evmVersion()
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
 	).parse(charStream);
 	if (!sourceUnit)
 		return ASTPointer<ContractDefinition>();
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 7640e4a5dd..6562e17435 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -46,7 +46,10 @@ namespace
 {
 Dialect const& defaultDialect()
 {
-	return yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion());
+	return yul::EVMDialect::strictAssemblyForEVM(
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 }
 }
 
@@ -101,11 +104,11 @@ std::string yul::test::format(std::string const& _source)
 
 namespace
 {
-std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion)> const validDialects = {
+std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion, std::optional<uint8_t>)> const validDialects = {
 	{
 		"evm",
-		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
-		{ return yul::EVMDialect::strictAssemblyForEVMObjects(_evmVersion); }
+		[](langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion) -> yul::Dialect const&
+		{ return yul::EVMDialect::strictAssemblyForEVMObjects(_evmVersion, _eofVersion); }
 	}
 };
 
@@ -118,7 +121,7 @@ std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion)> const
 }
 }
 
-yul::Dialect const& yul::test::dialect(std::string const& _name, langutil::EVMVersion _evmVersion)
+yul::Dialect const& yul::test::dialect(std::string const& _name, langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
 {
 	if (!validDialects.count(_name))
 		BOOST_THROW_EXCEPTION(std::runtime_error{
@@ -129,5 +132,5 @@ yul::Dialect const& yul::test::dialect(std::string const& _name, langutil::EVMVe
 			"."
 		});
 
-	return validDialects.at(_name)(_evmVersion);
+	return validDialects.at(_name)(_evmVersion, _eofVersion);
 }
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
index c87f1c68be..2255272b6b 100644
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@@ -54,6 +54,6 @@ parse(std::string const& _source, Dialect const& _dialect, langutil::ErrorList&
 Block disambiguate(std::string const& _source);
 std::string format(std::string const& _source);
 
-solidity::yul::Dialect const& dialect(std::string const& _name, langutil::EVMVersion _evmVersion);
+solidity::yul::Dialect const& dialect(std::string const& _name, langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion);
 
 }
diff --git a/test/libyul/CompilabilityChecker.cpp b/test/libyul/CompilabilityChecker.cpp
index 13788b75f8..6c86ac21f3 100644
--- a/test/libyul/CompilabilityChecker.cpp
+++ b/test/libyul/CompilabilityChecker.cpp
@@ -38,7 +38,11 @@ std::string check(std::string const& _input)
 	auto parsingResult = yul::test::parse(_input);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	BOOST_REQUIRE(obj.hasCode());
-	auto functions = CompilabilityChecker(EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion()), obj, true).stackDeficit;
+	auto functions = CompilabilityChecker(
+		EVMDialect::strictAssemblyForEVM(
+			solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()
+		), obj, true).stackDeficit;
 	std::string out;
 	for (auto const& function: functions)
 		out += function.first.str() + ": " + std::to_string(function.second) + " ";
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index 0060b850ef..b7264bc0e9 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -45,7 +45,11 @@ ControlFlowGraphTest::ControlFlowGraphTest(std::string const& _filename):
 {
 	m_source = m_reader.source();
 	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_dialect = &dialect(
+		dialectName,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 	m_expectation = m_reader.simpleExpectations();
 }
 
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index 3ad70f5a02..50c69b179d 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -62,8 +62,9 @@ TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std:
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
+	// TODO: Add EOF support
 	ControlFlowSideEffectsCollector sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
 		obj.code()->root()
 	);
 	m_obtainedResult.clear();
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index e54ab9c8f0..23c24ce305 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -67,12 +67,14 @@ TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::strin
 		return TestResult::FatalError;
 	}
 
+	// TODO: Add EOF support
 	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, std::nullopt, {}};
 	EthAssemblyAdapter adapter(assembly);
 	EVMObjectCompiler::compile(
 		*stack.parserResult(),
 		adapter,
-		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}),
+		// TODO: Make sure that why we cannot pass here solidity::test::CommonOptions::get().evmVersion() and assembly.eofVersion()
+		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}, std::nullopt),
 		m_stackOpt,
 		std::nullopt
 	);
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index 9d6599f42b..7a153de7d3 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -88,8 +88,9 @@ TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
+	// TODO: Add EOF support
 	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
 		CallGraphGenerator::callGraph(obj.code()->root())
 	);
 
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index 0293f8ee44..badeb21fe7 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -63,7 +63,8 @@ class KnowledgeBaseTest
 		return KnowledgeBase([this](YulName _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
-	EVMDialect m_dialect{EVMVersion{}, true};
+	// TODO: Add EOF support
+	EVMDialect m_dialect{EVMVersion{}, std::nullopt, true};
 	std::shared_ptr<Object> m_object;
 	SSAValueTracker m_ssaValues;
 	std::map<YulName, AssignedValue> m_values;
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index b23e530601..7ed321cd48 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -112,7 +112,8 @@ std::tuple<std::optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(
 
 	ErrorList errors;
 	ErrorReporter reporter(errors);
-	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion::berlin());
+	// TODO: Add EOF support
+	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	ObjectParser objectParser{reporter, dialect};
 	CharStream stream(std::move(source), "");
 	auto object = objectParser.parse(std::make_shared<Scanner>(stream), false);
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 9b8ce42921..930a34cf1a 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -162,7 +162,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
 	auto const sourceText =
 		"/// @src 0:234:543\n"
 		"{}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -180,7 +181,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -203,7 +205,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -225,7 +228,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
 			"/// @src 0:343:434\n"
 			"switch y case 0 {} default {}\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -249,7 +253,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
 			"    let z := add(3, 4)\n"
 			"}\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -281,7 +286,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -312,7 +318,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
 			"/// @src 1:1:10\n"
 			"a := true\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0); // should still parse
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -333,7 +340,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
 			"let b := true\n"
 			"\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result); // should still parse
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -353,7 +361,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
 			"/// @src 0:234:2026\n"
 			":= true\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -376,7 +385,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
 			2)
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -410,7 +420,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 			mstore(1, 2)                // FunctionCall
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -446,7 +457,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
 			let a := true
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -465,7 +477,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
 		/// @src 0:420:680foo
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -482,7 +495,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
 		/// abc@src 0:111:222
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -496,7 +510,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
 		/// @src -1:-1:-1
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -510,7 +525,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
 		/// @src a:b:c
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -527,7 +543,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
 		/// @src 111111111111111111111:222222222222222222222:333333333333333333333
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -548,7 +565,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
 			let x := true
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -566,7 +584,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
 		/// @src 0:111:222@src 1:333:444
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -583,7 +602,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_s
 		/// @src 0:111:222 @src 1:333:444
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -594,7 +614,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
 	ErrorList errorList;
 	ErrorReporter reporter(errorList);
 	auto const sourceText = "///     @src 0:111:222    \n{}";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -611,7 +632,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
 			let x := true
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -633,7 +655,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
 			let y := /** @src 1:96:165  "contract D {..." */ 128
 		}
 	)~~~";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -658,7 +681,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
 		/// @src 0:111:222 ""
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -672,7 +696,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_befo
 		/// @src 0:111:222"abc" def
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -689,7 +714,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_afte
 		/// @src 0:111:222 "abc"def
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -703,7 +729,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whites
 		/// @src 0:111:222 "abc"@src 1:333:444 "abc"
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -717,7 +744,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 		/// @src 0:111:222 " abc @src 1:333:444
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -735,7 +763,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
 		///
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -752,7 +781,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
 		/// @src 0:111:222 hex"abc"@src 1:333:444 "abc"
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	// the second source location is not parsed as such, as the hex string isn't interpreted as snippet but
@@ -768,7 +798,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
 		/// @src 0:111:222 "\n\\x\x\w\uö\xy\z\y\fq"
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -783,7 +814,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces
 		/// @src 1 :		222 : 333 '\x33\u1234\t\n'
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -798,7 +830,8 @@ BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_ar
 		/// @src 1:222:333
 		{{}}
 	)", invalid);
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -816,7 +849,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
 		/// " @src 0:333:444
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 333, 444);
@@ -834,7 +868,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locati
 			let y := /** @src 1:96:165  "function f() internal { \"\/** @src 0:6:7 *\/\"; }" */ 128
 		}
 	)~~~";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -863,7 +898,8 @@ BOOST_AUTO_TEST_CASE(astid)
 			mstore(1, 2)
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -885,7 +921,8 @@ BOOST_AUTO_TEST_CASE(astid_reset)
 			mstore(1, 2)
 		}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -903,7 +940,8 @@ BOOST_AUTO_TEST_CASE(astid_multi)
 		/// @src -1:-1:-1 @ast-id 7 @src 1:1:1 @ast-id 8
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(8));
@@ -917,7 +955,8 @@ BOOST_AUTO_TEST_CASE(astid_invalid)
 		/// @src -1:-1:-1 @ast-id abc @src 1:1:1
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -934,7 +973,8 @@ BOOST_AUTO_TEST_CASE(astid_too_large)
 		/// @ast-id 9223372036854775808
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -950,7 +990,8 @@ BOOST_AUTO_TEST_CASE(astid_way_too_large)
 		/// @ast-id 999999999999999999999999999999999999999
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -966,7 +1007,8 @@ BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
 		/// @ast-id 9x
 		{}
 	)";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -988,7 +1030,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
 		"\n"
 		"    let x := 123\n"
 		"}\n";
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{});
+	// TODO: Add EOF support
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 1);
diff --git a/test/libyul/SSAControlFlowGraphTest.cpp b/test/libyul/SSAControlFlowGraphTest.cpp
index a316356dbf..c0d1e87270 100644
--- a/test/libyul/SSAControlFlowGraphTest.cpp
+++ b/test/libyul/SSAControlFlowGraphTest.cpp
@@ -48,7 +48,11 @@ SSAControlFlowGraphTest::SSAControlFlowGraphTest(std::string const& _filename):
 {
 	m_source = m_reader.source();
 	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_dialect = &dialect(
+		dialectName,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 	m_expectation = m_reader.simpleExpectations();
 }
 
diff --git a/test/libyul/StackLayoutGeneratorTest.cpp b/test/libyul/StackLayoutGeneratorTest.cpp
index 9c16eaefc1..f50d2d23b0 100644
--- a/test/libyul/StackLayoutGeneratorTest.cpp
+++ b/test/libyul/StackLayoutGeneratorTest.cpp
@@ -49,7 +49,11 @@ StackLayoutGeneratorTest::StackLayoutGeneratorTest(std::string const& _filename)
 {
 	m_source = m_reader.source();
 	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_dialect = &dialect(
+		dialectName,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 	m_expectation = m_reader.simpleExpectations();
 }
 
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index 7ed87bee45..aa37e85afd 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -75,5 +75,9 @@ SyntaxTest::SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVe
 	CommonSyntaxTest(_filename, _evmVersion)
 {
 	std::string dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_dialect = &dialect(
+		dialectName,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 }
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 9d4ccd81ba..343a17b4a4 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -98,7 +98,7 @@ std::string YulInterpreterTest::interpret()
 	{
 		Interpreter::run(
 			state,
-			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion()),
+			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(), std::nullopt),
 			m_ast->root(),
 			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
 			/*disableMemoryTracing=*/ false
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 7f2f5815a6..308afef5f9 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -56,7 +56,11 @@ YulOptimizerTest::YulOptimizerTest(std::string const& _filename):
 	m_source = m_reader.source();
 
 	auto dialectName = m_reader.stringSetting("dialect", "evm");
-	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
+	m_dialect = &dialect(
+		dialectName,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
 
 	m_expectation = m_reader.simpleExpectations();
 }
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index a064fcdc80..6f603e335d 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -105,8 +105,9 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		YulAssembler assembler{version, std::nullopt, settings, yul_source};
 		unoptimisedByteCode = assembler.assemble();
 		auto yulObject = assembler.object();
+		// TODO: Add EOF support
 		recursiveFunction = recursiveFunctionExists(
-			EVMDialect::strictAssemblyForEVMObjects(version),
+			EVMDialect::strictAssemblyForEVMObjects(version, std::nullopt),
 			*yulObject
 		);
 	}
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index f685aa90da..ffeb147021 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -87,10 +87,11 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	// such as unused write to memory e.g.,
 	// { mstore(0, 1) }
 	// that would be removed by the redundant store eliminator.
+	// TODO: Add EOF support
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
 		stack.parserResult()->code()->root(),
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
 		/*disableMemoryTracing=*/true
 	);
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
@@ -100,7 +101,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	termReason = yulFuzzerUtil::interpret(
 		os2,
 		stack.parserResult()->code()->root(),
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
 		/*disableMemoryTracing=*/true
 	);
 
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index cfdb208130..4e9387f6f5 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -78,10 +78,11 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	)
 		yulAssert(false, "Proto fuzzer generated malformed program");
 
+	// TODO: Add EOF support
 	// Optimize
 	YulOptimizerTestCommon optimizerTest(
 		stack.parserResult(),
-		EVMDialect::strictAssemblyForEVMObjects(version)
+		EVMDialect::strictAssemblyForEVMObjects(version, std::nullopt)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
 	auto const* astRoot = optimizerTest.run();
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 13ac4aea84..eff96f831e 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -87,27 +87,30 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// such as unused write to memory e.g.,
 	// { mstore(0, 1) }
 	// that would be removed by the redundant store eliminator.
+	// TODO: Add EOF support
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
 		stack.parserResult()->code()->root(),
-		EVMDialect::strictAssemblyForEVMObjects(version),
+		EVMDialect::strictAssemblyForEVMObjects(version, std::nullopt),
 		/*disableMemoryTracing=*/true
 	);
 
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
 		return;
 
+	// TODO: Add EOF support
 	YulOptimizerTestCommon optimizerTest(
 		stack.parserResult(),
-		EVMDialect::strictAssemblyForEVMObjects(version)
+		EVMDialect::strictAssemblyForEVMObjects(version, std::nullopt)
 	);
 	optimizerTest.setStep(optimizerTest.randomOptimiserStep(_input.step()));
 	auto const* astRoot = optimizerTest.run();
 	yulAssert(astRoot != nullptr, "Optimiser error.");
+	// TODO: Add EOF support
 	termReason = yulFuzzerUtil::interpret(
 		os2,
 		*astRoot,
-		EVMDialect::strictAssemblyForEVMObjects(version),
+		EVMDialect::strictAssemblyForEVMObjects(version, std::nullopt),
 		true
 	);
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 13375f8277..cbe0219676 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -242,7 +242,7 @@ class YulOpti
 
 private:
 	std::shared_ptr<yul::Block> m_astRoot;
-	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
+	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}, std::nullopt)};
 	std::unique_ptr<AsmAnalysisInfo> m_analysisInfo;
 	std::set<YulName> const m_reservedIdentifiers = {};
 	NameDispenser m_nameDispenser{m_dialect, m_reservedIdentifiers};
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index e857c26645..36d4885862 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -87,7 +87,7 @@ void interpret(std::string const& _source, bool _inspect, bool _disableExternalC
 	state.maxTraceSize = 10000;
 	try
 	{
-		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
+		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}, std::nullopt));
 
 		if (_inspect)
 			InspectedInterpreter::run(std::make_shared<Inspector>(_source, state), state, dialect, ast->root(), _disableExternalCalls, /*disableMemoryTracing=*/false);
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 57e1bf2b93..fa7fbe274c 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -68,7 +68,8 @@ Program::Program(Program const& program):
 std::variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 {
 	// ASSUMPTION: parseSource() rewinds the stream on its own
-	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(EVMVersion{});
+	// TODO: Add support for EOF
+	Dialect const& dialect = EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}, std::nullopt);
 
 	std::variant<std::unique_ptr<AST>, ErrorList> astOrErrors = parseObject(dialect, _sourceCode);
 	if (std::holds_alternative<ErrorList>(astOrErrors))

From 62dc5975b83d5448acb70ccdcd54ac39e14d7b75 Mon Sep 17 00:00:00 2001
From: Franco Victorio <victorio.franco@gmail.com>
Date: Fri, 27 Sep 2024 11:06:43 +0200
Subject: [PATCH 1112/1140] Replace Hardhat with EDR in CI

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e6e658099..58d3803ed2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1394,13 +1394,13 @@ jobs:
             test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
       - matrix_notify_failure_unless_pr
 
-  t_ems_ext_hardhat:
+  t_ems_ext_edr:
     <<: *base_node_small
     docker:
-      - image: cimg/rust:1.74.0-node
+      - image: cimg/rust:1.79.0-node
     environment:
       <<: *base_node_small_env
-      HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
+      EDR_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
     steps:
       - checkout
       - attach_workspace:
@@ -1409,48 +1409,36 @@ jobs:
           name: Ensure pnpm is installed if npm is present
           command: sudo npm install -g pnpm
       - run:
-          name: Retrieve Hardhat latest release tag
+          name: Retrieve EDR latest release tag
           command: |
             # Make authenticated requests when the Github token is available
             if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
               EXTRA_HEADERS=(--header "Authorization: Bearer ${GITHUB_ACCESS_TOKEN}")
             fi
-            HARDHAT_LATEST_RELEASE_TAG=$(
+            EDR_LATEST_RELEASE_TAG=$(
               curl \
                 --silent \
                 --location \
                 --fail \
                 --show-error \
                 "${EXTRA_HEADERS[@]}" \
-                https://api.github.com/repos/nomiclabs/hardhat/releases/latest \
+                https://api.github.com/repos/nomicfoundation/edr/releases/latest \
                 | jq --raw-output .tag_name \
             )
-            echo "export HARDHAT_LATEST_RELEASE_TAG='${HARDHAT_LATEST_RELEASE_TAG}'" >> "$BASH_ENV"
-      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git --branch "$HARDHAT_LATEST_RELEASE_TAG"
+            echo "export EDR_LATEST_RELEASE_TAG='${EDR_LATEST_RELEASE_TAG}'" >> "$BASH_ENV"
+      - run: git clone --depth 1 https://github.com/nomicfoundation/edr.git --branch "$EDR_LATEST_RELEASE_TAG"
       - run:
           name: Install dependencies
           command: |
-            cd hardhat
+            cd edr
             pnpm install --no-frozen-lockfile
       - run:
-          name: Run hardhat-core test suite
+          name: Run hardhat-tests in EDR repo
           command: |
-            HARDHAT_TESTS_SOLC_VERSION=$(scripts/get_version.sh)
-            export HARDHAT_TESTS_SOLC_VERSION
-
-            # NOTE: This is expected to work without running `pnpm build` first.
-            cd hardhat/packages/hardhat-core
-            # TODO: temporarily set hardhat stack traces tests to use cancun hardfork
-            # Remove this when hardhat switch to cancun by default: https://github.com/NomicFoundation/hardhat/issues/4851
-            sed -i 's/hardfork: "shanghai",/hardfork: "cancun",/' test/internal/hardhat-network/stack-traces/execution.ts
-            # TODO: Remove these tests because they rely on specific stack sequence which has changed since
-            # Remove when hardhat properly fix a specific version for the tests: https://github.com/NomicFoundation/hardhat/issues/5443
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/modifiers/call-message/multiple-modifiers-require/
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/modifiers/create-message/multiple-modifiers-require/
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/between-statements/
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/no-other-statements/
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/statement-after/
-            rm -rf test/internal/hardhat-network/stack-traces/test-files/0_8/revert-without-message/revert-without-message/within-receive/statement-before/
+            EDR_TESTS_SOLC_VERSION=$(scripts/get_version.sh)
+            export EDR_TESTS_SOLC_VERSION
+
+            cd edr/hardhat-tests
             pnpm test
       - matrix_notify_failure_unless_pr
 
@@ -1904,7 +1892,7 @@ workflows:
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *requires_nothing
       - t_ems_solcjs: *requires_b_ems
-      - t_ems_ext_hardhat: *requires_b_ems
+      - t_ems_ext_edr: *requires_b_ems
 
       - t_ext: *job_ems_compile_ext_colony
 

From 2b4184674369e49f5edc1a7cd1cdf77637712221 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:24:11 +0200
Subject: [PATCH 1113/1140] cmake: remove USE_LD_GOLD option

---
 Changelog.md                    |  4 ++++
 cmake/EthCompilerSettings.cmake | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b171b6dd01..959aff257c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,10 @@ Bugfixes:
  * Yul AST: Fix shifted native source locations when debug info selection included code snippets.
 
 
+Build system:
+* Removed ``USE_LD_GOLD`` option and default to use the compiler default linker. For custom linkers, ``CMAKE_CXX_FLAGS`` can be used.
+
+
 ### 0.8.27 (2024-09-04)
 
 Language Features:
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index eda0e404dd..4cf3927d1d 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -266,13 +266,3 @@ option(USE_Z3 "Allow compiling with Z3 SMT solver integration" ON)
 if(UNIX AND NOT APPLE)
 	option(USE_Z3_DLOPEN "Dynamically load the Z3 SMT solver instead of linking against it." OFF)
 endif()
-
-if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
-	option(USE_LD_GOLD "Use GNU gold linker" ON)
-	if (USE_LD_GOLD)
-		execute_process(COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-		if ("${LD_VERSION}" MATCHES "GNU gold")
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-		endif ()
-	endif ()
-endif ()

From badd1154e87a7170467d7855bfc7e17c55748d55 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 2 Oct 2024 19:06:04 +0200
Subject: [PATCH 1114/1140] Avoid unnecessary copy in full inliner.

---
 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 2f138761fc..c6387f808e 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -106,7 +106,7 @@ void FullInliner::run(Pass _pass)
 	for (auto& statement: m_ast.statements)
 		if (std::holds_alternative<FunctionDefinition>(statement))
 			functions.emplace_back(&std::get<FunctionDefinition>(statement));
-	std::stable_sort(functions.begin(), functions.end(), [depths](
+	std::stable_sort(functions.begin(), functions.end(), [&depths](
 		FunctionDefinition const* _a,
 		FunctionDefinition const* _b
 	) {

From 39e5aeff86151c273c5e8c7b040f371536726b9c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 2 Oct 2024 15:18:40 +0200
Subject: [PATCH 1115/1140] Re-enable cxx20 job

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 58d3803ed2..82739dffb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1105,9 +1105,9 @@ 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_ubuntu2404_large
+    <<: *base_ubuntu2404_xlarge
     environment:
-      <<: *base_ubuntu2404_large_env
+      <<: *base_ubuntu2404_xlarge_env
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20
       MAKEFLAGS: -j 10
@@ -1859,8 +1859,7 @@ workflows:
 
       # build-only
       - b_docs: *requires_nothing
-      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *requires_nothing
-      # Issue: https://github.com/ethereum/solidity/issues/13868
+      - b_ubu_cxx20: *requires_nothing
       - b_ubu_ossfuzz: *requires_nothing
 
       # OS/X build and tests

From 136fe38f748ee399fd264fc72e641f1d0dcd769f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 7 Oct 2024 11:56:23 +0200
Subject: [PATCH 1116/1140] Disable legacy presets in zeppelin external test

---
 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 64c901f614..b9e65562e0 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -52,8 +52,8 @@ function zeppelin_test
     local settings_presets=(
         "${compile_only_presets[@]}"
         ir-optimize-evm+yul
-        legacy-no-optimize
-        legacy-optimize-evm-only
+        #legacy-no-optimize       # FIXME: Fails with stack too deep
+        #legacy-optimize-evm-only # FIXME: Fails with stack too deep
         legacy-optimize-evm+yul
     )
 

From 293bd7fc08d32e3d4871ea745e3cff664d99d48b Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 7 Oct 2024 13:41:52 +0200
Subject: [PATCH 1117/1140] Fix broken flyout layout due to RTD addons upgrade

---
 docs/_static/js/initialize.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/_static/js/initialize.js b/docs/_static/js/initialize.js
index a20d4fce71..3cf12e3e1e 100644
--- a/docs/_static/js/initialize.js
+++ b/docs/_static/js/initialize.js
@@ -23,18 +23,24 @@ function rearrangeDom() {
   document.body.prepend(wrapperDiv);
 
   const rstVersions = document.querySelector(".rst-versions");
-  rstVersions.remove();
   const wyNavSide = document.querySelector("nav.wy-nav-side");
-  wyNavSide.appendChild(rstVersions);
+  // NOTE: Since RTD migration to addons, `.rst-versions` is no longer present in the DOM.
+  // The following code is kept for compatibility with older versions.
+  // See: https://github.com/readthedocs/readthedocs.org/issues/11474
+  if (rstVersions && wyNavSide) {
+    rstVersions.remove();
+    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);
+  if (content) {
+    content.id = "content";
+    document.querySelector("section.wy-nav-content-wrap")?.remove();
+    document.querySelector(".wy-grid-for-nav")?.appendChild(content);
+  }
 }
 
 function buildHeader() {
@@ -146,6 +152,8 @@ 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");
+  if (!gitHubEditAnchor) return;
+
   const url = new URL(gitHubEditAnchor.href);
   const split = url.pathname.split("/");
   const versionIndex = split.indexOf("blob") + 1;
@@ -195,10 +203,12 @@ function initialize() {
     .querySelector(":root")
     .setAttribute("style", `--color-scheme: ${mode}`);
 
+  // NOTE: Since RTD migration to addons, the elements below are no longer present in the DOM.
+  // The following code is kept for compatibility with older versions.
   // 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();
+  document.querySelector("input[name=mode]")?.remove();
+  document.querySelector("label[for=switch]")?.remove();
+  document.querySelector(".wy-side-nav-search > a")?.remove();
 
   // Add footer note
   addFooterNote();
@@ -239,7 +249,7 @@ document.addEventListener("click", handleClick);
 
 const handleKeyDown = (e) => {
   if (e.metaKey && e.key === "k") {
-    document.querySelector("#rtd-search-form input").focus();
+    document.querySelector("#rtd-search-form input")?.focus();
   } else if (e.key === "Escape") {
     toggleMenu({ force: false });
   }

From f8477584e7fefd0384dd02223d104554097e3bc2 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 7 Oct 2024 17:17:17 +0200
Subject: [PATCH 1118/1140] Fix "Edit on GitHub" button to always point to
 develop branch

---
 docs/_static/js/initialize.js | 7 ++++++-
 docs/conf.py                  | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/_static/js/initialize.js b/docs/_static/js/initialize.js
index 3cf12e3e1e..1c3be8aadd 100644
--- a/docs/_static/js/initialize.js
+++ b/docs/_static/js/initialize.js
@@ -150,7 +150,12 @@ const updateActiveNavLink = () => {
 document.addEventListener("locationchange", updateActiveNavLink);
 
 function updateGitHubEditPath() {
-  // Replaces the version number in the GitHub edit path with "develop"
+  // Replaces the version number in the GitHub edit path with "develop" if it exists.
+  // This is to ensure that the edit path always points to the `develop` branch instead of the specific version branch.
+  // Note that it will fail silently if the anchor element is not found, i.e. the page is not editable or
+  // if the sphinx_rtd_theme is updated to a version that changes the anchor element.
+  // See: https://github.com/readthedocs/sphinx_rtd_theme/blob/a1c2147b17cbf0e57b7d7a6450ad4d9a5ff362cf/sphinx_rtd_theme/breadcrumbs.html#L35
+  // TODO: We should consider a more robust way to handle this in the future.
   const gitHubEditAnchor = document.querySelector(".wy-breadcrumbs-aside > a");
   if (!gitHubEditAnchor) return;
 
diff --git a/docs/conf.py b/docs/conf.py
index 9c9e2d5a06..354e1feecc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,6 +38,13 @@ def setup(sphinx):
 
 # -- General configuration ------------------------------------------------
 
+html_context = {
+    "display_github": True,
+    "github_user": "ethereum",
+    "github_repo": "solidity",
+    "github_version": os.getenv("READTHEDOCS_VERSION", "develop"),
+    "conf_py_path": "/docs/",
+}
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 

From e354f7b098f46d688c5aadf23d28befd6f4e5749 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 7 Oct 2024 12:45:35 -0300
Subject: [PATCH 1119/1140] fix changelog entry

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

diff --git a/Changelog.md b/Changelog.md
index 959aff257c..de1674a15a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,10 +1,10 @@
 ### 0.8.28 (unreleased)
 
 Language Features:
+ * Transient storage value type state variables are now fully supported.
 
 
 Compiler Features:
- * Code Generator: Transient storage value type state variables are now supported.
  * General: Generate JSON representations of Yul ASTs only on demand to reduce memory usage.
  * Standard JSON Interface: Bytecode or IR can now be requested for a subset of all contracts without triggering unnecessary code generation for other contracts.
 

From 8d4dc15588cbe44ff7999d8f73dd251fea04f903 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 7 Oct 2024 18:28:33 +0200
Subject: [PATCH 1120/1140] Fix github user and repo in RTD config for
 translation projects

---
 docs/conf.py | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 354e1feecc..f57a3b5b90 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,15 +36,55 @@ def setup(sphinx):
     sphinx.add_css_file('css/custom-dark.css')
     sphinx.add_css_file('css/pygments.css')
 
-# -- General configuration ------------------------------------------------
+# -- RTD GitHub configuration ---------------------------------------------
+
+# Taken from:
+# https://github.com/readthedocs/readthedocs.org/blob/e366e7fc8649fbcf1b6d06ecc12c5f7766144c46/readthedocs/projects/constants.py#L350
+GITHUB_REGEXS = [
+    re.compile(r"github.com/(.+)/(.+)(?:\.git){1}$"),
+    # This must come before the one without a / to make sure we don't capture the /
+    re.compile(r"github.com/(.+)/(.+)/"),
+    re.compile(r"github.com/(.+)/(.+)"),
+    re.compile(r"github.com:(.+)/(.+)\.git$"),
+]
+
+# Taken and adapted from:
+# https://github.com/readthedocs/readthedocs.org/blob/e366e7fc8649fbcf1b6d06ecc12c5f7766144c46/readthedocs/builds/utils.py#L24
+def get_github_username_repo(url):
+    if "github" in url:
+        for regex in GITHUB_REGEXS:
+            match = regex.search(url)
+            if match:
+                return match.groups()
+    return (None, None)
+
+display_github = False
+# NOTE: RTD_DISPLAY_GITHUB, RTD_GITHUB_USER and RTD_GITHUB_REPO are set in the RTD project settings
+github_user = os.getenv("RTD_GITHUB_USER")
+github_repo = os.getenv("RTD_GITHUB_REPO")
+
+if github_user and github_repo:
+    display_github = True
+else:
+    git_clone_url = os.getenv("READTHEDOCS_GIT_CLONE_URL")
+    if git_clone_url:
+        github_user, github_repo = get_github_username_repo(git_clone_url)
+        if github_user and github_repo:
+            display_github = True
+
+display_github_env = os.getenv("RTD_DISPLAY_GITHUB")
+if display_github_env:
+    display_github = display_github_env.lower() == "true"
 
 html_context = {
-    "display_github": True,
-    "github_user": "ethereum",
-    "github_repo": "solidity",
+    "display_github": display_github,
+    "github_user": github_user,
+    "github_repo": github_repo,
     "github_version": os.getenv("READTHEDOCS_VERSION", "develop"),
     "conf_py_path": "/docs/",
 }
+
+# -- General configuration ------------------------------------------------
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 

From 3651f231fd701340927c354c18a598122d7dbf1c Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:13:55 +0200
Subject: [PATCH 1121/1140] Use gold linker for ossfuzz, codecov, and cxx20
 builds

---
 .circleci/config.yml             | 10 ++++++----
 cmake/toolchains/libfuzzer.cmake |  3 ++-
 scripts/ci/build.sh              |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82739dffb5..0c8bb02ecb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1073,6 +1073,7 @@ jobs:
       <<: *base_ubuntu2404_env
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
+      CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-fuse-ld=gold
     steps:
       - checkout
       - run_build
@@ -1105,12 +1106,13 @@ 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_ubuntu2404_xlarge
+    <<: *base_ubuntu2404_large
     environment:
-      <<: *base_ubuntu2404_xlarge_env
+      <<: *base_ubuntu2404_large_env
       CMAKE_BUILD_TYPE: Debug
-      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20
-      MAKEFLAGS: -j 10
+      # gold is more memory-efficient than the default, allows us to stay with the "large" resource class without OOM errors
+      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_FLAGS=-fuse-ld=gold
+      MAKEFLAGS: -j 6
     steps:
       - checkout
       - run_build
diff --git a/cmake/toolchains/libfuzzer.cmake b/cmake/toolchains/libfuzzer.cmake
index 9d83d504f0..f9ea64860a 100644
--- a/cmake/toolchains/libfuzzer.cmake
+++ b/cmake/toolchains/libfuzzer.cmake
@@ -7,7 +7,8 @@ set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
 # Use libfuzzer as the fuzzing back-end
 set(LIB_FUZZING_ENGINE "-fsanitize=fuzzer" CACHE STRING "Use libfuzzer back-end" FORCE)
 # clang/libfuzzer specific flags for UBSan instrumentation
-set(CMAKE_CXX_FLAGS "-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -I /usr/local/include/c++/v1 -fsanitize=undefined -fsanitize=fuzzer-no-link -stdlib=libc++" CACHE STRING "Custom compilation flags" FORCE)
+# uses the more memory-efficient gold, which allows us to stay with the "large" resource class without OOM errors
+set(CMAKE_CXX_FLAGS "-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -I /usr/local/include/c++/v1 -fsanitize=undefined -fsanitize=fuzzer-no-link -fuse-ld=gold -stdlib=libc++" CACHE STRING "Custom compilation flags" FORCE)
 # Link statically against boost libraries
 set(BOOST_FOUND ON CACHE BOOL "" FORCE)
 set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link against static Boost libraries" FORCE)
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index d529b03c1a..e1d119a064 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -32,6 +32,6 @@ cd build
 [ -n "$COVERAGE" -a "$CIRCLE_BRANCH" != release -a -z "$CIRCLE_TAG" ] && CMAKE_OPTIONS="$CMAKE_OPTIONS -DCOVERAGE=ON"
 
 # shellcheck disable=SC2086
-cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" $CMAKE_OPTIONS -G "Unix Makefiles"
+cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" $CMAKE_OPTIONS
 
-make
+cmake --build .

From c7ff2175a1dae32dbf80be48f5840e04c5465d15 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:00:12 +0200
Subject: [PATCH 1122/1140] Bump ossfuzz to large resource class

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c8bb02ecb..ed14c8af4d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -528,6 +528,14 @@ defaults:
         MAKEFLAGS: -j 2
         CPUs: 2
 
+  - base_ubuntu_clang_large: &base_ubuntu_clang_large
+      <<: *base_ubuntu_clang
+      resource_class: large
+      environment: &base_ubuntu_clang_small_env
+        <<: *base_ubuntu_clang_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
   - base_ubuntu2004: &base_ubuntu2004
       docker:
         - image: << pipeline.parameters.ubuntu-2004-docker-image >>
@@ -1119,7 +1127,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
-    <<: *base_ubuntu_clang
+    <<: *base_ubuntu_clang_large
     steps:
       - checkout
       - setup_prerelease_commit_hash

From 525381c1b5476e37b5ddb57a9390e2b0a57205aa Mon Sep 17 00:00:00 2001
From: backbonexe <117212528+LMAO798@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:26:56 +0200
Subject: [PATCH 1123/1140] docs: fix broken links and typo

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

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 36b8586794..28b81626c1 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -556,7 +556,7 @@ topics, issues or feature implementations are debated in detail. The invitation
 
 We are also sharing feedback surveys and other content that is relevant to language design in the forum.
 
-If you want to know where the team is standing in terms or implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/ethereum/solidity/projects/43>`_.
+If you want to know where the team is standing in terms of implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/ethereum/solidity/projects>`_.
 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>`_.
 

From 1a8efbaf79ecd06206c2f0e2dd62ec8c5b5f8145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Tue, 8 Oct 2024 09:33:56 +0200
Subject: [PATCH 1124/1140] Update 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 28b81626c1..bb88d12016 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -556,7 +556,7 @@ topics, issues or feature implementations are debated in detail. The invitation
 
 We are also sharing feedback surveys and other content that is relevant to language design in the forum.
 
-If you want to know where the team is standing in terms of implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/ethereum/solidity/projects>`_.
+If you want to know where the team is standing in terms of implementing new features, you can follow the implementation status in the `Solidity GitHub project <https://github.com/orgs/ethereum/projects/17>`_.
 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>`_.
 

From e8a2c63214457e7e2c4058849d259407964b9a44 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:38:21 +0200
Subject: [PATCH 1125/1140] Yul: Add SSACFG liveness analysis

---
 libyul/CMakeLists.txt                  |   2 +
 libyul/backends/evm/SSACFGLiveness.cpp | 132 +++++++++++++++++++++++++
 libyul/backends/evm/SSACFGLiveness.h   |  55 +++++++++++
 3 files changed, 189 insertions(+)
 create mode 100644 libyul/backends/evm/SSACFGLiveness.cpp
 create mode 100644 libyul/backends/evm/SSACFGLiveness.h

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index f621b2089e..4265b91d3f 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -65,6 +65,8 @@ add_library(yul
 	backends/evm/NoOutputAssembly.cpp
 	backends/evm/OptimizedEVMCodeTransform.cpp
 	backends/evm/OptimizedEVMCodeTransform.h
+	backends/evm/SSACFGLiveness.cpp
+	backends/evm/SSACFGLiveness.h
 	backends/evm/SSACFGLoopNestingForest.cpp
 	backends/evm/SSACFGLoopNestingForest.h
 	backends/evm/SSACFGTopologicalSort.cpp
diff --git a/libyul/backends/evm/SSACFGLiveness.cpp b/libyul/backends/evm/SSACFGLiveness.cpp
new file mode 100644
index 0000000000..6ed926304d
--- /dev/null
+++ b/libyul/backends/evm/SSACFGLiveness.cpp
@@ -0,0 +1,132 @@
+/*
+	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/backends/evm/SSACFGLiveness.h>
+
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/filter.hpp>
+#include <range/v3/view/reverse.hpp>
+
+using namespace solidity::yul;
+
+SSACFGLiveness::SSACFGLiveness(SSACFG const& _cfg):
+	m_cfg(_cfg),
+	m_topologicalSort(_cfg),
+	m_loopNestingForest(m_topologicalSort),
+	m_liveIns(_cfg.numBlocks()),
+	m_liveOuts(_cfg.numBlocks())
+{
+	runDagDfs();
+	for (auto const loopRootNode: m_loopNestingForest.loopRootNodes())
+		runLoopTreeDfs(loopRootNode);
+}
+void SSACFGLiveness::runDagDfs()
+{
+	// SSA Book, Algorithm 9.2
+	for(auto const blockIdValue: m_topologicalSort.postOrder())
+	{
+		// post-order traversal
+		SSACFG::BlockId blockId{blockIdValue};
+		auto const filterLiterals = [this](auto const& valueId){
+			return !std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(valueId));
+		};
+		auto const& block = m_cfg.block(blockId);
+
+		// live <- PhiUses(B)
+		std::set<SSACFG::ValueId> live{};
+		block.forEachExit(
+			[&](SSACFG::BlockId const& _successor)
+			{
+				for (auto const& phi: m_cfg.block(_successor).phis)
+				{
+					auto const& info = m_cfg.valueInfo(phi);
+					yulAssert(std::holds_alternative<SSACFG::PhiValue>(info), "value info of phi wasn't PhiValue");
+					auto const& entries = m_cfg.block(std::get<SSACFG::PhiValue>(info).block).entries;
+					// this is getting the argument index of the phi function corresponding to the path going
+					// through "blockId", ie, the currently handled block
+					auto const it = entries.find(blockId);
+					yulAssert(it != entries.end());
+					auto const argIndex = static_cast<size_t>(std::distance(entries.begin(), it));
+					if (argIndex < std::get<SSACFG::PhiValue>(info).arguments.size())
+					{
+						// todo not sure why arg index would exceed phi arg length but it does happen
+						auto const arg = std::get<SSACFG::PhiValue>(info).arguments.at(argIndex);
+						if (!std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(arg)))
+							live.insert(arg);
+					}
+					else
+						yulAssert(false);
+				}
+			});
+
+		// for each S \in succs(B) s.t. (B, S) not a back edge: live <- live \cup (LiveIn(S) - PhiDefs(S))
+		block.forEachExit(
+			[&](SSACFG::BlockId const& _successor) {
+				if (!m_topologicalSort.backEdge(blockId, _successor))
+					live += m_liveIns[_successor.value] - m_cfg.block(_successor).phis;
+			});
+		if (std::holds_alternative<SSACFG::BasicBlock::FunctionReturn>(block.exit))
+			live += std::get<SSACFG::BasicBlock::FunctionReturn>(block.exit).returnValues
+					| ranges::views::filter(filterLiterals);
+
+		// clean out unreachables
+		live = live
+			   | ranges::views::filter(
+				   [&](auto const& valueId)
+				   { return !std::holds_alternative<SSACFG::UnreachableValue>(m_cfg.valueInfo(valueId)); })
+			   | ranges::to<std::set>;
+
+		// LiveOut(B) <- live
+		m_liveOuts[blockId.value] = live;
+
+		// for each program point p in B, backwards, do:
+		for (auto const& op: block.operations | ranges::views::reverse)
+		{
+			// remove variables defined at p from live
+			live -= op.outputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+			// add uses at p to live
+			live += op.inputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+		}
+
+		// livein(b) <- live \cup PhiDefs(B)
+		m_liveIns[blockId.value] = live + block.phis;
+	}
+}
+void SSACFGLiveness::runLoopTreeDfs(size_t const _loopHeader)
+{
+	// SSA Book, Algorithm 9.3
+	if (m_loopNestingForest.loopNodes().count(_loopHeader) > 0)
+	{
+		// the loop header block id
+		auto const& block = m_cfg.block(SSACFG::BlockId{_loopHeader});
+		// LiveLoop <- LiveIn(B_N) - PhiDefs(B_N)
+		auto liveLoop = m_liveIns[_loopHeader] - block.phis;
+		// must be live out of header if live in of children
+		m_liveOuts[_loopHeader] += liveLoop;
+		// for each blockId \in children(loopHeader)
+		for (size_t blockId = 0; blockId < m_cfg.numBlocks(); ++blockId)
+			if (m_loopNestingForest.loopParents()[blockId] == _loopHeader)
+			{
+				// propagate loop liveness information down to the loop header's children
+				m_liveIns[blockId] += liveLoop;
+				m_liveOuts[blockId] += liveLoop;
+
+				runLoopTreeDfs(blockId);
+			}
+	}
+}
diff --git a/libyul/backends/evm/SSACFGLiveness.h b/libyul/backends/evm/SSACFGLiveness.h
new file mode 100644
index 0000000000..bc254a03a2
--- /dev/null
+++ b/libyul/backends/evm/SSACFGLiveness.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 <libyul/backends/evm/SSACFGLoopNestingForest.h>
+#include <libyul/backends/evm/SSACFGTopologicalSort.h>
+#include <libyul/backends/evm/SSAControlFlowGraph.h>
+
+#include <cstddef>
+#include <set>
+#include <vector>
+
+namespace solidity::yul
+{
+
+/// Performs liveness analysis on an SSA CFG following Algorithm 9.1 in [1].
+///
+/// [1] Rastello, Fabrice, and Florent Bouchez Tichadou, eds. SSA-based Compiler Design. Springer, 2022.
+class SSACFGLiveness
+{
+public:
+	explicit SSACFGLiveness(SSACFG const& _cfg);
+
+	std::vector<std::set<SSACFG::ValueId>> const& liveIns() const { return m_liveIns; }
+	std::vector<std::set<SSACFG::ValueId>> const& liveOuts() const { return m_liveOuts; }
+
+private:
+
+	void runDagDfs();
+	void runLoopTreeDfs(size_t _loopHeader);
+
+	SSACFG const& m_cfg;
+	ForwardSSACFGTopologicalSort m_topologicalSort;
+	SSACFGLoopNestingForest m_loopNestingForest;
+	std::vector<std::set<SSACFG::ValueId>> m_liveIns;
+	std::vector<std::set<SSACFG::ValueId>> m_liveOuts;
+};
+
+}

From eb22cb6fd7b55cf70508cb76d6dda63659898df3 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 18 Sep 2024 14:03:56 +0200
Subject: [PATCH 1126/1140] Yul: add optional liveness output to toDot of
 SSACFGs

---
 libyul/CMakeLists.txt                         |  2 +
 libyul/backends/evm/ControlFlow.cpp           | 28 +++++++++
 libyul/backends/evm/ControlFlow.h             | 28 +++++++--
 libyul/backends/evm/SSAControlFlowGraph.cpp   | 30 ++++++++--
 libyul/backends/evm/SSAControlFlowGraph.h     |  7 ++-
 test/libyul/SSAControlFlowGraphTest.cpp       |  4 +-
 test/libyul/SSAControlFlowGraphTest.h         | 20 +++----
 .../libyul/yulSSAControlFlowGraph/complex.yul | 57 ++++++++++++-------
 .../yulSSAControlFlowGraph/complex2.yul       | 57 ++++++++++++-------
 .../yulSSAControlFlowGraph/function.yul       | 15 +++--
 test/libyul/yulSSAControlFlowGraph/if.yul     |  9 ++-
 test/libyul/yulSSAControlFlowGraph/switch.yul | 18 ++++--
 12 files changed, 200 insertions(+), 75 deletions(-)
 create mode 100644 libyul/backends/evm/ControlFlow.cpp

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 4265b91d3f..58c1b17b5c 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -48,6 +48,8 @@ add_library(yul
 	backends/evm/AsmCodeGen.h
 	backends/evm/ConstantOptimiser.cpp
 	backends/evm/ConstantOptimiser.h
+	backends/evm/ControlFlow.cpp
+	backends/evm/ControlFlow.h
 	backends/evm/ControlFlowGraph.h
 	backends/evm/ControlFlowGraphBuilder.cpp
 	backends/evm/ControlFlowGraphBuilder.h
diff --git a/libyul/backends/evm/ControlFlow.cpp b/libyul/backends/evm/ControlFlow.cpp
new file mode 100644
index 0000000000..3ec123a8ed
--- /dev/null
+++ b/libyul/backends/evm/ControlFlow.cpp
@@ -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
+
+#include <libyul/backends/evm/ControlFlow.h>
+#include <range/v3/range/conversion.hpp>
+
+using namespace solidity::yul;
+
+ControlFlowLiveness::ControlFlowLiveness(ControlFlow const& _controlFlow):
+	controlFlow(_controlFlow),
+	mainLiveness(std::make_unique<SSACFGLiveness>(*_controlFlow.mainGraph)),
+	functionLiveness(_controlFlow.functionGraphs | ranges::views::transform([](auto const& _cfg) { return std::make_unique<SSACFGLiveness>(*_cfg); }) | ranges::to<std::vector>)
+{ }
diff --git a/libyul/backends/evm/ControlFlow.h b/libyul/backends/evm/ControlFlow.h
index 59bc1b677b..6438f330c3 100644
--- a/libyul/backends/evm/ControlFlow.h
+++ b/libyul/backends/evm/ControlFlow.h
@@ -20,11 +20,22 @@
 
 #include <libyul/AST.h>
 #include <libyul/Scope.h>
+#include <libyul/backends/evm/SSACFGLiveness.h>
 #include <libyul/backends/evm/SSAControlFlowGraph.h>
 
 namespace solidity::yul
 {
 
+struct ControlFlow;
+
+struct ControlFlowLiveness{
+	explicit ControlFlowLiveness(ControlFlow const& _controlFlow);
+
+	std::reference_wrapper<ControlFlow const> controlFlow;
+	std::unique_ptr<SSACFGLiveness> mainLiveness;
+	std::vector<std::unique_ptr<SSACFGLiveness>> functionLiveness;
+};
+
 struct ControlFlow
 {
 	std::unique_ptr<SSACFG> mainGraph{std::make_unique<SSACFG>()};
@@ -39,14 +50,21 @@ struct ControlFlow
 		return nullptr;
 	}
 
-	std::string toDot() const
+	std::string toDot(ControlFlowLiveness const* _liveness=nullptr) const
 	{
+		if (_liveness)
+			yulAssert(&_liveness->controlFlow.get() == this);
 		std::ostringstream output;
 		output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
-		output << mainGraph->toDot(false);
-		size_t index = 1;
-		for (auto const& [function, functionGraph]: functionGraphMapping)
-			output << functionGraph->toDot(false, index++);
+		output << mainGraph->toDot(false, std::nullopt, _liveness ? _liveness->mainLiveness.get() : nullptr);
+
+		for (size_t index=0; index < functionGraphs.size(); ++index)
+			output << functionGraphs[index]->toDot(
+				false,
+				index+1,
+				_liveness ? _liveness->functionLiveness[index].get() : nullptr
+			);
+
 		output << "}\n";
 		return output.str();
 	}
diff --git a/libyul/backends/evm/SSAControlFlowGraph.cpp b/libyul/backends/evm/SSAControlFlowGraph.cpp
index e98936aaab..dcbdcdca3b 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraph.cpp
@@ -18,6 +18,8 @@
 
 #include <libyul/backends/evm/SSAControlFlowGraph.h>
 
+#include <libyul/backends/evm/SSACFGLiveness.h>
+
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Visitor.h>
 
@@ -37,11 +39,13 @@ namespace
 class SSACFGPrinter
 {
 public:
-	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId)
+	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId, SSACFGLiveness const* _liveness):
+		m_liveness(_liveness)
 	{
 		printBlock(_cfg, _blockId, 0);
 	}
-	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function)
+	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function, SSACFGLiveness const* _liveness):
+		m_liveness(_liveness)
 	{
 		printFunction(_cfg, _functionIndex, _function);
 	}
@@ -97,6 +101,17 @@ class SSACFGPrinter
 		}
 		{
 			m_result << fmt::format("Block{1}_{0} [label=\"\\\nBlock {0}\\n", _id.value, _functionIndex);
+			if (m_liveness)
+			{
+				m_result << fmt::format(
+					"LiveIn: {}\\l\\\n",
+					fmt::join(m_liveness->liveIns()[_id.value] | ranges::views::transform(valueToString), ",")
+				);
+				m_result << fmt::format(
+					"LiveOut: {}\\l\\n",
+					fmt::join(m_liveness->liveOuts()[_id.value] | ranges::views::transform(valueToString), ",")
+				);
+			}
 			for (auto const& phi: _block.phis)
 			{
 				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
@@ -224,18 +239,23 @@ class SSACFGPrinter
 	}
 
 	std::stringstream m_result{};
+	SSACFGLiveness const* m_liveness;
 };
 }
 
-std::string SSACFG::toDot(bool _includeDiGraphDefinition, std::optional<size_t> _functionIndex) const
+std::string SSACFG::toDot(
+	bool _includeDiGraphDefinition,
+	std::optional<size_t> _functionIndex,
+	SSACFGLiveness const* _liveness
+) const
 {
 	std::ostringstream output;
 	if (_includeDiGraphDefinition)
 		output << "digraph SSACFG {\nnodesep=0.7;\ngraph[fontname=\"DejaVu Sans\"]\nnode[shape=box,fontname=\"DejaVu Sans\"];\n\n";
 	if (function)
-		output << SSACFGPrinter(*this, _functionIndex ? *_functionIndex : static_cast<size_t>(1), *function);
+		output << SSACFGPrinter(*this, _functionIndex ? *_functionIndex : static_cast<size_t>(1), *function, _liveness);
 	else
-		output << SSACFGPrinter(*this, entry);
+		output << SSACFGPrinter(*this, entry, _liveness);
 	if (_includeDiGraphDefinition)
 		output << "}\n";
 	return output.str();
diff --git a/libyul/backends/evm/SSAControlFlowGraph.h b/libyul/backends/evm/SSAControlFlowGraph.h
index fd24f06cbb..00f12fc71d 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.h
+++ b/libyul/backends/evm/SSAControlFlowGraph.h
@@ -37,6 +37,7 @@
 
 namespace solidity::yul
 {
+class SSACFGLiveness;
 
 class SSACFG
 {
@@ -207,7 +208,11 @@ class SSACFG
 		return it->second;
 	}
 
-	std::string toDot(bool _includeDiGraphDefinition=true, std::optional<size_t> _functionIndex=std::nullopt) const;
+	std::string toDot(
+		bool _includeDiGraphDefinition=true,
+		std::optional<size_t> _functionIndex=std::nullopt,
+		SSACFGLiveness const* _liveness=nullptr
+	) const;
 private:
 	std::deque<ValueInfo> m_valueInfos;
 	std::map<u256, ValueId> m_literals;
diff --git a/test/libyul/SSAControlFlowGraphTest.cpp b/test/libyul/SSAControlFlowGraphTest.cpp
index c0d1e87270..5f0c79da53 100644
--- a/test/libyul/SSAControlFlowGraphTest.cpp
+++ b/test/libyul/SSAControlFlowGraphTest.cpp
@@ -72,8 +72,8 @@ TestCase::TestResult SSAControlFlowGraphTest::run(std::ostream& _stream, std::st
 		*m_dialect,
 		object->code()->root()
 	);
-
-	m_obtainedResult = controlFlow->toDot();
+	ControlFlowLiveness liveness(*controlFlow);
+	m_obtainedResult = controlFlow->toDot(&liveness);
 
 	auto result = checkResult(_stream, _linePrefix, _formatted);
 
diff --git a/test/libyul/SSAControlFlowGraphTest.h b/test/libyul/SSAControlFlowGraphTest.h
index f976be03c3..09c1044869 100644
--- a/test/libyul/SSAControlFlowGraphTest.h
+++ b/test/libyul/SSAControlFlowGraphTest.h
@@ -1,18 +1,18 @@
 /*
-This file is part of solidity.
+	This file is part of solidity.
 
-solidity is free software: you can redistribute it and/or modify
+	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.
+	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.
+	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/>.
+	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
 
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
index eef0b29fa3..799e53d06d 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -52,7 +52,8 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nv2 := f(2, 1)\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: \l\nv2 := f(2, 1)\l\
 // pop(v2)\l\
 // "];
 // Block0_0Exit [label="MainExit"];
@@ -61,12 +62,14 @@
 //  c := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\n"];
+// Block 0\nLiveIn: v0,v1\l\
+// LiveOut: v0,v1\l\n"];
 // Block1_0 -> Block1_0Exit [arrowhead=none];
 // Block1_0Exit [label="Jump" shape=oval];
 // Block1_0Exit -> Block1_1;
 // Block1_1 [label="\
-// Block 1\nv5 := φ(\l\
+// Block 1\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
 // )\l\
@@ -77,7 +80,8 @@
 // Block1_1Exit:0 -> Block1_4;
 // Block1_1Exit:1 -> Block1_2;
 // Block1_2 [label="\
-// Block 2\nv7 := mload(v5)\l\
+// Block 2\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5,v7\l\nv7 := mload(v5)\l\
 // v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
@@ -85,80 +89,93 @@
 // Block1_2Exit:0 -> Block1_7;
 // Block1_2Exit:1 -> Block1_6;
 // Block1_4 [label="\
-// Block 4\nsstore(3084, 12)\l\
+// Block 4\nLiveIn: \l\
+// LiveOut: \l\nsstore(3084, 12)\l\
 // "];
 // Block1_4Exit [label="FunctionReturn[0]"];
 // Block1_4 -> Block1_4Exit;
 // Block1_6 [label="\
-// Block 6\nsstore(514, 2)\l\
+// Block 6\nLiveIn: \l\
+// LiveOut: \l\nsstore(514, 2)\l\
 // "];
 // Block1_6 -> Block1_6Exit [arrowhead=none];
 // Block1_6Exit [label="Jump" shape=oval];
 // Block1_6Exit -> Block1_4;
 // Block1_7 [label="\
-// Block 7\nv13 := eq(1, v7)\l\
+// Block 7\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5,v7\l\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
 // Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_7Exit:0 -> Block1_10;
 // Block1_7Exit:1 -> Block1_9;
 // Block1_9 [label="\
-// Block 9\nsstore(1028, 4)\l\
+// Block 9\nLiveIn: \l\
+// LiveOut: \l\nsstore(1028, 4)\l\
 // "];
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nv20 := eq(2, v7)\l\
+// Block 10\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5,v7\l\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
 // Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_10Exit:0 -> Block1_13;
 // Block1_10Exit:1 -> Block1_12;
 // Block1_12 [label="\
-// Block 12\nsstore(1542, 6)\l\
+// Block 12\nLiveIn: \l\
+// LiveOut: \l\nsstore(1542, 6)\l\
 // revert(0, 0)\l\
 // "];
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nv25 := eq(3, v7)\l\
+// Block 13\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5\l\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
 // Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_13Exit:0 -> Block1_16;
 // Block1_13Exit:1 -> Block1_15;
 // Block1_15 [label="\
-// Block 15\nsstore(2056, 8)\l\
+// Block 15\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2056, 8)\l\
 // "];
 // Block1_15 -> Block1_15Exit [arrowhead=none];
 // Block1_15Exit [label="Jump" shape=oval];
 // Block1_15Exit -> Block1_5;
 // Block1_16 [label="\
-// Block 16\nv29 := mload(v1)\l\
+// Block 16\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nv29 := mload(v1)\l\
 // "];
 // Block1_16 -> Block1_16Exit;
 // Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_16Exit:0 -> Block1_18;
 // Block1_16Exit:1 -> Block1_17;
 // Block1_5 [label="\
-// Block 5\nsstore(2827, 11)\l\
+// Block 5\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2827, 11)\l\
 // "];
 // Block1_5 -> Block1_5Exit [arrowhead=none];
 // Block1_5Exit [label="Jump" shape=oval];
 // Block1_5Exit -> Block1_3;
 // Block1_17 [label="\
-// Block 17\nreturn(0, 0)\l\
+// Block 17\nLiveIn: \l\
+// LiveOut: \l\nreturn(0, 0)\l\
 // "];
 // Block1_17Exit [label="Terminated"];
 // Block1_17 -> Block1_17Exit;
 // Block1_18 [label="\
-// Block 18\nsstore(2570, 10)\l\
+// Block 18\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2570, 10)\l\
 // "];
 // Block1_18 -> Block1_18Exit [arrowhead=none];
 // Block1_18Exit [label="Jump" shape=oval];
 // Block1_18Exit -> Block1_5;
 // Block1_3 [label="\
-// Block 3\nv43 := add(1, v5)\l\
+// Block 3\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v43\l\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
@@ -166,12 +183,14 @@
 // Block1_3Exit:0 -> Block1_21;
 // Block1_3Exit:1 -> Block1_20;
 // Block1_20 [label="\
-// Block 20\nsstore(v43, 0)\l\
+// Block 20\nLiveIn: v43\l\
+// LiveOut: \l\nsstore(v43, 0)\l\
 // "];
 // Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
-// Block 21\nsstore(65535, 255)\l\
+// Block 21\nLiveIn: v0,v1,v43\l\
+// LiveOut: v0,v1,v43\l\nsstore(65535, 255)\l\
 // "];
 // Block1_21 -> Block1_21Exit [arrowhead=none];
 // Block1_21Exit [label="Jump" shape=oval];
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
index 743b0513cc..b35f341417 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex2.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -59,7 +59,8 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nsstore(1, 1)\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: \l\nsstore(1, 1)\l\
 // v2 := f(2, 1)\l\
 // pop(v2)\l\
 // v4 := sload(0)\l\
@@ -77,12 +78,14 @@
 //  c := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\n"];
+// Block 0\nLiveIn: v0,v1\l\
+// LiveOut: v0,v1\l\n"];
 // Block1_0 -> Block1_0Exit [arrowhead=none];
 // Block1_0Exit [label="Jump" shape=oval];
 // Block1_0Exit -> Block1_1;
 // Block1_1 [label="\
-// Block 1\nv5 := φ(\l\
+// Block 1\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
 // )\l\
@@ -93,7 +96,8 @@
 // Block1_1Exit:0 -> Block1_4;
 // Block1_1Exit:1 -> Block1_2;
 // Block1_2 [label="\
-// Block 2\nv7 := mload(v5)\l\
+// Block 2\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5,v7\l\nv7 := mload(v5)\l\
 // v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
@@ -101,80 +105,93 @@
 // Block1_2Exit:0 -> Block1_7;
 // Block1_2Exit:1 -> Block1_6;
 // Block1_4 [label="\
-// Block 4\nsstore(3084, 12)\l\
+// Block 4\nLiveIn: \l\
+// LiveOut: \l\nsstore(3084, 12)\l\
 // "];
 // Block1_4Exit [label="FunctionReturn[27]"];
 // Block1_4 -> Block1_4Exit;
 // Block1_6 [label="\
-// Block 6\nsstore(514, 2)\l\
+// Block 6\nLiveIn: \l\
+// LiveOut: \l\nsstore(514, 2)\l\
 // "];
 // Block1_6 -> Block1_6Exit [arrowhead=none];
 // Block1_6Exit [label="Jump" shape=oval];
 // Block1_6Exit -> Block1_4;
 // Block1_7 [label="\
-// Block 7\nv13 := eq(1, v7)\l\
+// Block 7\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5,v7\l\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
 // Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_7Exit:0 -> Block1_10;
 // Block1_7Exit:1 -> Block1_9;
 // Block1_9 [label="\
-// Block 9\nsstore(1028, 4)\l\
+// Block 9\nLiveIn: \l\
+// LiveOut: \l\nsstore(1028, 4)\l\
 // "];
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nv20 := eq(2, v7)\l\
+// Block 10\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5,v7\l\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
 // Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_10Exit:0 -> Block1_13;
 // Block1_10Exit:1 -> Block1_12;
 // Block1_12 [label="\
-// Block 12\nsstore(1542, 6)\l\
+// Block 12\nLiveIn: \l\
+// LiveOut: \l\nsstore(1542, 6)\l\
 // revert(0, 0)\l\
 // "];
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nv25 := eq(3, v7)\l\
+// Block 13\nLiveIn: v0,v1,v5,v7\l\
+// LiveOut: v0,v1,v5\l\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
 // Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_13Exit:0 -> Block1_16;
 // Block1_13Exit:1 -> Block1_15;
 // Block1_15 [label="\
-// Block 15\nsstore(2056, 8)\l\
+// Block 15\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2056, 8)\l\
 // "];
 // Block1_15 -> Block1_15Exit [arrowhead=none];
 // Block1_15Exit [label="Jump" shape=oval];
 // Block1_15Exit -> Block1_5;
 // Block1_16 [label="\
-// Block 16\nv29 := mload(v1)\l\
+// Block 16\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nv29 := mload(v1)\l\
 // "];
 // Block1_16 -> Block1_16Exit;
 // Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block1_16Exit:0 -> Block1_18;
 // Block1_16Exit:1 -> Block1_17;
 // Block1_5 [label="\
-// Block 5\nsstore(2827, 11)\l\
+// Block 5\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2827, 11)\l\
 // "];
 // Block1_5 -> Block1_5Exit [arrowhead=none];
 // Block1_5Exit [label="Jump" shape=oval];
 // Block1_5Exit -> Block1_3;
 // Block1_17 [label="\
-// Block 17\nreturn(0, 0)\l\
+// Block 17\nLiveIn: \l\
+// LiveOut: \l\nreturn(0, 0)\l\
 // "];
 // Block1_17Exit [label="Terminated"];
 // Block1_17 -> Block1_17Exit;
 // Block1_18 [label="\
-// Block 18\nsstore(2570, 10)\l\
+// Block 18\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v5\l\nsstore(2570, 10)\l\
 // "];
 // Block1_18 -> Block1_18Exit [arrowhead=none];
 // Block1_18Exit [label="Jump" shape=oval];
 // Block1_18Exit -> Block1_5;
 // Block1_3 [label="\
-// Block 3\nv43 := add(1, v5)\l\
+// Block 3\nLiveIn: v0,v1,v5\l\
+// LiveOut: v0,v1,v43\l\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
@@ -182,12 +199,14 @@
 // Block1_3Exit:0 -> Block1_21;
 // Block1_3Exit:1 -> Block1_20;
 // Block1_20 [label="\
-// Block 20\nsstore(v43, 0)\l\
+// Block 20\nLiveIn: v43\l\
+// LiveOut: \l\nsstore(v43, 0)\l\
 // "];
 // Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
-// Block 21\nsstore(65535, 255)\l\
+// Block 21\nLiveIn: v0,v1,v43\l\
+// LiveOut: v0,v1,v43\l\nsstore(65535, 255)\l\
 // "];
 // Block1_21 -> Block1_21Exit [arrowhead=none];
 // Block1_21Exit [label="Jump" shape=oval];
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
index 20a536b5e5..1b759f8b39 100644
--- a/test/libyul/yulSSAControlFlowGraph/function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -27,7 +27,8 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nv0, v1 := i()\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: \l\nv0, v1 := i()\l\
 // h(v0)\l\
 // "];
 // Block0_0Exit [label="Terminated"];
@@ -36,7 +37,8 @@
 //  r := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nv3 := add(v1, v0)\l\
+// Block 0\nLiveIn: v0,v1\l\
+// LiveOut: v4\l\nv3 := add(v1, v0)\l\
 // v4 := sub(v0, v3)\l\
 // "];
 // Block1_0Exit [label="FunctionReturn[v4]"];
@@ -45,7 +47,8 @@
 //  g()"];
 // FunctionEntry_g_0 -> Block2_0;
 // Block2_0 [label="\
-// Block 0\nsstore(257, 1)\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: \l\nsstore(257, 1)\l\
 // "];
 // Block2_0Exit [label="FunctionReturn[]"];
 // Block2_0 -> Block2_0Exit;
@@ -53,7 +56,8 @@
 //  h(v0)"];
 // FunctionEntry_h_0 -> Block3_0;
 // Block3_0 [label="\
-// Block 0\nv2 := f(0, v0)\l\
+// Block 0\nLiveIn: v0\l\
+// LiveOut: \l\nv2 := f(0, v0)\l\
 // h(v2)\l\
 // "];
 // Block3_0Exit [label="Terminated"];
@@ -62,7 +66,8 @@
 //  v, w := i()"];
 // FunctionEntry_i_0 -> Block4_0;
 // Block4_0 [label="\
-// Block 0\n"];
+// Block 0\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block4_0Exit [label="FunctionReturn[514, 771]"];
 // Block4_0 -> Block4_0Exit;
 // }
diff --git a/test/libyul/yulSSAControlFlowGraph/if.yul b/test/libyul/yulSSAControlFlowGraph/if.yul
index 9045d80340..9c4d73a13a 100644
--- a/test/libyul/yulSSAControlFlowGraph/if.yul
+++ b/test/libyul/yulSSAControlFlowGraph/if.yul
@@ -15,20 +15,23 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nv1 := calldataload(3)\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: v1\l\nv1 := calldataload(3)\l\
 // "];
 // Block0_0 -> Block0_0Exit;
 // Block0_0Exit [label="{ If 0| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block0_0Exit:0 -> Block0_2;
 // Block0_0Exit:1 -> Block0_1;
 // Block0_1 [label="\
-// Block 1\nv4 := calldataload(77)\l\
+// Block 1\nLiveIn: \l\
+// LiveOut: v4\l\nv4 := calldataload(77)\l\
 // "];
 // Block0_1 -> Block0_1Exit [arrowhead=none];
 // Block0_1Exit [label="Jump" shape=oval];
 // Block0_1Exit -> Block0_2;
 // Block0_2 [label="\
-// Block 2\nv5 := φ(\l\
+// Block 2\nLiveIn: v5\l\
+// LiveOut: \l\nv5 := φ(\l\
 // 	Block 0 => v1,\l\
 // 	Block 1 => v4\l\
 // )\l\
diff --git a/test/libyul/yulSSAControlFlowGraph/switch.yul b/test/libyul/yulSSAControlFlowGraph/switch.yul
index f6c084b001..d744bd7bd2 100644
--- a/test/libyul/yulSSAControlFlowGraph/switch.yul
+++ b/test/libyul/yulSSAControlFlowGraph/switch.yul
@@ -22,7 +22,8 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nv1 := calldataload(3)\l\
+// Block 0\nLiveIn: \l\
+// LiveOut: v3\l\nv1 := calldataload(3)\l\
 // v3 := sload(0)\l\
 // v4 := eq(0, v3)\l\
 // "];
@@ -31,20 +32,23 @@
 // Block0_0Exit:0 -> Block0_3;
 // Block0_0Exit:1 -> Block0_2;
 // Block0_2 [label="\
-// Block 2\nv6 := calldataload(77)\l\
+// Block 2\nLiveIn: \l\
+// LiveOut: v6\l\nv6 := calldataload(77)\l\
 // "];
 // Block0_2 -> Block0_2Exit [arrowhead=none];
 // Block0_2Exit [label="Jump" shape=oval];
 // Block0_2Exit -> Block0_1;
 // Block0_3 [label="\
-// Block 3\nv7 := eq(1, v3)\l\
+// Block 3\nLiveIn: v3\l\
+// LiveOut: \l\nv7 := eq(1, v3)\l\
 // "];
 // Block0_3 -> Block0_3Exit;
 // Block0_3Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
 // Block0_3Exit:0 -> Block0_5;
 // Block0_3Exit:1 -> Block0_4;
 // Block0_1 [label="\
-// Block 1\nv13 := φ(\l\
+// Block 1\nLiveIn: v13\l\
+// LiveOut: \l\nv13 := φ(\l\
 // 	Block 2 => v6,\l\
 // 	Block 4 => v10,\l\
 // 	Block 5 => v12\l\
@@ -54,13 +58,15 @@
 // Block0_1Exit [label="MainExit"];
 // Block0_1 -> Block0_1Exit;
 // Block0_4 [label="\
-// Block 4\nv10 := calldataload(88)\l\
+// Block 4\nLiveIn: \l\
+// LiveOut: v10\l\nv10 := calldataload(88)\l\
 // "];
 // Block0_4 -> Block0_4Exit [arrowhead=none];
 // Block0_4Exit [label="Jump" shape=oval];
 // Block0_4Exit -> Block0_1;
 // Block0_5 [label="\
-// Block 5\nv12 := calldataload(99)\l\
+// Block 5\nLiveIn: \l\
+// LiveOut: v12\l\nv12 := calldataload(99)\l\
 // "];
 // Block0_5 -> Block0_5Exit [arrowhead=none];
 // Block0_5Exit [label="Jump" shape=oval];

From f35fd1f6df3f0d341ead02d9a83c39f018ba168e Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:01:25 +0200
Subject: [PATCH 1127/1140] Yul: display dotted back edges in toDot

---
 libyul/backends/evm/SSACFGLiveness.cpp        |   8 +-
 libyul/backends/evm/SSACFGLiveness.h          |   2 +-
 libyul/backends/evm/SSACFGTopologicalSort.h   |   2 +
 libyul/backends/evm/SSAControlFlowGraph.cpp   | 111 ++++++++-----
 .../libyul/yulSSAControlFlowGraph/complex.yul |  92 +++++------
 .../yulSSAControlFlowGraph/complex2.yul       |  92 +++++------
 .../yulSSAControlFlowGraph/function.yul       |  10 +-
 test/libyul/yulSSAControlFlowGraph/if.yul     |  14 +-
 .../yulSSAControlFlowGraph/nested_for.yul     | 151 ++++++++++--------
 .../nested_function.yul                       |  55 ++++---
 test/libyul/yulSSAControlFlowGraph/switch.yul |  30 ++--
 11 files changed, 313 insertions(+), 254 deletions(-)

diff --git a/libyul/backends/evm/SSACFGLiveness.cpp b/libyul/backends/evm/SSACFGLiveness.cpp
index 6ed926304d..b9513f70df 100644
--- a/libyul/backends/evm/SSACFGLiveness.cpp
+++ b/libyul/backends/evm/SSACFGLiveness.cpp
@@ -38,7 +38,7 @@ SSACFGLiveness::SSACFGLiveness(SSACFG const& _cfg):
 void SSACFGLiveness::runDagDfs()
 {
 	// SSA Book, Algorithm 9.2
-	for(auto const blockIdValue: m_topologicalSort.postOrder())
+	for (auto const blockIdValue: m_topologicalSort.postOrder())
 	{
 		// post-order traversal
 		SSACFG::BlockId blockId{blockIdValue};
@@ -85,11 +85,7 @@ void SSACFGLiveness::runDagDfs()
 					| ranges::views::filter(filterLiterals);
 
 		// clean out unreachables
-		live = live
-			   | ranges::views::filter(
-				   [&](auto const& valueId)
-				   { return !std::holds_alternative<SSACFG::UnreachableValue>(m_cfg.valueInfo(valueId)); })
-			   | ranges::to<std::set>;
+		live = live | ranges::views::filter([&](auto const& valueId) { return !std::holds_alternative<SSACFG::UnreachableValue>(m_cfg.valueInfo(valueId)); }) | ranges::to<std::set>;
 
 		// LiveOut(B) <- live
 		m_liveOuts[blockId.value] = live;
diff --git a/libyul/backends/evm/SSACFGLiveness.h b/libyul/backends/evm/SSACFGLiveness.h
index bc254a03a2..6f486b737f 100644
--- a/libyul/backends/evm/SSACFGLiveness.h
+++ b/libyul/backends/evm/SSACFGLiveness.h
@@ -39,7 +39,7 @@ class SSACFGLiveness
 
 	std::vector<std::set<SSACFG::ValueId>> const& liveIns() const { return m_liveIns; }
 	std::vector<std::set<SSACFG::ValueId>> const& liveOuts() const { return m_liveOuts; }
-
+	ForwardSSACFGTopologicalSort const& topologicalSort() const { return m_topologicalSort; }
 private:
 
 	void runDagDfs();
diff --git a/libyul/backends/evm/SSACFGTopologicalSort.h b/libyul/backends/evm/SSACFGTopologicalSort.h
index 973f286f28..025054b950 100644
--- a/libyul/backends/evm/SSACFGTopologicalSort.h
+++ b/libyul/backends/evm/SSACFGTopologicalSort.h
@@ -38,6 +38,8 @@ class ForwardSSACFGTopologicalSort
 	std::set<size_t> const& backEdgeTargets() const { return m_backEdgeTargets; }
 	SSACFG const& cfg() const { return m_cfg; }
 	bool backEdge(SSACFG::BlockId const& _block1, SSACFG::BlockId const& _block2) const;
+	size_t preOrderIndexOf(size_t _block) const { return m_blockWisePreOrder[_block]; }
+	size_t maxSubtreePreOrderIndexOf(size_t _block) const { return m_blockWiseMaxSubtreePreOrder[_block]; }
 
 private:
 	void dfs(size_t _vertex);
diff --git a/libyul/backends/evm/SSAControlFlowGraph.cpp b/libyul/backends/evm/SSAControlFlowGraph.cpp
index dcbdcdca3b..ebd6d84a96 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraph.cpp
@@ -40,14 +40,14 @@ class SSACFGPrinter
 {
 public:
 	SSACFGPrinter(SSACFG const& _cfg, SSACFG::BlockId _blockId, SSACFGLiveness const* _liveness):
-		m_liveness(_liveness)
+		m_cfg(_cfg), m_functionIndex(0), m_liveness(_liveness)
 	{
-		printBlock(_cfg, _blockId, 0);
+		printBlock(_blockId);
 	}
 	SSACFGPrinter(SSACFG const& _cfg, size_t _functionIndex, Scope::Function const& _function, SSACFGLiveness const* _liveness):
-		m_liveness(_liveness)
+		m_cfg(_cfg), m_functionIndex(_functionIndex), m_liveness(_liveness)
 	{
-		printFunction(_cfg, _functionIndex, _function);
+		printFunction(_function);
 	}
 	friend std::ostream& operator<<(std::ostream& stream, SSACFGPrinter const& printer) {
 		stream << printer.m_result.str();
@@ -77,6 +77,20 @@ class SSACFGPrinter
 		);
 	}
 
+	std::string formatBlockHandle(SSACFG::BlockId const& _id) const
+	{
+		return fmt::format("Block{}_{}", m_functionIndex, _id.value);
+	}
+
+	std::string formatEdge(SSACFG::BlockId const& _v, SSACFG::BlockId const& _w, std::optional<std::string> const& _vPort = std::nullopt)
+	{
+		std::string const style = m_liveness && m_liveness->topologicalSort().backEdge(_v, _w) ? "dashed" : "solid";
+		if (_vPort)
+			return fmt::format("{}Exit:{} -> {} [style=\"{}\"];\n", formatBlockHandle(_v), *_vPort, formatBlockHandle(_w), style);
+		else
+			return fmt::format("{}Exit -> {} [style=\"{}\"];\n", formatBlockHandle(_v), formatBlockHandle(_w), style);
+	}
+
 	static std::string formatPhi(SSACFG const& _cfg, SSACFG::PhiValue const& _phiValue)
 	{
 		auto const transform = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
@@ -90,19 +104,25 @@ class SSACFGPrinter
 			return "φ()";
 	}
 
-	void writeBlock(SSACFG const& _cfg, SSACFG::BlockId const& _id, SSACFG::BasicBlock const& _block, size_t const _functionIndex)
+	void writeBlock(SSACFG::BlockId const& _id, SSACFG::BasicBlock const& _block)
 	{
-		auto const valueToString = [&](SSACFG::ValueId const& valueId) { return varToString(_cfg, valueId); };
-		bool entryBlock = _id.value == 0 && _functionIndex == 0;
+		auto const valueToString = [&](SSACFG::ValueId const& valueId) { return varToString(m_cfg, valueId); };
+		bool entryBlock = _id.value == 0 && m_functionIndex == 0;
 		if (entryBlock)
 		{
-			m_result << fmt::format("Entry{} [label=\"Entry\"];\n", _functionIndex);
-			m_result << fmt::format("Entry{} -> Block{}_{};\n", _functionIndex, _functionIndex, _id.value);
+			m_result << fmt::format("Entry{} [label=\"Entry\"];\n", m_functionIndex);
+			m_result << fmt::format("Entry{} -> {};\n", m_functionIndex, formatBlockHandle(_id));
 		}
 		{
-			m_result << fmt::format("Block{1}_{0} [label=\"\\\nBlock {0}\\n", _id.value, _functionIndex);
 			if (m_liveness)
 			{
+				m_result << fmt::format(
+					"{} [label=\"\\\nBlock {}; ({}, max {})\\n",
+					formatBlockHandle(_id),
+					_id.value,
+					m_liveness->topologicalSort().preOrderIndexOf(_id.value),
+					m_liveness->topologicalSort().maxSubtreePreOrderIndexOf(_id.value)
+				);
 				m_result << fmt::format(
 					"LiveIn: {}\\l\\\n",
 					fmt::join(m_liveness->liveIns()[_id.value] | ranges::views::transform(valueToString), ",")
@@ -112,11 +132,13 @@ class SSACFGPrinter
 					fmt::join(m_liveness->liveOuts()[_id.value] | ranges::views::transform(valueToString), ",")
 				);
 			}
+			else
+				m_result << fmt::format("{} [label=\"\\\nBlock {}\\n", formatBlockHandle(_id), _id.value);
 			for (auto const& phi: _block.phis)
 			{
-				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&_cfg.valueInfo(phi));
+				auto const* phiValue = std::get_if<SSACFG::PhiValue>(&m_cfg.valueInfo(phi));
 				solAssert(phiValue);
-				m_result << fmt::format("v{} := {}\\l\\\n", phi.value, formatPhi(_cfg, *phiValue));
+				m_result << fmt::format("v{} := {}\\l\\\n", phi.value, formatPhi(m_cfg, *phiValue));
 			}
 			for (auto const& operation: _block.operations)
 			{
@@ -143,29 +165,28 @@ class SSACFGPrinter
 			std::visit(GenericVisitor{
 				[&](SSACFG::BasicBlock::MainExit const&)
 				{
-					m_result << fmt::format("Block{}_{}Exit [label=\"MainExit\"];\n", _functionIndex, _id.value);
-					m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit;\n", _id.value, _functionIndex);
+					m_result << fmt::format("{}Exit [label=\"MainExit\"];\n", formatBlockHandle(_id));
+					m_result << fmt::format("{} -> {}Exit;\n", formatBlockHandle(_id), formatBlockHandle(_id));
 				},
 				[&](SSACFG::BasicBlock::Jump const& _jump)
 				{
-					m_result << fmt::format("Block{1}_{0} -> Block{1}_{0}Exit [arrowhead=none];\n", _id.value, _functionIndex);
-					m_result << fmt::format("Block{}_{}Exit [label=\"Jump\" shape=oval];\n", _functionIndex, _id.value);
-					m_result << fmt::format("Block{}_{}Exit -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, _jump.target.value);
+					m_result << fmt::format("{} -> {}Exit [arrowhead=none];\n", formatBlockHandle(_id), formatBlockHandle(_id));
+					m_result << fmt::format("{}Exit [label=\"Jump\" shape=oval];\n", formatBlockHandle(_id));
+					m_result << formatEdge(_id, _jump.target);
 				},
 				[&](SSACFG::BasicBlock::ConditionalJump const& _conditionalJump)
 				{
-					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
-					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"{ If ";
-					m_result << varToString(_cfg, _conditionalJump.condition);
-					m_result << "| { <0> Zero | <1> NonZero }}\" shape=Mrecord];\n";
-					m_result << "Block" << _functionIndex << "_" << _id.value;
-					m_result << "Exit:0 -> Block" << _functionIndex << "_" << _conditionalJump.zero.value << ";\n";
-					m_result << "Block" << _functionIndex << "_" << _id.value;
-					m_result << "Exit:1 -> Block" << _functionIndex << "_" << _conditionalJump.nonZero.value << ";\n";
+					m_result << fmt::format("{} -> {}Exit;\n", formatBlockHandle(_id), formatBlockHandle(_id));
+					m_result << fmt::format(
+						"{}Exit [label=\"{{ If {} | {{ <0> Zero | <1> NonZero }}}}\" shape=Mrecord];\n",
+						formatBlockHandle(_id), varToString(m_cfg, _conditionalJump.condition)
+					);
+					m_result << formatEdge(_id, _conditionalJump.zero, "0");
+					m_result << formatEdge(_id, _conditionalJump.nonZero, "1");
 				},
 				[&](SSACFG::BasicBlock::JumpTable const& jt)
 				{
-					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+					m_result << fmt::format("{} -> {}Exit;\n", formatBlockHandle(_id), formatBlockHandle(_id));
 					std::string options;
 					for (auto const& jumpCase: jt.cases)
 					{
@@ -176,28 +197,28 @@ class SSACFGPrinter
 					if (!options.empty())
 						options += " | ";
 					options += "<default> default";
-					m_result << fmt::format("Block{}_{}Exit [label=\"{{ JT | {{ {} }} }}\" shape=Mrecord];\n", _functionIndex, _id.value, options);
+					m_result << fmt::format("{}Exit [label=\"{{ JT | {{ {} }} }}\" shape=Mrecord];\n", formatBlockHandle(_id), options);
 					for (auto const& jumpCase: jt.cases)
-						m_result << fmt::format("Block{}_{}Exit:{} -> Block{}_{};\n", _functionIndex, _id.value, formatNumber(jumpCase.first), _functionIndex, jumpCase.second.value);
-					m_result << fmt::format("Block{}_{}Exit:default -> Block{}_{};\n", _functionIndex, _id.value, _functionIndex, jt.defaultCase.value);
+						m_result << formatEdge(_id, jumpCase.second, formatNumber(jumpCase.first));
+					m_result << formatEdge(_id, jt.defaultCase, "default");
 				},
 				[&](SSACFG::BasicBlock::FunctionReturn const& fr)
 				{
-					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"FunctionReturn["
+					m_result << formatBlockHandle(_id) << "Exit [label=\"FunctionReturn["
 							<< fmt::format("{}", fmt::join(fr.returnValues | ranges::views::transform(valueToString), ", "))
 							<< "]\"];\n";
-					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+					m_result << formatBlockHandle(_id) << " -> " << formatBlockHandle(_id) << "Exit;\n";
 				},
 				[&](SSACFG::BasicBlock::Terminated const&)
 				{
-					m_result << "Block" << _functionIndex << "_" << _id.value << "Exit [label=\"Terminated\"];\n";
-					m_result << "Block" << _functionIndex << "_" << _id.value << " -> Block" << _functionIndex << "_" << _id.value << "Exit;\n";
+					m_result << formatBlockHandle(_id) << "Exit [label=\"Terminated\"];\n";
+					m_result << formatBlockHandle(_id) << " -> " << formatBlockHandle(_id) << "Exit;\n";
 				}
 			}, _block.exit);
 		}
 	}
 
-	void printBlock(SSACFG const& _cfg, SSACFG::BlockId const& _rootId, size_t const _functionIndex)
+	void printBlock(SSACFG::BlockId const& _rootId)
 	{
 		std::set<SSACFG::BlockId> explored{};
 		explored.insert(_rootId);
@@ -209,8 +230,8 @@ class SSACFGPrinter
 		{
 			auto const id = toVisit.front();
 			toVisit.pop_front();
-			auto const& block = _cfg.block(id);
-			writeBlock(_cfg, id, block, _functionIndex);
+			auto const& block = m_cfg.block(id);
+			writeBlock(id, block);
 			block.forEachExit(
 				[&](SSACFG::BlockId const& _exitBlock)
 				{
@@ -224,22 +245,24 @@ class SSACFGPrinter
 		}
 	}
 
-	void printFunction(SSACFG const& _cfg, size_t const _functionIndex, Scope::Function const& _fun)
+	void printFunction(Scope::Function const& _fun)
 	{
 		static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return functionReturnValue.get().name.str(); };
 		static auto constexpr argsTransform = [](auto const& arg) { return fmt::format("v{}", std::get<1>(arg).value); };
-		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " [label=\"";
-		if (!_cfg.returns.empty())
-			m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << m_cfg.entry.value << " [label=\"";
+		if (!m_cfg.returns.empty())
+			m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(m_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
 		else
-			m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(_cfg.arguments | ranges::views::transform(argsTransform), ", "));
+			m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
 		m_result << "\"];\n";
-		m_result << "FunctionEntry_" << _fun.name.str() << "_" << _cfg.entry.value << " -> Block" << _functionIndex << "_" << _cfg.entry.value << ";\n";
-		printBlock(_cfg, _cfg.entry, _functionIndex);
+		m_result << "FunctionEntry_" << _fun.name.str() << "_" << m_cfg.entry.value << " -> Block" << m_functionIndex << "_" << m_cfg.entry.value << ";\n";
+		printBlock(m_cfg.entry);
 	}
 
-	std::stringstream m_result{};
+	SSACFG const& m_cfg;
+	size_t m_functionIndex;
 	SSACFGLiveness const* m_liveness;
+	std::stringstream m_result{};
 };
 }
 
diff --git a/test/libyul/yulSSAControlFlowGraph/complex.yul b/test/libyul/yulSSAControlFlowGraph/complex.yul
index 799e53d06d..6fb0453c18 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex.yul
@@ -52,7 +52,7 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 0)\nLiveIn: \l\
 // LiveOut: \l\nv2 := f(2, 1)\l\
 // pop(v2)\l\
 // "];
@@ -62,13 +62,13 @@
 //  c := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nLiveIn: v0,v1\l\
+// Block 0; (0, max 17)\nLiveIn: v0,v1\l\
 // LiveOut: v0,v1\l\n"];
 // Block1_0 -> Block1_0Exit [arrowhead=none];
 // Block1_0Exit [label="Jump" shape=oval];
-// Block1_0Exit -> Block1_1;
+// Block1_0Exit -> Block1_1 [style="solid"];
 // Block1_1 [label="\
-// Block 1\nLiveIn: v0,v1,v5\l\
+// Block 1; (1, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
@@ -76,123 +76,123 @@
 // v6 := lt(v0, v5)\l\
 // "];
 // Block1_1 -> Block1_1Exit;
-// Block1_1Exit [label="{ If v6| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_1Exit:0 -> Block1_4;
-// Block1_1Exit:1 -> Block1_2;
+// Block1_1Exit [label="{ If v6 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit:0 -> Block1_4 [style="solid"];
+// Block1_1Exit:1 -> Block1_2 [style="solid"];
 // Block1_2 [label="\
-// Block 2\nLiveIn: v0,v1,v5\l\
+// Block 2; (2, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5,v7\l\nv7 := mload(v5)\l\
 // v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
-// Block1_2Exit [label="{ If v8| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_2Exit:0 -> Block1_7;
-// Block1_2Exit:1 -> Block1_6;
+// Block1_2Exit [label="{ If v8 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit:0 -> Block1_7 [style="solid"];
+// Block1_2Exit:1 -> Block1_6 [style="solid"];
 // Block1_4 [label="\
-// Block 4\nLiveIn: \l\
+// Block 4; (4, max 4)\nLiveIn: \l\
 // LiveOut: \l\nsstore(3084, 12)\l\
 // "];
 // Block1_4Exit [label="FunctionReturn[0]"];
 // Block1_4 -> Block1_4Exit;
 // Block1_6 [label="\
-// Block 6\nLiveIn: \l\
+// Block 6; (3, max 4)\nLiveIn: \l\
 // LiveOut: \l\nsstore(514, 2)\l\
 // "];
 // Block1_6 -> Block1_6Exit [arrowhead=none];
 // Block1_6Exit [label="Jump" shape=oval];
-// Block1_6Exit -> Block1_4;
+// Block1_6Exit -> Block1_4 [style="solid"];
 // Block1_7 [label="\
-// Block 7\nLiveIn: v0,v1,v5,v7\l\
+// Block 7; (5, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5,v7\l\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
-// Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_7Exit:0 -> Block1_10;
-// Block1_7Exit:1 -> Block1_9;
+// Block1_7Exit [label="{ If v13 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_7Exit:0 -> Block1_10 [style="solid"];
+// Block1_7Exit:1 -> Block1_9 [style="solid"];
 // Block1_9 [label="\
-// Block 9\nLiveIn: \l\
+// Block 9; (6, max 6)\nLiveIn: \l\
 // LiveOut: \l\nsstore(1028, 4)\l\
 // "];
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nLiveIn: v0,v1,v5,v7\l\
+// Block 10; (7, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5,v7\l\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
-// Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_10Exit:0 -> Block1_13;
-// Block1_10Exit:1 -> Block1_12;
+// Block1_10Exit [label="{ If v20 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_10Exit:0 -> Block1_13 [style="solid"];
+// Block1_10Exit:1 -> Block1_12 [style="solid"];
 // Block1_12 [label="\
-// Block 12\nLiveIn: \l\
+// Block 12; (8, max 8)\nLiveIn: \l\
 // LiveOut: \l\nsstore(1542, 6)\l\
 // revert(0, 0)\l\
 // "];
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nLiveIn: v0,v1,v5,v7\l\
+// Block 13; (9, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5\l\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
-// Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_13Exit:0 -> Block1_16;
-// Block1_13Exit:1 -> Block1_15;
+// Block1_13Exit [label="{ If v25 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_13Exit:0 -> Block1_16 [style="solid"];
+// Block1_13Exit:1 -> Block1_15 [style="solid"];
 // Block1_15 [label="\
-// Block 15\nLiveIn: v0,v1,v5\l\
+// Block 15; (10, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2056, 8)\l\
 // "];
 // Block1_15 -> Block1_15Exit [arrowhead=none];
 // Block1_15Exit [label="Jump" shape=oval];
-// Block1_15Exit -> Block1_5;
+// Block1_15Exit -> Block1_5 [style="solid"];
 // Block1_16 [label="\
-// Block 16\nLiveIn: v0,v1,v5\l\
+// Block 16; (15, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nv29 := mload(v1)\l\
 // "];
 // Block1_16 -> Block1_16Exit;
-// Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_16Exit:0 -> Block1_18;
-// Block1_16Exit:1 -> Block1_17;
+// Block1_16Exit [label="{ If v29 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_16Exit:0 -> Block1_18 [style="solid"];
+// Block1_16Exit:1 -> Block1_17 [style="solid"];
 // Block1_5 [label="\
-// Block 5\nLiveIn: v0,v1,v5\l\
+// Block 5; (11, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2827, 11)\l\
 // "];
 // Block1_5 -> Block1_5Exit [arrowhead=none];
 // Block1_5Exit [label="Jump" shape=oval];
-// Block1_5Exit -> Block1_3;
+// Block1_5Exit -> Block1_3 [style="solid"];
 // Block1_17 [label="\
-// Block 17\nLiveIn: \l\
+// Block 17; (16, max 16)\nLiveIn: \l\
 // LiveOut: \l\nreturn(0, 0)\l\
 // "];
 // Block1_17Exit [label="Terminated"];
 // Block1_17 -> Block1_17Exit;
 // Block1_18 [label="\
-// Block 18\nLiveIn: v0,v1,v5\l\
+// Block 18; (17, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2570, 10)\l\
 // "];
 // Block1_18 -> Block1_18Exit [arrowhead=none];
 // Block1_18Exit [label="Jump" shape=oval];
-// Block1_18Exit -> Block1_5;
+// Block1_18Exit -> Block1_5 [style="solid"];
 // Block1_3 [label="\
-// Block 3\nLiveIn: v0,v1,v5\l\
+// Block 3; (12, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v43\l\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
-// Block1_3Exit [label="{ If v44| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_3Exit:0 -> Block1_21;
-// Block1_3Exit:1 -> Block1_20;
+// Block1_3Exit [label="{ If v44 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_3Exit:0 -> Block1_21 [style="solid"];
+// Block1_3Exit:1 -> Block1_20 [style="solid"];
 // Block1_20 [label="\
-// Block 20\nLiveIn: v43\l\
+// Block 20; (13, max 13)\nLiveIn: v43\l\
 // LiveOut: \l\nsstore(v43, 0)\l\
 // "];
 // Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
-// Block 21\nLiveIn: v0,v1,v43\l\
+// Block 21; (14, max 14)\nLiveIn: v0,v1,v43\l\
 // LiveOut: v0,v1,v43\l\nsstore(65535, 255)\l\
 // "];
 // Block1_21 -> Block1_21Exit [arrowhead=none];
 // Block1_21Exit [label="Jump" shape=oval];
-// Block1_21Exit -> Block1_1;
+// Block1_21Exit -> Block1_1 [style="dashed"];
 // }
diff --git a/test/libyul/yulSSAControlFlowGraph/complex2.yul b/test/libyul/yulSSAControlFlowGraph/complex2.yul
index b35f341417..c3ea8b94f8 100644
--- a/test/libyul/yulSSAControlFlowGraph/complex2.yul
+++ b/test/libyul/yulSSAControlFlowGraph/complex2.yul
@@ -59,7 +59,7 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 0)\nLiveIn: \l\
 // LiveOut: \l\nsstore(1, 1)\l\
 // v2 := f(2, 1)\l\
 // pop(v2)\l\
@@ -78,13 +78,13 @@
 //  c := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nLiveIn: v0,v1\l\
+// Block 0; (0, max 17)\nLiveIn: v0,v1\l\
 // LiveOut: v0,v1\l\n"];
 // Block1_0 -> Block1_0Exit [arrowhead=none];
 // Block1_0Exit [label="Jump" shape=oval];
-// Block1_0Exit -> Block1_1;
+// Block1_0Exit -> Block1_1 [style="solid"];
 // Block1_1 [label="\
-// Block 1\nLiveIn: v0,v1,v5\l\
+// Block 1; (1, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nv5 := φ(\l\
 // 	Block 0 => 42,\l\
 // 	Block 21 => v43\l\
@@ -92,123 +92,123 @@
 // v6 := lt(v0, v5)\l\
 // "];
 // Block1_1 -> Block1_1Exit;
-// Block1_1Exit [label="{ If v6| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_1Exit:0 -> Block1_4;
-// Block1_1Exit:1 -> Block1_2;
+// Block1_1Exit [label="{ If v6 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_1Exit:0 -> Block1_4 [style="solid"];
+// Block1_1Exit:1 -> Block1_2 [style="solid"];
 // Block1_2 [label="\
-// Block 2\nLiveIn: v0,v1,v5\l\
+// Block 2; (2, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5,v7\l\nv7 := mload(v5)\l\
 // v8 := eq(0, v7)\l\
 // "];
 // Block1_2 -> Block1_2Exit;
-// Block1_2Exit [label="{ If v8| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_2Exit:0 -> Block1_7;
-// Block1_2Exit:1 -> Block1_6;
+// Block1_2Exit [label="{ If v8 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_2Exit:0 -> Block1_7 [style="solid"];
+// Block1_2Exit:1 -> Block1_6 [style="solid"];
 // Block1_4 [label="\
-// Block 4\nLiveIn: \l\
+// Block 4; (4, max 4)\nLiveIn: \l\
 // LiveOut: \l\nsstore(3084, 12)\l\
 // "];
 // Block1_4Exit [label="FunctionReturn[27]"];
 // Block1_4 -> Block1_4Exit;
 // Block1_6 [label="\
-// Block 6\nLiveIn: \l\
+// Block 6; (3, max 4)\nLiveIn: \l\
 // LiveOut: \l\nsstore(514, 2)\l\
 // "];
 // Block1_6 -> Block1_6Exit [arrowhead=none];
 // Block1_6Exit [label="Jump" shape=oval];
-// Block1_6Exit -> Block1_4;
+// Block1_6Exit -> Block1_4 [style="solid"];
 // Block1_7 [label="\
-// Block 7\nLiveIn: v0,v1,v5,v7\l\
+// Block 7; (5, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5,v7\l\nv13 := eq(1, v7)\l\
 // "];
 // Block1_7 -> Block1_7Exit;
-// Block1_7Exit [label="{ If v13| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_7Exit:0 -> Block1_10;
-// Block1_7Exit:1 -> Block1_9;
+// Block1_7Exit [label="{ If v13 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_7Exit:0 -> Block1_10 [style="solid"];
+// Block1_7Exit:1 -> Block1_9 [style="solid"];
 // Block1_9 [label="\
-// Block 9\nLiveIn: \l\
+// Block 9; (6, max 6)\nLiveIn: \l\
 // LiveOut: \l\nsstore(1028, 4)\l\
 // "];
 // Block1_9Exit [label="FunctionReturn[0]"];
 // Block1_9 -> Block1_9Exit;
 // Block1_10 [label="\
-// Block 10\nLiveIn: v0,v1,v5,v7\l\
+// Block 10; (7, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5,v7\l\nv20 := eq(2, v7)\l\
 // "];
 // Block1_10 -> Block1_10Exit;
-// Block1_10Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_10Exit:0 -> Block1_13;
-// Block1_10Exit:1 -> Block1_12;
+// Block1_10Exit [label="{ If v20 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_10Exit:0 -> Block1_13 [style="solid"];
+// Block1_10Exit:1 -> Block1_12 [style="solid"];
 // Block1_12 [label="\
-// Block 12\nLiveIn: \l\
+// Block 12; (8, max 8)\nLiveIn: \l\
 // LiveOut: \l\nsstore(1542, 6)\l\
 // revert(0, 0)\l\
 // "];
 // Block1_12Exit [label="Terminated"];
 // Block1_12 -> Block1_12Exit;
 // Block1_13 [label="\
-// Block 13\nLiveIn: v0,v1,v5,v7\l\
+// Block 13; (9, max 17)\nLiveIn: v0,v1,v5,v7\l\
 // LiveOut: v0,v1,v5\l\nv25 := eq(3, v7)\l\
 // "];
 // Block1_13 -> Block1_13Exit;
-// Block1_13Exit [label="{ If v25| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_13Exit:0 -> Block1_16;
-// Block1_13Exit:1 -> Block1_15;
+// Block1_13Exit [label="{ If v25 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_13Exit:0 -> Block1_16 [style="solid"];
+// Block1_13Exit:1 -> Block1_15 [style="solid"];
 // Block1_15 [label="\
-// Block 15\nLiveIn: v0,v1,v5\l\
+// Block 15; (10, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2056, 8)\l\
 // "];
 // Block1_15 -> Block1_15Exit [arrowhead=none];
 // Block1_15Exit [label="Jump" shape=oval];
-// Block1_15Exit -> Block1_5;
+// Block1_15Exit -> Block1_5 [style="solid"];
 // Block1_16 [label="\
-// Block 16\nLiveIn: v0,v1,v5\l\
+// Block 16; (15, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nv29 := mload(v1)\l\
 // "];
 // Block1_16 -> Block1_16Exit;
-// Block1_16Exit [label="{ If v29| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_16Exit:0 -> Block1_18;
-// Block1_16Exit:1 -> Block1_17;
+// Block1_16Exit [label="{ If v29 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_16Exit:0 -> Block1_18 [style="solid"];
+// Block1_16Exit:1 -> Block1_17 [style="solid"];
 // Block1_5 [label="\
-// Block 5\nLiveIn: v0,v1,v5\l\
+// Block 5; (11, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2827, 11)\l\
 // "];
 // Block1_5 -> Block1_5Exit [arrowhead=none];
 // Block1_5Exit [label="Jump" shape=oval];
-// Block1_5Exit -> Block1_3;
+// Block1_5Exit -> Block1_3 [style="solid"];
 // Block1_17 [label="\
-// Block 17\nLiveIn: \l\
+// Block 17; (16, max 16)\nLiveIn: \l\
 // LiveOut: \l\nreturn(0, 0)\l\
 // "];
 // Block1_17Exit [label="Terminated"];
 // Block1_17 -> Block1_17Exit;
 // Block1_18 [label="\
-// Block 18\nLiveIn: v0,v1,v5\l\
+// Block 18; (17, max 17)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v5\l\nsstore(2570, 10)\l\
 // "];
 // Block1_18 -> Block1_18Exit [arrowhead=none];
 // Block1_18Exit [label="Jump" shape=oval];
-// Block1_18Exit -> Block1_5;
+// Block1_18Exit -> Block1_5 [style="solid"];
 // Block1_3 [label="\
-// Block 3\nLiveIn: v0,v1,v5\l\
+// Block 3; (12, max 14)\nLiveIn: v0,v1,v5\l\
 // LiveOut: v0,v1,v43\l\nv43 := add(1, v5)\l\
 // v44 := calldataload(v43)\l\
 // "];
 // Block1_3 -> Block1_3Exit;
-// Block1_3Exit [label="{ If v44| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block1_3Exit:0 -> Block1_21;
-// Block1_3Exit:1 -> Block1_20;
+// Block1_3Exit [label="{ If v44 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1_3Exit:0 -> Block1_21 [style="solid"];
+// Block1_3Exit:1 -> Block1_20 [style="solid"];
 // Block1_20 [label="\
-// Block 20\nLiveIn: v43\l\
+// Block 20; (13, max 13)\nLiveIn: v43\l\
 // LiveOut: \l\nsstore(v43, 0)\l\
 // "];
 // Block1_20Exit [label="FunctionReturn[0]"];
 // Block1_20 -> Block1_20Exit;
 // Block1_21 [label="\
-// Block 21\nLiveIn: v0,v1,v43\l\
+// Block 21; (14, max 14)\nLiveIn: v0,v1,v43\l\
 // LiveOut: v0,v1,v43\l\nsstore(65535, 255)\l\
 // "];
 // Block1_21 -> Block1_21Exit [arrowhead=none];
 // Block1_21Exit [label="Jump" shape=oval];
-// Block1_21Exit -> Block1_1;
+// Block1_21Exit -> Block1_1 [style="dashed"];
 // }
diff --git a/test/libyul/yulSSAControlFlowGraph/function.yul b/test/libyul/yulSSAControlFlowGraph/function.yul
index 1b759f8b39..acf1a37aa4 100644
--- a/test/libyul/yulSSAControlFlowGraph/function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/function.yul
@@ -27,7 +27,7 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 0)\nLiveIn: \l\
 // LiveOut: \l\nv0, v1 := i()\l\
 // h(v0)\l\
 // "];
@@ -37,7 +37,7 @@
 //  r := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nLiveIn: v0,v1\l\
+// Block 0; (0, max 0)\nLiveIn: v0,v1\l\
 // LiveOut: v4\l\nv3 := add(v1, v0)\l\
 // v4 := sub(v0, v3)\l\
 // "];
@@ -47,7 +47,7 @@
 //  g()"];
 // FunctionEntry_g_0 -> Block2_0;
 // Block2_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 0)\nLiveIn: \l\
 // LiveOut: \l\nsstore(257, 1)\l\
 // "];
 // Block2_0Exit [label="FunctionReturn[]"];
@@ -56,7 +56,7 @@
 //  h(v0)"];
 // FunctionEntry_h_0 -> Block3_0;
 // Block3_0 [label="\
-// Block 0\nLiveIn: v0\l\
+// Block 0; (0, max 0)\nLiveIn: v0\l\
 // LiveOut: \l\nv2 := f(0, v0)\l\
 // h(v2)\l\
 // "];
@@ -66,7 +66,7 @@
 //  v, w := i()"];
 // FunctionEntry_i_0 -> Block4_0;
 // Block4_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 0)\nLiveIn: \l\
 // LiveOut: \l\n"];
 // Block4_0Exit [label="FunctionReturn[514, 771]"];
 // Block4_0 -> Block4_0Exit;
diff --git a/test/libyul/yulSSAControlFlowGraph/if.yul b/test/libyul/yulSSAControlFlowGraph/if.yul
index 9c4d73a13a..e2a66ab74f 100644
--- a/test/libyul/yulSSAControlFlowGraph/if.yul
+++ b/test/libyul/yulSSAControlFlowGraph/if.yul
@@ -15,22 +15,22 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 2)\nLiveIn: \l\
 // LiveOut: v1\l\nv1 := calldataload(3)\l\
 // "];
 // Block0_0 -> Block0_0Exit;
-// Block0_0Exit [label="{ If 0| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_0Exit:0 -> Block0_2;
-// Block0_0Exit:1 -> Block0_1;
+// Block0_0Exit [label="{ If 0 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_0Exit:0 -> Block0_2 [style="solid"];
+// Block0_0Exit:1 -> Block0_1 [style="solid"];
 // Block0_1 [label="\
-// Block 1\nLiveIn: \l\
+// Block 1; (1, max 2)\nLiveIn: \l\
 // LiveOut: v4\l\nv4 := calldataload(77)\l\
 // "];
 // Block0_1 -> Block0_1Exit [arrowhead=none];
 // Block0_1Exit [label="Jump" shape=oval];
-// Block0_1Exit -> Block0_2;
+// Block0_1Exit -> Block0_2 [style="solid"];
 // Block0_2 [label="\
-// Block 2\nLiveIn: v5\l\
+// Block 2; (2, max 2)\nLiveIn: v5\l\
 // LiveOut: \l\nv5 := φ(\l\
 // 	Block 0 => v1,\l\
 // 	Block 1 => v4\l\
diff --git a/test/libyul/yulSSAControlFlowGraph/nested_for.yul b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
index 0ed17c870a..b088e3b55e 100644
--- a/test/libyul/yulSSAControlFlowGraph/nested_for.yul
+++ b/test/libyul/yulSSAControlFlowGraph/nested_for.yul
@@ -26,170 +26,195 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\n"];
+// Block 0; (0, max 24)\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block0_0 -> Block0_0Exit [arrowhead=none];
 // Block0_0Exit [label="Jump" shape=oval];
-// Block0_0Exit -> Block0_1;
+// Block0_0Exit -> Block0_1 [style="solid"];
 // Block0_1 [label="\
-// Block 1\nv2 := φ(\l\
+// Block 1; (1, max 24)\nLiveIn: v2\l\
+// LiveOut: v2\l\nv2 := φ(\l\
 // 	Block 0 => 0,\l\
 // 	Block 3 => v36\l\
 // )\l\
 // v3 := lt(3, v2)\l\
 // "];
 // Block0_1 -> Block0_1Exit;
-// Block0_1Exit [label="{ If v3| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_1Exit:0 -> Block0_4;
-// Block0_1Exit:1 -> Block0_2;
+// Block0_1Exit [label="{ If v3 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_1Exit:0 -> Block0_4 [style="solid"];
+// Block0_1Exit:1 -> Block0_2 [style="solid"];
 // Block0_2 [label="\
-// Block 2\n"];
+// Block 2; (2, max 23)\nLiveIn: v2\l\
+// LiveOut: v2\l\n"];
 // Block0_2 -> Block0_2Exit [arrowhead=none];
 // Block0_2Exit [label="Jump" shape=oval];
-// Block0_2Exit -> Block0_5;
+// Block0_2Exit -> Block0_5 [style="solid"];
 // Block0_4 [label="\
-// Block 4\n"];
+// Block 4; (24, max 24)\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block0_4Exit [label="MainExit"];
 // Block0_4 -> Block0_4Exit;
 // Block0_5 [label="\
-// Block 5\nv4 := φ(\l\
+// Block 5; (3, max 23)\nLiveIn: v2,v4\l\
+// LiveOut: v2,v4\l\nv4 := φ(\l\
 // 	Block 2 => 0,\l\
 // 	Block 7 => v35\l\
 // )\l\
 // v5 := lt(3, v4)\l\
 // "];
 // Block0_5 -> Block0_5Exit;
-// Block0_5Exit [label="{ If v5| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_5Exit:0 -> Block0_8;
-// Block0_5Exit:1 -> Block0_6;
+// Block0_5Exit [label="{ If v5 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_5Exit:0 -> Block0_8 [style="solid"];
+// Block0_5Exit:1 -> Block0_6 [style="solid"];
 // Block0_6 [label="\
-// Block 6\n"];
+// Block 6; (4, max 21)\nLiveIn: v2,v4\l\
+// LiveOut: v2,v4\l\n"];
 // Block0_6 -> Block0_6Exit [arrowhead=none];
 // Block0_6Exit [label="Jump" shape=oval];
-// Block0_6Exit -> Block0_9;
+// Block0_6Exit -> Block0_9 [style="solid"];
 // Block0_8 [label="\
-// Block 8\n"];
+// Block 8; (22, max 23)\nLiveIn: v2\l\
+// LiveOut: v2\l\n"];
 // Block0_8 -> Block0_8Exit [arrowhead=none];
 // Block0_8Exit [label="Jump" shape=oval];
-// Block0_8Exit -> Block0_3;
+// Block0_8Exit -> Block0_3 [style="solid"];
 // Block0_9 [label="\
-// Block 9\nv6 := φ(\l\
+// Block 9; (5, max 21)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\nv6 := φ(\l\
 // 	Block 6 => 0,\l\
 // 	Block 11 => v31\l\
 // )\l\
 // v7 := lt(3, v6)\l\
 // "];
 // Block0_9 -> Block0_9Exit;
-// Block0_9Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_9Exit:0 -> Block0_12;
-// Block0_9Exit:1 -> Block0_10;
+// Block0_9Exit [label="{ If v7 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_9Exit:0 -> Block0_12 [style="solid"];
+// Block0_9Exit:1 -> Block0_10 [style="solid"];
 // Block0_3 [label="\
-// Block 3\nv36 := add(1, v2)\l\
+// Block 3; (23, max 23)\nLiveIn: v2\l\
+// LiveOut: v36\l\nv36 := add(1, v2)\l\
 // "];
 // Block0_3 -> Block0_3Exit [arrowhead=none];
 // Block0_3Exit [label="Jump" shape=oval];
-// Block0_3Exit -> Block0_1;
+// Block0_3Exit -> Block0_1 [style="dashed"];
 // Block0_10 [label="\
-// Block 10\n"];
+// Block 10; (6, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_10 -> Block0_10Exit;
-// Block0_10Exit [label="{ If 0| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_10Exit:0 -> Block0_14;
-// Block0_10Exit:1 -> Block0_13;
+// Block0_10Exit [label="{ If 0 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_10Exit:0 -> Block0_14 [style="solid"];
+// Block0_10Exit:1 -> Block0_13 [style="solid"];
 // Block0_12 [label="\
-// Block 12\n"];
+// Block 12; (20, max 21)\nLiveIn: v2,v4\l\
+// LiveOut: v2,v4\l\n"];
 // Block0_12 -> Block0_12Exit [arrowhead=none];
 // Block0_12Exit [label="Jump" shape=oval];
-// Block0_12Exit -> Block0_7;
+// Block0_12Exit -> Block0_7 [style="solid"];
 // Block0_13 [label="\
-// Block 13\n"];
+// Block 13; (7, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_13 -> Block0_13Exit [arrowhead=none];
 // Block0_13Exit [label="Jump" shape=oval];
-// Block0_13Exit -> Block0_15;
+// Block0_13Exit -> Block0_15 [style="solid"];
 // Block0_14 [label="\
-// Block 14\n"];
+// Block 14; (12, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_14 -> Block0_14Exit;
-// Block0_14Exit [label="{ If 1| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_14Exit:0 -> Block0_20;
-// Block0_14Exit:1 -> Block0_19;
+// Block0_14Exit [label="{ If 1 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_14Exit:0 -> Block0_20 [style="solid"];
+// Block0_14Exit:1 -> Block0_19 [style="solid"];
 // Block0_7 [label="\
-// Block 7\nv35 := add(1, v4)\l\
+// Block 7; (21, max 21)\nLiveIn: v2,v4\l\
+// LiveOut: v2,v35\l\nv35 := add(1, v4)\l\
 // "];
 // Block0_7 -> Block0_7Exit [arrowhead=none];
 // Block0_7Exit [label="Jump" shape=oval];
-// Block0_7Exit -> Block0_5;
+// Block0_7Exit -> Block0_5 [style="dashed"];
 // Block0_15 [label="\
-// Block 15\nv8 := φ(\l\
+// Block 15; (8, max 19)\nLiveIn: v2,v4,v6,v8\l\
+// LiveOut: v2,v4,v6,v8\l\nv8 := φ(\l\
 // 	Block 13 => 0,\l\
 // 	Block 17 => v16\l\
 // )\l\
 // v9 := lt(3, v8)\l\
 // "];
 // Block0_15 -> Block0_15Exit;
-// Block0_15Exit [label="{ If v9| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_15Exit:0 -> Block0_18;
-// Block0_15Exit:1 -> Block0_16;
+// Block0_15Exit [label="{ If v9 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_15Exit:0 -> Block0_18 [style="solid"];
+// Block0_15Exit:1 -> Block0_16 [style="solid"];
 // Block0_19 [label="\
-// Block 19\n"];
+// Block 19; (13, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_19 -> Block0_19Exit [arrowhead=none];
 // Block0_19Exit [label="Jump" shape=oval];
-// Block0_19Exit -> Block0_21;
+// Block0_19Exit -> Block0_21 [style="solid"];
 // Block0_20 [label="\
-// Block 20\n"];
+// Block 20; (18, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_20 -> Block0_20Exit [arrowhead=none];
 // Block0_20Exit [label="Jump" shape=oval];
-// Block0_20Exit -> Block0_11;
+// Block0_20Exit -> Block0_11 [style="solid"];
 // Block0_16 [label="\
-// Block 16\nv13 := add(v4, v2)\l\
+// Block 16; (9, max 10)\nLiveIn: v2,v4,v6,v8\l\
+// LiveOut: v2,v4,v6,v8\l\nv13 := add(v4, v2)\l\
 // v14 := add(v6, v13)\l\
 // sstore(v14, v8)\l\
 // "];
 // Block0_16 -> Block0_16Exit [arrowhead=none];
 // Block0_16Exit [label="Jump" shape=oval];
-// Block0_16Exit -> Block0_17;
+// Block0_16Exit -> Block0_17 [style="solid"];
 // Block0_18 [label="\
-// Block 18\n"];
+// Block 18; (11, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_18 -> Block0_18Exit [arrowhead=none];
 // Block0_18Exit [label="Jump" shape=oval];
-// Block0_18Exit -> Block0_14;
+// Block0_18Exit -> Block0_14 [style="solid"];
 // Block0_21 [label="\
-// Block 21\nv19 := φ(\l\
+// Block 21; (14, max 19)\nLiveIn: v2,v4,v6,v19\l\
+// LiveOut: v2,v4,v6,v19\l\nv19 := φ(\l\
 // 	Block 19 => 0,\l\
 // 	Block 23 => v26\l\
 // )\l\
 // v20 := lt(3, v19)\l\
 // "];
 // Block0_21 -> Block0_21Exit;
-// Block0_21Exit [label="{ If v20| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_21Exit:0 -> Block0_24;
-// Block0_21Exit:1 -> Block0_22;
+// Block0_21Exit [label="{ If v20 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_21Exit:0 -> Block0_24 [style="solid"];
+// Block0_21Exit:1 -> Block0_22 [style="solid"];
 // Block0_11 [label="\
-// Block 11\nv31 := add(1, v6)\l\
+// Block 11; (19, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v31\l\nv31 := add(1, v6)\l\
 // "];
 // Block0_11 -> Block0_11Exit [arrowhead=none];
 // Block0_11Exit [label="Jump" shape=oval];
-// Block0_11Exit -> Block0_9;
+// Block0_11Exit -> Block0_9 [style="dashed"];
 // Block0_17 [label="\
-// Block 17\nv16 := add(1, v8)\l\
+// Block 17; (10, max 10)\nLiveIn: v2,v4,v6,v8\l\
+// LiveOut: v2,v4,v6,v16\l\nv16 := add(1, v8)\l\
 // "];
 // Block0_17 -> Block0_17Exit [arrowhead=none];
 // Block0_17Exit [label="Jump" shape=oval];
-// Block0_17Exit -> Block0_15;
+// Block0_17Exit -> Block0_15 [style="dashed"];
 // Block0_22 [label="\
-// Block 22\nv24 := add(v4, v2)\l\
+// Block 22; (15, max 16)\nLiveIn: v2,v4,v6,v19\l\
+// LiveOut: v2,v4,v6,v19\l\nv24 := add(v4, v2)\l\
 // v25 := add(v6, v24)\l\
 // sstore(v25, v19)\l\
 // "];
 // Block0_22 -> Block0_22Exit [arrowhead=none];
 // Block0_22Exit [label="Jump" shape=oval];
-// Block0_22Exit -> Block0_23;
+// Block0_22Exit -> Block0_23 [style="solid"];
 // Block0_24 [label="\
-// Block 24\n"];
+// Block 24; (17, max 19)\nLiveIn: v2,v4,v6\l\
+// LiveOut: v2,v4,v6\l\n"];
 // Block0_24 -> Block0_24Exit [arrowhead=none];
 // Block0_24Exit [label="Jump" shape=oval];
-// Block0_24Exit -> Block0_20;
+// Block0_24Exit -> Block0_20 [style="solid"];
 // Block0_23 [label="\
-// Block 23\nv26 := add(1, v19)\l\
+// Block 23; (16, max 16)\nLiveIn: v2,v4,v6,v19\l\
+// LiveOut: v2,v4,v6,v26\l\nv26 := add(1, v19)\l\
 // "];
 // Block0_23 -> Block0_23Exit [arrowhead=none];
 // Block0_23Exit [label="Jump" shape=oval];
-// Block0_23Exit -> Block0_21;
+// Block0_23Exit -> Block0_21 [style="dashed"];
 // }
diff --git a/test/libyul/yulSSAControlFlowGraph/nested_function.yul b/test/libyul/yulSSAControlFlowGraph/nested_function.yul
index 859b241515..acda15ce81 100644
--- a/test/libyul/yulSSAControlFlowGraph/nested_function.yul
+++ b/test/libyul/yulSSAControlFlowGraph/nested_function.yul
@@ -38,14 +38,16 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\n"];
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block0_0Exit [label="MainExit"];
 // Block0_0 -> Block0_0Exit;
 // FunctionEntry_f_0 [label="function f:
 //  r := f(v0, v1)"];
 // FunctionEntry_f_0 -> Block1_0;
 // Block1_0 [label="\
-// Block 0\nv3 := add(v1, v0)\l\
+// Block 0; (0, max 0)\nLiveIn: v0,v1\l\
+// LiveOut: v4\l\nv3 := add(v1, v0)\l\
 // v4 := sub(v0, v3)\l\
 // "];
 // Block1_0Exit [label="FunctionReturn[v4]"];
@@ -54,7 +56,8 @@
 //  g()"];
 // FunctionEntry_g_0 -> Block2_0;
 // Block2_0 [label="\
-// Block 0\nv1 := v()\l\
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: \l\nv1 := v()\l\
 // v2 := f(2, v1)\l\
 // v3 := z()\l\
 // sstore(v2, v3)\l\
@@ -65,7 +68,8 @@
 //  r := z()"];
 // FunctionEntry_z_0 -> Block3_0;
 // Block3_0 [label="\
-// Block 0\nv1 := w()\l\
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: v1\l\nv1 := w()\l\
 // "];
 // Block3_0Exit [label="FunctionReturn[v1]"];
 // Block3_0 -> Block3_0Exit;
@@ -73,14 +77,16 @@
 //  rw1 := w()"];
 // FunctionEntry_w_0 -> Block4_0;
 // Block4_0 [label="\
-// Block 0\n"];
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block4_0Exit [label="FunctionReturn[1]"];
 // Block4_0 -> Block4_0Exit;
 // FunctionEntry_v_0 [label="function v:
 //  r := v()"];
 // FunctionEntry_v_0 -> Block5_0;
 // Block5_0 [label="\
-// Block 0\nv1 := w()\l\
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: v1\l\nv1 := w()\l\
 // "];
 // Block5_0Exit [label="FunctionReturn[v1]"];
 // Block5_0 -> Block5_0Exit;
@@ -88,27 +94,31 @@
 //  rw2 := w()"];
 // FunctionEntry_w_0 -> Block6_0;
 // Block6_0 [label="\
-// Block 0\n"];
+// Block 0; (0, max 0)\nLiveIn: \l\
+// LiveOut: \l\n"];
 // Block6_0Exit [label="FunctionReturn[17]"];
 // Block6_0 -> Block6_0Exit;
 // FunctionEntry_cycle1_0 [label="function cycle1:
 //  r := cycle1()"];
 // FunctionEntry_cycle1_0 -> Block7_0;
 // Block7_0 [label="\
-// Block 0\nv2 := mload(3)\l\
+// Block 0; (0, max 2)\nLiveIn: \l\
+// LiveOut: \l\nv2 := mload(3)\l\
 // "];
 // Block7_0 -> Block7_0Exit;
-// Block7_0Exit [label="{ If v2| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block7_0Exit:0 -> Block7_2;
-// Block7_0Exit:1 -> Block7_1;
+// Block7_0Exit [label="{ If v2 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block7_0Exit:0 -> Block7_2 [style="solid"];
+// Block7_0Exit:1 -> Block7_1 [style="solid"];
 // Block7_1 [label="\
-// Block 1\nv3 := cycle2()\l\
+// Block 1; (1, max 2)\nLiveIn: \l\
+// LiveOut: v3\l\nv3 := cycle2()\l\
 // "];
 // Block7_1 -> Block7_1Exit [arrowhead=none];
 // Block7_1Exit [label="Jump" shape=oval];
-// Block7_1Exit -> Block7_2;
+// Block7_1Exit -> Block7_2 [style="solid"];
 // Block7_2 [label="\
-// Block 2\nv4 := φ(\l\
+// Block 2; (2, max 2)\nLiveIn: v4\l\
+// LiveOut: v4\l\nv4 := φ(\l\
 // 	Block 0 => 0,\l\
 // 	Block 1 => v3\l\
 // )\l\
@@ -119,20 +129,23 @@
 //  r := cycle2()"];
 // FunctionEntry_cycle2_0 -> Block8_0;
 // Block8_0 [label="\
-// Block 0\nv2 := mload(4)\l\
+// Block 0; (0, max 2)\nLiveIn: \l\
+// LiveOut: \l\nv2 := mload(4)\l\
 // "];
 // Block8_0 -> Block8_0Exit;
-// Block8_0Exit [label="{ If v2| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block8_0Exit:0 -> Block8_2;
-// Block8_0Exit:1 -> Block8_1;
+// Block8_0Exit [label="{ If v2 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block8_0Exit:0 -> Block8_2 [style="solid"];
+// Block8_0Exit:1 -> Block8_1 [style="solid"];
 // Block8_1 [label="\
-// Block 1\nv3 := cycle1()\l\
+// Block 1; (1, max 2)\nLiveIn: \l\
+// LiveOut: v3\l\nv3 := cycle1()\l\
 // "];
 // Block8_1 -> Block8_1Exit [arrowhead=none];
 // Block8_1Exit [label="Jump" shape=oval];
-// Block8_1Exit -> Block8_2;
+// Block8_1Exit -> Block8_2 [style="solid"];
 // Block8_2 [label="\
-// Block 2\nv4 := φ(\l\
+// Block 2; (2, max 2)\nLiveIn: v4\l\
+// LiveOut: v4\l\nv4 := φ(\l\
 // 	Block 0 => 0,\l\
 // 	Block 1 => v3\l\
 // )\l\
diff --git a/test/libyul/yulSSAControlFlowGraph/switch.yul b/test/libyul/yulSSAControlFlowGraph/switch.yul
index d744bd7bd2..10573b0122 100644
--- a/test/libyul/yulSSAControlFlowGraph/switch.yul
+++ b/test/libyul/yulSSAControlFlowGraph/switch.yul
@@ -22,32 +22,32 @@
 // Entry0 [label="Entry"];
 // Entry0 -> Block0_0;
 // Block0_0 [label="\
-// Block 0\nLiveIn: \l\
+// Block 0; (0, max 5)\nLiveIn: \l\
 // LiveOut: v3\l\nv1 := calldataload(3)\l\
 // v3 := sload(0)\l\
 // v4 := eq(0, v3)\l\
 // "];
 // Block0_0 -> Block0_0Exit;
-// Block0_0Exit [label="{ If v4| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_0Exit:0 -> Block0_3;
-// Block0_0Exit:1 -> Block0_2;
+// Block0_0Exit [label="{ If v4 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_0Exit:0 -> Block0_3 [style="solid"];
+// Block0_0Exit:1 -> Block0_2 [style="solid"];
 // Block0_2 [label="\
-// Block 2\nLiveIn: \l\
+// Block 2; (1, max 2)\nLiveIn: \l\
 // LiveOut: v6\l\nv6 := calldataload(77)\l\
 // "];
 // Block0_2 -> Block0_2Exit [arrowhead=none];
 // Block0_2Exit [label="Jump" shape=oval];
-// Block0_2Exit -> Block0_1;
+// Block0_2Exit -> Block0_1 [style="solid"];
 // Block0_3 [label="\
-// Block 3\nLiveIn: v3\l\
+// Block 3; (3, max 5)\nLiveIn: v3\l\
 // LiveOut: \l\nv7 := eq(1, v3)\l\
 // "];
 // Block0_3 -> Block0_3Exit;
-// Block0_3Exit [label="{ If v7| { <0> Zero | <1> NonZero }}" shape=Mrecord];
-// Block0_3Exit:0 -> Block0_5;
-// Block0_3Exit:1 -> Block0_4;
+// Block0_3Exit [label="{ If v7 | { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block0_3Exit:0 -> Block0_5 [style="solid"];
+// Block0_3Exit:1 -> Block0_4 [style="solid"];
 // Block0_1 [label="\
-// Block 1\nLiveIn: v13\l\
+// Block 1; (2, max 2)\nLiveIn: v13\l\
 // LiveOut: \l\nv13 := φ(\l\
 // 	Block 2 => v6,\l\
 // 	Block 4 => v10,\l\
@@ -58,17 +58,17 @@
 // Block0_1Exit [label="MainExit"];
 // Block0_1 -> Block0_1Exit;
 // Block0_4 [label="\
-// Block 4\nLiveIn: \l\
+// Block 4; (4, max 4)\nLiveIn: \l\
 // LiveOut: v10\l\nv10 := calldataload(88)\l\
 // "];
 // Block0_4 -> Block0_4Exit [arrowhead=none];
 // Block0_4Exit [label="Jump" shape=oval];
-// Block0_4Exit -> Block0_1;
+// Block0_4Exit -> Block0_1 [style="solid"];
 // Block0_5 [label="\
-// Block 5\nLiveIn: \l\
+// Block 5; (5, max 5)\nLiveIn: \l\
 // LiveOut: v12\l\nv12 := calldataload(99)\l\
 // "];
 // Block0_5 -> Block0_5Exit [arrowhead=none];
 // Block0_5Exit [label="Jump" shape=oval];
-// Block0_5Exit -> Block0_1;
+// Block0_5Exit -> Block0_1 [style="solid"];
 // }

From 8a77a26861046a0a2a37cfc908edcc8947ffb91a Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:56:20 +0200
Subject: [PATCH 1128/1140] SSACFGLiveness: add operation-wise live out

---
 libyul/backends/evm/SSACFGLiveness.cpp      | 32 ++++++++++++++++++++-
 libyul/backends/evm/SSACFGLiveness.h        | 12 +++++---
 libyul/backends/evm/SSAControlFlowGraph.cpp |  4 +--
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/libyul/backends/evm/SSACFGLiveness.cpp b/libyul/backends/evm/SSACFGLiveness.cpp
index b9513f70df..85bd41d10e 100644
--- a/libyul/backends/evm/SSACFGLiveness.cpp
+++ b/libyul/backends/evm/SSACFGLiveness.cpp
@@ -29,12 +29,16 @@ SSACFGLiveness::SSACFGLiveness(SSACFG const& _cfg):
 	m_topologicalSort(_cfg),
 	m_loopNestingForest(m_topologicalSort),
 	m_liveIns(_cfg.numBlocks()),
-	m_liveOuts(_cfg.numBlocks())
+	m_liveOuts(_cfg.numBlocks()),
+	m_operationLiveOuts(_cfg.numBlocks())
 {
 	runDagDfs();
 	for (auto const loopRootNode: m_loopNestingForest.loopRootNodes())
 		runLoopTreeDfs(loopRootNode);
+
+	fillOperationsLiveOut();
 }
+
 void SSACFGLiveness::runDagDfs()
 {
 	// SSA Book, Algorithm 9.2
@@ -103,6 +107,7 @@ void SSACFGLiveness::runDagDfs()
 		m_liveIns[blockId.value] = live + block.phis;
 	}
 }
+
 void SSACFGLiveness::runLoopTreeDfs(size_t const _loopHeader)
 {
 	// SSA Book, Algorithm 9.3
@@ -126,3 +131,28 @@ void SSACFGLiveness::runLoopTreeDfs(size_t const _loopHeader)
 			}
 	}
 }
+
+void SSACFGLiveness::fillOperationsLiveOut()
+{
+	auto const filterLiterals = [this](auto const& valueId){
+		return !std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(valueId));
+	};
+	for (size_t blockIdValue = 0; blockIdValue < m_cfg.numBlocks(); ++blockIdValue)
+	{
+		auto const& operations = m_cfg.block(SSACFG::BlockId{blockIdValue}).operations;
+		auto& liveOuts = m_operationLiveOuts[blockIdValue];
+		liveOuts.resize(operations.size());
+		if (!operations.empty())
+		{
+			auto live = m_liveOuts[blockIdValue];
+			auto rit = liveOuts.rbegin();
+			for (auto const& op: operations | ranges::views::reverse)
+			{
+				*rit = live;
+				live -= op.outputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+				live += op.inputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+				++rit;
+			}
+		}
+	}
+}
diff --git a/libyul/backends/evm/SSACFGLiveness.h b/libyul/backends/evm/SSACFGLiveness.h
index 6f486b737f..72752cfefd 100644
--- a/libyul/backends/evm/SSACFGLiveness.h
+++ b/libyul/backends/evm/SSACFGLiveness.h
@@ -35,21 +35,25 @@ namespace solidity::yul
 class SSACFGLiveness
 {
 public:
+	using LivenessData = std::set<SSACFG::ValueId>;
 	explicit SSACFGLiveness(SSACFG const& _cfg);
 
-	std::vector<std::set<SSACFG::ValueId>> const& liveIns() const { return m_liveIns; }
-	std::vector<std::set<SSACFG::ValueId>> const& liveOuts() const { return m_liveOuts; }
+	LivenessData const& liveIn(SSACFG::BlockId _blockId) const { return m_liveIns[_blockId.value]; }
+	LivenessData const& liveOut(SSACFG::BlockId _blockId) const { return m_liveOuts[_blockId.value]; }
+	std::vector<LivenessData> const& operationsLiveOut(SSACFG::BlockId _blockId) const { return m_operationLiveOuts[_blockId.value]; }
 	ForwardSSACFGTopologicalSort const& topologicalSort() const { return m_topologicalSort; }
 private:
 
 	void runDagDfs();
 	void runLoopTreeDfs(size_t _loopHeader);
+	void fillOperationsLiveOut();
 
 	SSACFG const& m_cfg;
 	ForwardSSACFGTopologicalSort m_topologicalSort;
 	SSACFGLoopNestingForest m_loopNestingForest;
-	std::vector<std::set<SSACFG::ValueId>> m_liveIns;
-	std::vector<std::set<SSACFG::ValueId>> m_liveOuts;
+	std::vector<LivenessData> m_liveIns;
+	std::vector<LivenessData> m_liveOuts;
+	std::vector<std::vector<LivenessData>> m_operationLiveOuts;
 };
 
 }
diff --git a/libyul/backends/evm/SSAControlFlowGraph.cpp b/libyul/backends/evm/SSAControlFlowGraph.cpp
index ebd6d84a96..35c9db0dfe 100644
--- a/libyul/backends/evm/SSAControlFlowGraph.cpp
+++ b/libyul/backends/evm/SSAControlFlowGraph.cpp
@@ -125,11 +125,11 @@ class SSACFGPrinter
 				);
 				m_result << fmt::format(
 					"LiveIn: {}\\l\\\n",
-					fmt::join(m_liveness->liveIns()[_id.value] | ranges::views::transform(valueToString), ",")
+					fmt::join(m_liveness->liveIn(_id) | ranges::views::transform(valueToString), ",")
 				);
 				m_result << fmt::format(
 					"LiveOut: {}\\l\\n",
-					fmt::join(m_liveness->liveOuts()[_id.value] | ranges::views::transform(valueToString), ",")
+					fmt::join(m_liveness->liveOut(_id) | ranges::views::transform(valueToString), ",")
 				);
 			}
 			else

From cdfb93edf08ad36d1399fbb5aa960e29812828ab Mon Sep 17 00:00:00 2001
From: Elias Rad <146735585+nnsW3@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:42:05 +0300
Subject: [PATCH 1129/1140] Update functions.rst

---
 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 e653eb8f09..a3a2755388 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -267,7 +267,7 @@ This behavior is also in line with the ``STATICCALL`` opcode.
 
 .. note::
   Prior to version 0.4.17 the compiler did not enforce that ``pure`` is not reading the state.
-  It is a compile-time type check, which can be circumvented doing invalid explicit conversions
+  It is a compile-time type check, which can be circumvented by doing invalid explicit conversions
   between contract types, because the compiler can verify that the type of the contract does
   not do state-changing operations, but it cannot check that the contract that will be called
   at runtime is actually of that type.

From 11395ad5b4462de08efa294a5e31c221a4d37bda Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:24:26 +0200
Subject: [PATCH 1130/1140] CI: Remove nightly codecov job

---
 .circleci/config.yml | 46 --------------------------------------------
 codecov.yml          | 22 ---------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 codecov.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed14c8af4d..ca1043685c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -670,11 +670,6 @@ defaults:
       requires:
         - b_archlinux
 
-  - requires_b_ubu_codecov: &requires_b_ubu_codecov
-      <<: *on_all_tags_and_branches
-      requires:
-        - b_ubu_codecov
-
   - requires_b_osx: &requires_b_osx
       <<: *on_all_tags_and_branches
       requires:
@@ -1074,43 +1069,6 @@ jobs:
             - solc/solc-static-linux
       - matrix_notify_failure_unless_pr
 
-  b_ubu_codecov:
-    # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2404
-    environment:
-      <<: *base_ubuntu2404_env
-      COVERAGE: ON
-      CMAKE_BUILD_TYPE: Debug
-      CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-fuse-ld=gold
-    steps:
-      - checkout
-      - run_build
-      - persist_executables_to_workspace
-      - matrix_notify_failure_unless_pr
-
-  t_ubu_codecov:
-    <<: *base_ubuntu2404_large
-    environment:
-      <<: *base_ubuntu2404_large_env
-      EVM: << pipeline.parameters.evm-version >>
-      OPTIMIZE: 1
-    steps:
-      - checkout
-      - attach_workspace:
-          at: build
-      - run:
-          name: "soltest: Syntax Tests"
-          command: build/test/soltest -t 'syntaxTest*' -- --testpath test
-      - run:
-          name: "Code Coverage: Syntax Tests"
-          command: codecov --flags syntax --gcov-root build
-      - run_soltest
-      - run:
-          name: "Coverage: All"
-          command: codecov --flags all --gcov-root build
-      - store_artifacts_test_results
-      - 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.
   b_ubu_cxx20:
@@ -2007,10 +1965,6 @@ workflows:
           <<: *on_develop
 
     jobs:
-      # Code Coverage enabled build and tests
-      - b_ubu_codecov: *requires_nothing
-      - t_ubu_codecov: *requires_b_ubu_codecov
-
       # ASan build and tests
       - b_ubu_asan: *requires_nothing
       - b_ubu_san_clang: *job_b_ubu_asan_clang
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index c0b72761e4..0000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-codecov:
-  branch: develop
-coverage:
-  range: 70...100
-  status:
-    patch:
-      default:
-        target: "50%"
-        paths: "!test/"
-    project:
-      default:
-        target: auto
-        paths: "!test/"
-      syntax:
-        target: auto
-        paths: "libsolidity/analysis"
-        flags: syntax
-      tests:
-        target: auto
-        paths: "test/"
-comment:
-  layout: "reach, diff, flags"

From 5f2b1bf72d9fc2ea87eeecc66f03f2480f2c135c Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:12:54 +0200
Subject: [PATCH 1131/1140] Docs: fix curly bracket language wikipedia anchor

---
 docs/index.rst               | 2 +-
 docs/language-influences.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 600173d654..f1608890d7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,7 +4,7 @@ Solidity
 Solidity is an object-oriented, high-level language for implementing smart contracts.
 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).
+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.
 
diff --git a/docs/language-influences.rst b/docs/language-influences.rst
index e4f0ab6902..a3ab1562e9 100644
--- a/docs/language-influences.rst
+++ b/docs/language-influences.rst
@@ -2,7 +2,7 @@
 Language Influences
 ###################
 
-Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_
+Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly_bracket_languages>`_
 that has been influenced and inspired by several well-known programming languages.
 
 Solidity is most profoundly influenced by C++, but also borrowed concepts from languages like

From 9b97e52d45b4d94df22b3599dc0411317b056668 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 8 Oct 2024 11:58:12 -0300
Subject: [PATCH 1132/1140] sort Changelog

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

diff --git a/Changelog.md b/Changelog.md
index de1674a15a..eabd5b9eee 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
-### 0.8.28 (unreleased)
+### 0.8.28 (2024-10-09)
 
 Language Features:
- * Transient storage value type state variables are now fully supported.
+ * Transient storage state variables of value types are now fully supported.
 
 
 Compiler Features:
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index f9913d812c..2c3b6487ae 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1902,6 +1902,10 @@
         "bugs": [],
         "released": "2024-09-04"
     },
+    "0.8.28": {
+        "bugs": [],
+        "released": "2024-10-09"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From fecd1329cd7a2bb0b77428ac8d02bb6b86c72d24 Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Wed, 9 Oct 2024 13:06:41 +0200
Subject: [PATCH 1133/1140] eof: Support EOF asm analysis

---
 libyul/AsmAnalysis.cpp                        | 43 +++++++++++++++++--
 libyul/AsmAnalysis.h                          |  4 ++
 test/Common.cpp                               |  2 +
 test/TestCase.cpp                             | 30 ++++++++++++-
 test/TestCase.h                               |  4 ++
 .../eof/call_intruction_in_eof.yul            | 13 ++++++
 6 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 test/libyul/yulSyntaxTests/eof/call_intruction_in_eof.yul

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index cf8c720f6b..682931dc41 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -625,12 +625,16 @@ void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation cons
 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.
-	// TODO: Add EOF support
 	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt).builtin(YulName(_instructionIdentifier));
 	if (builtin && builtin->instruction.has_value())
 		return validateInstructions(builtin->instruction.value(), _location);
-	else
-		return false;
+
+	// TODO: Change `prague()` to `EVMVersion{}` once EOF gets deployed
+	auto const eofBuiltin = EVMDialect::strictAssemblyForEVM(EVMVersion::prague(), 1).builtin(YulName(_instructionIdentifier));
+	if (eofBuiltin && eofBuiltin->instruction.has_value())
+		return validateInstructions(eofBuiltin->instruction.value(), _location);
+
+	return false;
 }
 
 bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocation const& _location)
@@ -702,9 +706,42 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 			"PC instruction is a low-level EVM feature. "
 			"Because of that PC is disallowed in strict assembly."
 		);
+	else if (m_eofVersion.has_value() && (
+		_instr == evmasm::Instruction::CALL ||
+		_instr == evmasm::Instruction::CALLCODE ||
+		_instr == evmasm::Instruction::DELEGATECALL ||
+		_instr == evmasm::Instruction::SELFDESTRUCT ||
+		_instr == evmasm::Instruction::JUMP ||
+		_instr == evmasm::Instruction::JUMPI ||
+		_instr == evmasm::Instruction::PC ||
+		_instr == evmasm::Instruction::CREATE ||
+		_instr == evmasm::Instruction::CODESIZE ||
+		_instr == evmasm::Instruction::CODECOPY ||
+		_instr == evmasm::Instruction::EXTCODESIZE ||
+		_instr == evmasm::Instruction::EXTCODECOPY ||
+		_instr == evmasm::Instruction::GAS
+	))
+	{
+		m_errorReporter.typeError(
+			9132_error,
+			_location,
+			fmt::format(
+				"The \"{instruction}\" instruction is {kind} VMs (you are currently compiling to EOF).",
+				fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr, m_evmVersion).name)),
+				fmt::arg("kind", "only available in legacy bytecode")
+			)
+		);
+	}
 	else
+	{
+		// Sanity check
+		solAssert(m_evmVersion.hasOpcode(_instr, m_eofVersion));
 		return false;
+	}
 
+	// Sanity check
+	// PC is not available in strict assembly but it is always valid opcode in legacy evm.
+	solAssert(_instr == evmasm::Instruction::PC || !m_evmVersion.hasOpcode(_instr, m_eofVersion));
 	return true;
 }
 
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index 64cab51f54..d8a2b2b1ac 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -70,7 +70,10 @@ class AsmAnalyzer
 		m_dataNames(std::move(_dataNames))
 	{
 		if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect))
+		{
 			m_evmVersion = evmDialect->evmVersion();
+			m_eofVersion = evmDialect->eofVersion();
+		}
 	}
 
 	bool analyze(Block const& _block);
@@ -125,6 +128,7 @@ class AsmAnalyzer
 	AsmAnalysisInfo& m_info;
 	langutil::ErrorReporter& m_errorReporter;
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	Dialect const& m_dialect;
 	/// Names of data objects to be referenced by builtin functions with literal arguments.
 	std::set<std::string> m_dataNames;
diff --git a/test/Common.cpp b/test/Common.cpp
index ae725774c4..bab95c457b 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -155,6 +155,8 @@ void CommonOptions::validate() const
 			std::cout << "- ABI coder: v1 (default: v2)" << std::endl;
 		std::cout << std::endl << "DO NOT COMMIT THE UPDATED EXPECTATIONS." << std::endl << std::endl;
 	}
+
+	assertThrow(!eofVersion().has_value() || evmVersion() >= langutil::EVMVersion::prague(), ConfigException, "EOF is unavailable before Prague fork.");
 }
 
 bool CommonOptions::parse(int argc, char const* const* argv)
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index ae89bb56f3..942153d3cd 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -96,8 +96,7 @@ TestCase::TestResult TestCase::checkResult(std::ostream& _stream, const std::str
 	return TestResult::Success;
 }
 
-EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(std::string const& _filename):
-	TestCase(_filename)
+void EVMVersionRestrictedTestCase::processEVMVersionSetting()
 {
 	std::string versionString = m_reader.stringSetting("EVMVersion", "any");
 	if (versionString == "any")
@@ -139,3 +138,30 @@ EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(std::string const& _f
 	if (!comparisonResult)
 		m_shouldRun = false;
 }
+
+void EVMVersionRestrictedTestCase::processBytecodeFormatSetting()
+{
+	std::optional<uint8_t> eofVersion = solidity::test::CommonOptions::get().eofVersion();
+	// TODO: Update if EOF moved to Osaka
+	// EOF only available since Prague
+	solAssert(!eofVersion.has_value() ||solidity::test::CommonOptions::get().evmVersion() >= langutil::EVMVersion::prague());
+
+	std::string bytecodeFormatString = m_reader.stringSetting("bytecodeFormat", "legacy");
+	if (bytecodeFormatString == "legacy,>=EOFv1" || bytecodeFormatString == ">=EOFv1,legacy")
+		return;
+
+	// TODO: This is naive implementation because for now we support only one EOF version.
+	if (bytecodeFormatString == "legacy" && eofVersion.has_value())
+		m_shouldRun = false;
+	else if (bytecodeFormatString == ">=EOFv1" && !eofVersion.has_value())
+		m_shouldRun = false;
+	else if (bytecodeFormatString != "legacy" && bytecodeFormatString != ">=EOFv1" )
+		BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid bytecodeFormat flag: \"" + bytecodeFormatString + "\""});
+}
+
+EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(std::string const& _filename):
+	TestCase(_filename)
+{
+	processEVMVersionSetting();
+	processBytecodeFormatSetting();
+}
diff --git a/test/TestCase.h b/test/TestCase.h
index 301dbfb658..bdf51d2a55 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -112,6 +112,10 @@ class TestCase
 
 class EVMVersionRestrictedTestCase: public TestCase
 {
+private:
+	void processEVMVersionSetting();
+	void processBytecodeFormatSetting();
+
 protected:
 	EVMVersionRestrictedTestCase(std::string const& _filename);
 };
diff --git a/test/libyul/yulSyntaxTests/eof/call_intruction_in_eof.yul b/test/libyul/yulSyntaxTests/eof/call_intruction_in_eof.yul
new file mode 100644
index 0000000000..d26af22a70
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/eof/call_intruction_in_eof.yul
@@ -0,0 +1,13 @@
+object "a" {
+    code {
+        let success := call(gas(), 0x1, 0, 128, 4, 128, 0)
+    }
+}
+// ====
+// EVMVersion: >=shanghai
+// bytecodeFormat: >=EOFv1
+// ----
+// TypeError 9132: (47-51): The "call" instruction is only available in legacy bytecode VMs (you are currently compiling to EOF).
+// TypeError 9132: (52-55): The "gas" instruction is only available in legacy bytecode VMs (you are currently compiling to EOF).
+// TypeError 3950: (52-57): Expected expression to evaluate to one value, but got 0 values instead.
+// DeclarationError 3812: (32-82): Variable count mismatch for declaration of "success": 1 variables and 0 values.

From 91a37af31ae42d73aa591fca1e42de2fa37a7007 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 8 Oct 2024 12:19:32 -0300
Subject: [PATCH 1134/1140] Set next version (0.8.29)

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c36ff73b4..b78269a3d6 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.28")
+set(PROJECT_VERSION "0.8.29")
 # 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 eabd5b9eee..13af14b75b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.29 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.28 (2024-10-09)
 
 Language Features:

From 7210680329061d0a1f0e03a1431a9781fd79708d Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:05:48 +0200
Subject: [PATCH 1135/1140] Yul: SSACFGLiveness simplifications

---
 libyul/backends/evm/SSACFGLiveness.cpp | 50 +++++++++++++-------------
 libyul/backends/evm/SSACFGLiveness.h   |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/libyul/backends/evm/SSACFGLiveness.cpp b/libyul/backends/evm/SSACFGLiveness.cpp
index 85bd41d10e..4537c8c5d8 100644
--- a/libyul/backends/evm/SSACFGLiveness.cpp
+++ b/libyul/backends/evm/SSACFGLiveness.cpp
@@ -24,6 +24,17 @@
 
 using namespace solidity::yul;
 
+namespace
+{
+constexpr auto literalsFilter(SSACFG const& _cfg)
+{
+	return [&_cfg](SSACFG::ValueId const& _valueId) -> bool
+	{
+		return !std::holds_alternative<SSACFG::LiteralValue>(_cfg.valueInfo(_valueId));;
+	};
+}
+}
+
 SSACFGLiveness::SSACFGLiveness(SSACFG const& _cfg):
 	m_cfg(_cfg),
 	m_topologicalSort(_cfg),
@@ -46,9 +57,6 @@ void SSACFGLiveness::runDagDfs()
 	{
 		// post-order traversal
 		SSACFG::BlockId blockId{blockIdValue};
-		auto const filterLiterals = [this](auto const& valueId){
-			return !std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(valueId));
-		};
 		auto const& block = m_cfg.block(blockId);
 
 		// live <- PhiUses(B)
@@ -66,15 +74,10 @@ void SSACFGLiveness::runDagDfs()
 					auto const it = entries.find(blockId);
 					yulAssert(it != entries.end());
 					auto const argIndex = static_cast<size_t>(std::distance(entries.begin(), it));
-					if (argIndex < std::get<SSACFG::PhiValue>(info).arguments.size())
-					{
-						// todo not sure why arg index would exceed phi arg length but it does happen
-						auto const arg = std::get<SSACFG::PhiValue>(info).arguments.at(argIndex);
-						if (!std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(arg)))
-							live.insert(arg);
-					}
-					else
-						yulAssert(false);
+					yulAssert(argIndex < std::get<SSACFG::PhiValue>(info).arguments.size());
+					auto const arg = std::get<SSACFG::PhiValue>(info).arguments.at(argIndex);
+					if (!std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(arg)))
+						live.insert(arg);
 				}
 			});
 
@@ -86,7 +89,7 @@ void SSACFGLiveness::runDagDfs()
 			});
 		if (std::holds_alternative<SSACFG::BasicBlock::FunctionReturn>(block.exit))
 			live += std::get<SSACFG::BasicBlock::FunctionReturn>(block.exit).returnValues
-					| ranges::views::filter(filterLiterals);
+					| ranges::views::filter(literalsFilter(m_cfg));
 
 		// clean out unreachables
 		live = live | ranges::views::filter([&](auto const& valueId) { return !std::holds_alternative<SSACFG::UnreachableValue>(m_cfg.valueInfo(valueId)); }) | ranges::to<std::set>;
@@ -98,9 +101,9 @@ void SSACFGLiveness::runDagDfs()
 		for (auto const& op: block.operations | ranges::views::reverse)
 		{
 			// remove variables defined at p from live
-			live -= op.outputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+			live -= op.outputs | ranges::views::filter(literalsFilter(m_cfg)) | ranges::to<std::vector>;
 			// add uses at p to live
-			live += op.inputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+			live += op.inputs | ranges::views::filter(literalsFilter(m_cfg)) | ranges::to<std::vector>;
 		}
 
 		// livein(b) <- live \cup PhiDefs(B)
@@ -120,23 +123,20 @@ void SSACFGLiveness::runLoopTreeDfs(size_t const _loopHeader)
 		// must be live out of header if live in of children
 		m_liveOuts[_loopHeader] += liveLoop;
 		// for each blockId \in children(loopHeader)
-		for (size_t blockId = 0; blockId < m_cfg.numBlocks(); ++blockId)
-			if (m_loopNestingForest.loopParents()[blockId] == _loopHeader)
+		for (size_t blockIdValue = 0; blockIdValue < m_cfg.numBlocks(); ++blockIdValue)
+			if (m_loopNestingForest.loopParents()[blockIdValue] == _loopHeader)
 			{
 				// propagate loop liveness information down to the loop header's children
-				m_liveIns[blockId] += liveLoop;
-				m_liveOuts[blockId] += liveLoop;
+				m_liveIns[blockIdValue] += liveLoop;
+				m_liveOuts[blockIdValue] += liveLoop;
 
-				runLoopTreeDfs(blockId);
+				runLoopTreeDfs(blockIdValue);
 			}
 	}
 }
 
 void SSACFGLiveness::fillOperationsLiveOut()
 {
-	auto const filterLiterals = [this](auto const& valueId){
-		return !std::holds_alternative<SSACFG::LiteralValue>(m_cfg.valueInfo(valueId));
-	};
 	for (size_t blockIdValue = 0; blockIdValue < m_cfg.numBlocks(); ++blockIdValue)
 	{
 		auto const& operations = m_cfg.block(SSACFG::BlockId{blockIdValue}).operations;
@@ -149,8 +149,8 @@ void SSACFGLiveness::fillOperationsLiveOut()
 			for (auto const& op: operations | ranges::views::reverse)
 			{
 				*rit = live;
-				live -= op.outputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
-				live += op.inputs | ranges::views::filter(filterLiterals) | ranges::to<std::vector>;
+				live -= op.outputs | ranges::views::filter(literalsFilter(m_cfg)) | ranges::to<std::vector>;
+				live += op.inputs | ranges::views::filter(literalsFilter(m_cfg)) | ranges::to<std::vector>;
 				++rit;
 			}
 		}
diff --git a/libyul/backends/evm/SSACFGLiveness.h b/libyul/backends/evm/SSACFGLiveness.h
index 72752cfefd..b0b9ccb7a3 100644
--- a/libyul/backends/evm/SSACFGLiveness.h
+++ b/libyul/backends/evm/SSACFGLiveness.h
@@ -29,7 +29,7 @@
 namespace solidity::yul
 {
 
-/// Performs liveness analysis on an SSA CFG following Algorithm 9.1 in [1].
+/// Performs liveness analysis on a reducible SSA CFG following Algorithm 9.1 in [1].
 ///
 /// [1] Rastello, Fabrice, and Florent Bouchez Tichadou, eds. SSA-based Compiler Design. Springer, 2022.
 class SSACFGLiveness

From 3edd2e173828737f6250256380e2d1193e232969 Mon Sep 17 00:00:00 2001
From: Ustas <82833595+ustas-eth@users.noreply.github.com>
Date: Sun, 21 Jan 2024 13:48:21 +0000
Subject: [PATCH 1136/1140] [docs] Add warning about `codehash` behavior
 depending on the account state

Co-authored-by: r0qs <rodrigo.saramago@protonmail.com>
---
 docs/types/value-types.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 27baf54851..5efb080554 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -344,6 +344,13 @@ You can query the deployed code for any smart contract. Use ``.code`` to get the
 ``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)``.
 
+.. warning::
+    The output of ``addr.codehash`` may be ``0`` if the account associated with ``addr`` is empty or non-existent
+    (i.e., it has no code, zero balance, and zero nonce as defined by `EIP-161 <https://eips.ethereum.org/EIPS/eip-161>`_).
+    If the account has no code but a non-zero balance or nonce, then ``addr.codehash`` will output the Keccak-256 hash of empty data
+    (i.e., ``keccak256("")`` which is equal to ``c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470``), as defined by
+    `EIP-1052 <https://eips.ethereum.org/EIPS/eip-1052>`_.
+
 .. 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 e8b5ca83f37b6a126db6a0a1dcfa00decff63647 Mon Sep 17 00:00:00 2001
From: Jeff Wentworth <jeff@curvegrid.com>
Date: Fri, 11 Oct 2024 21:25:17 +0900
Subject: [PATCH 1137/1140] Update Natspec format to correct devdoc return
 parameters (#15187)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update natspec-format.rst for devdoc return values

* update changelog

* values ==> returns

* Fix Solidity and improve doc output

* Update Changelog.md

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

* Apply suggestions from code review

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

---------

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 docs/natspec-format.rst | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index b187ea84c7..f191064837 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -73,8 +73,9 @@ The following example shows a contract and a function using all available tags.
         /// @dev The Alexandr N. Tetearing algorithm could increase precision
         /// @param rings The number of rings from dendrochronological sample
         /// @return Age in years, rounded up for partial years
-        function age(uint256 rings) external virtual pure returns (uint256) {
-            return rings + 1;
+        /// @return Name of the tree
+        function age(uint256 rings) external virtual pure returns (uint256, string memory) {
+            return (rings + 1, "tree");
         }
 
         /// @notice Returns the amount of leaves the tree has.
@@ -91,8 +92,8 @@ The following example shows a contract and a function using all available tags.
     }
 
     contract KumquatTree is Tree, Plant {
-        function age(uint256 rings) external override pure returns (uint256) {
-            return rings + 2;
+        function age(uint256 rings) external override pure returns (uint256, string memory) {
+            return (rings + 2, "Kumquat");
         }
 
         /// Return the amount of leaves that this specific kind of tree has
@@ -196,7 +197,7 @@ User Documentation
 ------------------
 
 The above documentation will produce the following user documentation
-JSON file as output:
+JSON file as output for the ``Tree`` contract:
 
 .. code-block:: json
 
@@ -209,6 +210,10 @@ JSON file as output:
         {
           "notice" : "Calculate tree age in years, rounded up, for live trees"
         }
+        "leaves()" :
+        {
+            "notice" : "Returns the amount of leaves the tree has."
+        }
       },
       "notice" : "You can use this contract for only the most basic simulation"
     }
@@ -243,7 +248,14 @@ file should also be produced and should look like this:
           {
             "rings" : "The number of rings from dendrochronological sample"
           },
-          "return" : "age in years, rounded up for partial years"
+          "returns" : {
+            "_0" : "Age in years, rounded up for partial years",
+            "_1" : "Name of the tree"
+          }
+        },
+        "leaves()" :
+        {
+            "details" : "Returns only a fixed number."
         }
       },
       "title" : "A simulator for trees"

From c38e4e66a181ff623a21073a78bdefe61ca80c7d Mon Sep 17 00:00:00 2001
From: rodiazet <radek.zagorowicz@gmail.com>
Date: Fri, 11 Oct 2024 14:57:24 +0200
Subject: [PATCH 1138/1140] Pass `evmVersion` and `eofVersion` to `YulStack` in
 `ObjectCompilerTest`

---
 test/libyul/ControlFlowSideEffectsTest.cpp    |   4 +-
 test/libyul/EVMCodeTransformTest.cpp          |   5 +-
 test/libyul/FunctionSideEffects.cpp           |   4 +-
 test/libyul/KnowledgeBaseTest.cpp             |   4 +-
 test/libyul/ObjectCompilerTest.cpp            |   6 +-
 test/libyul/ObjectCompilerTest.h              |   2 +-
 test/libyul/ObjectParser.cpp                  |   4 +-
 test/libyul/Parser.cpp                        | 172 +++++++++---------
 test/libyul/YulInterpreterTest.cpp            |   3 +-
 test/libyul/objectCompiler/datacopy.yul       |   2 +
 .../libyul/objectCompiler/dataoffset_code.yul |   2 +
 .../libyul/objectCompiler/dataoffset_data.yul |   2 +
 .../libyul/objectCompiler/dataoffset_self.yul |   2 +
 test/libyul/objectCompiler/datasize_code.yul  |   2 +
 test/libyul/objectCompiler/datasize_data.yul  |   2 +
 test/libyul/objectCompiler/datasize_self.yul  |   2 +
 .../libyul/objectCompiler/function_series.yul |   1 +
 .../identical_subobjects_full_debug_info.yul  |   1 +
 .../identical_subobjects_no_debug_info.yul    |   1 +
 ...dentical_subobjects_partial_debug_info.yul |   1 +
 ...bobjects_partial_debug_info_no_use_src.yul |   1 +
 ...cal_subobjects_with_subject_references.yul |   1 +
 ..._long_name_does_not_end_up_in_bytecode.yul |   2 +
 .../leading_and_trailing_dots.yul             |   2 +
 test/libyul/objectCompiler/linkersymbol.yul   |   2 +
 .../objectCompiler/long_object_name.yul       |   1 +
 test/libyul/objectCompiler/manySubObjects.yul |   2 +
 test/libyul/objectCompiler/metadata.yul       |   2 +
 .../libyul/objectCompiler/namedObjectCode.yul |   2 +
 .../objectCompiler/nested_optimizer.yul       |   1 +
 test/libyul/objectCompiler/simple.yul         |   2 +
 .../objectCompiler/simple_optimizer.yul       |   1 +
 .../libyul/objectCompiler/sourceLocations.yul |   2 +
 .../libyul/objectCompiler/subObjectAccess.yul |   2 +
 test/libyul/objectCompiler/verbatim_bug.yul   |   1 +
 35 files changed, 144 insertions(+), 102 deletions(-)

diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index 50c69b179d..b9d883dcde 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -62,9 +62,9 @@ TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std:
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
-	// TODO: Add EOF support
 	ControlFlowSideEffectsCollector sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
+		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()),
 		obj.code()->root()
 	);
 	m_obtainedResult.clear();
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 23c24ce305..75d86136e9 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -67,14 +67,13 @@ TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::strin
 		return TestResult::FatalError;
 	}
 
-	// TODO: Add EOF support
 	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, std::nullopt, {}};
 	EthAssemblyAdapter adapter(assembly);
 	EVMObjectCompiler::compile(
 		*stack.parserResult(),
 		adapter,
-		// TODO: Make sure that why we cannot pass here solidity::test::CommonOptions::get().evmVersion() and assembly.eofVersion()
-		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}, std::nullopt),
+		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()),
 		m_stackOpt,
 		std::nullopt
 	);
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index 7a153de7d3..a878d375d0 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -88,9 +88,9 @@ TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
-	// TODO: Add EOF support
 	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(), std::nullopt),
+		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()),
 		CallGraphGenerator::callGraph(obj.code()->root())
 	);
 
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index badeb21fe7..253e7e0d5a 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -63,8 +63,8 @@ class KnowledgeBaseTest
 		return KnowledgeBase([this](YulName _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
-	// TODO: Add EOF support
-	EVMDialect m_dialect{EVMVersion{}, std::nullopt, true};
+	EVMDialect m_dialect{solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(), true};
 	std::shared_ptr<Object> m_object;
 	SSAValueTracker m_ssaValues;
 	std::map<YulName, AssignedValue> m_values;
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 5d6dd1b23d..126c3ad6f6 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -46,7 +46,7 @@ using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
 ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
-	TestCase(_filename)
+	solidity::frontend::test::EVMVersionRestrictedTestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_optimisationPreset = m_reader.enumSetting<OptimisationPreset>(
@@ -65,8 +65,8 @@ ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
 TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	YulStack stack(
-		EVMVersion(),
-		std::nullopt,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()
diff --git a/test/libyul/ObjectCompilerTest.h b/test/libyul/ObjectCompilerTest.h
index fe89987002..3310d80b8e 100644
--- a/test/libyul/ObjectCompilerTest.h
+++ b/test/libyul/ObjectCompilerTest.h
@@ -38,7 +38,7 @@ struct Block;
 namespace solidity::yul::test
 {
 
-class ObjectCompilerTest: public solidity::frontend::test::TestCase
+class ObjectCompilerTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index 7ed321cd48..9a891be915 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -112,8 +112,8 @@ std::tuple<std::optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(
 
 	ErrorList errors;
 	ErrorReporter reporter(errors);
-	// TODO: Add EOF support
-	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	ObjectParser objectParser{reporter, dialect};
 	CharStream stream(std::move(source), "");
 	auto object = objectParser.parse(std::make_shared<Scanner>(stream), false);
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 930a34cf1a..d0850972b4 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -162,8 +162,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
 	auto const sourceText =
 		"/// @src 0:234:543\n"
 		"{}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -181,8 +181,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -205,8 +205,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -228,8 +228,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
 			"/// @src 0:343:434\n"
 			"switch y case 0 {} default {}\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -253,8 +253,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
 			"    let z := add(3, 4)\n"
 			"}\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 234, 543);
@@ -286,8 +286,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 			"let z := true\n"
 			"let y := add(1, 2)\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -318,8 +318,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
 			"/// @src 1:1:10\n"
 			"a := true\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0); // should still parse
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -340,8 +340,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
 			"let b := true\n"
 			"\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result); // should still parse
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -361,8 +361,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
 			"/// @src 0:234:2026\n"
 			":= true\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
@@ -385,8 +385,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
 			2)
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -420,8 +420,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 			mstore(1, 2)                // FunctionCall
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(2, result->root().statements.size());
@@ -457,8 +457,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
 			let a := true
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->root().statements.size());
@@ -477,8 +477,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
 		/// @src 0:420:680foo
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -495,8 +495,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
 		/// abc@src 0:111:222
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -510,8 +510,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
 		/// @src -1:-1:-1
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "", -1, -1);
@@ -525,8 +525,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
 		/// @src a:b:c
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -543,8 +543,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
 		/// @src 111111111111111111111:222222222222222222222:333333333333333333333
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -565,8 +565,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
 			let x := true
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -584,8 +584,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
 		/// @src 0:111:222@src 1:333:444
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -602,8 +602,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_s
 		/// @src 0:111:222 @src 1:333:444
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -614,8 +614,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
 	ErrorList errorList;
 	ErrorReporter reporter(errorList);
 	auto const sourceText = "///     @src 0:111:222    \n{}";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -632,8 +632,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
 			let x := true
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->root().statements.at(0)));
@@ -655,8 +655,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
 			let y := /** @src 1:96:165  "contract D {..." */ 128
 		}
 	)~~~";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -681,8 +681,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
 		/// @src 0:111:222 ""
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -696,8 +696,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_befo
 		/// @src 0:111:222"abc" def
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -714,8 +714,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_afte
 		/// @src 0:111:222 "abc"def
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -729,8 +729,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whites
 		/// @src 0:111:222 "abc"@src 1:333:444 "abc"
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 333, 444);
@@ -744,8 +744,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 		/// @src 0:111:222 " abc @src 1:333:444
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -763,8 +763,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote)
 		///
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -781,8 +781,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_snippets_with_hex_comment)
 		/// @src 0:111:222 hex"abc"@src 1:333:444 "abc"
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	// the second source location is not parsed as such, as the hex string isn't interpreted as snippet but
@@ -798,8 +798,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_escapes)
 		/// @src 0:111:222 "\n\\x\x\w\uö\xy\z\y\fq"
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 111, 222);
@@ -814,8 +814,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_single_quote_snippet_with_whitespaces
 		/// @src 1 :		222 : 333 '\x33\u1234\t\n'
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -830,8 +830,8 @@ BOOST_DATA_TEST_CASE(customSourceLocations_scanner_errors_outside_string_lits_ar
 		/// @src 1:222:333
 		{{}}
 	)", invalid);
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source1", 222, 333);
@@ -849,8 +849,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multi_line_source_loc)
 		/// " @src 0:333:444
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.empty());
 	CHECK_LOCATION(result->root().debugData->originLocation, "source0", 333, 444);
@@ -868,8 +868,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locati
 			let y := /** @src 1:96:165  "function f() internal { \"\/** @src 0:6:7 *\/\"; }" */ 128
 		}
 	)~~~";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 2);
@@ -898,8 +898,8 @@ BOOST_AUTO_TEST_CASE(astid)
 			mstore(1, 2)
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -921,8 +921,8 @@ BOOST_AUTO_TEST_CASE(astid_reset)
 			mstore(1, 2)
 		}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(7));
@@ -940,8 +940,8 @@ BOOST_AUTO_TEST_CASE(astid_multi)
 		/// @src -1:-1:-1 @ast-id 7 @src 1:1:1 @ast-id 8
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->root().debugData->astID == int64_t(8));
@@ -955,8 +955,8 @@ BOOST_AUTO_TEST_CASE(astid_invalid)
 		/// @src -1:-1:-1 @ast-id abc @src 1:1:1
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -973,8 +973,8 @@ BOOST_AUTO_TEST_CASE(astid_too_large)
 		/// @ast-id 9223372036854775808
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -990,8 +990,8 @@ BOOST_AUTO_TEST_CASE(astid_way_too_large)
 		/// @ast-id 999999999999999999999999999999999999999
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -1007,8 +1007,8 @@ BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
 		/// @ast-id 9x
 		{}
 	)";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
@@ -1030,8 +1030,8 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
 		"\n"
 		"    let x := 123\n"
 		"}\n";
-	// TODO: Add EOF support
-	auto const& dialect = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt);
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion());
 	std::shared_ptr<AST> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->root().statements.size(), 1);
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 343a17b4a4..484a7a241d 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -98,7 +98,8 @@ std::string YulInterpreterTest::interpret()
 	{
 		Interpreter::run(
 			state,
-			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(), std::nullopt),
+			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
+				solidity::test::CommonOptions::get().eofVersion()),
 			m_ast->root(),
 			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
 			/*disableMemoryTracing=*/ false
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
index 9f7fca9adc..46a0ec0f7a 100644
--- a/test/libyul/objectCompiler/datacopy.yul
+++ b/test/libyul/objectCompiler/datacopy.yul
@@ -11,6 +11,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":77:92   */
diff --git a/test/libyul/objectCompiler/dataoffset_code.yul b/test/libyul/objectCompiler/dataoffset_code.yul
index 8ca10add2f..1171303af2 100644
--- a/test/libyul/objectCompiler/dataoffset_code.yul
+++ b/test/libyul/objectCompiler/dataoffset_code.yul
@@ -5,6 +5,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:61   */
diff --git a/test/libyul/objectCompiler/dataoffset_data.yul b/test/libyul/objectCompiler/dataoffset_data.yul
index 9155674898..381cb999f0 100644
--- a/test/libyul/objectCompiler/dataoffset_data.yul
+++ b/test/libyul/objectCompiler/dataoffset_data.yul
@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, dataoffset("data1")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":56:75   */
diff --git a/test/libyul/objectCompiler/dataoffset_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
index 681c24c0ee..b6a0552cb7 100644
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ b/test/libyul/objectCompiler/dataoffset_self.yul
@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, dataoffset("a")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:59   */
diff --git a/test/libyul/objectCompiler/datasize_code.yul b/test/libyul/objectCompiler/datasize_code.yul
index cab7987ea9..7bf365031b 100644
--- a/test/libyul/objectCompiler/datasize_code.yul
+++ b/test/libyul/objectCompiler/datasize_code.yul
@@ -5,6 +5,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:59   */
diff --git a/test/libyul/objectCompiler/datasize_data.yul b/test/libyul/objectCompiler/datasize_data.yul
index d1261d2464..f0ae32b1b6 100644
--- a/test/libyul/objectCompiler/datasize_data.yul
+++ b/test/libyul/objectCompiler/datasize_data.yul
@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, datasize("data1")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:61   */
diff --git a/test/libyul/objectCompiler/datasize_self.yul b/test/libyul/objectCompiler/datasize_self.yul
index 2a19d0a88f..fb5b7fb894 100644
--- a/test/libyul/objectCompiler/datasize_self.yul
+++ b/test/libyul/objectCompiler/datasize_self.yul
@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, datasize("a")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":36:49   */
diff --git a/test/libyul/objectCompiler/function_series.yul b/test/libyul/objectCompiler/function_series.yul
index 7be2db96b9..8750f16499 100644
--- a/test/libyul/objectCompiler/function_series.yul
+++ b/test/libyul/objectCompiler/function_series.yul
@@ -11,6 +11,7 @@ object "Contract" {
 }
 
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: none
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
index 74574be13c..88ec2c3542 100644
--- a/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul
@@ -64,6 +64,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
index aa20ac6799..309d995469 100644
--- a/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul
@@ -50,6 +50,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
index 9b63bdc1b1..82c2fd766e 100644
--- a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul
@@ -69,6 +69,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
index d288503bab..2305355250 100644
--- a/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul
@@ -56,6 +56,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul b/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul
index e14b010083..74f613cdff 100644
--- a/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul
@@ -95,6 +95,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
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 c6fd0ac805..18d31087f9 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
@@ -7,6 +7,8 @@ object "a" {
         )
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":143:185   */
diff --git a/test/libyul/objectCompiler/leading_and_trailing_dots.yul b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
index 13c9523557..9d32cadc0c 100644
--- a/test/libyul/objectCompiler/leading_and_trailing_dots.yul
+++ b/test/libyul/objectCompiler/leading_and_trailing_dots.yul
@@ -12,6 +12,8 @@
     }
     g(2)
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":53:54   */
diff --git a/test/libyul/objectCompiler/linkersymbol.yul b/test/libyul/objectCompiler/linkersymbol.yul
index 91a456461f..ba0319108b 100644
--- a/test/libyul/objectCompiler/linkersymbol.yul
+++ b/test/libyul/objectCompiler/linkersymbol.yul
@@ -5,6 +5,8 @@ object "a" {
         let success := call(gas(), addr, 0, 128, 4, 128, 0)
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":190:191   */
diff --git a/test/libyul/objectCompiler/long_object_name.yul b/test/libyul/objectCompiler/long_object_name.yul
index f752602240..805beb4249 100644
--- a/test/libyul/objectCompiler/long_object_name.yul
+++ b/test/libyul/objectCompiler/long_object_name.yul
@@ -7,6 +7,7 @@ object "t" {
 	}
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/manySubObjects.yul b/test/libyul/objectCompiler/manySubObjects.yul
index c046b182ff..1a087f9c94 100644
--- a/test/libyul/objectCompiler/manySubObjects.yul
+++ b/test/libyul/objectCompiler/manySubObjects.yul
@@ -134,6 +134,8 @@ object "root" {
         }
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":59:75   */
diff --git a/test/libyul/objectCompiler/metadata.yul b/test/libyul/objectCompiler/metadata.yul
index 4f8cda7a4c..dbd802e338 100644
--- a/test/libyul/objectCompiler/metadata.yul
+++ b/test/libyul/objectCompiler/metadata.yul
@@ -19,6 +19,8 @@ object "A" {
   data ".metadata" "M2"
   data "x" "Hello, World2!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":55:68   */
diff --git a/test/libyul/objectCompiler/namedObjectCode.yul b/test/libyul/objectCompiler/namedObjectCode.yul
index f18535d711..efb41524b5 100644
--- a/test/libyul/objectCompiler/namedObjectCode.yul
+++ b/test/libyul/objectCompiler/namedObjectCode.yul
@@ -1,6 +1,8 @@
 object "a" {
   code { sstore(0, 1) }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":36:37   */
diff --git a/test/libyul/objectCompiler/nested_optimizer.yul b/test/libyul/objectCompiler/nested_optimizer.yul
index ae06509429..0275e1665a 100644
--- a/test/libyul/objectCompiler/nested_optimizer.yul
+++ b/test/libyul/objectCompiler/nested_optimizer.yul
@@ -15,6 +15,7 @@ object "a" {
   }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/simple.yul b/test/libyul/objectCompiler/simple.yul
index fb2339cebb..f7f945abf5 100644
--- a/test/libyul/objectCompiler/simple.yul
+++ b/test/libyul/objectCompiler/simple.yul
@@ -1,6 +1,8 @@
 {
   sstore(0, 1)
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":41:42   */
diff --git a/test/libyul/objectCompiler/simple_optimizer.yul b/test/libyul/objectCompiler/simple_optimizer.yul
index cc63075895..7348b2e20c 100644
--- a/test/libyul/objectCompiler/simple_optimizer.yul
+++ b/test/libyul/objectCompiler/simple_optimizer.yul
@@ -5,6 +5,7 @@
   sstore(add(x, 0), z)
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
index d9f1d84fcb..a1e55ade4a 100644
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ b/test/libyul/objectCompiler/sourceLocations.yul
@@ -28,6 +28,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "abc.sol":0:2   */
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
index b18c902db6..047eae4087 100644
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ b/test/libyul/objectCompiler/subObjectAccess.yul
@@ -65,6 +65,8 @@ object "A" {
     }
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":57:72   */
diff --git a/test/libyul/objectCompiler/verbatim_bug.yul b/test/libyul/objectCompiler/verbatim_bug.yul
index 14a1c02b1f..3858b5984d 100644
--- a/test/libyul/objectCompiler/verbatim_bug.yul
+++ b/test/libyul/objectCompiler/verbatim_bug.yul
@@ -23,6 +23,7 @@ object "a" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

From 69942810512321501c50247b342193e079db53e6 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 3 Oct 2024 12:23:19 -0300
Subject: [PATCH 1139/1140] enable euler ext test

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca1043685c..79a149a7ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -760,9 +760,6 @@ defaults:
       name: t_native_compile_ext_euler
       project: euler
       binary_type: native
-      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
-      # which does not support shanghai EVM.
-      compile_only: 1
       resource_class: medium
 
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator

From 1c0695f664bc123a2cdbf502304c16c9ea2b915f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Mon, 14 Oct 2024 10:44:11 +0200
Subject: [PATCH 1140/1140] Fix ObjectCompiler test (#15511)

---
 .../objectCompiler/identical_subobjects_creation_deployed.yul    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul b/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
index 5eb079db18..01270ef443 100644
--- a/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
+++ b/test/libyul/objectCompiler/identical_subobjects_creation_deployed.yul
@@ -64,6 +64,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=constantinople
 // optimizationPreset: full
 // ----
 // Assembly: