Skip to content

[DebugInfo] When merging locations prefer unannotated empty locs #157707

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

Merged
merged 1 commit into from
Sep 10, 2025
Merged

[DebugInfo] When merging locations prefer unannotated empty locs #157707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions llvm/lib/IR/DebugLoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,19 @@ DebugLoc DebugLoc::getMergedLocations(ArrayRef<DebugLoc> Locs) {
return Merged;
}
DebugLoc DebugLoc::getMergedLocation(DebugLoc LocA, DebugLoc LocB) {
if (!LocA)
return LocA;
if (!LocB)
if (!LocA || !LocB) {
// If coverage tracking is enabled, prioritize returning empty non-annotated
// locations to empty annotated locations.
#if LLVM_ENABLE_DEBUGLOC_TRACKING_COVERAGE
if (!LocA && LocA.getKind() == DebugLocKind::Normal)
return LocA;
if (!LocB && LocB.getKind() == DebugLocKind::Normal)
return LocB;
#endif // LLVM_ENABLE_DEBUGLOC_TRACKING_COVERAGE
if (!LocA)
return LocA;
return LocB;
}
return DILocation::getMergedLocation(LocA, LocB);
}

Expand Down