Skip to content

perf(linter/plugins): move creating merger functions off hot path #20314

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

Closed
overlookmotel wants to merge 1 commit into from
+12 −22
Closed

perf(linter/plugins): move creating merger functions off hot path #20314

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
34 changes: 12 additions & 22 deletions apps/oxlint/src-js/plugins/visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,17 +570,10 @@ function mergeVisitFns(visitProps: VisitProp[]): VisitFn {
return strA === strB ? 0 : strA < strB ? -1 : 1;
});

// Get or create merger for merging `numVisitFns` functions
let merger: Merger | null;
if (mergers.length <= numVisitFns) {
while (mergers.length < numVisitFns) {
mergers.push(null);
}
merger = createMerger(numVisitFns);
mergers.push(merger);
} else {
merger = mergers[numVisitFns];
if (merger === null) merger = mergers[numVisitFns] = createMerger(numVisitFns);
// If no existing merger for `numVisitFns` functions, create mergers for all numbers of functions up to
// and including `numVisitFns`. After warm-up over first few files, this loop will be skipped.
while (mergers.length <= numVisitFns) {
mergers.push(createMerger(mergers.length));
Comment on lines +573 to +576
Copy link
Member Author

@overlookmotel overlookmotel Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I've re-thought this. #20319 takes a different approach.

}

// Merge functions.
Expand All @@ -593,6 +586,8 @@ function mergeVisitFns(visitProps: VisitProp[]): VisitFn {
debugAssertIsNonNull(visitProps[i].fn);
visitFns.push(visitProps[i].fn!);
}

const merger = mergers[numVisitFns]!;
mergedFn = merger(...visitFns);

visitFns.length = 0;
Expand Down Expand Up @@ -687,17 +682,10 @@ function mergeCfgVisitFns(visitProps: CfgVisitProp[]): CfgVisitFn {
} else {
// No need to sort in order of specificity, because each rule can only have 1 handler for each CFG event

// Get or create merger for merging `numVisitFns` functions
let merger: CfgMerger | null;
if (cfgMergers.length <= numVisitFns) {
while (cfgMergers.length < numVisitFns) {
cfgMergers.push(null);
}
merger = createCfgMerger(numVisitFns);
cfgMergers.push(merger);
} else {
merger = cfgMergers[numVisitFns];
if (merger === null) merger = cfgMergers[numVisitFns] = createCfgMerger(numVisitFns);
// If no existing merger for `numVisitFns` functions, create mergers for all numbers of functions up to
// and including `numVisitFns`. After warm-up over first few files, this loop will be skipped.
while (cfgMergers.length <= numVisitFns) {
cfgMergers.push(createCfgMerger(cfgMergers.length));
}

// Merge functions.
Expand All @@ -710,6 +698,8 @@ function mergeCfgVisitFns(visitProps: CfgVisitProp[]): CfgVisitFn {
debugAssertIsNonNull(visitProps[i].fn);
visitFns.push(visitProps[i].fn!);
}

const merger = cfgMergers[numVisitFns]!;
mergedFn = merger(...visitFns);

visitFns.length = 0;
Expand Down
Loading