@@ -789,7 +789,7 @@ namespace {
789789 const bool conditional = stopOnCondition (condTok);
790790 ForwardTraversal ft = fork ();
791791 ft.analyzer ->assume (condTok, true );
792- Progress p = ft.updateBranch (thenBranch, depth - 1 );
792+ Progress pThen = ft.updateBranch (thenBranch, depth - 1 );
793793
794794 // Only commit the condition as false on the main path when it actually
795795 // matters
@@ -807,20 +807,20 @@ namespace {
807807 }
808808 if (thenBranch.isModified () || elseBranch.isModified ()) {
809809 if (!ft.analyzer ->lowerToPossible ())
810- p = Progress::Break;
810+ pThen = Progress::Break;
811811 if (pElse != Progress::Break && !analyzer->lowerToPossible ())
812812 return Break (Analyzer::Terminate::Bail);
813813 }
814814 if (thenBranch.isInconclusive () || elseBranch.isInconclusive ()) {
815815 if (!ft.analyzer ->lowerToInconclusive ())
816- p = Progress::Break;
816+ pThen = Progress::Break;
817817 if (pElse != Progress::Break && !analyzer->lowerToInconclusive ())
818818 return Break (Analyzer::Terminate::Bail);
819819 }
820820 if (thenBranch.hasGoto () || elseBranch.hasGoto ()) {
821821 return Break (Analyzer::Terminate::Bail);
822822 }
823- if (p != Progress::Break && !thenBranch.isEscape ())
823+ if (pThen != Progress::Break && !thenBranch.isEscape ())
824824 ft.updateRange (thenBranch.endBlock , end, depth - 1 );
825825 if (pElse == Progress::Break)
826826 return Break ();
0 commit comments