Change default EVM version to Shanghai.

Co-authored-by: Rodrigo Q. Saramago <rodrigoqsaramago@gmail.com>
2023-10-03 13:03:40 +00:00 · 2023-04-26 13:03:17 +02:00 · 2023-04-26 13:03:17 +02:00 · 44da8507b1
commit 44da8507b1
parent 34b13c1f89
267 changed files with 949 additions and 934 deletions
--- 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
--- 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)

--- 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.
--- 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:
--- 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:
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@ -113,7 +113,7 @@ private:

 	EVMVersion(Version _version): m_version(_version) {}

-	Version m_version = Version::Paris;
+	Version m_version = Version::Shanghai;
 };

 }
--- 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
--- 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
--- 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
        }
--- 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
                }
--- 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
                                    }
                                ]
                            }
--- 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   */
--- 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")
--- 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")
--- 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   */
--- 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   */
--- 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")
--- 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")
--- 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   */
--- 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
--- 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   */
--- 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
--- 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   */
--- 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
--- 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
--- 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   */
--- 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   */
--- 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   */
--- 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
--- 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
--- 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())
 	{
--- 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.");
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 #
--- 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
--- 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
--- 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 #
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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() ->
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More