Skip to content

[turbopack] Allocate EarlyReturn on an arena #94615

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
sampoder wants to merge 1 commit into
base: canary
Choose a base branch
from
+8 −7
Open

[turbopack] Allocate EarlyReturn on an arena #94615

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
15 changes: 8 additions & 7 deletions turbopack/crates/turbopack-ecmascript/src/analyzer/graph/visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ mod analyzer_state {
/// return statement handler.
cur_fn_return_values: Option<Vec<JsValue<'a>>>,
/// Stack of early returns for control flow analysis.
early_return_stack: Vec<EarlyReturn<'a>>,
early_return_stack: BumpVec<'a, EarlyReturn<'a>>,
lexical_stack: Vec<LexicalContext>,
var_decl_kind: Option<VarDeclKind>,
}
Expand Down Expand Up @@ -325,8 +325,9 @@ mod analyzer_state {
}

/// Helper to access the early_return_stack mutably (for push operations)
pub(super) fn early_return_stack_mut(&mut self) -> &mut Vec<EarlyReturn<'a>> {
&mut self.state.early_return_stack
pub(super) fn push_early_return(&mut self, early_return: EarlyReturn<'a>) {
let arena = self.arena;
self.state.early_return_stack.push(arena, early_return);
}

/// Records an unconditional early return (return, throw, or finally block that always
Expand All @@ -340,7 +341,7 @@ mod analyzer_state {
prev_effects: take(&mut self.effects),
start_ast_path: as_parent_path(ast_path),
};
self.early_return_stack_mut().push(early_return);
self.push_early_return(early_return);
}

/// Runs `func` with a fresh early return stack, restoring the previous stack afterwards.
Expand Down Expand Up @@ -2202,7 +2203,7 @@ impl<'a> Analyzer<'a, '_> {
span,
early_return_condition_value: true,
};
self.early_return_stack_mut().push(early_return);
self.push_early_return(early_return);
}
(false, true) => {
let early_return = EarlyReturn::Conditional {
Expand All @@ -2215,7 +2216,7 @@ impl<'a> Analyzer<'a, '_> {
span,
early_return_condition_value: false,
};
self.early_return_stack_mut().push(early_return);
self.push_early_return(early_return);
}
(false, false) | (true, true) => {
let kind = match (then, r#else) {
Expand All @@ -2238,7 +2239,7 @@ impl<'a> Analyzer<'a, '_> {
prev_effects: take(&mut self.effects),
start_ast_path: as_parent_path(ast_path),
};
self.early_return_stack_mut().push(early_return);
self.push_early_return(early_return);
}
}
}
Expand Down
Loading