specialize functions that are going to be inlined.

crates/cairo-lang-lowering/src/lower/test_data/for

@@ -56,40 +56,41 @@ blk0 (root):
 Statements:
   (v2: core::felt252) <- 1
   (v3: core::felt252) <- 1
-  (v4: core::felt252) <- core::felt252_add(v2, v3)
-  (v5: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
-  (v6: core::felt252) <- 10
-  (v7: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v5, v6)
-  (v8: core::felt252) <- 11
-  (v9: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v7, v8)
-  (v10: core::felt252) <- 12
-  (v11: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v9, v10)
-  (v12: core::felt252) <- 13
-  (v13: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v11, v12)
-  (v14: core::array::Array::<core::felt252>, v15: @core::array::Array::<core::felt252>) <- snapshot(v13)
-  (v16: core::array::Span::<core::felt252>) <- struct_construct(v15)
-  (v17: core::array::SpanIter::<core::felt252>) <- struct_construct(v16)
-  (v18: core::RangeCheck, v19: core::gas::GasBuiltin, v20: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- test::foo[118-164](v0, v1, v17, v2, v4)
+  (v4: core::felt252) <- 1
+  (v5: core::felt252) <- core::felt252_add(v4, v3)
+  (v6: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
+  (v7: core::felt252) <- 10
+  (v8: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v6, v7)
+  (v9: core::felt252) <- 11
+  (v10: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v8, v9)
+  (v11: core::felt252) <- 12
+  (v12: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v10, v11)
+  (v13: core::felt252) <- 13
+  (v14: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v12, v13)
+  (v15: core::array::Array::<core::felt252>, v16: @core::array::Array::<core::felt252>) <- snapshot(v14)
+  (v17: core::array::Span::<core::felt252>) <- struct_construct(v16)
+  (v18: core::array::SpanIter::<core::felt252>) <- struct_construct(v17)
+  (v19: core::RangeCheck, v20: core::gas::GasBuiltin, v21: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- test::foo[118-164](v0, v1, v18, v2, v5)
 End:
-  Match(match_enum(v20) {
-    PanicResult::Ok(v21) => blk1,
-    PanicResult::Err(v22) => blk2,
+  Match(match_enum(v21) {
+    PanicResult::Ok(v22) => blk1,
+    PanicResult::Err(v23) => blk2,
   })
 
 blk1:
 Statements:
-  (v23: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v19)
-  (v24: core::array::SpanIter::<core::felt252>, v25: core::felt252, v26: ()) <- struct_destructure(v21)
-  (v27: (core::felt252,)) <- struct_construct(v25)
-  (v28: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v27)
+  (v24: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v20)
+  (v25: core::array::SpanIter::<core::felt252>, v26: core::felt252, v27: ()) <- struct_destructure(v22)
+  (v28: (core::felt252,)) <- struct_construct(v26)
+  (v29: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v28)
 End:
-  Return(v18, v23, v28)
+  Return(v19, v24, v29)
 
 blk2:
 Statements:
-  (v29: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v22)
+  (v30: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v23)
 End:
-  Return(v18, v19, v29)
+  Return(v19, v20, v30)
 
 
 Generated loop lowering for source location:
@@ -230,10 +231,10 @@ Parameters: v0: core::RangeCheck, v1: core::gas::GasBuiltin
 blk0 (root):
 Statements:
   (v2: core::integer::u32) <- 1
-  (v3: core::integer::u32) <- 0
-  (v4: core::integer::u32) <- 5
+  (v3: core::integer::u32) <- 5
+  (v4: core::integer::u32) <- 0
 End:
-  Match(match core::ops::range::internal::int_range_try_new::<core::integer::u32>(v0, v3, v4) {
+  Match(match core::ops::range::internal::int_range_try_new::<core::integer::u32>(v0, v4, v3) {
     Result::Ok(v5, v6) => blk1,
     Result::Err(v7, v8) => blk2,
   })

crates/cairo-lang-lowering/src/lower/test_data/loop

@@ -1158,7 +1158,8 @@ Statements:
   (v1: test::B) <- struct_construct(v0)
   (v2: test::B, v3: @test::B) <- snapshot(v1)
   () <- test::ex1(v3)
-  () <- test::ex(v0)
+  (v4: core::integer::u32) <- 3
+  () <- test::ex(v4)
 End:
   Return()
 
@@ -1277,10 +1278,10 @@ Final lowering:
 Parameters:
 blk0 (root):
 Statements:
-  (v0: core::integer::u32) <- 3
-  (v1: test::B) <- struct_construct(v0)
-  () <- test::ex1(v1)
-  (v2: core::integer::u32, v3: @core::integer::u32) <- snapshot(v0)
+  (v0: test::B) <- { 3: core::integer::u32 }
+  () <- test::ex1(v0)
+  (v1: core::integer::u32) <- struct_destructure(v0)
+  (v2: core::integer::u32, v3: @core::integer::u32) <- snapshot(v1)
   () <- test::ex(v3)
 End:
   Return()
@@ -2761,10 +2762,10 @@ Final lowering:
 Parameters: v0: core::RangeCheck, v1: core::gas::GasBuiltin
 blk0 (root):
 Statements:
-  (v2: core::integer::u32) <- 1
-  (v3: core::integer::u32) <- 5
+  (v2: core::integer::u32) <- 5
+  (v3: core::integer::u32) <- 1
 End:
-  Match(match core::ops::range::internal::int_range_try_new::<core::integer::u32>(v0, v2, v3) {
+  Match(match core::ops::range::internal::int_range_try_new::<core::integer::u32>(v0, v3, v2) {
     Result::Ok(v4, v5) => blk1,
     Result::Err(v6, v7) => blk2,
   })

crates/cairo-lang-lowering/src/specialization.rs

@@ -209,6 +209,12 @@ pub fn priv_should_specialize(
         return Ok(false);
     }
 
+    // If the function is going to be inlined, it should be specialized.
+    // This is after the cycle check to avoid inlining the first-iteration of loop functions.
+    if db.priv_should_inline(function_id)? {
+        return Ok(true);
+    }
+
     // The heuristic is that the size is 8/10*orig_size > specialized_size of the original size.
     Ok(8 * db.estimate_size(specialized_func.base)? > 10 * db.estimate_size(function_id)?)
 }

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

@@ -24,11 +24,12 @@ foo
 Parameters: v0: core::felt252
 blk0 (root):
 Statements:
-  (v1: core::felt252) <- 2
-  (v2: core::felt252) <- 3
-  (v3: core::felt252) <- core::felt252_add(v1, v2)
+  (v1: (core::felt252,)) <- { 2: core::felt252 }
+  (v2: core::felt252) <- struct_destructure(v1)
+  (v3: core::felt252) <- 3
+  (v4: core::felt252) <- core::felt252_add(v2, v3)
 End:
-  Return(v3)
+  Return(v4)
 
 //! > ==========================================================================
 
@@ -61,10 +62,12 @@ Parameters:
 blk0 (root):
 Statements:
   (v0: core::felt252) <- 8
-  (v1: core::felt252) <- 2
-  (v2: core::felt252) <- 3
-  (v3: core::felt252) <- core::felt252_add(v1, v2)
-  (v4: core::felt252) <- core::felt252_mul(v0, v3)
-  (v5: core::felt252) <- core::felt252_add(v4, v0)
+  (v1: (core::felt252,)) <- { 2: core::felt252 }
+  (v2: core::felt252) <- struct_destructure(v1)
+  (v3: core::felt252) <- 3
+  (v4: core::felt252) <- core::felt252_add(v2, v3)
+  (v5: core::felt252) <- core::felt252_mul(v0, v4)
+  (v6: core::felt252) <- 8
+  (v7: core::felt252) <- core::felt252_add(v5, v6)
 End:
-  Return(v5)
+  Return(v7)

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

@@ -51,7 +51,7 @@ Statements:
   (v20: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v16)
   (v21: core::felt252) <- 1
   (v22: core::felt252) <- 1
-  (v23: core::felt252) <- core::felt252_add(v21, v22)
+  (v23: core::felt252) <- core::felt252_add(v22, v21)
   (v24: (core::felt252,)) <- struct_construct(v23)
   (v25: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v24)
 End:

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

@@ -33,16 +33,14 @@ extern fn immovable<T>(t: T) -> T nopanic;
 Parameters:
 blk0 (root):
 Statements:
-  (v0: core::felt252) <- 5
-  (v1: ()) <- struct_construct()
-  (v2: core::bool) <- bool::True(v1)
-  (v3: (core::felt252, core::bool)) <- struct_construct(v0, v2)
-  (v4: core::felt252, v5: core::bool) <- test::immovable::<(core::felt252, core::bool)>(v3)
+  (v0: core::bool) <- bool::True({})
+  (v1: core::felt252) <- 5
+  (v2: (core::felt252, core::bool)) <- struct_construct(v1, v0)
+  (v3: core::felt252, v4: core::bool) <- test::immovable::<(core::felt252, core::bool)>(v2)
+  (v5: core::bool) <- bool::False({})
   (v6: core::felt252) <- 6
-  (v7: ()) <- struct_construct()
-  (v8: core::bool) <- bool::False(v7)
-  (v9: (core::felt252, core::bool)) <- struct_construct(v6, v8)
-  (v10: core::felt252, v11: core::bool) <- test::immovable::<(core::felt252, core::bool)>(v9)
+  (v7: (core::felt252, core::bool)) <- struct_construct(v6, v5)
+  (v8: core::felt252, v9: core::bool) <- test::immovable::<(core::felt252, core::bool)>(v7)
 End:
   Return()
 
@@ -214,12 +212,12 @@ fn bar<const N: felt252>() -> felt252 {
 Parameters:
 blk0 (root):
 Statements:
-  (v0: core::felt252) <- 3
-  (v1: core::felt252) <- 5
-  (v2: core::felt252) <- core::felt252_add(v0, v1)
-  (v3: core::felt252) <- 2
-  (v4: core::felt252) <- 5
-  (v5: core::felt252) <- core::felt252_add(v3, v4)
+  (v0: core::felt252) <- 5
+  (v1: core::felt252) <- 3
+  (v2: core::felt252) <- core::felt252_add(v1, v0)
+  (v3: core::felt252) <- 5
+  (v4: core::felt252) <- 2
+  (v5: core::felt252) <- core::felt252_add(v4, v3)
   (v6: core::felt252) <- core::felt252_add(v2, v5)
 End:
   Return(v6)