Brummel/RustAst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor inlining logic into try_inline function

Browse Source 
This commit extracts the logic for inlining function calls into a new
private
method, `try_inline`. This improves code organization and reduces
duplication in the `Optimizer`'s `visit_node` method.

The extracted method handles the preparation of substitutions and the
recursive visiting of the inlined node. It also ensures that the
substitution map state is correctly synchronized back to the calling
context.
This commit is contained in:
Michael Schimmel
2026-03-07 21:10:48 +01:00
parent f88992da61
commit d08fab4f73
3 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ast/compiler/optimizer/engine.rs
+37 -31
View File
@@ -70,6 +70,33 @@ impl Optimizer {
(*current).clone()
}
fn try_inline(
&self,
params: &AnalyzedNode,
arg_nodes: &[Rc<AnalyzedNode>],
body: &AnalyzedNode,
sub: &mut SubstitutionMap,
path: &mut PathTracker,
base_sub: Option<SubstitutionMap>,
) -> Option<Rc<AnalyzedNode>> {
let inliner = Inliner::new(&self.globals, &self.global_purity);
let mut inner_sub = base_sub.unwrap_or_else(|| sub.new_for_inlining());
if inliner.prepare_beta_reduction(params, arg_nodes, body, &mut inner_sub).is_some() {
let res = self.visit_node(Rc::new(body.clone()), &mut inner_sub, path);
// Sync back state to parent substitution map
sub.next_slot = inner_sub.next_slot;
sub.used.extend(inner_sub.used.iter().cloned());
sub.assigned.extend(inner_sub.assigned.iter().cloned());
sub.captured_slots.extend(inner_sub.captured_slots.iter().cloned());
Some(res)
} else {
None
}
}
fn visit_node(
&self,
node_rc: Rc<AnalyzedNode>,
@@ -249,15 +276,7 @@ impl Optimizer {
&& path.enter_lambda(&callee_opt.identity)
{
path.inlining_depth += 1;
let mut inner_sub = sub.new_for_inlining();
let collapsed = if inliner
.prepare_beta_reduction(params, &arg_nodes, body, &mut inner_sub)
.is_some()
{
Some(self.visit_node(body.clone(), &mut inner_sub, path))
} else {
None
};
let collapsed = self.try_inline(params, &arg_nodes, body, sub, path, None);
path.inlining_depth -= 1;
path.exit_lambda(&callee_opt.identity);
@@ -286,17 +305,9 @@ impl Optimizer {
&& positional_count.is_some()
&& !lambda_node.ty.is_recursive
{
let mut inner_sub = sub.new_for_inlining();
path.inlining_stack.insert(*idx);
path.inlining_depth += 1;
let collapsed = if inliner
.prepare_beta_reduction(params, &arg_nodes, body, &mut inner_sub)
.is_some()
{
Some(self.visit_node(body.clone(), &mut inner_sub, path))
} else {
None
};
let collapsed = self.try_inline(params, &arg_nodes, body, sub, path, None);
path.inlining_depth -= 1;
path.inlining_stack.remove(idx);
@@ -323,19 +334,14 @@ impl Optimizer {
}
path.inlining_depth += 1;
let collapsed = if inliner
.prepare_beta_reduction(
&closure.parameter_node,
&arg_nodes,
&closure.function_node,
&mut closure_sub,
)
.is_some()
{
Some(self.visit_node(closure.function_node.clone(), &mut closure_sub, path))
} else {
None
};
let collapsed = self.try_inline(
&closure.parameter_node,
&arg_nodes,
&closure.function_node,
sub,
path,
Some(closure_sub),
);
path.inlining_depth -= 1;
path.exit_lambda(&closure.function_node.identity);