Final scope from Continue_ points should not be used for while (true)

Author: greew

src/Analyser/NodeScopeResolver.php

@@ -1104,19 +1104,23 @@ private function processStmtNode(
 			$bodyScope = $this->processExprNode($stmt, $stmt->cond, $bodyScope, $nodeCallback, ExpressionContext::createDeep())->getTruthyScope();
 			$finalScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $bodyScope, $nodeCallback, $context)->filterOutLoopExitPoints();
 			$finalScope = $finalScopeResult->getScope()->filterByFalseyValue($stmt->cond);
-			foreach ($finalScopeResult->getExitPointsByType(Continue_::class) as $continueExitPoint) {
-				$finalScope = $finalScope->mergeWith($continueExitPoint->getScope());
+
+			$condBooleanType = ($this->treatPhpDocTypesAsCertain ? $bodyScopeMaybeRan->getType($stmt->cond) : $bodyScopeMaybeRan->getNativeType($stmt->cond))->toBoolean();
+			$alwaysIterates = $condBooleanType->isTrue()->yes() && $context->isTopLevel();
+			$neverIterates = $condBooleanType->isFalse()->yes() && $context->isTopLevel();
+			if (!$alwaysIterates) {
+				foreach ($finalScopeResult->getExitPointsByType(Continue_::class) as $continueExitPoint) {
+					$finalScope = $finalScope->mergeWith($continueExitPoint->getScope());
+				}
 			}
+
 			$breakExitPoints = $finalScopeResult->getExitPointsByType(Break_::class);
 			foreach ($breakExitPoints as $breakExitPoint) {
 				$finalScope = $finalScope->mergeWith($breakExitPoint->getScope());
 			}
 
 			$beforeCondBooleanType = ($this->treatPhpDocTypesAsCertain ? $scope->getType($stmt->cond) : $scope->getNativeType($stmt->cond))->toBoolean();
-			$condBooleanType = ($this->treatPhpDocTypesAsCertain ? $bodyScopeMaybeRan->getType($stmt->cond) : $bodyScopeMaybeRan->getNativeType($stmt->cond))->toBoolean();
 			$isIterableAtLeastOnce = $beforeCondBooleanType->isTrue()->yes();
-			$alwaysIterates = $condBooleanType->isTrue()->yes() && $context->isTopLevel();
-			$neverIterates = $condBooleanType->isFalse()->yes() && $context->isTopLevel();
 			$nodeCallback(new BreaklessWhileLoopNode($stmt, $finalScopeResult->getExitPoints()), $bodyScopeMaybeRan);
 
 			if ($alwaysIterates) {

tests/PHPStan/Analyser/Bug10980Test.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PHPStan\Testing\TypeInferenceTestCase;
+
+class Bug10980Test extends TypeInferenceTestCase
+{
+
+	public function dataFileAsserts(): iterable
+	{
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-10980.php');
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args,
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+}

tests/PHPStan/Analyser/data/bug-10980.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug10980;
+
+use function PHPStan\Testing\assertType;
+
+class A {}
+
+class B extends A {}
+
+function a(): A {}
+
+while (true) {
+	$type = a();
+	if (!$type instanceof B) {
+		continue;
+	}
+	break;
+}
+
+assertType('Bug10980\B', $type);