[Alignment][NFC] Use Align in StringTableBuilder ctor

Author: gchatelet

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);
 }
 

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.

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;

llvm/include/llvm/MC/StringTableBuilder.h

@@ -46,7 +46,7 @@ class StringTableBuilder {
   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

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();
 }