Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Analyser/StatementsHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ public function processNodesWithStorage(
);

if ($alreadyTerminated) {
if ($node->getAttribute(GotoLabelVisitor::LABEL_IS_USED_ATTRIBUTE) !== true) {
$nextStmts = $this->getNextUnreachableStatements(array_slice($nodes, $stmtToNodeIndex[$si] + 1), true);
$this->processUnreachableStatement($nodeScopeResolver, $nextStmts, $scope, $expressionResultStorage, $nodeCallback);
}

continue;
}

Expand Down Expand Up @@ -681,6 +686,11 @@ private function processStatementStep(
);

if ($state->alreadyTerminated) {
if ($stmt->getAttribute(GotoLabelVisitor::LABEL_IS_USED_ATTRIBUTE) !== true) {
$nextStmts = $this->getNextUnreachableStatements(array_slice($stmts, $i + 1), $parentNode instanceof Node\Stmt\Namespace_);
$this->processUnreachableStatement($nodeScopeResolver, $nextStmts, $state->scope, $storage, $nodeCallback);
}

return;
}

Expand Down
27 changes: 27 additions & 0 deletions tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,31 @@ public function testNullsafeShortCircuitTerminating(): void
]);
}

public function testUnreachableAfterUnusedLabel(): void
{
$this->treatPhpDocTypesAsCertain = true;
$this->analyse([__DIR__ . '/data/unreachable-after-unused-label.php'], [
[
'Unreachable statement - code above always terminates.',
10,
],
[
'Unreachable statement - code above always terminates.',
20,
],
[
'Unreachable statement - code above always terminates.',
68,
],
[
'Unreachable statement - code above always terminates.',
73,
],
[
'Unreachable statement - code above always terminates.',
78,
],
]);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

namespace UnreachableAfterUnusedLabel;

function afterTerminatingGoto(int $value): int
{
if ($value > 1) {
goto end;
dead:
$items = [$value, 1];
foreach ($items as $item) {
$value += $item;
}

end:
}

return $value;
unreachable:
$value = $value * 1;
return $value;
}

function unusedLabelInReachableCode(int $value): int
{
unused:
$value++;
return $value;
}

function usedLabel(int $value): int
{
if ($value > 1) {
goto end;
}
return 1;
end:
return $value;
}

function reachedOnlyByBackwardGoto(int $value): int
{
goto second;
first:
$value++;
return $value;
second:
goto first;
}

function reachedByJumpIntoBlock(int $value): int
{
if ($value > 1) {
return 1;
inside:
$value++;
}
if ($value === 0) {
goto inside;
}
return $value;
}

function severalUnusedLabels(): void
{
return;
one:
echo 1;
echo 2;
two:

three:
echo 3;
}

goto end;
lbl:
$a = array(1);
end:
27 changes: 25 additions & 2 deletions turbo-ext/src/StatementsHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,20 @@ class StatementsHandler
zv::Val labelName = nameToString(nameNode);
if (UNEXPECTED(labelName.isUndef())) return zv::Val();
if (UNEXPECTED(!mergeForwardGotoExitPoints(labelName.raw(), scope, alreadyTerminated, exitPoints))) return zv::Val();
if (alreadyTerminated) continue;
if (alreadyTerminated) {
zv::Val labelIsUsed = pt_engine_node_get_attribute(Z_OBJ_P(node), PT_LC("labelIsUsed"));
if (UNEXPECTED(labelIsUsed.isUndef())) return zv::Val();
if (!labelIsUsed.ref().isTrue()) {
zval *labelNodeIndex = zend_hash_index_find(stmtToNodeIndex.table(), si);
zend_long labelNodeOffset;
if (UNEXPECTED(!offsetAfter(labelNodeIndex, labelNodeOffset))) return zv::Val();
zv::Val labelRest = arraySlice(nodesHeld.raw(), labelNodeOffset);
zv::Val labelNextStmts = getNextUnreachableStatements(labelRest.raw(), true);
if (UNEXPECTED(labelNextStmts.isUndef())) return zv::Val();
if (UNEXPECTED(!processUnreachableStatement(nodeScopeResolver, labelNextStmts.raw(), scope.raw(), storage, nodeCallback))) return zv::Val();
}
continue;
}

zv::Val hasBackwardGoto = pt_engine_node_get_attribute(Z_OBJ_P(node), PT_LC("hasBackwardGoto"));
if (UNEXPECTED(hasBackwardGoto.isUndef())) return zv::Val();
Expand Down Expand Up @@ -1555,7 +1568,17 @@ class StatementsHandler
ZVAL_BOOL(OBJ_PROP_NUM(stateObject, stateSlots::alreadyTerminated), alreadyTerminated);
zv::Ref(OBJ_PROP_NUM(stateObject, stateSlots::exitPoints)).assign(std::move(exitPoints));

if (alreadyTerminated) return true;
if (alreadyTerminated) {
zv::Val labelIsUsed = pt_engine_node_get_attribute(Z_OBJ_P(stmt), PT_LC("labelIsUsed"));
if (UNEXPECTED(labelIsUsed.isUndef())) return false;
if (labelIsUsed.ref().isTrue()) return true;
zv::Val labelRest = arraySlice(stmts, i + 1);
bool labelEarlyBinding;
if (UNEXPECTED(!isInstance(parentNode, PT_CLASS_NAMESPACE_STMT, labelEarlyBinding))) return false;
zv::Val labelNextStmts = getNextUnreachableStatements(labelRest.raw(), labelEarlyBinding);
if (UNEXPECTED(labelNextStmts.isUndef())) return false;
return processUnreachableStatement(nodeScopeResolver, labelNextStmts.raw(), OBJ_PROP_NUM(stateObject, stateSlots::scope), storage, nodeCallback);
}

zv::Val hasBackwardGoto = pt_engine_node_get_attribute(Z_OBJ_P(stmt), PT_LC("hasBackwardGoto"));
if (UNEXPECTED(hasBackwardGoto.isUndef())) return false;
Expand Down
Loading