Skip to content

Derive expression-statement exit points from the never type #6150

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
ondrejmirtes merged 1 commit into from
Jul 30, 2026
+8 −16
Merged

Derive expression-statement exit points from the never type #6150

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
24 changes: 8 additions & 16 deletions src/Analyser/NodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,6 @@ public function processStmtNode(
if ($stmt->expr instanceof Expr\Throw_) {
$scope = $stmtScope;
}
$earlyTerminationExpr = $this->findEarlyTerminatingExpr($stmt->expr, $scope);
$hasAssign = false;
$currentScope = $scope;
$result = $this->processExprNode($stmt, $stmt->expr, $scope, $storage, new GatheringNodeCallback(static function (Node $node, Scope $scope) use ($currentScope, &$hasAssign): void {
Expand Down Expand Up @@ -1179,7 +1178,14 @@ public function processStmtNode(
$impurePoints = $result->getImpurePoints();
$isAlwaysTerminating = $result->isAlwaysTerminating();

if ($earlyTerminationExpr !== null) {
// The expression statement is an exit point when its value type is an
// explicit never: exit/die/throw, a never-returning call, or a call
// configured as early-terminating (the call handlers give those never).
// Asked on the pre-statement scope: a conditional return type must
// resolve against the argument types the call was made with, not
// against state the statement itself just changed (bug-11565).
$statementType = $currentScope->getType($stmt->expr);
if ($statementType instanceof NeverType && $statementType->isExplicit()) {
return new InternalStatementResult($scope, $hasYield, true, [
new InternalStatementExitPoint($stmt, $scope),
], $overridingThrowPoints ?? $throwPoints, $impurePoints);
Expand Down Expand Up @@ -2761,20 +2767,6 @@ private function lookForExpressionCallback(MutatingScope $scope, Expr $expr, Clo
return $scope;
}

private function findEarlyTerminatingExpr(Expr $expr, Scope $scope): ?Expr
{
if ($expr instanceof Expr\Exit_ || $expr instanceof Expr\Throw_) {
return $expr;
}

$exprType = $scope->getType($expr);
if ($exprType instanceof NeverType && $exprType->isExplicit()) {
return $expr;
}

return null;
}

/**
* @param callable(Node $node, Scope $scope): void $nodeCallback
*/
Expand Down
Loading