Skip to content

[NFC][SpecialCaseList] Convert preprocess into LazyInit #167281

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 9 commits into from
Nov 15, 2025
Merged

[NFC][SpecialCaseList] Convert preprocess into LazyInit #167281

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
53c9cb0
[𝘀𝗽𝗿] changes to main this commit is based on
vitalybuka Nov 10, 2025
21782c6
[𝘀𝗽𝗿] initial version
vitalybuka Nov 10, 2025
76b1056
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Nov 11, 2025
08f8ffd
rebase
vitalybuka Nov 11, 2025
c3c6686
[𝘀𝗽𝗿] changes introduced through rebase
vitalybuka Nov 11, 2025
eaf9e63
rebase
vitalybuka Nov 11, 2025
ff5162f
[𝘀𝗽𝗿] changes introduced through rebase
alexey-bataev Nov 14, 2025
f2bd5c6
rebase
vitalybuka Nov 14, 2025
56ab9f6
rebase
vitalybuka Nov 15, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions llvm/lib/Support/SpecialCaseList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/iterator_range.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/GlobPattern.h"
#include "llvm/Support/LineIterator.h"
#include "llvm/Support/MemoryBuffer.h"
Expand All @@ -42,10 +43,9 @@ namespace {
class RegexMatcher {
public:
Error insert(StringRef Pattern, unsigned LineNumber);
void preprocess();

unsigned match(StringRef Query) const;

private:
struct Reg {
Reg(StringRef Name, unsigned LineNo, Regex &&Rg)
: Name(Name), LineNo(LineNo), Rg(std::move(Rg)) {}
Expand All @@ -60,10 +60,9 @@ class RegexMatcher {
class GlobMatcher {
public:
Error insert(StringRef Pattern, unsigned LineNumber);
void preprocess();

unsigned match(StringRef Query) const;

private:
struct Glob {
Glob(StringRef Name, unsigned LineNo, GlobPattern &&Pattern)
: Name(Name), LineNo(LineNo), Pattern(std::move(Pattern)) {}
Expand All @@ -72,15 +71,20 @@ class GlobMatcher {
GlobPattern Pattern;
};

void LazyInit() const;

std::vector<GlobMatcher::Glob> Globs;

RadixTree<iterator_range<StringRef::const_iterator>,
RadixTree<iterator_range<StringRef::const_reverse_iterator>,
SmallVector<int, 1>>>
mutable RadixTree<iterator_range<StringRef::const_iterator>,
RadixTree<iterator_range<StringRef::const_reverse_iterator>,
SmallVector<int, 1>>>
PrefixSuffixToGlob;

RadixTree<iterator_range<StringRef::const_iterator>, SmallVector<int, 1>>
mutable RadixTree<iterator_range<StringRef::const_iterator>,
SmallVector<int, 1>>
SubstrToGlob;

mutable bool Initialized = false;
};

/// Represents a set of patterns and their line numbers
Expand All @@ -89,7 +93,6 @@ class Matcher {
Matcher(bool UseGlobs, bool RemoveDotSlash);

Error insert(StringRef Pattern, unsigned LineNumber);
void preprocess();
unsigned match(StringRef Query) const;

bool matchAny(StringRef Query) const { return match(Query); }
Expand Down Expand Up @@ -122,8 +125,6 @@ Error RegexMatcher::insert(StringRef Pattern, unsigned LineNumber) {
return Error::success();
}

void RegexMatcher::preprocess() {}

unsigned RegexMatcher::match(StringRef Query) const {
for (const auto &R : reverse(RegExes))
if (R.Rg.match(Query))
Expand All @@ -142,7 +143,10 @@ Error GlobMatcher::insert(StringRef Pattern, unsigned LineNumber) {
return Error::success();
}

void GlobMatcher::preprocess() {
void GlobMatcher::LazyInit() const {
if (LLVM_LIKELY(Initialized))
return;
Initialized = true;
for (const auto &[Idx, G] : enumerate(Globs)) {
StringRef Prefix = G.Pattern.prefix();
StringRef Suffix = G.Pattern.suffix();
Expand All @@ -167,6 +171,8 @@ void GlobMatcher::preprocess() {
}

unsigned GlobMatcher::match(StringRef Query) const {
LazyInit();

int Best = -1;
if (!PrefixSuffixToGlob.empty()) {
for (const auto &[_, SToGlob] : PrefixSuffixToGlob.find_prefixes(Query)) {
Expand Down Expand Up @@ -224,10 +230,6 @@ Error Matcher::insert(StringRef Pattern, unsigned LineNumber) {
return std::visit([&](auto &V) { return V.insert(Pattern, LineNumber); }, M);
}

void Matcher::preprocess() {
return std::visit([&](auto &V) { return V.preprocess(); }, M);
}

unsigned Matcher::match(StringRef Query) const {
if (RemoveDotSlash)
Query = llvm::sys::path::remove_leading_dotslash(Query);
Expand All @@ -237,7 +239,6 @@ unsigned Matcher::match(StringRef Query) const {

class SpecialCaseList::Section::SectionImpl {
public:
void preprocess();
const Matcher *findMatcher(StringRef Prefix, StringRef Category) const;

using SectionEntries = StringMap<StringMap<Matcher>>;
Expand Down Expand Up @@ -395,9 +396,6 @@ bool SpecialCaseList::parse(unsigned FileIdx, const MemoryBuffer *MB,
}
}

for (Section &S : Sections)
S.Impl->preprocess();

return true;
}

Expand Down Expand Up @@ -448,13 +446,6 @@ SpecialCaseList::Section::SectionImpl::findMatcher(StringRef Prefix,
return &II->second;
}

void SpecialCaseList::Section::SectionImpl::preprocess() {
SectionMatcher.preprocess();
for (auto &[K1, E] : Entries)
for (auto &[K2, M] : E)
M.preprocess();
}

unsigned SpecialCaseList::Section::getLastMatch(StringRef Prefix,
StringRef Query,
StringRef Category) const {
Expand Down
Loading