Fix issue #3863

Author: spapinistarkware

crates/cairo-lang-sierra-generator/src/store_variables/mod.rs

@@ -249,8 +249,8 @@ impl<'a> AddStoreVariableStatements<'a> {
             res_deferred_info = Some(deferred_info);
         }
 
-        if self.state().temporary_variables.get(arg).is_some() {
-            self.store_temp_as_local(arg);
+        if self.state().temporary_variables.get(arg).is_some() && self.store_temp_as_local(arg) {
+            self.known_stack().remove_variable(arg);
         }
 
         (false, res_deferred_info)
@@ -365,11 +365,13 @@ impl<'a> AddStoreVariableStatements<'a> {
 
     /// Copies the given variable into a local variable if it is marked as local.
     /// Removes it from [State::temporary_variables].
-    fn store_temp_as_local(&mut self, var: &sierra::ids::VarId) {
+    fn store_temp_as_local(&mut self, var: &sierra::ids::VarId) -> bool {
         if let Some(uninitialized_local_var_id) = self.local_variables.get(var).cloned() {
             let ty = self.state().temporary_variables.swap_remove(var).unwrap();
             self.store_local(var, &uninitialized_local_var_id, &ty);
+            return true;
         }
+        false
     }
 
     /// Stores all the deffered and temporary variables as local variables.

tests/bug_samples/issue3863.cairo

@@ -0,0 +1,52 @@
+use array::{ArrayTrait, SpanTrait};
+use option::OptionTrait;
+/// The call context.
+#[derive(Destruct)]
+struct CallContext {
+    /// The bytecode to execute.
+    bytecode: Span<u8>,
+    /// The call data.
+    call_data: Span<u8>,
+    /// Amount of native token to transfer.
+    value: u256,
+}
+
+
+trait CallContextTrait {
+    fn new(bytecode: Span<u8>, call_data: Span<u8>, value: u256) -> CallContext;
+    fn bytecode(self: @CallContext) -> Span<u8>;
+    fn call_data(self: @CallContext) -> Span<u8>;
+    fn value(self: @CallContext) -> u256;
+}
+
+impl CallContextImpl of CallContextTrait {
+    fn new(bytecode: Span<u8>, call_data: Span<u8>, value: u256) -> CallContext {
+        CallContext { bytecode, call_data, value, }
+    }
+    fn bytecode(self: @CallContext) -> Span<u8> {
+        *self.bytecode
+    }
+
+    fn call_data(self: @CallContext) -> Span<u8> {
+        *self.call_data
+    }
+
+    fn value(self: @CallContext) -> u256 {
+        *self.value
+    }
+}
+
+#[test]
+#[available_gas(1000000)]
+fn test_call_context_new() {
+    // Given
+    let bytecode = array![1, 2, 3];
+    let call_data = array![4, 5, 6];
+    let value: u256 = 100;
+    // When
+    let call_context = CallContextTrait::new(bytecode.span(), call_data.span(), value);
+    // Then
+    assert(call_context.bytecode() == bytecode.span(), 'wrong bytecode');
+    assert(call_context.call_data() == call_data.span(), 'wrong call data');
+    assert(call_context.value() == value, 'wrong value');
+}

tests/bug_samples/lib.cairo

@@ -23,8 +23,10 @@ mod issue3192;
 mod issue3211;
 mod issue3345;
 mod issue3658;
+mod issue3863;
 mod loop_only_change;
 mod inconsistent_gas;
 mod partial_param_local;
 mod loop_break_in_match;
 mod generic_cycles;
+