Prevent unnecessary scope merging #4640
Open
+1
−1
Conversation
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
ondrejmirtes
requested changes
Dec 19, 2025
| public function mergeWith(?self $otherScope): self | ||
| { | ||
| if ($otherScope === null) { | ||
| if ($otherScope === null || $this === $otherScope) { |
Member
There was a problem hiding this comment.
Suggested change
| if ($otherScope === null || $this === $otherScope) { | |
| if ($otherScope === null || $this === $otherScope || $this->equals($otherScope)) { |
Contributor
Author
There was a problem hiding this comment.
the suggested change will make the test-suite fail with
There was 1 failure:
1) PHPStan\Analyser\NodeScopeResolverTest::testFile with data set "tests/PHPStan/Analyser/nsrt/unset-conditional-expressions.php" ('/Users/staabm/workspace/phpst...ns.php')
Failed assertions in /Users/staabm/workspace/phpstan-src/tests/PHPStan/Analyser/nsrt/unset-conditional-expressions.php:
Line 27:
Expected: array<string, mixed>
Actual: array{}
/Users/staabm/workspace/phpstan-src/tests/PHPStan/Analyser/NodeScopeResolverTest.php:298
Member
|
Sounds like something to fix. The equals method should probably also check |
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
MutatingScope->createConditionalExpressionsas one of the most expensive calls (which gets called viaMutatingScope->merge()):After this PR, we can see
PHPSTAN_FNSR=1 php bin/phpstan analyse src/Analyser/NodeScopeResolver.php -vvv --debugtaking thereturn $this;fast path ~180 times.It seems
make testis 0.5-1 second faster