Skip to content

refactor(ap-change): remove unused tracking payload and redundant clones #9708

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
Perekup1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(ap-change): remove unused tracking payload and redundant clones #9708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions crates/cairo-lang-sierra-ap-change/src/compute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ impl<TokenUsages: Fn(CostTokenType) -> usize> InvocationApChangeInfoProvider
#[derive(Clone, Debug)]
enum ApTrackingBase {
FunctionStart(FunctionId),
#[expect(dead_code)]
EnableStatement(StatementIdx),
EnableStatement,
}

/// The information for ap tracking of a statement.
Expand Down Expand Up @@ -83,16 +82,16 @@ impl<'a, TokenUsages: Fn(StatementIdx, CostTokenType) -> usize>
program: &'a Program,
program_info: &'a ProgramRegistryInfo,
token_usages: TokenUsages,
) -> Result<Self, ApChangeError> {
Ok(Self {
) -> Self {
Self {
program,
program_info,
token_usages,
function_ap_change: Default::default(),
infos: vec![StatementInfo::default(); program.statements.len()],
variable_values: Default::default(),
branches: vec![vec![]; program.statements.len()],
})
}
}

/// Calculates the locals size and function ap changes.
Expand Down Expand Up @@ -213,7 +212,7 @@ impl<'a, TokenUsages: Fn(StatementIdx, CostTokenType) -> usize>
for (ap_change, target) in &self.branches[idx.0] {
if matches!(ap_change, ApChange::EnableApTracking) {
self.infos[target.0].tracking_info = Some(ApTrackingInfo {
base: ApTrackingBase::EnableStatement(idx),
base: ApTrackingBase::EnableStatement,
ap_change: 0,
});
continue;
Expand All @@ -222,7 +221,7 @@ impl<'a, TokenUsages: Fn(StatementIdx, CostTokenType) -> usize>
continue;
};
if let Some(ap_change) =
self.branch_ap_change(idx, ap_change, |id| self.function_ap_change.get(id).cloned())
self.branch_ap_change(idx, ap_change, |id| self.function_ap_change.get(id).copied())
{
base_info.ap_change += ap_change;
} else {
Expand Down Expand Up @@ -259,7 +258,7 @@ impl<'a, TokenUsages: Fn(StatementIdx, CostTokenType) -> usize>
continue;
}
let Some(change) = self
.branch_ap_change(idx, ap_change, |id| self.function_ap_change.get(id).cloned())
.branch_ap_change(idx, ap_change, |id| self.function_ap_change.get(id).copied())
else {
source_ap_change = Some(base_info.ap_change);
continue;
Expand Down Expand Up @@ -337,7 +336,7 @@ pub fn calc_ap_changes<TokenUsages: Fn(StatementIdx, CostTokenType) -> usize>(
program_info: &ProgramRegistryInfo,
token_usages: TokenUsages,
) -> Result<ApChangeInfo, ApChangeError> {
let mut helper = ApChangeCalcHelper::new(program, program_info, token_usages)?;
let mut helper = ApChangeCalcHelper::new(program, program_info, token_usages);
helper.calc_branches()?;
helper.calc_locals_and_function_ap_changes()?;
let ap_tracked_reverse_topological_ordering =
Expand Down