Avoid using ConcreteFunctionWithBodyLongId.function_with_body_id.

Author: ilyalesokhin-starkware

crates/bin/get-lowering/src/main.rs

@@ -258,7 +258,7 @@ fn main() -> anyhow::Result<()> {
         if let Some(generated_function_index) = args.generated_function_index {
             let multi = db
                 .priv_function_with_body_multi_lowering(
-                    function_id.function_with_body_id(db).base_semantic_function(db),
+                    function_id.base_semantic_function(db).function_with_body_id(db),
                 )
                 .unwrap();
             let keys = multi

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

@@ -94,7 +94,7 @@ fn create_panic_block(
 ) -> Maybe<Block> {
     let mut variables = VariableAllocator::new(
         db,
-        function.function_with_body_id(db).base_semantic_function(db),
+        function.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )?;
     let never_ty = never_ty(db);

crates/cairo-lang-lowering/src/borrow_check/test.rs

@@ -1,11 +1,12 @@
 use cairo_lang_debug::DebugWithDb;
 use cairo_lang_semantic::test_utils::setup_test_function;
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
+use cairo_lang_utils::Intern;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 
 use crate::db::LoweringGroup;
 use crate::fmt::LoweredFormatter;
-use crate::ids::ConcreteFunctionWithBodyId;
+use crate::ids::FunctionWithBodyLongId;
 use crate::test_utils::LoweringDatabaseForTesting;
 
 cairo_lang_test_utils::test_file_test!(
@@ -30,13 +31,11 @@ fn test_borrow_check(
         inputs["module_code"].as_str(),
     )
     .split();
-    let function_id =
-        ConcreteFunctionWithBodyId::from_semantic(db, test_function.concrete_function_id);
 
     let lowering_diagnostics = db.module_lowering_diagnostics(test_function.module_id).unwrap();
-    let lowering = if let Ok(lowered) =
-        db.priv_function_with_body_lowering(function_id.function_with_body_id(db))
-    {
+    let lowering = if let Ok(lowered) = db.priv_function_with_body_lowering(
+        FunctionWithBodyLongId::Semantic(test_function.function_id).intern(db),
+    ) {
         format!(
             "{:?}",
             lowered.debug(&LoweredFormatter {

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

@@ -312,7 +312,7 @@ pub fn add_destructs(
 
     let mut variables = VariableAllocator::new(
         db,
-        function_id.function_with_body_id(db).base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )
     .unwrap();
@@ -323,7 +323,7 @@ pub fn add_destructs(
 
     // Add destructions.
     let stable_ptr =
-        function_id.function_with_body_id(db).base_semantic_function(db).untyped_stable_ptr(db);
+        function_id.base_semantic_function(db).function_with_body_id(db).untyped_stable_ptr(db);
 
     let location = variables.get_location(stable_ptr);
 

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

@@ -45,7 +45,7 @@ pub fn inner_lower_implicits(
     function_id: ConcreteFunctionWithBodyId,
     lowered: &mut Lowered,
 ) -> Maybe<()> {
-    let semantic_function = function_id.function_with_body_id(db).base_semantic_function(db);
+    let semantic_function = function_id.base_semantic_function(db).function_with_body_id(db);
     let location = LocationId::from_stable_location(
         db,
         StableLocation::new(semantic_function.untyped_stable_ptr(db)),
@@ -55,7 +55,7 @@ pub fn inner_lower_implicits(
 
     let mut variables = VariableAllocator::new(
         db,
-        function_id.function_with_body_id(db).base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )?;
 
@@ -264,7 +264,7 @@ pub trait FunctionImplicitsTrait<'a>: Upcast<dyn LoweringGroup + 'a> {
         let mut implicits = db.scc_implicits(scc_representative)?;
 
         let precedence = db.function_declaration_implicit_precedence(
-            function.function_with_body_id(db).base_semantic_function(db),
+            function.base_semantic_function(db).function_with_body_id(db),
         )?;
         precedence.apply(&mut implicits, db);
 

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

@@ -62,7 +62,7 @@ pub fn priv_should_inline(
     }
 
     let config = db.function_declaration_inline_config(
-        function_id.function_with_body_id(db).base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
     )?;
     match (db.optimization_config().inlining_strategy, config) {
         (_, InlineConfiguration::Always(_)) => Ok(true),
@@ -331,10 +331,9 @@ pub fn apply_inlining(
     function_id: ConcreteFunctionWithBodyId,
     lowered: &mut Lowered,
 ) -> Maybe<()> {
-    let function_with_body_id = function_id.function_with_body_id(db);
     let variables = VariableAllocator::new(
         db,
-        function_with_body_id.base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )?;
     if let Ok(new_lowered) = FunctionInlinerRewriter::apply(variables, lowered, function_id) {

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

@@ -37,7 +37,7 @@ pub fn return_optimization(
 
     let mut variables = VariableAllocator::new(
         db,
-        function_id.function_with_body_id(db).base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )
     .unwrap();

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

@@ -5,7 +5,7 @@ use cairo_lang_semantic::test_utils::setup_test_function;
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 
-use crate::concretize::concretize_lowered;
+use crate::LoweringStage;
 use crate::db::LoweringGroup;
 use crate::fmt::LoweredFormatter;
 use crate::ids::ConcreteFunctionWithBodyId;
@@ -37,15 +37,10 @@ fn test_scrub_units(
     let function_id =
         ConcreteFunctionWithBodyId::from_semantic(db, test_function.concrete_function_id);
 
-    let mut before = db
-        .function_with_body_lowering(function_id.function_with_body_id(db))
-        .unwrap()
-        .deref()
-        .clone();
-    concretize_lowered(db, &mut before, &function_id.substitution(db).unwrap()).unwrap();
+    let before = db.lowered_body(function_id, LoweringStage::Monomorphized).unwrap();
 
     let lowering_diagnostics = db.module_lowering_diagnostics(test_function.module_id).unwrap();
-    let mut after = before.clone();
+    let mut after = before.deref().clone();
     scrub_units(db, &mut after);
 
     TestRunnerResult::success(OrderedHashMap::from([

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

@@ -42,7 +42,7 @@ pub fn lower_panics(
     }
     let variables = VariableAllocator::new(
         db,
-        function_id.function_with_body_id(db).base_semantic_function(db),
+        function_id.base_semantic_function(db).function_with_body_id(db),
         lowered.variables.clone(),
     )?;
 

crates/cairo-lang-sierra-generator/src/block_generator_test.rs

@@ -5,9 +5,10 @@ use cairo_lang_filesystem::db::FilesGroupEx;
 use cairo_lang_filesystem::flag::Flag;
 use cairo_lang_filesystem::ids::FlagId;
 use cairo_lang_lowering::db::LoweringGroup;
-use cairo_lang_lowering::{self as lowering, LoweringStage};
+use cairo_lang_lowering::{self as lowering, LoweringStage, ids};
 use cairo_lang_semantic::test_utils::setup_test_function;
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
+use cairo_lang_utils::Intern;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use lowering::fmt::LoweredFormatter;
@@ -57,8 +58,11 @@ fn block_generator_test(
     // Lower code.
     let function_id =
         ConcreteFunctionWithBodyId::from_semantic(db, test_function.concrete_function_id);
-    let lowering_diagnostics =
-        db.function_with_body_lowering_diagnostics(function_id.function_with_body_id(db)).unwrap();
+    let lowering_diagnostics = db
+        .function_with_body_lowering_diagnostics(
+            ids::FunctionWithBodyLongId::Semantic(test_function.function_id).intern(db),
+        )
+        .unwrap();
 
     let lowered = match db.lowered_body(function_id, LoweringStage::Final) {
         Ok(lowered) if !lowered.blocks.is_empty() => lowered,