Fix duplicate Assign result storing

Author: ondrejmirtes

src/Analyser/ExpressionResultStorage.php

@@ -4,7 +4,9 @@
 
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Fiber\ExpressionAnalysisRequest;
+use PHPStan\ShouldNotHappenException;
 use SplObjectStorage;
+use function sprintf;
 
 final class ExpressionResultStorage
 {
@@ -29,6 +31,9 @@ public function duplicate(): self
 
 	public function storeResult(Expr $expr, ExpressionResult $result): void
 	{
+		if (isset($this->results[$expr])) {
+			throw new ShouldNotHappenException(sprintf('already stored %s on line %d', get_class($expr), $expr->getStartLine()));
+		}
 		$this->results[$expr] = $result;
 	}
 

src/Analyser/NodeScopeResolver.php

@@ -2557,6 +2557,14 @@ public function processExprNode(
 		ExpressionContext $context,
 	): ExpressionResult
 	{
+		$existingExprResult = $storage->findResult($expr);
+		if ($existingExprResult !== null) {
+			if ($nodeCallback instanceof ShallowNodeCallback) {
+				return $existingExprResult;
+			}
+			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', get_class($expr), $expr->getStartLine()));
+		}
+
 		if ($expr instanceof Expr\CallLike && $expr->isFirstClassCallable()) {
 			if ($expr instanceof FuncCall) {
 				$newExpr = new FunctionCallableNode($expr->name, $expr);
@@ -2575,14 +2583,6 @@ public function processExprNode(
 			return $newExprResult;
 		}
 
-		$existingExprResult = $storage->findResult($expr);
-		if ($existingExprResult !== null) {
-			if ($nodeCallback instanceof ShallowNodeCallback) {
-				return $existingExprResult;
-			}
-			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', get_class($expr), $expr->getStartLine()));
-		}
-
 		$originalScope = $scope;
 		$this->callNodeCallbackWithExpression($nodeCallback, $expr, $scope, $storage, $context);
 
@@ -2658,7 +2658,6 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				true,
 			);
 			$scope = $result->getScope();
-			$this->storeResult($storage, $expr, $result);
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$impurePoints = $result->getImpurePoints();
@@ -2671,6 +2670,17 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 					$scope = $this->processStmtVarAnnotation($scope, $storage, $stmt, null, $nodeCallback);
 				}
 			}
+
+			return new ExpressionResult(
+				$scope,
+				$originalScope,
+				$hasYield,
+				$isAlwaysTerminating,
+				$throwPoints,
+				$impurePoints,
+				static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
+				static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
+			);
 		} elseif ($expr instanceof Expr\AssignOp) {
 			$result = $this->processAssignVar(
 				$scope,
@@ -2708,7 +2718,9 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				$expr instanceof Expr\AssignOp\Coalesce,
 			);
 			$scope = $result->getScope();
-			$this->storeResult($storage, $expr, $result);
+			if (!$expr instanceof Expr\AssignOp\Coalesce) {
+				$this->storeResult($storage, $expr, $result);
+			}
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$impurePoints = $result->getImpurePoints();
@@ -2719,6 +2731,17 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			) {
 				$throwPoints[] = InternalThrowPoint::createExplicit($scope, new ObjectType(DivisionByZeroError::class), $expr, false);
 			}
+
+			return new ExpressionResult(
+				$scope,
+				$originalScope,
+				$hasYield,
+				$isAlwaysTerminating,
+				$throwPoints,
+				$impurePoints,
+				static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
+				static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
+			);
 		} elseif ($expr instanceof FuncCall) {
 			$parametersAcceptor = null;
 			$functionReflection = null;