Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[clang][cleanup] simplify ReachableCode scanFromBlock #72257

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[clang][cleanup] simplify ReachableCode scanFromBlock #72257

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52b0204
Update ReachableCode.cpp
thyecust Nov 14, 2023
e6ff526
Update ReachableCode.cpp
thyecust Nov 14, 2023
bcb3f98
Update ReachableCode.cpp
thyecust Nov 14, 2023
8ec7fd1
Merge branch 'llvm:main' into patch-1
thyecust Nov 14, 2023
b6ab5db
Merge branch 'llvm:main' into patch-1
thyecust Nov 18, 2023
af5a985
Update ReachableCode.cpp
thyecust Nov 24, 2023
7eff518
Merge branch 'llvm:main' into patch-1
thyecust Nov 24, 2023
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
21 changes: 9 additions & 12 deletions clang/lib/Analysis/ReachableCode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,30 +341,27 @@ static unsigned scanFromBlock(const CFGBlock *Start,
// This allows us to potentially uncover some "always unreachable" code
// within the "sometimes unreachable" code.
// Look at the successors and mark then reachable.
std::optional<bool> TreatAllSuccessorsAsReachable;
if (!IncludeSometimesUnreachableEdges)
bool TreatAllSuccessorsAsReachable;
if (IncludeSometimesUnreachableEdges) {
assert(PP);
TreatAllSuccessorsAsReachable =
shouldTreatSuccessorsAsReachable(item, *PP);
} else {
TreatAllSuccessorsAsReachable = false;
}

for (CFGBlock::const_succ_iterator I = item->succ_begin(),
E = item->succ_end(); I != E; ++I) {
const CFGBlock *B = *I;
if (!B) do {
if (!B) {
const CFGBlock *UB = I->getPossiblyUnreachableBlock();
if (!UB)
break;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a functional change. Previously this break was breaking out of the do-while loop, now it is breaking out of the for loop.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right. I should replace this break with continue.

Because previously this break, under if (!B) {, was going to if (B) { and contining the next for loop iteration.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review. The fix is done.


if (!TreatAllSuccessorsAsReachable) {
assert(PP);
TreatAllSuccessorsAsReachable =
shouldTreatSuccessorsAsReachable(item, *PP);
}

if (*TreatAllSuccessorsAsReachable) {
if (TreatAllSuccessorsAsReachable) {
B = UB;
break;
}
}
while (false);

if (B) {
unsigned blockID = B->getBlockID();
Expand Down