[NFC][SpecialCaseList] Refactor error handling

[vitalybuka]

Will help in future patches.

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: Vitaly Buka (vitalybuka)

Changes

Will help in future patches.

---

Full diff: https://github.com/llvm/llvm-project/pull/167277.diff

1 Files Affected:

• (modified) llvm/lib/Support/SpecialCaseList.cpp (+7-5)

diff --git a/llvm/lib/Support/SpecialCaseList.cpp b/llvm/lib/Support/SpecialCaseList.cpp
index 395a55d75acd4..beec8b8ef0d5b 100644
--- a/llvm/lib/Support/SpecialCaseList.cpp
+++ b/llvm/lib/Support/SpecialCaseList.cpp
@@ -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.
@@ -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;
     }
 

[Copilot]

Pull Request Overview

This PR refactors error handling in SpecialCaseList::parse() by replacing calls to moveInto() with a two-step approach: first calling takeError() to check for errors, then calling get() to retrieve the value. However, this refactoring introduces a subtle but critical API misuse issue.

• Replaces moveInto() pattern with takeError() followed by get()
• Applied to two instances of addSection() calls in the parsing logic

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.