Sitelet https://github.com/starkware-libs/cairo/commit/aa346da79c1eed437b5fa703786d9f587302956c
Skip to content

Commit aa346da

Browse files
eytan-starkwareeytan-starkware
committed
(opt): remove cancel_ops phase, subsumed by variable forwarding
1 parent ed21f8d commit aa346da

45 files changed

Lines changed: 22576 additions & 23628 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ Final lowering:
196196
Parameters: v0: {closure@lib.cairo:11:5: 11:7}, v1: ()
197197
blk0 (root):
198198
Statements:
199+
(v2: test::PanicDestructable) <- struct_destructure(v0)
200+
() <- struct_destructure(v2)
199201
End:
200202
Return()
201203

‎crates/cairo-lang-lowering/src/optimizations/cancel_ops.rs‎

Lines changed: 0 additions & 327 deletions
This file was deleted.

‎crates/cairo-lang-lowering/src/optimizations/cancel_ops_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn test_cancel_ops(
4646
.unwrap();
4747

4848
let mut after = before.clone();
49-
OptimizationPhase::CancelOps.apply(db, function_id, &mut after).unwrap();
49+
OptimizationPhase::VariableForwarding.apply(db, function_id, &mut after).unwrap();
5050

5151
TestRunnerResult::success(OrderedHashMap::from([
5252
("semantic_diagnostics".into(), semantic_diagnostics),

‎crates/cairo-lang-lowering/src/optimizations/const_folding_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn test_match_optimizer(
4949
[
5050
OptimizationPhase::ApplyInlining { enable_const_folding: false },
5151
OptimizationPhase::ReorganizeBlocks,
52-
OptimizationPhase::CancelOps,
52+
OptimizationPhase::VariableForwarding,
5353
OptimizationPhase::ReorganizeBlocks,
5454
]
5555
.apply(db, function_id, &mut before)

‎crates/cairo-lang-lowering/src/optimizations/mod.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ macro_rules! trace {
1515
}
1616

1717
pub mod branch_inversion;
18-
pub mod cancel_ops;
1918
pub mod config;
2019
pub mod const_folding;
2120
pub mod cse;
@@ -34,3 +33,10 @@ pub mod trim_unreachable;
3433
pub mod validate;
3534
pub mod var_renamer;
3635
pub mod variable_forwarding;
36+
37+
// TODO(eytan-starkware): Move these cases into `variable_forwarding` test data and remove this
38+
// module. The `cancel_ops` phase was removed, but its test cases are kept here, wired to
39+
// `variable_forwarding`, until they are migrated.
40+
#[cfg(test)]
41+
#[path = "cancel_ops_test.rs"]
42+
mod cancel_ops_test;

0 commit comments

Comments
 (0)