Merge pull request #5776 from ethereum/equivalentFunctionCombiner

[Yul] Equivalent function combiner.

1 files changed, 19 insertions, 19 deletions

diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi2.yul b/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
index bb60b1fa..887399b6 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/abi2.yul
@@ -1073,12 +1073,12 @@
 // fullSuite
 // {
 //     let _2 := mload(1)
-//     let _1042 := mload(0)
-//     if slt(sub(_2, _1042), 64)
+//     let _172 := mload(0)
+//     if slt(sub(_2, _172), 64)
 //     {
 //         revert(0, 0)
 //     }
-//     sstore(0, and(calldataload(_1042), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
+//     sstore(0, and(calldataload(_172), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
 //     let x0, x1, x2, x3, x4 := abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949(mload(7), mload(8))
 //     sstore(x1, x0)
 //     sstore(x3, x2)
@@ -1093,40 +1093,40 @@
 //         value0_57 := and(calldataload(add(headStart_55, value4)), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 //         value1_58 := calldataload(add(headStart_55, 32))
 //         let offset_62 := calldataload(add(headStart_55, 64))
-//         let _1090 := 0xffffffffffffffff
-//         if gt(offset_62, _1090)
+//         let _220 := 0xffffffffffffffff
+//         if gt(offset_62, _220)
 //         {
 //             revert(value4, value4)
 //         }
-//         let _1092 := add(headStart_55, offset_62)
-//         if iszero(slt(add(_1092, 0x1f), dataEnd_56))
+//         let _222 := add(headStart_55, offset_62)
+//         if iszero(slt(add(_222, 0x1f), dataEnd_56))
 //         {
 //             revert(value4, value4)
 //         }
-//         let abi_decode_length_15_689 := calldataload(_1092)
-//         if gt(abi_decode_length_15_689, _1090)
+//         let abi_decode_length_15_116 := calldataload(_222)
+//         if gt(abi_decode_length_15_116, _220)
 //         {
 //             revert(value4, value4)
 //         }
-//         if gt(add(add(_1092, abi_decode_length_15_689), 0x20), dataEnd_56)
+//         if gt(add(add(_222, abi_decode_length_15_116), 32), dataEnd_56)
 //         {
 //             revert(value4, value4)
 //         }
-//         value2_59 := add(_1092, 0x20)
-//         value3 := abi_decode_length_15_689
-//         let _1095 := calldataload(add(headStart_55, 96))
-//         if iszero(lt(_1095, 3))
+//         value2_59 := add(_222, 32)
+//         value3 := abi_decode_length_15_116
+//         let _225 := calldataload(add(headStart_55, 96))
+//         if iszero(lt(_225, 3))
 //         {
 //             revert(value4, value4)
 //         }
-//         value4 := _1095
+//         value4 := _225
 //     }
 //     function abi_encode_tuple_t_bytes32_t_address_t_uint256_t_bytes32_t_enum$_Operation_$1949_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256__to_t_bytes32_t_address_t_uint256_t_bytes32_t_uint8_t_uint256_t_uint256_t_uint256_t_address_t_address_t_uint256_(headStart_252, value10_253, value9_254, value8_255, value7_256, value6_257, value5_258, value4_259, value3_260, value2_261, value1_262, value0_263) -> tail_264
 //     {
 //         tail_264 := add(headStart_252, 352)
 //         mstore(headStart_252, value0_263)
-//         let _1307 := 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-//         mstore(add(headStart_252, 32), and(value1_262, _1307))
+//         let _439 := 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+//         mstore(add(headStart_252, 32), and(value1_262, _439))
 //         mstore(add(headStart_252, 64), value2_261)
 //         mstore(add(headStart_252, 96), value3_260)
 //         if iszero(lt(value4_259, 3))
@@ -1137,8 +1137,8 @@
 //         mstore(add(headStart_252, 160), value5_258)
 //         mstore(add(headStart_252, 192), value6_257)
 //         mstore(add(headStart_252, 224), value7_256)
-//         mstore(add(headStart_252, 256), and(value8_255, _1307))
-//         mstore(add(headStart_252, 288), and(value9_254, _1307))
+//         mstore(add(headStart_252, 256), and(value8_255, _439))
+//         mstore(add(headStart_252, 288), and(value9_254, _439))
 //         mstore(add(headStart_252, 320), value10_253)
 //     }
 // }