maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Initialize OffsetMap earlier. 

Now that getSectionPiece uses OffsetMap, it is advantageous to
initialize it earlier.

llvm-svn: 329242
This commit is contained in:
Rafael Espindola 2018-04-05 00:01:57 +00:00
parent 072b1a2d6c
commit 7bd45502fe
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/ELF/InputSection.cpp
View File

@ -920,6 +920,10 @@ void MergeInputSection::splitIntoPieces() {
else
splitNonStrings(Data, Entsize);
OffsetMap.reserve(Pieces.size());
for (size_t I = 0, E = Pieces.size(); I != E; ++I)
OffsetMap[Pieces[I].InputOff] = I;
if (Config->GcSections && (Flags & SHF_ALLOC))
for (uint32_t Off : LiveOffsets)
getSectionPiece(Off)->Live = true;

24
lld/ELF/SyntheticSections.cpp
View File

@ -2440,15 +2440,10 @@ void MergeTailSection::finalizeContents() {
// finalize() fixed tail-optimized strings, so we can now get
// offsets of strings. Get an offset for each string and save it
// to a corresponding StringPiece for easy access.
for (MergeInputSection *Sec : Sections) {
Sec->OffsetMap.reserve(Sec->Pieces.size());
for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I) {
SectionPiece &P = Sec->Pieces[I];
Sec->OffsetMap[P.InputOff] = I;
if (P.Live)
P.OutputOff = Builder.getOffset(Sec->getData(I));
}
}
for (MergeInputSection *Sec : Sections)
for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I)
if (Sec->Pieces[I].Live)
Sec->Pieces[I].OutputOff = Builder.getOffset(Sec->getData(I));
}
void MergeNoTailSection::writeTo(uint8_t *Buf) {
@ -2501,13 +2496,10 @@ void MergeNoTailSection::finalizeContents() {
// So far, section pieces have offsets from beginning of shards, but
// we want offsets from beginning of the whole section. Fix them.
parallelForEach(Sections, [&](MergeInputSection *Sec) {
Sec->OffsetMap.reserve(Sec->Pieces.size());
for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I) {
SectionPiece &P = Sec->Pieces[I];
Sec->OffsetMap[P.InputOff] = I;
if (P.Live)
P.OutputOff += ShardOffsets[getShardId(P.Hash)];
}
for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I)
if (Sec->Pieces[I].Live)
Sec->Pieces[I].OutputOff +=
ShardOffsets[getShardId(Sec->Pieces[I].Hash)];
});
}