From 173f62d98fcaa2d3e5afc477f0c3bb65cd502fd6 Mon Sep 17 00:00:00 2001 From: Guillaume Chatelet Date: Fri, 2 Dec 2022 12:42:43 +0000 Subject: [PATCH] [Alignment][NFC] Use Align in StringTableBuilder ctor --- lld/COFF/Chunks.cpp | 2 +- lld/ELF/SyntheticSections.cpp | 4 ++-- lld/wasm/InputChunks.h | 3 ++- llvm/include/llvm/MC/StringTableBuilder.h | 2 +- llvm/lib/MC/StringTableBuilder.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp index ee222cb6f08d..f626458fea95 100644 --- a/lld/COFF/Chunks.cpp +++ b/lld/COFF/Chunks.cpp @@ -941,7 +941,7 @@ uint8_t Baserel::getDefaultType() { } MergeChunk::MergeChunk(uint32_t alignment) - : builder(StringTableBuilder::RAW, alignment) { + : builder(StringTableBuilder::RAW, llvm::Align(alignment)) { setAlignment(alignment); } diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp index 24a6f40dbb93..6162edac2130 100644 --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -3210,7 +3210,7 @@ void MergeSyntheticSection::addSection(MergeInputSection *ms) { MergeTailSection::MergeTailSection(StringRef name, uint32_t type, uint64_t flags, uint32_t alignment) : MergeSyntheticSection(name, type, flags, alignment), - builder(StringTableBuilder::RAW, alignment) {} + builder(StringTableBuilder::RAW, llvm::Align(alignment)) {} size_t MergeTailSection::getSize() const { return builder.getSize(); } @@ -3252,7 +3252,7 @@ void MergeNoTailSection::writeTo(uint8_t *buf) { void MergeNoTailSection::finalizeContents() { // Initializes string table builders. for (size_t i = 0; i < numShards; ++i) - shards.emplace_back(StringTableBuilder::RAW, addralign); + shards.emplace_back(StringTableBuilder::RAW, llvm::Align(addralign)); // Concurrency level. Must be a power of 2 to avoid expensive modulo // operations in the following tight loop. diff --git a/lld/wasm/InputChunks.h b/lld/wasm/InputChunks.h index 203ad5ad947d..fb2c43861945 100644 --- a/lld/wasm/InputChunks.h +++ b/lld/wasm/InputChunks.h @@ -223,7 +223,8 @@ class SyntheticMergedChunk : public InputChunk { public: SyntheticMergedChunk(StringRef name, uint32_t alignment, uint32_t flags) : InputChunk(nullptr, InputChunk::MergedChunk, name, alignment, flags), - builder(llvm::StringTableBuilder::RAW, 1ULL << alignment) {} + builder(llvm::StringTableBuilder::RAW, llvm::Align(1ULL << alignment)) { + } static bool classof(const InputChunk *c) { return c->kind() == InputChunk::MergedChunk; diff --git a/llvm/include/llvm/MC/StringTableBuilder.h b/llvm/include/llvm/MC/StringTableBuilder.h index 5e12e2d52734..d0d5aaa03738 100644 --- a/llvm/include/llvm/MC/StringTableBuilder.h +++ b/llvm/include/llvm/MC/StringTableBuilder.h @@ -46,7 +46,7 @@ private: void initSize(); public: - StringTableBuilder(Kind K, unsigned Alignment = 1); + StringTableBuilder(Kind K, Align Alignment = Align(1)); ~StringTableBuilder(); /// Add a string to the builder. Returns the position of S in the diff --git a/llvm/lib/MC/StringTableBuilder.cpp b/llvm/lib/MC/StringTableBuilder.cpp index f78460edafab..bb948fe3d13b 100644 --- a/llvm/lib/MC/StringTableBuilder.cpp +++ b/llvm/lib/MC/StringTableBuilder.cpp @@ -52,7 +52,7 @@ void StringTableBuilder::initSize() { } } -StringTableBuilder::StringTableBuilder(Kind K, unsigned Alignment) +StringTableBuilder::StringTableBuilder(Kind K, Align Alignment) : K(K), Alignment(Alignment) { initSize(); }