Skip to content

[LLD][COFF][NFC] Always align null chunks #116677

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 1 commit into from
Nov 19, 2024
Merged

[LLD][COFF][NFC] Always align null chunks #116677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions lld/COFF/DLL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,14 @@ class ImportDirectoryChunk : public NonSectionChunk {
// Contents of this chunk is always null bytes.
class NullChunk : public NonSectionChunk {
public:
explicit NullChunk(size_t n) : size(n) { hasData = false; }
explicit NullChunk(size_t n, uint32_t align) : size(n) {
hasData = false;
setAlignment(align);
}
explicit NullChunk(COFFLinkerContext &ctx)
: NullChunk(ctx.config.wordsize, ctx.config.wordsize) {}
explicit NullChunk(COFFLinkerContext &ctx, size_t n)
: NullChunk(n, ctx.config.wordsize) {}
size_t getSize() const override { return size; }

void writeTo(uint8_t *buf) const override {
Expand Down Expand Up @@ -737,11 +744,11 @@ void IdataContents::create(COFFLinkerContext &ctx) {
}
}
// Terminate with null values.
lookups.push_back(make<NullChunk>(ctx.config.wordsize));
addresses.push_back(make<NullChunk>(ctx.config.wordsize));
lookups.push_back(make<NullChunk>(ctx));
addresses.push_back(make<NullChunk>(ctx));
if (ctx.config.machine == ARM64EC) {
auxIat.push_back(make<NullChunk>(ctx.config.wordsize));
auxIatCopy.push_back(make<NullChunk>(ctx.config.wordsize));
auxIat.push_back(make<NullChunk>(ctx));
auxIatCopy.push_back(make<NullChunk>(ctx));
}

for (int i = 0, e = syms.size(); i < e; ++i)
Expand All @@ -755,7 +762,7 @@ void IdataContents::create(COFFLinkerContext &ctx) {
dirs.push_back(dir);
}
// Add null terminator.
dirs.push_back(make<NullChunk>(sizeof(ImportDirectoryTableEntry)));
dirs.push_back(make<NullChunk>(sizeof(ImportDirectoryTableEntry), 4));
}

std::vector<Chunk *> DelayLoadContents::getChunks() {
Expand Down Expand Up @@ -830,17 +837,16 @@ void DelayLoadContents::create(Defined *h) {
saver().save("__tailMerge_" + syms[0]->getDLLName().lower());
ctx.symtab.addSynthetic(tmName, tm);
// Terminate with null values.
addresses.push_back(make<NullChunk>(8));
names.push_back(make<NullChunk>(8));
addresses.push_back(make<NullChunk>(ctx, 8));
names.push_back(make<NullChunk>(ctx, 8));
if (ctx.config.machine == ARM64EC) {
auxIat.push_back(make<NullChunk>(8));
auxIatCopy.push_back(make<NullChunk>(8));
auxIat.push_back(make<NullChunk>(ctx, 8));
auxIatCopy.push_back(make<NullChunk>(ctx, 8));
}

for (int i = 0, e = syms.size(); i < e; ++i)
syms[i]->setLocation(addresses[base + i]);
auto *mh = make<NullChunk>(8);
mh->setAlignment(8);
auto *mh = make<NullChunk>(8, 8);
moduleHandles.push_back(mh);

// Fill the delay import table header fields.
Expand All @@ -853,7 +859,8 @@ void DelayLoadContents::create(Defined *h) {
if (unwind)
unwindinfo.push_back(unwind);
// Add null terminator.
dirs.push_back(make<NullChunk>(sizeof(delay_import_directory_table_entry)));
dirs.push_back(
make<NullChunk>(sizeof(delay_import_directory_table_entry), 4));
}

Chunk *DelayLoadContents::newTailMergeChunk(Chunk *dir) {
Expand Down
Loading