replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[llvm-objcopy] Use llvm::all_of and rename the variables "Segment" to avoid confusion with the type of the same name 

llvm-svn: 347123
This commit is contained in:
Fangrui Song 2018-11-17 01:15:55 +00:00
parent ddfb07567d
commit 5ec95dbd74
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/tools/llvm-objcopy/ELF/Object.cpp
View File

@ -1540,10 +1540,10 @@ void BinaryWriter::finalize() {
// loading and physical addresses are intended for ROM loading.
// However, if no segment has a physical address, we'll fallback to using
// virtual addresses for all.
if (std::all_of(std::begin(OrderedSegments), std::end(OrderedSegments),
[](const Segment *Segment) { return Segment->PAddr == 0; }))
for (const auto &Segment : OrderedSegments)
Segment->PAddr = Segment->VAddr;
if (all_of(OrderedSegments,
[](const Segment *Seg) { return Seg->PAddr == 0; }))
for (Segment *Seg : OrderedSegments)
Seg->PAddr = Seg->VAddr;
std::stable_sort(std::begin(OrderedSegments), std::end(OrderedSegments),
compareSegmentsByPAddr);
@ -1558,8 +1558,8 @@ void BinaryWriter::finalize() {
uint64_t Offset = 0;
// Modify the first segment so that there is no gap at the start. This allows
// our layout algorithm to proceed as expected while not out writing out the
// gap at the start.
// our layout algorithm to proceed as expected while not writing out the gap
// at the start.
if (!OrderedSegments.empty()) {
auto Seg = OrderedSegments[0];
auto Sec = Seg->firstSection();