Revert Optimization - do not pass along implicit throw points outside of try-catch

This reverts commit 2911f68.

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -261,7 +261,7 @@ public function processNodes(
 	}
 
 	/**
-	 * @param \PhpParser\Node\Stmt|\PhpParser\Node\Expr $parentNode
+	 * @param \PhpParser\Node $parentNode
 	 * @param \PhpParser\Node\Stmt[] $stmts
 	 * @param \PHPStan\Analyser\MutatingScope $scope
 	 * @param callable(\PhpParser\Node $node, Scope $scope): void $nodeCallback
@@ -298,7 +298,6 @@ public function processStmtNodes(
 				$nodeCallback(new ExecutionEndNode(
 					$stmt,
 					new StatementResult(
-						$stmt,
 						$scope,
 						$hasYield,
 						$statementResult->isAlwaysTerminating(),
@@ -324,7 +323,7 @@ public function processStmtNodes(
 			break;
 		}
 
-		$statementResult = new StatementResult($parentNode instanceof Node\Stmt ? $parentNode : new Node\Stmt\Expression($parentNode), $scope, $hasYield, $alreadyTerminated, $exitPoints, $throwPoints);
+		$statementResult = new StatementResult($scope, $hasYield, $alreadyTerminated, $exitPoints, $throwPoints);
 		if ($stmtCount === 0 && $shouldCheckLastStatement) {
 			/** @var Node\Stmt\Function_|Node\Stmt\ClassMethod|Expr\Closure $parentNode */
 			$parentNode = $parentNode;
@@ -373,12 +372,12 @@ private function processStmtNode(
 			) {
 				$methodReflection = $scope->getClassReflection()->getNativeMethod($stmt->name->toString());
 				if ($methodReflection instanceof NativeMethodReflection) {
-					return new StatementResult($stmt, $scope, false, false, [], []);
+					return new StatementResult($scope, false, false, [], []);
 				}
 				if ($methodReflection instanceof PhpMethodReflection) {
 					$declaringTrait = $methodReflection->getDeclaringTrait();
 					if ($declaringTrait === null || $declaringTrait->getName() !== $scope->getTraitReflection()->getName()) {
-						return new StatementResult($stmt, $scope, false, false, [], []);
+						return new StatementResult($scope, false, false, [], []);
 					}
 				}
 			}
@@ -561,7 +560,7 @@ private function processStmtNode(
 				$throwPoints = [];
 			}
 
-			return new StatementResult($stmt, $scope, $hasYield, true, [
+			return new StatementResult($scope, $hasYield, true, [
 				new StatementExitPoint($stmt, $scope),
 			], $throwPoints);
 		} elseif ($stmt instanceof Continue_ || $stmt instanceof Break_) {
@@ -575,7 +574,7 @@ private function processStmtNode(
 				$throwPoints = [];
 			}
 
-			return new StatementResult($stmt, $scope, $hasYield, true, [
+			return new StatementResult($scope, $hasYield, true, [
 				new StatementExitPoint($stmt, $scope),
 			], $throwPoints);
 		} elseif ($stmt instanceof Node\Stmt\Expression) {
@@ -590,11 +589,11 @@ private function processStmtNode(
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			if ($earlyTerminationExpr !== null) {
-				return new StatementResult($stmt, $scope, $hasYield, true, [
+				return new StatementResult($scope, $hasYield, true, [
 					new StatementExitPoint($stmt, $scope),
 				], $throwPoints);
 			}
-			return new StatementResult($stmt, $scope, $hasYield, false, [], $throwPoints);
+			return new StatementResult($scope, $hasYield, false, [], $throwPoints);
 		} elseif ($stmt instanceof Node\Stmt\Namespace_) {
 			if ($stmt->name !== null) {
 				$scope = $scope->enterNamespace($stmt->name->toString());
@@ -604,7 +603,7 @@ private function processStmtNode(
 			$hasYield = false;
 			$throwPoints = [];
 		} elseif ($stmt instanceof Node\Stmt\Trait_) {
-			return new StatementResult($stmt, $scope, false, false, [], []);
+			return new StatementResult($scope, false, false, [], []);
 		} elseif ($stmt instanceof Node\Stmt\ClassLike) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -680,7 +679,7 @@ private function processStmtNode(
 			$result = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep());
 			$throwPoints = $result->getThrowPoints();
 			$throwPoints[] = ThrowPoint::createExplicit($result->getScope(), $scope->getType($stmt->expr), false);
-			return new StatementResult($stmt, $result->getScope(), $result->hasYield(), true, [
+			return new StatementResult($result->getScope(), $result->hasYield(), true, [
 				new StatementExitPoint($stmt, $scope),
 			], $throwPoints);
 		} elseif ($stmt instanceof If_) {
@@ -768,7 +767,7 @@ private function processStmtNode(
 				$finalScope = $scope;
 			}
 
-			return new StatementResult($stmt, $finalScope, $hasYield, $alwaysTerminating, $exitPoints, $throwPoints);
+			return new StatementResult($finalScope, $hasYield, $alwaysTerminating, $exitPoints, $throwPoints);
 		} elseif ($stmt instanceof Node\Stmt\TraitUse) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -834,7 +833,6 @@ private function processStmtNode(
 			}
 
 			return new StatementResult(
-				$stmt,
 				$finalScope,
 				$finalScopeResult->hasYield() || $condResult->hasYield(),
 				$isIterableAtLeastOnce->yes() && $finalScopeResult->isAlwaysTerminating(),
@@ -908,7 +906,6 @@ private function processStmtNode(
 			}
 
 			return new StatementResult(
-				$stmt,
 				$finalScope,
 				$finalScopeResult->hasYield() || $condResult->hasYield(),
 				$isAlwaysTerminating,
@@ -977,7 +974,6 @@ private function processStmtNode(
 			}
 
 			return new StatementResult(
-				$stmt,
 				$finalScope,
 				$bodyScopeResult->hasYield() || $hasYield,
 				$alwaysTerminating,
@@ -1061,7 +1057,6 @@ private function processStmtNode(
 			$finalScope = $finalScope->mergeWith($scope);
 
 			return new StatementResult(
-				$stmt,
 				$finalScope,
 				$finalScopeResult->hasYield() || $hasYield,
 				false/* $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable*/,
@@ -1133,7 +1128,7 @@ private function processStmtNode(
 				$finalScope = $scope->mergeWith($finalScope);
 			}
 
-			return new StatementResult($stmt, $finalScope, $hasYield, $alwaysTerminating, $exitPointsForOuterLoop, $throwPoints);
+			return new StatementResult($finalScope, $hasYield, $alwaysTerminating, $exitPointsForOuterLoop, $throwPoints);
 		} elseif ($stmt instanceof TryCatch) {
 			$branchScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $scope, $nodeCallback);
 			$branchScope = $branchScopeResult->getScope();
@@ -1303,7 +1298,7 @@ private function processStmtNode(
 				$exitPoints = array_merge($exitPoints, $finallyResult->getExitPoints());
 			}
 
-			return new StatementResult($stmt, $finalScope, $hasYield, $alwaysTerminating, $exitPoints, array_merge($throwPoints, $throwPointsForLater));
+			return new StatementResult($finalScope, $hasYield, $alwaysTerminating, $exitPoints, array_merge($throwPoints, $throwPointsForLater));
 		} elseif ($stmt instanceof Unset_) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -1398,7 +1393,7 @@ private function processStmtNode(
 			$throwPoints = [];
 		}
 
-		return new StatementResult($stmt, $scope, $hasYield, false, [], $throwPoints);
+		return new StatementResult($scope, $hasYield, false, [], $throwPoints);
 	}
 
 	private function getCurrentClassReflection(Node\Stmt\ClassLike $stmt, Scope $scope): ClassReflection

src/Analyser/StatementResult.php

@@ -2,15 +2,12 @@
 
 namespace PHPStan\Analyser;
 
-use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Stmt;
 
 class StatementResult
 {
 
-	private Stmt $statement;
-
 	private MutatingScope $scope;
 
 	private bool $hasYield;
@@ -24,78 +21,25 @@ class StatementResult
 	private array $throwPoints;
 
 	/**
-	 * @param Stmt $statement
 	 * @param MutatingScope $scope
 	 * @param bool $hasYield
 	 * @param bool $isAlwaysTerminating
 	 * @param StatementExitPoint[] $exitPoints
 	 * @param ThrowPoint[] $throwPoints
 	 */
 	public function __construct(
-		Stmt $statement,
 		MutatingScope $scope,
 		bool $hasYield,
 		bool $isAlwaysTerminating,
 		array $exitPoints,
 		array $throwPoints
 	)
 	{
-		$this->statement = $statement;
 		$this->scope = $scope;
 		$this->hasYield = $hasYield;
 		$this->isAlwaysTerminating = $isAlwaysTerminating;
 		$this->exitPoints = $exitPoints;
-		$this->throwPoints = $this->filterThrowPoints($statement, $throwPoints);
-	}
-
-	/**
-	 * @param Stmt $statement
-	 * @param ThrowPoint[] $throwPoints
-	 * @return ThrowPoint[]
-	 */
-	private function filterThrowPoints(Stmt $statement, array $throwPoints): array
-	{
-		if ($this->isInTry($statement)) {
-			return $throwPoints;
-		}
-
-		return array_values(array_filter($throwPoints, static function (ThrowPoint $throwPoint): bool {
-			return $throwPoint->isExplicit();
-		}));
-	}
-
-	private function isInTry(\PhpParser\Node $node): bool
-	{
-		if ($node instanceof Stmt\TryCatch) {
-			return true;
-		}
-
-		if ($node instanceof Stmt\Catch_ || $node instanceof Stmt\Finally_) {
-			$parent = $node->getAttribute('parent');
-			if ($parent === null) {
-				return false;
-			}
-			$parent2 = $parent->getAttribute('parent');
-			if (!$parent2 instanceof Stmt) {
-				return false;
-			}
-			return $this->isInTry($parent2);
-		}
-
-		if (
-			$node instanceof Stmt\ClassMethod
-			|| $node instanceof Stmt\Function_
-			|| $node instanceof Closure
-		) {
-			return false;
-		}
-
-		$parent = $node->getAttribute('parent');
-		if ($parent === null) {
-			return false;
-		}
-
-		return $this->isInTry($parent);
+		$this->throwPoints = $throwPoints;
 	}
 
 	public function getScope(): MutatingScope
@@ -127,14 +71,14 @@ public function filterOutLoopExitPoints(): self
 
 			$num = $statement->num;
 			if (!$num instanceof LNumber) {
-				return new self($this->statement, $this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);
+				return new self($this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);
 			}
 
 			if ($num->value !== 1) {
 				continue;
 			}
 
-			return new self($this->statement, $this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);
+			return new self($this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);
 		}
 
 		return $this;