Skip to content

perf(semantic): remove function stack #12676

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

Merged
graphite-app merged 1 commit into from
Aug 1, 2025
Merged

perf(semantic): remove function stack #12676

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion crates/oxc_semantic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ oxc_allocator = { workspace = true }
oxc_ast = { workspace = true }
oxc_ast_visit = { workspace = true }
oxc_cfg = { workspace = true }
oxc_data_structures = { workspace = true, features = ["assert_unchecked", "stack"] }
oxc_data_structures = { workspace = true, features = ["assert_unchecked"] }
oxc_diagnostics = { workspace = true }
oxc_ecmascript = { workspace = true }
oxc_index = { workspace = true }
Expand Down
33 changes: 18 additions & 15 deletions crates/oxc_semantic/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use oxc_cfg::{
ControlFlowGraphBuilder, CtxCursor, CtxFlags, EdgeType, ErrorEdgeKind, InstructionKind,
IterationInstructionKind, ReturnInstructionKind,
};
use oxc_data_structures::stack::Stack;
use oxc_diagnostics::OxcDiagnostic;
use oxc_span::{Atom, SourceType, Span};
use oxc_syntax::{
Expand Down Expand Up @@ -66,8 +65,9 @@ pub struct SemanticBuilder<'a> {
pub(crate) current_node_id: NodeId,
pub(crate) current_node_flags: NodeFlags,
pub(crate) current_scope_id: ScopeId,
/// Stores current `AstKind::Function` and `AstKind::ArrowFunctionExpression` during AST visit
pub(crate) function_stack: Stack<NodeId>,
/// `NodeId` of current `Function` (not including arrow functions).
/// When not in a function, is `NodeId` of `Program`.
pub(crate) current_function_node_id: NodeId,
pub(crate) module_instance_state_cache: FxHashMap<Address, ModuleInstanceState>,
current_reference_flags: ReferenceFlags,
pub(crate) hoisting_variables: FxHashMap<ScopeId, FxHashMap<Atom<'a>, SymbolId>>,
Expand Down Expand Up @@ -121,7 +121,7 @@ impl<'a> SemanticBuilder<'a> {
current_node_flags: NodeFlags::empty(),
current_reference_flags: ReferenceFlags::empty(),
current_scope_id,
function_stack: Stack::with_capacity(16),
current_function_node_id: NodeId::ROOT,
module_instance_state_cache: FxHashMap::default(),
nodes: AstNodes::default(),
hoisting_variables: FxHashMap::default(),
Expand Down Expand Up @@ -357,12 +357,6 @@ impl<'a> SemanticBuilder<'a> {
self.current_scope_flags().is_strict_mode()
}

pub(crate) fn set_function_node_flags(&mut self, flags: NodeFlags) {
if let Some(current_function) = self.function_stack.last() {
*self.nodes.get_node_mut(*current_function).flags_mut() |= flags;
}
}

/// Declares a `Symbol` for the node, adds it to symbol table, and binds it to the scope.
///
/// includes: the `SymbolFlags` that node has in addition to its declaration type (eg: export, ambient, etc.)
Expand Down Expand Up @@ -654,6 +648,9 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
// as scope depth must remain >= 1.

self.leave_node(kind);

// Check `current_function_node_id` has been reset to as it was at start
debug_assert!(self.current_function_node_id == NodeId::ROOT);
}

fn visit_break_statement(&mut self, stmt: &BreakStatement<'a>) {
Expand Down Expand Up @@ -1613,10 +1610,14 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

let kind = AstKind::Function(self.alloc(func));
self.enter_node(kind);
self.function_stack.push(self.current_node_id);

let parent_function_node_id = self.current_function_node_id;
self.current_function_node_id = self.current_node_id;

if func.is_declaration() {
func.bind(self);
}

self.enter_scope(
{
let mut flags = flags;
Expand Down Expand Up @@ -1693,7 +1694,8 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

self.leave_scope();
self.leave_node(kind);
self.function_stack.pop();

self.current_function_node_id = parent_function_node_id;
}

fn visit_arrow_function_expression(&mut self, expr: &ArrowFunctionExpression<'a>) {
Expand All @@ -1712,7 +1714,6 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {

let kind = AstKind::ArrowFunctionExpression(self.alloc(expr));
self.enter_node(kind);
self.function_stack.push(self.current_node_id);
self.enter_scope(
{
let mut flags = ScopeFlags::Function | ScopeFlags::Arrow;
Expand Down Expand Up @@ -1775,7 +1776,6 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
/* cfg */

self.leave_node(kind);
self.function_stack.pop();
self.leave_scope();
}

Expand Down Expand Up @@ -2039,7 +2039,10 @@ impl<'a> SemanticBuilder<'a> {
}
}
AstKind::YieldExpression(_) => {
self.set_function_node_flags(NodeFlags::HasYield);
// If not in a function, `current_function_node_id` is `NodeId` of `Program`.
// But it shouldn't be possible for `yield` to at top level - that's a parse error.
*self.nodes.get_node_mut(self.current_function_node_id).flags_mut() |=
NodeFlags::HasYield;
}
AstKind::CallExpression(call_expr) => {
if !call_expr.optional && call_expr.callee.is_specific_id("eval") {
Expand Down
Loading