Skip to content
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

perf(semantic): remove branch from Nodes::add_node #4361

Merged
merged 1 commit into from
Jul 19, 2024
Merged

perf(semantic): remove branch from Nodes::add_node #4361

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
14 changes: 13 additions & 1 deletion crates/oxc_semantic/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,19 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
});
/* cfg - must be above directives as directives are in cfg */

self.enter_node(kind);
// Don't call `enter_node` here as `Program` is a special case - node has no `parent_id`.
// Inline the specific logic for `Program` here instead.
// This avoids `Nodes::add_node` having to handle the special case.
// We can also skip calling `self.enter_kind`, and `self.jsdoc.retrieve_attached_jsdoc`
// as they are no-ops for `Program`.
self.current_node_id = self.nodes.add_program_node(
kind,
self.current_scope_id,
control_flow!(self, |cfg| cfg.current_node_ix),
self.current_node_flags,
);
self.record_ast_node();

self.enter_scope(
{
let mut flags = ScopeFlags::Top;
Expand Down
25 changes: 17 additions & 8 deletions crates/oxc_semantic/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ impl<'a> AstNodes<'a> {
}

/// Create and add an `AstNode` to the `AstNodes` tree and returns its `AstNodeId`.
/// Node must not be `Program`. Use `add_program_node` instead.
pub fn add_node(
&mut self,
kind: AstKind<'a>,
Expand All @@ -150,14 +151,22 @@ impl<'a> AstNodes<'a> {
cfg_id: BasicBlockId,
flags: NodeFlags,
) -> AstNodeId {
let ast_node_id = match kind {
AstKind::Program(_) => {
let id = self.parent_ids.push(None);
self.root = Some(id);
id
}
_ => self.parent_ids.push(Some(parent_node_id)),
};
let ast_node_id = self.parent_ids.push(Some(parent_node_id));
let node = AstNode::new(kind, scope_id, cfg_id, flags, ast_node_id);
self.nodes.push(node);
ast_node_id
}

/// Create and add an `AstNode` to the `AstNodes` tree and returns its `AstNodeId`.
pub fn add_program_node(
&mut self,
kind: AstKind<'a>,
scope_id: ScopeId,
cfg_id: BasicBlockId,
flags: NodeFlags,
) -> AstNodeId {
let ast_node_id = self.parent_ids.push(None);
self.root = Some(ast_node_id);
let node = AstNode::new(kind, scope_id, cfg_id, flags, ast_node_id);
self.nodes.push(node);
ast_node_id
Expand Down