Adding redeposit gas by default. (#6904)

Author: orizi

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

@@ -89,7 +89,6 @@ pub struct RootDatabaseBuilder {
     plugin_suite: PluginSuite,
     detect_corelib: bool,
     auto_withdraw_gas: bool,
-    add_redeposit_gas: bool,
     project_config: Option<Box<ProjectConfig>>,
     cfg_set: Option<CfgSet>,
     inlining_strategy: InliningStrategy,
@@ -101,7 +100,6 @@ impl RootDatabaseBuilder {
             plugin_suite: get_default_plugin_suite(),
             detect_corelib: false,
             auto_withdraw_gas: true,
-            add_redeposit_gas: false,
             project_config: None,
             cfg_set: None,
             inlining_strategy: InliningStrategy::Default,
@@ -123,11 +121,6 @@ impl RootDatabaseBuilder {
         self
     }
 
-    pub fn with_add_redeposit_gas(&mut self) -> &mut Self {
-        self.add_redeposit_gas = true;
-        self
-    }
-
     pub fn detect_corelib(&mut self) -> &mut Self {
         self.detect_corelib = true;
         self
@@ -175,11 +168,6 @@ impl RootDatabaseBuilder {
             add_withdraw_gas_flag_id,
             Some(Arc::new(Flag::AddWithdrawGas(self.auto_withdraw_gas))),
         );
-        let add_redeposit_gas_flag_id = FlagId::new(db.upcast(), "add_redeposit_gas");
-        db.set_flag(
-            add_redeposit_gas_flag_id,
-            Some(Arc::new(Flag::AddRedepositGas(self.add_redeposit_gas))),
-        );
 
         if let Some(config) = &self.project_config {
             update_crate_roots_from_project_config(&mut db, config.as_ref());

crates/cairo-lang-filesystem/src/flag.rs

@@ -3,9 +3,8 @@
 pub enum Flag {
     /// Whether automatically add `withdraw_gas` calls in code cycles.
     /// Default is true - automatically add.
+    ///
+    /// Additionally controls addition of `redeposit_gas` which happens on default.
     AddWithdrawGas(bool),
-    /// Whether automatically add `redeposit_gas` calls on stores of the gas builtin.
-    /// Default is false - automatically add.
-    AddRedepositGas(bool),
     NumericMatchOptimizationMinArmsThreshold(usize),
 }

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

@@ -78,17 +78,19 @@ End:
 
 blk1:
 Statements:
-  (v23: core::array::SpanIter::<core::felt252>, v24: core::felt252, v25: ()) <- struct_destructure(v21)
-  (v26: (core::felt252,)) <- struct_construct(v24)
-  (v27: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v26)
+  (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)
 End:
-  Return(v18, v19, v27)
+  Return(v18, v23, v28)
 
 blk2:
 Statements:
-  (v28: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v22)
+  (v29: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v19)
+  (v30: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v22)
 End:
-  Return(v18, v19, v28)
+  Return(v18, v29, v30)
 
 
 Generated loop lowering for source location:
@@ -139,81 +141,89 @@ End:
 
 blk1:
 Statements:
-  (v9: core::array::Span::<core::felt252>) <- struct_destructure(v2)
-  (v10: @core::array::Array::<core::felt252>) <- struct_destructure(v9)
+  (v9: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
+  (v10: core::array::Span::<core::felt252>) <- struct_destructure(v2)
+  (v11: @core::array::Array::<core::felt252>) <- struct_destructure(v10)
 End:
-  Match(match core::array::array_snapshot_pop_front::<core::felt252>(v10) {
-    Option::Some(v11, v12) => blk2,
-    Option::None(v13) => blk3,
+  Match(match core::array::array_snapshot_pop_front::<core::felt252>(v11) {
+    Option::Some(v12, v13) => blk2,
+    Option::None(v14) => blk3,
   })
 
 blk2:
 Statements:
-  (v14: core::option::Option::<core::box::Box::<@core::felt252>>) <- Option::Some(v12)
+  (v15: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v9)
+  (v16: core::option::Option::<core::box::Box::<@core::felt252>>) <- Option::Some(v13)
 End:
-  Goto(blk4, {v11 -> v15, v14 -> v16})
+  Goto(blk4, {v15 -> v17, v12 -> v18, v16 -> v19})
 
 blk3:
 Statements:
-  (v17: ()) <- struct_construct()
-  (v18: core::option::Option::<core::box::Box::<@core::felt252>>) <- Option::None(v17)
+  (v20: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v9)
+  (v21: ()) <- struct_construct()
+  (v22: core::option::Option::<core::box::Box::<@core::felt252>>) <- Option::None(v21)
 End:
-  Goto(blk4, {v13 -> v15, v18 -> v16})
+  Goto(blk4, {v20 -> v17, v14 -> v18, v22 -> v19})
 
 blk4:
 Statements:
-  (v19: core::array::Span::<core::felt252>) <- struct_construct(v15)
+  (v23: core::array::Span::<core::felt252>) <- struct_construct(v18)
 End:
-  Match(match_enum(v16) {
-    Option::Some(v20) => blk5,
-    Option::None(v21) => blk6,
+  Match(match_enum(v19) {
+    Option::Some(v24) => blk5,
+    Option::None(v25) => blk6,
   })
 
 blk5:
 Statements:
-  (v22: @core::felt252) <- core::box::unbox::<@core::felt252>(v20)
-  (v23: core::option::Option::<@core::felt252>) <- Option::Some(v22)
+  (v26: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v17)
+  (v27: @core::felt252) <- core::box::unbox::<@core::felt252>(v24)
+  (v28: core::option::Option::<@core::felt252>) <- Option::Some(v27)
 End:
-  Goto(blk7, {v23 -> v24})
+  Goto(blk7, {v26 -> v29, v28 -> v30})
 
 blk6:
 Statements:
-  (v25: ()) <- struct_construct()
-  (v26: core::option::Option::<@core::felt252>) <- Option::None(v25)
+  (v31: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v17)
+  (v32: ()) <- struct_construct()
+  (v33: core::option::Option::<@core::felt252>) <- Option::None(v32)
 End:
-  Goto(blk7, {v26 -> v24})
+  Goto(blk7, {v31 -> v29, v33 -> v30})
 
 blk7:
 Statements:
-  (v27: core::array::SpanIter::<core::felt252>) <- struct_construct(v19)
+  (v34: core::array::SpanIter::<core::felt252>) <- struct_construct(v23)
 End:
-  Match(match_enum(v24) {
-    Option::Some(v28) => blk8,
-    Option::None(v29) => blk9,
+  Match(match_enum(v30) {
+    Option::Some(v35) => blk8,
+    Option::None(v36) => blk9,
   })
 
 blk8:
 Statements:
-  (v30: core::felt252) <- core::felt252_add(v3, v4)
-  (v31: core::RangeCheck, v32: core::gas::GasBuiltin, v33: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- test::foo[expr30](v5, v6, v27, v30, v4)
+  (v37: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v29)
+  (v38: core::felt252) <- core::felt252_add(v3, v4)
+  (v39: core::RangeCheck, v40: core::gas::GasBuiltin, v41: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- test::foo[expr30](v5, v37, v34, v38, v4)
 End:
-  Return(v31, v32, v33)
+  Return(v39, v40, v41)
 
 blk9:
 Statements:
-  (v34: ()) <- struct_construct()
-  (v35: (core::array::SpanIter::<core::felt252>, core::felt252, ())) <- struct_construct(v27, v3, v34)
-  (v36: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Ok(v35)
+  (v42: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v29)
+  (v43: ()) <- struct_construct()
+  (v44: (core::array::SpanIter::<core::felt252>, core::felt252, ())) <- struct_construct(v34, v3, v43)
+  (v45: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Ok(v44)
 End:
-  Return(v5, v6, v36)
+  Return(v5, v42, v45)
 
 blk10:
 Statements:
-  (v37: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
-  (v38: core::felt252) <- 375233589013918064796019
-  (v39: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v37, v38)
-  (v40: core::panics::Panic) <- struct_construct()
-  (v41: (core::panics::Panic, core::array::Array::<core::felt252>)) <- struct_construct(v40, v39)
-  (v42: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Err(v41)
+  (v46: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v8)
+  (v47: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
+  (v48: core::felt252) <- 375233589013918064796019
+  (v49: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v47, v48)
+  (v50: core::panics::Panic) <- struct_construct()
+  (v51: (core::panics::Panic, core::array::Array::<core::felt252>)) <- struct_construct(v50, v49)
+  (v52: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Err(v51)
 End:
-  Return(v7, v8, v42)
+  Return(v7, v46, v52)