shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BOLT] Fix a bug related to iterators in ReorderData pass

Browse Source 
If `Itr` is the last element and then `std::next(Itr)` will be
`Range.end()`, so that the statement `std::next(Itr)->second` is
a UB.

Reviewed By: yota9, maksfb

Differential Revision: https://reviews.llvm.org/D159177
This commit is contained in:
Sinan Lin 2023-08-31 11:01:39 +08:00 committed by 杨桃
parent 39f6a31eaa
commit 9c99e9fd68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bolt/lib/Passes/ReorderData.cpp
View File

@ -413,17 +413,17 @@ bool ReorderData::markUnmoveableSymbols(BinaryContext &BC,
auto Range = BC.getBinaryDataForSection(Section);
bool FoundUnmoveable = false;
for (auto Itr = Range.begin(); Itr != Range.end(); ++Itr) {
BinaryData *Next =
std::next(Itr) != Range.end() ? std::next(Itr)->second : nullptr;
if (Itr->second->getName().startswith("PG.")) {
BinaryData *Prev =
Itr != Range.begin() ? std::prev(Itr)->second : nullptr;
BinaryData *Next = Itr != Range.end() ? std::next(Itr)->second : nullptr;
bool PrevIsPrivate = Prev && isPrivate(Prev);
bool NextIsPrivate = Next && isPrivate(Next);
if (isPrivate(Itr->second) && (PrevIsPrivate || NextIsPrivate))
Itr->second->setIsMoveable(false);
} else {
// check for overlapping symbols.
BinaryData *Next = Itr != Range.end() ? std::next(Itr)->second : nullptr;
if (Next && Itr->second->getEndAddress() != Next->getAddress() &&
Next->containsAddress(Itr->second->getEndAddress())) {
Itr->second->setIsMoveable(false);