Skip to content

Faster MutatingScope->getNodeKey() #5014

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
staabm merged 4 commits into from
Feb 24, 2026
+10 −1
Merged

Faster MutatingScope->getNodeKey() #5014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2091ecd
Faster MutatingScope->getNodeKey()
staabm Feb 21, 2026
dc55cd3
cs
staabm Feb 21, 2026
242f09a
Update MutatingScope.php
staabm Feb 21, 2026
90d7edd
Update ExprPrinter.php
staabm Feb 24, 2026
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
6 changes: 5 additions & 1 deletion src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,8 +917,12 @@ public function getScopeNativeType(Expr $expr): Type

private function getNodeKey(Expr $node): string
{
$key = $this->exprPrinter->printExpr($node);
// perf optimize for the most common path
if ($node instanceof Variable && !$node->name instanceof Expr) {
return '$' . $node->name;
}
Comment on lines +920 to +923
Copy link
Contributor Author

@staabm staabm Feb 24, 2026

Choose a reason for hiding this comment

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

I duplicated the logic to here now, as getNodeKey is by far the most common caller of exprPrinter->printExpr:

grafik

and with this check here, we also prevent unnecessary getAttributes calls below


$key = $this->exprPrinter->printExpr($node);
$attributes = $node->getAttributes();
if (
$node instanceof Node\FunctionLike
Expand Down
5 changes: 5 additions & 0 deletions src/Node/Printer/ExprPrinter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ public function __construct(private Printer $printer)

public function printExpr(Expr $expr): string
{
// perf optimize for the most common path
if ($expr instanceof Expr\Variable && !$expr->name instanceof Expr) {
return '$' . $expr->name;
}

/** @var string|null $exprString */
$exprString = $expr->getAttribute(self::ATTRIBUTE_CACHE_KEY);
if ($exprString === null) {
Expand Down
Loading