Skip to content

Commit 7395387

Browse files
ilyalesokhin-starkwareilyalesokhin-starkware
authored
Avoid adding redeposit_gas before panic flows. (#7687)
1 parent 401bda0 commit 7395387

File tree

67 files changed

+51174
-55351
lines changed

Some content is hidden

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

67 files changed

+51174
-55351
lines changed

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

+7-10
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,9 @@ End:
8787

8888
blk2:
8989
Statements:
90-
(v29: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v19)
91-
(v30: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v22)
90+
(v29: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v22)
9291
End:
93-
Return(v18, v29, v30)
92+
Return(v18, v19, v29)
9493

9594

9695
Generated loop lowering for source location:
@@ -168,11 +167,10 @@ End:
168167

169168
blk4:
170169
Statements:
171-
(v28: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v8)
172-
(v29: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
173-
(v30: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Err(v29)
170+
(v28: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
171+
(v29: core::panics::PanicResult::<(core::array::SpanIter::<core::felt252>, core::felt252, ())>) <- PanicResult::Err(v28)
174172
End:
175-
Return(v7, v28, v30)
173+
Return(v7, v8, v29)
176174

177175
//! > ==========================================================================
178176

@@ -254,7 +252,6 @@ End:
254252

255253
blk2:
256254
Statements:
257-
(v16: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v7)
258-
(v17: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v10)
255+
(v16: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v10)
259256
End:
260-
Return(v6, v16, v17)
257+
Return(v6, v7, v16)

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

+65-88
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ End:
6161

6262
blk2:
6363
Statements:
64-
(v13: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
65-
(v14: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
64+
(v13: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
6665
End:
67-
Return(v3, v13, v14)
66+
Return(v3, v4, v13)
6867

6968

7069
Generated loop lowering for source location:
@@ -149,11 +148,10 @@ End:
149148

150149
blk4:
151150
Statements:
152-
(v21: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
153-
(v22: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
154-
(v23: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v22)
151+
(v21: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
152+
(v22: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v21)
155153
End:
156-
Return(v5, v21, v23)
154+
Return(v5, v6, v22)
157155

158156
//! > ==========================================================================
159157

@@ -219,10 +217,9 @@ End:
219217

220218
blk2:
221219
Statements:
222-
(v13: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
223-
(v14: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
220+
(v13: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
224221
End:
225-
Return(v3, v13, v14)
222+
Return(v3, v4, v13)
226223

227224

228225
Generated loop lowering for source location:
@@ -307,11 +304,10 @@ End:
307304

308305
blk4:
309306
Statements:
310-
(v21: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
311-
(v22: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
312-
(v23: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v22)
307+
(v21: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
308+
(v22: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v21)
313309
End:
314-
Return(v5, v21, v23)
310+
Return(v5, v6, v22)
315311

316312
//! > ==========================================================================
317313

@@ -397,10 +393,9 @@ End:
397393

398394
blk2:
399395
Statements:
400-
(v19: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v8)
401-
(v20: core::panics::PanicResult::<(test::A, ())>) <- PanicResult::Err(v11)
396+
(v19: core::panics::PanicResult::<(test::A, ())>) <- PanicResult::Err(v11)
402397
End:
403-
Return(v7, v19, v20)
398+
Return(v7, v8, v19)
404399

405400

406401
Generated loop lowering for source location:
@@ -472,11 +467,10 @@ End:
472467

473468
blk2:
474469
Statements:
475-
(v17: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v8)
476-
(v18: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
477-
(v19: core::panics::PanicResult::<(core::integer::u32, test::A, test::A)>) <- PanicResult::Err(v18)
470+
(v17: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
471+
(v18: core::panics::PanicResult::<(core::integer::u32, test::A, test::A)>) <- PanicResult::Err(v17)
478472
End:
479-
Return(v7, v17, v19)
473+
Return(v7, v8, v18)
480474

481475
//! > ==========================================================================
482476

@@ -546,10 +540,9 @@ End:
546540

547541
blk2:
548542
Statements:
549-
(v13: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
550-
(v14: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
543+
(v13: core::panics::PanicResult::<(core::bool,)>) <- PanicResult::Err(v7)
551544
End:
552-
Return(v3, v13, v14)
545+
Return(v3, v4, v13)
553546

554547

555548
Generated loop lowering for source location:
@@ -678,11 +671,10 @@ End:
678671

679672
blk7:
680673
Statements:
681-
(v26: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
682-
(v27: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
683-
(v28: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v27)
674+
(v26: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
675+
(v27: core::panics::PanicResult::<(core::felt252, core::bool)>) <- PanicResult::Err(v26)
684676
End:
685-
Return(v5, v26, v28)
677+
Return(v5, v6, v27)
686678

687679
//! > ==========================================================================
688680

@@ -828,10 +820,9 @@ End:
828820

829821
blk2:
830822
Statements:
831-
(v12: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
832-
(v13: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
823+
(v12: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
833824
End:
834-
Return(v3, v12, v13)
825+
Return(v3, v4, v12)
835826

836827

837828
Generated loop lowering for source location:
@@ -931,11 +922,10 @@ End:
931922

932923
blk4:
933924
Statements:
934-
(v17: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
935-
(v18: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
936-
(v19: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Err(v18)
925+
(v17: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
926+
(v18: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Err(v17)
937927
End:
938-
Return(v5, v17, v19)
928+
Return(v5, v6, v18)
939929

940930
//! > ==========================================================================
941931

@@ -1440,10 +1430,9 @@ End:
14401430

14411431
blk2:
14421432
Statements:
1443-
(v14: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
1444-
(v15: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v9)
1433+
(v14: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v9)
14451434
End:
1446-
Return(v5, v14, v15)
1435+
Return(v5, v6, v14)
14471436

14481437

14491438
Generated loop lowering for source location:
@@ -1528,11 +1517,10 @@ End:
15281517

15291518
blk4:
15301519
Statements:
1531-
(v24: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v7)
1532-
(v25: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
1533-
(v26: core::panics::PanicResult::<(test::A, core::felt252, ())>) <- PanicResult::Err(v25)
1520+
(v24: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
1521+
(v25: core::panics::PanicResult::<(test::A, core::felt252, ())>) <- PanicResult::Err(v24)
15341522
End:
1535-
Return(v6, v24, v26)
1523+
Return(v6, v7, v25)
15361524

15371525
//! > ==========================================================================
15381526

@@ -1608,10 +1596,9 @@ End:
16081596

16091597
blk2:
16101598
Statements:
1611-
(v12: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
1612-
(v13: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
1599+
(v12: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
16131600
End:
1614-
Return(v3, v12, v13)
1601+
Return(v3, v4, v12)
16151602

16161603
//! > lowering_diagnostics
16171604

@@ -1722,10 +1709,9 @@ End:
17221709

17231710
blk4:
17241711
Statements:
1725-
(v19: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
1726-
(v20: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
1712+
(v19: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
17271713
End:
1728-
Return(v3, v19, v20)
1714+
Return(v3, v4, v19)
17291715

17301716

17311717
Generated loop lowering for source location:
@@ -1900,11 +1886,10 @@ End:
19001886

19011887
blk9:
19021888
Statements:
1903-
(v35: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
1904-
(v36: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
1905-
(v37: core::panics::PanicResult::<(core::felt252, core::internal::LoopResult::<core::bool, core::integer::u32>)>) <- PanicResult::Err(v36)
1889+
(v35: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
1890+
(v36: core::panics::PanicResult::<(core::felt252, core::internal::LoopResult::<core::bool, core::integer::u32>)>) <- PanicResult::Err(v35)
19061891
End:
1907-
Return(v5, v35, v37)
1892+
Return(v5, v6, v36)
19081893

19091894
//! > lowering_diagnostics
19101895

@@ -2158,10 +2143,9 @@ End:
21582143

21592144
blk4:
21602145
Statements:
2161-
(v19: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
2162-
(v20: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
2146+
(v19: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
21632147
End:
2164-
Return(v3, v19, v20)
2148+
Return(v3, v4, v19)
21652149

21662150

21672151
Generated loop lowering for source location:
@@ -2385,11 +2369,10 @@ End:
23852369

23862370
blk8:
23872371
Statements:
2388-
(v32: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
2389-
(v33: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2390-
(v34: core::panics::PanicResult::<(core::array::Array::<core::integer::u32>, core::internal::LoopResult::<(), core::integer::u32>)>) <- PanicResult::Err(v33)
2372+
(v32: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2373+
(v33: core::panics::PanicResult::<(core::array::Array::<core::integer::u32>, core::internal::LoopResult::<(), core::integer::u32>)>) <- PanicResult::Err(v32)
23912374
End:
2392-
Return(v5, v32, v34)
2375+
Return(v5, v6, v33)
23932376

23942377
//! > lowering_diagnostics
23952378

@@ -2497,10 +2480,9 @@ End:
24972480

24982481
blk4:
24992482
Statements:
2500-
(v19: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
2501-
(v20: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
2483+
(v19: core::panics::PanicResult::<(core::integer::u32,)>) <- PanicResult::Err(v7)
25022484
End:
2503-
Return(v3, v19, v20)
2485+
Return(v3, v4, v19)
25042486

25052487

25062488
Generated loop lowering for source location:
@@ -2724,11 +2706,10 @@ End:
27242706

27252707
blk8:
27262708
Statements:
2727-
(v32: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
2728-
(v33: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2729-
(v34: core::panics::PanicResult::<(core::array::Array::<core::integer::u32>, core::internal::LoopResult::<(), core::integer::u32>)>) <- PanicResult::Err(v33)
2709+
(v32: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2710+
(v33: core::panics::PanicResult::<(core::array::Array::<core::integer::u32>, core::internal::LoopResult::<(), core::integer::u32>)>) <- PanicResult::Err(v32)
27302711
End:
2731-
Return(v5, v32, v34)
2712+
Return(v5, v6, v33)
27322713

27332714
//! > lowering_diagnostics
27342715

@@ -2834,10 +2815,9 @@ End:
28342815

28352816
blk4:
28362817
Statements:
2837-
(v22: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
2838-
(v23: core::panics::PanicResult::<(core::result::Result::<(), core::integer::u32>,)>) <- PanicResult::Err(v9)
2818+
(v22: core::panics::PanicResult::<(core::result::Result::<(), core::integer::u32>,)>) <- PanicResult::Err(v9)
28392819
End:
2840-
Return(v5, v22, v23)
2820+
Return(v5, v6, v22)
28412821

28422822

28432823
Generated loop lowering for source location:
@@ -2949,30 +2929,28 @@ End:
29492929

29502930
blk6:
29512931
Statements:
2952-
(v26: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
2953-
(v27: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<155785504323917466144735657540098748279>()
2954-
(v28: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Err(v27)
2932+
(v26: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<155785504323917466144735657540098748279>()
2933+
(v27: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Err(v26)
29552934
End:
2956-
Return(v12, v26, v28)
2935+
Return(v12, v4, v27)
29572936

29582937
blk7:
29592938
Statements:
2960-
(v29: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
2961-
(v30: ()) <- struct_construct()
2962-
(v31: core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>) <- LoopResult::Normal(v30)
2963-
(v32: core::ops::range::RangeIterator::<core::integer::u32>) <- struct_construct(v7, v8)
2964-
(v33: (core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)) <- struct_construct(v32, v31)
2965-
(v34: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Ok(v33)
2939+
(v28: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
2940+
(v29: ()) <- struct_construct()
2941+
(v30: core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>) <- LoopResult::Normal(v29)
2942+
(v31: core::ops::range::RangeIterator::<core::integer::u32>) <- struct_construct(v7, v8)
2943+
(v32: (core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)) <- struct_construct(v31, v30)
2944+
(v33: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Ok(v32)
29662945
End:
2967-
Return(v3, v29, v34)
2946+
Return(v3, v28, v33)
29682947

29692948
blk8:
29702949
Statements:
2971-
(v35: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v6)
2972-
(v36: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2973-
(v37: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Err(v36)
2950+
(v34: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
2951+
(v35: core::panics::PanicResult::<(core::ops::range::RangeIterator::<core::integer::u32>, core::internal::LoopResult::<(), core::result::Result::<(), core::integer::u32>>)>) <- PanicResult::Err(v34)
29742952
End:
2975-
Return(v5, v35, v37)
2953+
Return(v5, v6, v35)
29762954

29772955
//! > lowering_diagnostics
29782956

@@ -3095,10 +3073,9 @@ End:
30953073

30963074
blk4:
30973075
Statements:
3098-
(v17: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v5)
3099-
(v18: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
3100-
(v19: core::panics::PanicResult::<(core::result::Result::<(), core::integer::u32>,)>) <- PanicResult::Err(v18)
3076+
(v17: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
3077+
(v18: core::panics::PanicResult::<(core::result::Result::<(), core::integer::u32>,)>) <- PanicResult::Err(v17)
31013078
End:
3102-
Return(v4, v17, v19)
3079+
Return(v4, v5, v18)
31033080

31043081
//! > lowering_diagnostics

0 commit comments

Comments
 (0)