Skip to content

perf(semantic): dereference parent_ids to slice only once #12137

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
Jul 9, 2025
Merged

perf(semantic): dereference parent_ids to slice only once #12137

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
18 changes: 9 additions & 9 deletions crates/oxc_semantic/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::iter::FusedIterator;
use oxc_allocator::{Address, GetAddress};
use oxc_ast::{AstKind, ast::Program};
use oxc_cfg::BlockNodeId;
use oxc_index::IndexVec;
use oxc_index::{IndexSlice, IndexVec};
use oxc_span::{GetSpan, Span};
use oxc_syntax::{
node::{NodeFlags, NodeId},
Expand Down Expand Up @@ -256,30 +256,30 @@ impl<'a, 'n> IntoIterator for &'n AstNodes<'a> {
///
/// Yields `NodeId` of each AST node. The last node yielded is `Program`.
#[derive(Debug, Clone)]
pub struct AstNodeIdAncestorsIter<'s, 'a> {
pub struct AstNodeIdAncestorsIter<'n> {
next_node_id: Option<NodeId>,
nodes: &'s AstNodes<'a>,
parent_ids: &'n IndexSlice<NodeId, [NodeId]>,
}

impl<'s, 'a> AstNodeIdAncestorsIter<'s, 'a> {
fn new(node_id: NodeId, nodes: &'s AstNodes<'a>) -> Self {
Self { next_node_id: Some(node_id), nodes }
impl<'n> AstNodeIdAncestorsIter<'n> {
fn new(node_id: NodeId, nodes: &'n AstNodes<'_>) -> Self {
Self { next_node_id: Some(node_id), parent_ids: nodes.parent_ids.as_slice() }
}
}

impl Iterator for AstNodeIdAncestorsIter<'_, '_> {
impl Iterator for AstNodeIdAncestorsIter<'_> {
type Item = NodeId;

fn next(&mut self) -> Option<Self::Item> {
if let Some(node_id) = self.next_node_id {
// `Program`'s parent is itself, so next node is `None` if this node is `Program`
self.next_node_id =
if node_id == NodeId::ROOT { None } else { Some(self.nodes.parent_ids[node_id]) };
if node_id == NodeId::ROOT { None } else { Some(self.parent_ids[node_id]) };
Some(node_id)
} else {
None
}
}
}

impl FusedIterator for AstNodeIdAncestorsIter<'_, '_> {}
impl FusedIterator for AstNodeIdAncestorsIter<'_> {}
Loading