Update strategy. (#7563)

Author: ilyalesokhin-starkware

crates/cairo-lang-lowering/src/inline/test_data/inline

@@ -875,35 +875,32 @@ End:
 
 blk6:
 Statements:
+  (v11: (core::integer::u128,)) <- struct_construct(v0)
+  (v12: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Ok(v11)
 End:
-  Goto(blk9, {v0 -> v11})
+  Goto(blk4, {v12 -> v3})
 
 blk7:
 Statements:
 End:
   Match(match core::integer::u128_overflowing_add(v1, v0) {
-    Result::Ok(v12) => blk8,
-    Result::Err(v13) => blk10,
+    Result::Ok(v13) => blk8,
+    Result::Err(v14) => blk9,
   })
 
 blk8:
 Statements:
+  (v15: (core::integer::u128,)) <- struct_construct(v13)
+  (v16: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Ok(v15)
 End:
-  Goto(blk9, {v12 -> v11})
+  Goto(blk4, {v16 -> v3})
 
 blk9:
 Statements:
-  (v14: (core::integer::u128,)) <- struct_construct(v11)
-  (v15: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Ok(v14)
+  (v17: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<39878429859757942499084499860145094553463>()
+  (v18: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Err(v17)
 End:
-  Goto(blk4, {v15 -> v3})
-
-blk10:
-Statements:
-  (v16: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<39878429859757942499084499860145094553463>()
-  (v17: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Err(v16)
-End:
-  Goto(blk4, {v17 -> v3})
+  Goto(blk4, {v18 -> v3})
 
 //! > lowering_diagnostics
 

crates/cairo-lang-lowering/src/optimizations/strategy.rs

@@ -130,9 +130,11 @@ pub fn baseline_optimization_strategy(db: &dyn LoweringGroup) -> OptimizationStr
         OptimizationPhase::OptimizeMatches,
         OptimizationPhase::ReorganizeBlocks,
         OptimizationPhase::CancelOps,
-        OptimizationPhase::ReorderStatements,
         OptimizationPhase::ReorganizeBlocks,
         OptimizationPhase::DedupBlocks,
+        // Re-run ReturnOptimization to eliminate harmful merges introduced by DedupBlocks.
+        OptimizationPhase::ReturnOptimization,
+        OptimizationPhase::ReorderStatements,
         OptimizationPhase::ReorganizeBlocks,
     ])
     .intern(db)
@@ -148,13 +150,6 @@ pub fn final_optimization_strategy(db: &dyn LoweringGroup) -> OptimizationStrate
         OptimizationPhase::TrimUnreachable,
         OptimizationPhase::LowerImplicits,
         OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::CancelOps,
-        OptimizationPhase::ReorderStatements,
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::DedupBlocks,
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::ReturnOptimization,
-        OptimizationPhase::ReorganizeBlocks,
     ])
     .intern(db)
 }

crates/cairo-lang-lowering/src/optimizations/test_data/match_optimization

@@ -1902,10 +1902,10 @@ End:
 
 blk1:
 Statements:
-  (v5: core::option::Option::<@core::box::Box::<[core::felt252; 4]>>) <- Option::Some(v3)
-  (v6: core::array::Span::<core::felt252>) <- struct_construct(v2)
+  (v5: core::array::Span::<core::felt252>) <- struct_construct(v2)
+  (v6: core::option::Option::<@core::box::Box::<[core::felt252; 4]>>) <- Option::Some(v3)
 End:
-  Goto(blk3, {v6 -> v7, v5 -> v8})
+  Goto(blk3, {v5 -> v7, v6 -> v8})
 
 blk2:
 Statements:
@@ -1948,9 +1948,9 @@ End:
 
 blk1:
 Statements:
-  (v6: core::array::Span::<core::felt252>) <- struct_construct(v2)
+  (v5: core::array::Span::<core::felt252>) <- struct_construct(v2)
 End:
-  Goto(blk4, {v3 -> v12, v6 -> v18})
+  Goto(blk4, {v3 -> v12, v5 -> v18})
 
 blk2:
 Statements:

crates/cairo-lang-lowering/src/test_data/extern

@@ -397,19 +397,15 @@ End:
 
 blk1:
 Statements:
+  (v6: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v3)
 End:
-  Goto(blk3, {v3 -> v6, v2 -> v7})
+  Return(v2, v6)
 
 blk2:
 Statements:
+  (v7: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v5)
 End:
-  Goto(blk3, {v5 -> v6, v4 -> v7})
-
-blk3:
-Statements:
-  (v8: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
-End:
-  Return(v7, v8)
+  Return(v4, v7)
 
 //! > ==========================================================================
 

crates/cairo-lang-starknet/cairo_level_tests/abi_dispatchers_tests.cairo

@@ -112,7 +112,7 @@ fn test_validate_gas_cost() {
     assert!(
         call_building_gas_usage == 4030
             && serialization_gas_usage == 31070
-            && entry_point_gas_usage == 144240,
+            && entry_point_gas_usage == 142740,
         "Unexpected gas_usage:
      call_building: `{call_building_gas_usage}`.
      serialization: `{serialization_gas_usage}`.

crates/cairo-lang-starknet/cairo_level_tests/interoperability.cairo

@@ -79,9 +79,9 @@ fn test_flow_safe_dispatcher() {
 }
 
 // If the test is failing due to gas usage changes, update the gas limit by taking `test_flow` test
-// gas usage and add about 96000.
+// gas usage and add about 94000.
 #[test]
-#[available_gas(805080)]
+#[available_gas(804080)]
 #[should_panic(expected: ('Out of gas', 'ENTRYPOINT_FAILED'))]
 fn test_flow_out_of_gas() {
     // Calling the `test_flow` test but a low gas limit.