Skip to content

[NFC][SpecialCaseList] Refactor error handling #167277

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 4 commits into from
Nov 10, 2025
Merged

[NFC][SpecialCaseList] Refactor error handling #167277

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16613b9
[𝘀𝗽𝗿] changes to main this commit is based on
vitalybuka Nov 10, 2025
879a0f4
[𝘀𝗽𝗿] initial version
vitalybuka Nov 10, 2025
6e9364b
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Nov 10, 2025
1d2ba82
rebase
vitalybuka Nov 10, 2025
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
12 changes: 7 additions & 5 deletions llvm/lib/Support/SpecialCaseList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,12 @@ bool SpecialCaseList::parse(unsigned FileIdx, const MemoryBuffer *MB,

bool RemoveDotSlash = Version > 2;

Section *CurrentSection;
if (auto Err = addSection("*", FileIdx, 1, true).moveInto(CurrentSection)) {
auto ErrOrSection = addSection("*", FileIdx, 1, true);
if (auto Err = ErrOrSection.takeError()) {
Error = toString(std::move(Err));
return false;
}
Section *CurrentSection = ErrOrSection.get();

// This is the current list of prefixes for all existing users matching file
// path. We may need parametrization in constructor in future.
Expand All @@ -300,12 +301,13 @@ bool SpecialCaseList::parse(unsigned FileIdx, const MemoryBuffer *MB,
return false;
}

if (auto Err = addSection(Line.drop_front().drop_back(), FileIdx, LineNo,
UseGlobs)
.moveInto(CurrentSection)) {
auto ErrOrSection =
addSection(Line.drop_front().drop_back(), FileIdx, LineNo, UseGlobs);
if (auto Err = ErrOrSection.takeError()) {
Error = toString(std::move(Err));
return false;
}
CurrentSection = ErrOrSection.get();
continue;
}

Expand Down
Loading