Solve FNSR memory problem

Author: ondrejmirtes

src/Analyser/ExpressionResultStorage.php

@@ -13,10 +13,10 @@
 final class ExpressionResultStorage
 {
 
-	/** @var SplObjectStorage<Expr, ExpressionResult> */
+	/** @var SplObjectStorage<Expr, Scope> */
 	private SplObjectStorage $results;
 
-	/** @var array<array{fiber: Fiber<mixed, ExpressionResult, null, ExpressionAnalysisRequest>, request: ExpressionAnalysisRequest}> */
+	/** @var array<array{fiber: Fiber<mixed, Scope, null, ExpressionAnalysisRequest>, request: ExpressionAnalysisRequest}> */
 	public array $pendingFibers = [];
 
 	public function __construct()
@@ -31,15 +31,15 @@ public function duplicate(): self
 		return $new;
 	}
 
-	public function storeResult(Expr $expr, ExpressionResult $result): void
+	public function storeResult(Expr $expr, Scope $scope): void
 	{
 		if (isset($this->results[$expr])) {
-			throw new ShouldNotHappenException(sprintf('already stored %s on line %d', get_class($expr), $expr->getStartLine()));
+			//throw new ShouldNotHappenException(sprintf('already stored %s on line %d', get_class($expr), $expr->getStartLine()));
 		}
-		$this->results[$expr] = $result;
+		$this->results[$expr] = $scope;
 	}
 
-	public function findResult(Expr $expr): ?ExpressionResult
+	public function findResult(Expr $expr): ?Scope
 	{
 		return $this->results[$expr] ?? null;
 	}

src/Analyser/Fiber/FiberNodeScopeResolver.php

@@ -103,7 +103,7 @@ protected function processPendingFibers(ExpressionResultStorage $storage): void
 		}
 	}
 
-	protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, ExpressionResult $result): void
+	protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, Scope $result): void
 	{
 		$restartLoop = true;
 

src/Analyser/Fiber/FiberScope.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\ExpressionResult;
 use PHPStan\Analyser\MutatingScope;
+use PHPStan\Analyser\Scope;
 use PHPStan\Type\Type;
 
 final class FiberScope extends MutatingScope
@@ -41,12 +42,12 @@ public function toMutatingScope(): MutatingScope
 	/** @api */
 	public function getType(Expr $node): Type
 	{
-		/** @var ExpressionResult $exprResult */
+		/** @var Scope $exprResult */
 		$exprResult = Fiber::suspend(
 			new ExpressionAnalysisRequest($node, $this),
 		);
 
-		return $exprResult->getBeforeScope()->toMutatingScope()->getType($node);
+		return $exprResult->toMutatingScope()->getType($node);
 	}
 
 	public function getScopeType(Expr $expr): Type
@@ -62,22 +63,22 @@ public function getScopeNativeType(Expr $expr): Type
 	/** @api */
 	public function getNativeType(Expr $expr): Type
 	{
-		/** @var ExpressionResult $exprResult */
+		/** @var Scope $exprResult */
 		$exprResult = Fiber::suspend(
 			new ExpressionAnalysisRequest($expr, $this),
 		);
 
-		return $exprResult->getBeforeScope()->toMutatingScope()->getNativeType($expr);
+		return $exprResult->toMutatingScope()->getNativeType($expr);
 	}
 
 	public function getKeepVoidType(Expr $node): Type
 	{
-		/** @var ExpressionResult $exprResult */
+		/** @var Scope $exprResult */
 		$exprResult = Fiber::suspend(
 			new ExpressionAnalysisRequest($node, $this),
 		);
 
-		return $exprResult->getBeforeScope()->toMutatingScope()->getKeepVoidType($node);
+		return $exprResult->toMutatingScope()->getKeepVoidType($node);
 	}
 
 }

src/Analyser/NodeScopeResolver.php

@@ -344,15 +344,15 @@ public function processNodes(
 
 	private function storeResult(ExpressionResultStorage $storage, Expr $expr, ExpressionResult $result): void
 	{
-		$storage->storeResult($expr, $result);
-		$this->processPendingFibersForRequestedExpr($storage, $expr, $result);
+		$storage->storeResult($expr, $result->getBeforeScope());
+		$this->processPendingFibersForRequestedExpr($storage, $expr, $result->getBeforeScope());
 	}
 
 	protected function processPendingFibers(ExpressionResultStorage $storage): void
 	{
 	}
 
-	protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, ExpressionResult $result): void
+	protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, Scope $result): void
 	{
 	}
 
@@ -2545,13 +2545,13 @@ public function processExprNode(
 		ExpressionContext $context,
 	): ExpressionResult
 	{
-		$existingExprResult = $storage->findResult($expr);
+		/*$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) {