Skip to content

Make sure that the std::optional<> result is checked before being accessed #116479

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

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

Make sure that the std::optional<> result is checked before being accessed #116479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb1ca2
Make sure that the `std::optional<>` result is checked before being a…
romainthomas Nov 16, 2024
394adb0
Fix coding style
romainthomas Nov 23, 2024
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
17 changes: 11 additions & 6 deletions llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,17 @@ Expected<DWARFAddressRangesVector> DWARFDie::getAddressRanges() const {
return DWARFAddressRangesVector{{LowPC, HighPC, Index}};

std::optional<DWARFFormValue> Value = find(DW_AT_ranges);
if (Value) {
if (Value->getForm() == DW_FORM_rnglistx)
return U->findRnglistFromIndex(*Value->getAsSectionOffset());
return U->findRnglistFromOffset(*Value->getAsSectionOffset());
}
return DWARFAddressRangesVector();
if (!Value)
return DWARFAddressRangesVector();

std::optional<uint64_t> SecOff = Value->getAsSectionOffset();
if (!SecOff)
return DWARFAddressRangesVector();

if (Value->getForm() == DW_FORM_rnglistx)
return U->findRnglistFromIndex(*SecOff);

return U->findRnglistFromOffset(*SecOff);
}

bool DWARFDie::addressRangeContainsAddress(const uint64_t Address) const {
Expand Down
Loading