de-duplicate fix

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -4293,27 +4293,6 @@ private function processClosureNode(
 			return new ProcessClosureResult($scope, $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
 		}
 
-		if ($expr->getAttribute(ImmediatelyInvokedClosureVisitor::ATTRIBUTE_NAME) === true) {
-			$intermediaryClosureScopeResult = $this->processStmtNodes($expr, $expr->stmts, $closureScope, static function (): void {
-			}, StatementContext::createTopLevel());
-			$intermediaryClosureScope = $intermediaryClosureScopeResult->getScope();
-			foreach ($intermediaryClosureScopeResult->getExitPoints() as $exitPoint) {
-				$intermediaryClosureScope = $intermediaryClosureScope->mergeWith($exitPoint->getScope());
-			}
-
-			$statementResult = $this->processStmtNodes($expr, $expr->stmts, $closureScope, $closureStmtsCallback, StatementContext::createTopLevel());
-			$nodeCallback(new ClosureReturnStatementsNode(
-				$expr,
-				$gatheredReturnStatements,
-				$gatheredYieldStatements,
-				$statementResult,
-				$executionEnds,
-				array_merge($statementResult->getImpurePoints(), $closureImpurePoints),
-			), $closureScope);
-
-			return new ProcessClosureResult($scope->processClosureScope($intermediaryClosureScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
-		}
-
 		$count = 0;
 		do {
 			$prevScope = $closureScope;
@@ -4324,8 +4303,15 @@ private function processClosureNode(
 			foreach ($intermediaryClosureScopeResult->getExitPoints() as $exitPoint) {
 				$intermediaryClosureScope = $intermediaryClosureScope->mergeWith($exitPoint->getScope());
 			}
+
+			if ($expr->getAttribute(ImmediatelyInvokedClosureVisitor::ATTRIBUTE_NAME) === true) {
+				$closureResultScope = $intermediaryClosureScope;
+				break;
+			}
+
 			$closureScope = $scope->enterAnonymousFunction($expr, $callableParameters);
 			$closureScope = $closureScope->processClosureScope($intermediaryClosureScope, $prevScope, $byRefUses);
+
 			if ($closureScope->equals($prevScope)) {
 				break;
 			}
@@ -4335,6 +4321,10 @@ private function processClosureNode(
 			$count++;
 		} while ($count < self::LOOP_SCOPE_ITERATIONS);
 
+		if (!isset($closureResultScope)) {
+			$closureResultScope = $closureScope;
+		}
+
 		$statementResult = $this->processStmtNodes($expr, $expr->stmts, $closureScope, $closureStmtsCallback, StatementContext::createTopLevel());
 		$nodeCallback(new ClosureReturnStatementsNode(
 			$expr,
@@ -4345,7 +4335,7 @@ private function processClosureNode(
 			array_merge($statementResult->getImpurePoints(), $closureImpurePoints),
 		), $closureScope);
 
-		return new ProcessClosureResult($scope->processClosureScope($closureScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
+		return new ProcessClosureResult($scope->processClosureScope($closureResultScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
 	}
 
 	/**