Skip to content

bugfix(lowering): propagate snapshot pop success values #9783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcastil0 wants to merge 4 commits into
base: main
Choose a base branch
from
+264 −5
Open

bugfix(lowering): propagate snapshot pop success values #9783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e59c451
bugfix(lowering): propagate snapshot pop success values
jcastil0 Mar 25, 2026
3a8ba0c
test(lowering): move snapshot pop coverage to const_folding test data
jcastil0 Mar 28, 2026
1db7cc2
Merge branch 'main' into lowering-snapshot-pop-success-values
jcastil0 Mar 28, 2026
c339be9
Merge branch 'main' into lowering-snapshot-pop-success-values
jcastil0 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions crates/cairo-lang-lowering/src/optimizations/const_folding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,18 +1325,35 @@ impl<'db, 'mt> ConstFoldingContext<'db, 'mt> {
let var_info = self.var_info.get(&info.inputs[0].var_id)?;
let desnapped = try_extract_matches!(var_info.as_ref(), VarInfo::Snapshot)?;
let element_var_infos = try_extract_matches!(desnapped.as_ref(), VarInfo::Array)?;
// TODO(orizi): Propagate success values as well.
if element_var_infos.is_empty() {
let wrap_snapshot_array = |var_infos: Vec<Option<Rc<VarInfo<'db>>>>| {
VarInfo::Snapshot(VarInfo::Array(var_infos).into())
};
if let Some((element_var_info, remaining_var_infos)) = if id
== self.array_snapshot_pop_front
{
element_var_infos.split_first().map(|(first, rest)| (first.clone(), rest.to_vec()))
} else {
element_var_infos.split_last().map(|(last, rest)| (last.clone(), rest.to_vec()))
} {
let arm = &info.arms[0];
self.var_info
.insert(arm.var_ids[0], wrap_snapshot_array(remaining_var_infos).into());
if let Some(element_var_info) = element_var_info {
self.var_info.insert(
arm.var_ids[1],
VarInfo::Box(VarInfo::Snapshot(element_var_info).into()).into(),
);
}
None
} else {
let arm = &info.arms[1];
self.var_info.insert(arm.var_ids[0], VarInfo::Array(vec![]).into());
self.var_info.insert(arm.var_ids[0], wrap_snapshot_array(vec![]).into());
Some(BlockEnd::Goto(
arm.block_id,
VarRemapping {
remapping: FromIterator::from_iter([(arm.var_ids[0], info.inputs[0])]),
},
))
} else {
None
}
} else {
None
Expand Down
242 changes: 242 additions & 0 deletions crates/cairo-lang-lowering/src/optimizations/test_data/const_folding
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6075,6 +6075,248 @@ End:

//! > ==========================================================================

//! > Snapshot pop_front propagates success values.

//! > test_runner_name
test_match_optimizer

//! > function_code
fn foo() -> felt252 {
let mut snapshot = array![1, 2].span().snapshot;
let Some(v) = array_snapshot_pop_front(ref snapshot) else {
return 0;
};
let Some(w) = array_snapshot_pop_front(ref snapshot) else {
return 100;
};
*v.unbox() + *w.unbox()
}

//! > function_name
foo

//! > module_code
use core::array::array_snapshot_pop_front;

//! > semantic_diagnostics

//! > before
Parameters:
blk0 (root):
Statements:
(v0: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
(v1: core::felt252) <- 1
(v2: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v0, v1)
(v3: core::felt252) <- 2
(v4: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v2, v3)
(v5: core::array::Array::<core::felt252>, v6: @core::array::Array::<core::felt252>) <- snapshot(v4)
End:
Match(match core::array::array_snapshot_pop_front::<core::felt252>(v6) {
Option::Some(v7, v8) => blk1,
Option::None(v9) => blk4,
})

blk1:
Statements:
End:
Match(match core::array::array_snapshot_pop_front::<core::felt252>(v7) {
Option::Some(v10, v11) => blk2,
Option::None(v12) => blk3,
})

blk2:
Statements:
(v13: @core::felt252) <- unbox(v8)
(v14: core::felt252) <- desnap(v13)
(v15: @core::felt252) <- unbox(v11)
(v16: core::felt252) <- desnap(v15)
(v17: core::felt252) <- core::felt252_add(v14, v16)
End:
Return(v17)

blk3:
Statements:
(v18: core::felt252) <- 100
End:
Return(v18)

blk4:
Statements:
(v19: core::felt252) <- 0
End:
Return(v19)

//! > after
Parameters:
blk0 (root):
Statements:
(v0: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
(v1: core::felt252) <- 1
(v2: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v0, v1)
(v3: core::felt252) <- 2
(v4: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v2, v3)
(v5: core::array::Array::<core::felt252>, v6: @core::array::Array::<core::felt252>) <- snapshot(v4)
End:
Match(match core::array::array_snapshot_pop_front::<core::felt252>(v6) {
Option::Some(v7, v8) => blk1,
Option::None(v9) => blk4,
})

blk1:
Statements:
End:
Match(match core::array::array_snapshot_pop_front::<core::felt252>(v7) {
Option::Some(v10, v11) => blk2,
Option::None(v12) => blk3,
})

blk2:
Statements:
(v13: @core::felt252) <- unbox(v8)
(v14: core::felt252) <- desnap(v13)
(v15: @core::felt252) <- unbox(v11)
(v16: core::felt252) <- desnap(v15)
(v17: core::felt252) <- 3
End:
Return(v17)

blk3:
Statements:
(v18: core::felt252) <- 100
End:
Return(v18)

blk4:
Statements:
(v19: core::felt252) <- 0
End:
Return(v19)

//! > lowering_diagnostics

//! > ==========================================================================

//! > Snapshot pop_back propagates success values.

//! > test_runner_name
test_match_optimizer

//! > function_code
fn foo() -> felt252 {
let mut snapshot = array![1, 2].span().snapshot;
let Some(v) = array_snapshot_pop_back(ref snapshot) else {
return 0;
};
let Some(w) = array_snapshot_pop_back(ref snapshot) else {
return 100;
};
*v.unbox() + *w.unbox()
}

//! > function_name
foo

//! > module_code
use core::array::array_snapshot_pop_back;

//! > semantic_diagnostics

//! > before
Parameters:
blk0 (root):
Statements:
(v0: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
(v1: core::felt252) <- 1
(v2: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v0, v1)
(v3: core::felt252) <- 2
(v4: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v2, v3)
(v5: core::array::Array::<core::felt252>, v6: @core::array::Array::<core::felt252>) <- snapshot(v4)
End:
Match(match core::array::array_snapshot_pop_back::<core::felt252>(v6) {
Option::Some(v7, v8) => blk1,
Option::None(v9) => blk4,
})

blk1:
Statements:
End:
Match(match core::array::array_snapshot_pop_back::<core::felt252>(v7) {
Option::Some(v10, v11) => blk2,
Option::None(v12) => blk3,
})

blk2:
Statements:
(v13: @core::felt252) <- unbox(v8)
(v14: core::felt252) <- desnap(v13)
(v15: @core::felt252) <- unbox(v11)
(v16: core::felt252) <- desnap(v15)
(v17: core::felt252) <- core::felt252_add(v14, v16)
End:
Return(v17)

blk3:
Statements:
(v18: core::felt252) <- 100
End:
Return(v18)

blk4:
Statements:
(v19: core::felt252) <- 0
End:
Return(v19)

//! > after
Parameters:
blk0 (root):
Statements:
(v0: core::array::Array::<core::felt252>) <- core::array::array_new::<core::felt252>()
(v1: core::felt252) <- 1
(v2: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v0, v1)
(v3: core::felt252) <- 2
(v4: core::array::Array::<core::felt252>) <- core::array::array_append::<core::felt252>(v2, v3)
(v5: core::array::Array::<core::felt252>, v6: @core::array::Array::<core::felt252>) <- snapshot(v4)
End:
Match(match core::array::array_snapshot_pop_back::<core::felt252>(v6) {
Option::Some(v7, v8) => blk1,
Option::None(v9) => blk4,
})

blk1:
Statements:
End:
Match(match core::array::array_snapshot_pop_back::<core::felt252>(v7) {
Option::Some(v10, v11) => blk2,
Option::None(v12) => blk3,
})

blk2:
Statements:
(v13: @core::felt252) <- unbox(v8)
(v14: core::felt252) <- desnap(v13)
(v15: @core::felt252) <- unbox(v11)
(v16: core::felt252) <- desnap(v15)
(v17: core::felt252) <- 3
End:
Return(v17)

blk3:
Statements:
(v18: core::felt252) <- 100
End:
Return(v18)

blk4:
Statements:
(v19: core::felt252) <- 0
End:
Return(v19)

//! > lowering_diagnostics

//! > ==========================================================================

//! > Panic with byte array value.

//! > test_runner_name
Expand Down