Prevent double normalization of FuncCall nodes#4637
Merged
ondrejmirtes merged 1 commit intophpstan:2.1.xfrom Dec 19, 2025
Merged
Prevent double normalization of FuncCall nodes#4637ondrejmirtes merged 1 commit intophpstan:2.1.xfrom
ondrejmirtes merged 1 commit intophpstan:2.1.xfrom
Conversation
staabm
commented
Dec 19, 2025
| if ($normalizedNode !== null && $functionName !== null && $this->reflectionProvider->hasFunction($functionName, $this)) { | ||
| $functionReflection = $this->reflectionProvider->getFunction($functionName, $this); | ||
| $resolvedType = $this->getDynamicFunctionReturnType($parametersAcceptor, $node, $functionReflection); | ||
| $resolvedType = $this->getDynamicFunctionReturnType($normalizedNode, $functionReflection); |
Contributor
Author
There was a problem hiding this comment.
in this path we invoked getDynamicFunctionReturnType without beeing normalized beforehand.
staabm
commented
Dec 19, 2025
Comment on lines
-2474
to
+2475
| $resolvedType = $this->getDynamicFunctionReturnType($parametersAcceptor, $normalizedNode, $functionReflection); | ||
| $resolvedType = $this->getDynamicFunctionReturnType($normalizedNode, $functionReflection); |
Contributor
Author
There was a problem hiding this comment.
in this path $node was already normalized in line 2449 and before this PR will get normalized again within getDynamicFunctionReturnType
Member
|
Thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In the profiles of #4628 (comment) we can see
getDynamicFunctionReturnTypeas one of the most expensive calls:in the happy path in which
FuncCallhas aNamebefore this PR we tend to normalize the argument list twice.this PR remove duplicate arg normalization per FuncCall. I did not send it against
fnsr-storage-branch, as I think it will not conflict with the PRs changes and makes sense on its own