Skip to content

perf(parser): store Modifiers on stack #20742

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
Mar 26, 2026
Merged

perf(parser): store Modifiers on stack #20742

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
22 changes: 11 additions & 11 deletions crates/oxc_parser/src/js/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
&mut self,
start_span: u32,
stmt_ctx: StatementContext,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> Statement<'a> {
let decl = self.parse_class_declaration(start_span, modifiers, decorators);
Expand All @@ -37,7 +37,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
pub(crate) fn parse_class_declaration(
&mut self,
start_span: u32,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> Box<'a, Class<'a>> {
self.parse_class(start_span, ClassType::ClassDeclaration, modifiers, decorators)
Expand All @@ -49,7 +49,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
pub(crate) fn parse_class_expression(
&mut self,
span: u32,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> Expression<'a> {
let class = self.parse_class(span, ClassType::ClassExpression, modifiers, decorators);
Expand All @@ -60,7 +60,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
&mut self,
start_span: u32,
r#type: ClassType,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> Box<'a, Class<'a>> {
self.bump_any(); // advance `class`
Expand Down Expand Up @@ -320,7 +320,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
self.unexpected()
}

fn parse_class_element_name(&mut self, modifiers: &Modifiers<'a>) -> (PropertyKey<'a>, bool) {
fn parse_class_element_name(&mut self, modifiers: &Modifiers) -> (PropertyKey<'a>, bool) {
self.verify_modifiers(
modifiers,
ModifierKinds::all_except([ModifierKind::Const, ModifierKind::In, ModifierKind::Out]),
Expand Down Expand Up @@ -377,7 +377,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
key: PropertyKey<'a>,
computed: bool,
definite: bool,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
let type_annotation = if self.is_ts { self.parse_ts_type_annotation() } else { None };
Expand Down Expand Up @@ -422,7 +422,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
span: u32,
r#type: MethodDefinitionType,
kind: MethodDefinitionKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
let (name, computed) = self.parse_class_element_name(modifiers);
Expand Down Expand Up @@ -459,7 +459,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
span: u32,
r#type: MethodDefinitionType,
name: PropertyKey<'a>,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
if let Some(modifier) = modifiers.get(ModifierKind::Declare) {
Expand Down Expand Up @@ -509,7 +509,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
&mut self,
span: u32,
r#type: MethodDefinitionType,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
let generator = self.eat(Kind::Star);
Expand Down Expand Up @@ -596,7 +596,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
name: PropertyKey<'a>,
computed: bool,
optional: bool,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
let value = self.parse_method(
Expand Down Expand Up @@ -628,7 +628,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
computed: bool,
optional_span: Option<Span>,
definite: bool,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
let type_annotation = if self.is_ts { self.parse_ts_type_annotation() } else { None };
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
generator: bool,
func_kind: FunctionKind,
param_kind: FormalParameterKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Box<'a, Function<'a>> {
let ctx = self.ctx;
self.ctx = self.ctx.and_in(true).and_await(r#async).and_yield(generator);
Expand Down Expand Up @@ -366,7 +366,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
&mut self,
start_span: u32,
func_kind: FunctionKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Box<'a, Function<'a>> {
let r#async = modifiers.contains(ModifierKind::Async);
self.expect(Kind::Function);
Expand Down
10 changes: 2 additions & 8 deletions crates/oxc_parser/src/js/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use super::FunctionKind;
use crate::{
ParserConfig as Config, ParserImpl, diagnostics,
lexer::Kind,
modifiers::{Modifier, ModifierKind, ModifierKinds, Modifiers},
modifiers::{Modifier, ModifierKind, Modifiers},
};

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
Expand Down Expand Up @@ -711,13 +711,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
if !cur_token.is_on_new_line() {
// export default abstract class ...
if is_abstract && kind == Kind::Class {
let modifiers = self
.ast
.vec1(Modifier::new(self.end_span(modifier_span), ModifierKind::Abstract));
let modifiers = Modifiers::new(
Some(modifiers),
ModifierKinds::new([ModifierKind::Abstract]),
);
let modifiers = Modifiers::new_single(ModifierKind::Abstract, modifier_span);
return ExportDefaultDeclarationKind::ClassDeclaration(
self.parse_class_declaration(decl_span, &modifiers, decorators),
);
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_parser/src/js/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
&mut self,
span: u32,
kind: PropertyKind,
modifiers: &Modifiers<'a>,
modifiers: &Modifiers,
) -> Box<'a, ObjectProperty<'a>> {
let (key, computed) = self.parse_property_name();
let function = self.parse_method(false, false, FunctionKind::ObjectMethod);
Expand Down
6 changes: 2 additions & 4 deletions crates/oxc_parser/src/js/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use super::{VariableDeclarationParent, grammar::CoverGrammar};
use crate::{
Context, ParserConfig as Config, ParserImpl, StatementContext, diagnostics,
lexer::Kind,
modifiers::{Modifier, ModifierKind, ModifierKinds, Modifiers},
modifiers::{ModifierKind, Modifiers},
};

impl<'a, C: Config> ParserImpl<'a, C> {
Expand Down Expand Up @@ -794,9 +794,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
let span = self.start_span();
self.bump_any();
if self.is_ts && self.at(Kind::Enum) {
let modifiers = self.ast.vec1(Modifier::new(self.end_span(span), ModifierKind::Const));
let modifiers =
Modifiers::new(Some(modifiers), ModifierKinds::new([ModifierKind::Const]));
let modifiers = Modifiers::new_single(ModifierKind::Const, span);
Statement::from(self.parse_ts_enum_declaration(span, &modifiers))
} else {
self.parse_variable_statement(span, VariableDeclarationKind::Const, stmt_ctx)
Expand Down
Loading
Loading