Enable function specialization.

Author: ilyalesokhin-starkware

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

@@ -68,11 +68,11 @@ foo
 Parameters:
 blk0 (root):
 Statements:
-  (v0: core::integer::u32) <- 10
-  (v1: (core::integer::u32,)) <- struct_construct(v0)
-  (v2: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Ok(v1)
+  (v0: {[email protected]:2:13: 2:16}) <- struct_construct()
+  (v1: {[email protected]:2:13: 2:16}, v2: @{[email protected]:2:13: 2:16}) <- snapshot(v0)
+  (v3: core::panics::PanicResult::<(core::integer::u32,)>) <- "Generated `core::ops::function::Fn::call` for {[email protected]:2:13: 2:16}"{None, { 5: core::integer::u32 }, }(v2)
 End:
-  Return(v2)
+  Return(v3)
 
 //! > ==========================================================================
 

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

@@ -9,7 +9,9 @@ use cairo_lang_diagnostics::{Diagnostics, DiagnosticsBuilder, Maybe};
 use cairo_lang_filesystem::ids::FileId;
 use cairo_lang_semantic::db::SemanticGroup;
 use cairo_lang_semantic::items::enm::SemanticEnumEx;
-use cairo_lang_semantic::{self as semantic, ConcreteTypeId, TypeId, TypeLongId, corelib};
+use cairo_lang_semantic::{
+    self as semantic, ConcreteTypeId, TypeId, TypeLongId, corelib,
+};
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use cairo_lang_utils::unordered_hash_map::UnorderedHashMap;
@@ -475,23 +477,7 @@ fn priv_concrete_function_with_body_lowered_flat(
     db: &dyn LoweringGroup,
     function: ids::ConcreteFunctionWithBodyId,
 ) -> Maybe<Arc<FlatLowered>> {
-    let semantic_db = db;
-
-    let generic_function_id = function.function_with_body_id(db);
-    db.function_with_body_lowering_diagnostics(generic_function_id)?.check_error_free()?;
-    let mut lowered = (*db.function_with_body_lowering(generic_function_id)?).clone();
-    concretize_lowered(db, &mut lowered, &function.substitution(semantic_db)?)?;
-    Ok(Arc::new(lowered))
-}
-
-// * Adds `withdraw_gas` calls.
-// * Adds panics.
-// * Adds destructor calls.
-fn concrete_function_with_body_postpanic_lowered(
-    db: &dyn LoweringGroup,
-    function: ids::ConcreteFunctionWithBodyId,
-) -> Maybe<Arc<FlatLowered>> {
-    let mut lowered = if let ids::ConcreteFunctionWithBodyLongId::Specialized(specialized) =
+    if let ids::ConcreteFunctionWithBodyLongId::Specialized(specialized) =
         function.lookup_intern(db)
     {
         let base = db.concrete_function_with_body_postpanic_lowered(specialized.base)?;
@@ -545,20 +531,35 @@ fn concrete_function_with_body_postpanic_lowered(
             statements: statement,
             end: FlatBlockEnd::Return(ret_usage, location),
         });
-        FlatLowered {
+        return Ok(Arc::new(FlatLowered {
             signature: function.signature(db)?,
             variables: variables.variables,
             blocks: block_builder.build().unwrap(),
             parameters,
             diagnostics: Default::default(),
-        }
-    } else {
-        let mut lowered = (*db.priv_concrete_function_with_body_lowered_flat(function)?).clone();
-        add_withdraw_gas(db, function, &mut lowered)?;
-        lower_panics(db, function, &mut lowered)?;
-        add_destructs(db, function, &mut lowered);
-        lowered
+        }));
     };
+
+    let semantic_db = db;
+
+    let generic_function_id = function.function_with_body_id(db);
+    db.function_with_body_lowering_diagnostics(generic_function_id)?.check_error_free()?;
+    let mut lowered = (*db.function_with_body_lowering(generic_function_id)?).clone();
+    concretize_lowered(db, &mut lowered, &function.substitution(semantic_db)?)?;
+    Ok(Arc::new(lowered))
+}
+
+// * Adds `withdraw_gas` calls.
+// * Adds panics.
+// * Adds destructor calls.
+fn concrete_function_with_body_postpanic_lowered(
+    db: &dyn LoweringGroup,
+    function: ids::ConcreteFunctionWithBodyId,
+) -> Maybe<Arc<FlatLowered>> {
+    let mut lowered = (*db.priv_concrete_function_with_body_lowered_flat(function)?).clone();
+    add_withdraw_gas(db, function, &mut lowered)?;
+    lower_panics(db, function, &mut lowered)?;
+    add_destructs(db, function, &mut lowered);
     scrub_units(db, &mut lowered);
 
     Ok(Arc::new(lowered))

crates/cairo-lang-lowering/src/inline/mod.rs

@@ -5,6 +5,7 @@ mod statements_weights;
 
 use std::collections::{HashMap, VecDeque};
 
+use cairo_lang_debug::DebugWithDb;
 use cairo_lang_defs::diagnostic_utils::StableLocation;
 use cairo_lang_defs::ids::LanguageElementId;
 use cairo_lang_diagnostics::{Diagnostics, Maybe};
@@ -21,15 +22,15 @@ use crate::db::LoweringGroup;
 use crate::diagnostic::{
     LoweringDiagnostic, LoweringDiagnosticKind, LoweringDiagnostics, LoweringDiagnosticsBuilder,
 };
+use crate::fmt::LoweredFormatter;
 use crate::ids::{
     ConcreteFunctionWithBodyId, FunctionWithBodyId, FunctionWithBodyLongId, LocationId,
 };
 use crate::lower::context::{VarRequest, VariableAllocator};
 use crate::utils::{InliningStrategy, Rebuilder, RebuilderEx};
 use crate::{
     BlockId, FlatBlock, FlatBlockEnd, FlatLowered, Statement, StatementCall, VarRemapping,
-    VariableId,
-};
+    VariableId};
 
 pub fn get_inline_diagnostics(
     db: &dyn LoweringGroup,
@@ -217,6 +218,21 @@ impl Rebuilder for Mapper<'_, '_> {
     fn transform_end(&mut self, end: &mut FlatBlockEnd) {
         match end {
             FlatBlockEnd::Return(returns, _location) => {
+                if self.outputs.len() != returns.len() {
+                    let db = self.variables.db;
+                    let lowered = self.lowered;
+                    let fmt = LoweredFormatter::new(db, &lowered.variables);
+
+                    eprintln!(
+                        "{:?}",
+                        self.inlining_location.diagnostic_location(db).debug(db.elongate())
+                    );
+                    eprintln!("{:?}", self.outputs);
+                    eprintln!("{:?}", returns);
+
+                    eprintln!("{:?}", lowered.debug(&fmt));
+                }
+
                 let remapping = VarRemapping {
                     remapping: OrderedHashMap::from_iter(zip_eq(
                         self.outputs.iter().cloned(),

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

@@ -37,10 +37,9 @@ End:
 
 blk2:
 Statements:
-  (v2: core::felt252) <- -1
-  (v3: core::felt252) <- core::felt252_mul(v0, v2)
+  (v2: core::felt252) <- "core::Felt252Mul::mul"{None, -1, }(v0)
 End:
-  Goto(blk1, {v3 -> v1})
+  Goto(blk1, {v2 -> v1})
 
 //! > lowering_diagnostics
 
@@ -890,15 +889,19 @@ End:
 
 blk8:
 Statements:
-  (v15: (core::integer::u128,)) <- struct_construct(v13)
-  (v16: core::panics::PanicResult::<(core::integer::u128,)>) <- PanicResult::Ok(v15)
+  (v15: core::result::Result::<core::integer::u128, core::integer::u128>) <- Result::Ok(v13)
 End:
-  Goto(blk4, {v16 -> v3})
+  Goto(blk10, {v15 -> v16})
 
 blk9:
 Statements:
-  (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)
+  (v17: core::result::Result::<core::integer::u128, core::integer::u128>) <- Result::Err(v14)
+End:
+  Goto(blk10, {v17 -> v16})
+
+blk10:
+Statements:
+  (v18: core::panics::PanicResult::<(core::integer::u128,)>) <- "core::result::ResultTraitImpl::expect::<core::traits::PanicDestructForDestruct::<core::integer::u128, core::traits::DestructFromDrop::<core::integer::u128, core::integer::u128Drop>>>"{None, 39878429859757942499084499860145094553463, }(v16)
 End:
   Goto(blk4, {v18 -> v3})
 
@@ -1113,19 +1116,18 @@ End:
 
 blk8:
 Statements:
-  (v13: core::felt252) <- 1
-  (v14: core::felt252) <- core::felt252_sub(v0, v13)
-  (v15: core::panics::PanicResult::<(core::felt252,)>) <- test::foo(v14)
+  (v13: core::felt252) <- "core::Felt252Sub::sub"{None, 1, }(v0)
+  (v14: core::panics::PanicResult::<(core::felt252,)>) <- test::foo(v13)
 End:
-  Goto(blk6, {v15 -> v3})
+  Goto(blk6, {v14 -> v3})
 
 blk9:
 Statements:
-  (v16: core::felt252) <- 1
-  (v17: (core::felt252,)) <- struct_construct(v16)
-  (v18: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v17)
+  (v15: core::felt252) <- 1
+  (v16: (core::felt252,)) <- struct_construct(v15)
+  (v17: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v16)
 End:
-  Goto(blk6, {v18 -> v3})
+  Goto(blk6, {v17 -> v3})
 
 //! > lowering_diagnostics
 
@@ -1668,19 +1670,18 @@ End:
 
 blk8:
 Statements:
-  (v13: core::felt252) <- 1
-  (v14: core::felt252) <- core::felt252_sub(v0, v13)
-  (v15: core::panics::PanicResult::<(core::felt252,)>) <- test::foo(v14)
+  (v13: core::felt252) <- "core::Felt252Sub::sub"{None, 1, }(v0)
+  (v14: core::panics::PanicResult::<(core::felt252,)>) <- test::foo(v13)
 End:
-  Goto(blk6, {v15 -> v3})
+  Goto(blk6, {v14 -> v3})
 
 blk9:
 Statements:
-  (v16: core::felt252) <- 1
-  (v17: (core::felt252,)) <- struct_construct(v16)
-  (v18: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v17)
+  (v15: core::felt252) <- 1
+  (v16: (core::felt252,)) <- struct_construct(v15)
+  (v17: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v16)
 End:
-  Goto(blk6, {v18 -> v3})
+  Goto(blk6, {v17 -> v3})
 
 //! > lowering_diagnostics
 

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

@@ -143,21 +143,17 @@ Final lowering:
 Parameters: v0: test::PanicDestructable
 blk0 (root):
 Statements:
-  (v1: core::panics::Panic) <- struct_construct()
-  (v2: core::panics::Panic) <- test::MyPanicDestruct::panic_destruct(v0, v1)
-  (v3: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
-  (v4: core::felt252) <- 1997209042069643135709344952807065910992472029923670688473712229447419591075
-  (v5: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v3, v4)
-  (v6: core::felt252) <- 0
-  (v7: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v5, v6)
-  (v8: core::felt252) <- 345232009571
-  (v9: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v7, v8)
-  (v10: core::felt252) <- 5
-  (v11: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v9, v10)
-  (v12: (core::panics::Panic, core::array::Array::<core::felt252>)) <- struct_construct(v2, v11)
-  (v13: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v12)
+  (v1: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
+  (v2: core::array::Array::<core::felt252>) <- "core::array::ArrayImpl::append"{None, 1997209042069643135709344952807065910992472029923670688473712229447419591075, }(v1)
+  (v3: core::array::Array::<core::felt252>) <- "core::array::ArrayImpl::append"{None, 0, }(v2)
+  (v4: core::array::Array::<core::felt252>) <- "core::array::ArrayImpl::append"{None, 345232009571, }(v3)
+  (v5: core::array::Array::<core::felt252>) <- "core::array::ArrayImpl::append"{None, 5, }(v4)
+  (v6: {[email protected]:11:5: 11:7}) <- struct_construct(v0)
+  (v7: core::panics::Panic) <- "Generated `core::traits::PanicDestruct::panic_destruct` for {[email protected]:11:5: 11:7}"{None, {}, }(v6)
+  (v8: (core::panics::Panic, core::array::Array::<core::felt252>)) <- struct_construct(v7, v5)
+  (v9: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v8)
 End:
-  Return(v13)
+  Return(v9)
 
 
 Generated core::traits::PanicDestruct::panic_destruct lowering for source location:
@@ -348,22 +344,9 @@ Final lowering:
 Parameters: v0: core::integer::u32
 blk0 (root):
 Statements:
-  (v1: core::felt252) <- 1
-  (v2: core::felt252) <- 2
-  (v3: core::felt252) <- core::felt252_sub(v1, v2)
-End:
-  Match(match core::felt252_is_zero(v3) {
-    IsZeroResult::Zero => blk1,
-    IsZeroResult::NonZero(v4) => blk2,
-  })
-
-blk1:
-Statements:
-End:
-  Return()
-
-blk2:
-Statements:
+  (v1: {[email protected]:2:13: 2:25}) <- struct_construct()
+  (v2: {[email protected]:2:13: 2:25}, v3: @{[email protected]:2:13: 2:25}) <- snapshot(v1)
+  () <- "Generated `core::ops::function::Fn::call` for {[email protected]:2:13: 2:25}"{None, { 0: core::felt252 }, }(v3)
 End:
   Return()
 
@@ -505,11 +488,7 @@ Final lowering:
 Parameters:
 blk0 (root):
 Statements:
-  (v0: core::felt252) <- 2
-  (v1: {[email protected]:5:29: 5:36}) <- struct_construct()
-  (v2: {[email protected]:5:29: 5:36}, v3: @{[email protected]:5:29: 5:36}) <- snapshot(v1)
-  (v4: (core::felt252,)) <- struct_construct(v0)
-  (v5: core::felt252) <- Generated `core::ops::function::Fn::call` for {[email protected]:5:29: 5:36}(v3, v4)
+  () <- "test::apply::<{[email protected]:5:29: 5:36}, Generated core::traits::Drop::<{[email protected]:5:29: 5:36}>, core::ops::function::FnOnceImpl::<{[email protected]:5:29: 5:36}, (core::felt252,), core::traits::DestructFromDrop::<{[email protected]:5:29: 5:36}, Generated core::traits::Drop::<{[email protected]:5:29: 5:36}>>, Generated core::ops::function::Fn::<{[email protected]:5:29: 5:36}, (core::felt252,)>>, core::felt252Drop>"{{}, }()
 End:
   Return()