Skip to content

Commit 699f085

Browse files
authored
[NFC][SanitizerSection] Store Section& instead of Entries and FileIdx (#162382)
1 parent 7f82996 commit 699f085

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

clang/include/clang/Basic/SanitizerSpecialCaseList.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,10 @@ class SanitizerSpecialCaseList : public llvm::SpecialCaseList {
5757
void createSanitizerSections();
5858

5959
struct SanitizerSection {
60-
SanitizerSection(SanitizerMask SM, SectionEntries &E, unsigned idx)
61-
: Mask(SM), Entries(E), FileIdx(idx) {};
60+
SanitizerSection(SanitizerMask SM, const Section &S) : Mask(SM), S(S) {};
6261

6362
SanitizerMask Mask;
64-
SectionEntries &Entries;
65-
unsigned FileIdx;
63+
const Section &S;
6664
};
6765

6866
std::vector<SanitizerSection> SanitizerSections;

clang/lib/Basic/SanitizerSpecialCaseList.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SanitizerSpecialCaseList::createOrDie(const std::vector<std::string> &Paths,
3838
}
3939

4040
void SanitizerSpecialCaseList::createSanitizerSections() {
41-
for (auto &S : Sections) {
41+
for (const auto &S : Sections) {
4242
SanitizerMask Mask;
4343

4444
#define SANITIZER(NAME, ID) \
@@ -50,7 +50,7 @@ void SanitizerSpecialCaseList::createSanitizerSections() {
5050
#undef SANITIZER
5151
#undef SANITIZER_GROUP
5252

53-
SanitizerSections.emplace_back(Mask, S.Entries, S.FileIdx);
53+
SanitizerSections.emplace_back(Mask, S);
5454
}
5555
}
5656

@@ -67,9 +67,9 @@ SanitizerSpecialCaseList::inSectionBlame(SanitizerMask Mask, StringRef Prefix,
6767
for (const auto &S : llvm::reverse(SanitizerSections)) {
6868
if (S.Mask & Mask) {
6969
unsigned LineNum =
70-
SpecialCaseList::inSectionBlame(S.Entries, Prefix, Query, Category);
70+
SpecialCaseList::inSectionBlame(S.S.Entries, Prefix, Query, Category);
7171
if (LineNum > 0)
72-
return {S.FileIdx, LineNum};
72+
return {S.S.FileIdx, LineNum};
7373
}
7474
}
7575
return NotFound;

0 commit comments

Comments
 (0)