Skip to content

Analyser: Prevent unnecessary work #6767

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 2 commits into from
Oct 20, 2026
Merged

Analyser: Prevent unnecessary work #6767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6366ed7
Analyser: Prevent unnecessary work
staabm Oct 20, 2026
430568e
Bump expected turbo version
staabm Oct 20, 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
9 changes: 5 additions & 4 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,10 +1410,6 @@ public function specifyTypesOfNewWorldHandlerNode(Expr $node, TypeSpecifierConte
*/
public function obtainResultForNode(Expr $node): ExpressionResult
{
// see resolveTypeOfNewWorldHandlerNode() - rules ask the dispatcher
// with their NodeCallbackScope (e.g. ImpossibleCheckTypeHelper), the engine
// side of the boundary works with the mutating flavor
$scope = $this->toWalkScope();
$storage = $this->expressionResultStorageStack->getCurrent();
if ($storage !== null) {
$result = $storage->findExpressionResult($node);
Expand All @@ -1434,6 +1430,11 @@ public function obtainResultForNode(Expr $node): ExpressionResult
));
}

// see resolveTypeOfNewWorldHandlerNode() - rules ask the dispatcher
// with their NodeCallbackScope (e.g. ImpossibleCheckTypeHelper), the engine
// side of the boundary works with the mutating flavor
$scope = $this->toWalkScope();

// a synthetic node, or no analysis in progress
return $this->container->getByType(NodeScopeResolver::class)->processExprOnDemand(
$node,
Expand Down
49 changes: 25 additions & 24 deletions src/Analyser/StmtHandler/ForeachHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,39 +604,40 @@ private function enterForeach(NodeScopeResolver $nodeScopeResolver, MutatingScop
}
}

$constantArrays = $iterateeType->getConstantArrays();
if (
$stmt->getDocComment() === null
&& $iterateeType->isConstantArray()->yes()
&& count($constantArrays) === 1
&& $stmt->valueVar instanceof Variable && is_string($stmt->valueVar->name)
&& $stmt->keyVar instanceof Variable && is_string($stmt->keyVar->name)
) {
$valueConditionalHolders = [];
$arrayDimFetchConditionalHolders = [];
foreach ($constantArrays[0]->getKeyTypes() as $i => $keyType) {
$valueType = $constantArrays[0]->getValueTypes()[$i];
$keyExpressionTypeHolder = ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType);

$holder = new ConditionalExpressionHolder([
'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
], ExpressionTypeHolder::createYes($stmt->valueVar, $valueType));
$valueConditionalHolders[$holder->getKey()] = $holder;
$arrayDimFetchHolder = new ConditionalExpressionHolder([
'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
], ExpressionTypeHolder::createYes(new ArrayDimFetch($stmt->expr, $stmt->keyVar), $valueType));
$arrayDimFetchConditionalHolders[$arrayDimFetchHolder->getKey()] = $arrayDimFetchHolder;
}
$constantArrays = $iterateeType->getConstantArrays();
if (count($constantArrays) === 1) {
$valueConditionalHolders = [];
$arrayDimFetchConditionalHolders = [];
foreach ($constantArrays[0]->getKeyTypes() as $i => $keyType) {
$valueType = $constantArrays[0]->getValueTypes()[$i];
$keyExpressionTypeHolder = ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType);

$holder = new ConditionalExpressionHolder([
'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
], ExpressionTypeHolder::createYes($stmt->valueVar, $valueType));
$valueConditionalHolders[$holder->getKey()] = $holder;
$arrayDimFetchHolder = new ConditionalExpressionHolder([
'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
], ExpressionTypeHolder::createYes(new ArrayDimFetch($stmt->expr, $stmt->keyVar), $valueType));
$arrayDimFetchConditionalHolders[$arrayDimFetchHolder->getKey()] = $arrayDimFetchHolder;
}

$scope = $scope->addConditionalExpressions(
'$' . $stmt->valueVar->name,
$valueConditionalHolders,
);
if ($stmt->expr instanceof Variable && is_string($stmt->expr->name)) {
$scope = $scope->addConditionalExpressions(
sprintf('$%s[$%s]', $stmt->expr->name, $stmt->keyVar->name),
$arrayDimFetchConditionalHolders,
'$' . $stmt->valueVar->name,
$valueConditionalHolders,
);
if ($stmt->expr instanceof Variable && is_string($stmt->expr->name)) {
$scope = $scope->addConditionalExpressions(
sprintf('$%s[$%s]', $stmt->expr->name, $stmt->keyVar->name),
$arrayDimFetchConditionalHolders,
);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Turbo/TurboExtensionEnabler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
final class TurboExtensionEnabler
{

public const EXPECTED_EXTENSION_VERSION = '536f37b';
public const EXPECTED_EXTENSION_VERSION = '6366ed7';

private static bool $active = false;

Expand Down
14 changes: 8 additions & 6 deletions turbo-ext/src/ForeachHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,16 +1295,18 @@ class ForeachHandler
}
}

zv::Val constantArrays = typeOp(iterateeType, PT_OP_GET_CONSTANT_ARRAYS, "getConstantArrays");
if (UNEXPECTED(constantArrays.isUndef())) return zv::Val();
bool noDocComment;
if (UNEXPECTED(!hasNoDocComment(stmt, noDocComment))) return zv::Val();
if (noDocComment) {
if (noDocComment && parts.valueVarName != NULL && parts.keyVarName != NULL) {
zend_long isConstantArray = pt_type_op_trinary(Z_OBJ_P(iterateeType), PT_OP_IS_CONSTANT_ARRAY, 0, NULL);
if (UNEXPECTED(isConstantArray < 0)) return zv::Val();
if (isConstantArray == PT_TRI_YES && ptlh::countOf(constantArrays.raw()) == 1 && parts.valueVarName != NULL && parts.keyVarName != NULL) {
scope = addConstantArrayConditionalHolders(scope.raw(), parts, listAt(constantArrays.raw(), 0));
if (UNEXPECTED(scope.isUndef())) return zv::Val();
if (isConstantArray == PT_TRI_YES) {
zv::Val constantArrays = typeOp(iterateeType, PT_OP_GET_CONSTANT_ARRAYS, "getConstantArrays");
if (UNEXPECTED(constantArrays.isUndef())) return zv::Val();
if (ptlh::countOf(constantArrays.raw()) == 1) {
scope = addConstantArrayConditionalHolders(scope.raw(), parts, listAt(constantArrays.raw(), 0));
if (UNEXPECTED(scope.isUndef())) return zv::Val();
}
}
}

Expand Down
5 changes: 3 additions & 2 deletions turbo-ext/src/MutatingScope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2938,8 +2938,6 @@ class MutatingScope

zv::Val obtainResultForNode(zend_object *node)
{
zv::Val scope = thisToWalkScope();
if (UNEXPECTED(scope.isUndef())) return zv::Val();
zv::Val storage = currentStorage();
if (UNEXPECTED(storage.isUndef())) return zv::Val();
if (!storage.isNull()) {
Expand All @@ -2955,6 +2953,9 @@ class MutatingScope
return zv::Val();
}

zv::Val scope = thisToWalkScope();
if (UNEXPECTED(scope.isUndef())) return zv::Val();

/* a synthetic node, or no analysis in progress */
zv::Val resolver = containerGetByType(PT_LC("PHPStan\\Analyser\\NodeScopeResolver"));
if (UNEXPECTED(resolver.isUndef())) return zv::Val();
Expand Down
Loading