[lld] [llvm] ldd(wasm): Support for the custom-page-sizes WebAssembly proposal (PR #128942)

[via llvm-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 4ec199035efbc10211a95ca102f05fb6fcbbdc09 dae13ec31998820a9287ff97bfdbba1a8543e5f9 --extensions h,cpp -- lld/wasm/Config.h lld/wasm/Driver.cpp lld/wasm/SymbolTable.cpp lld/wasm/Symbols.cpp lld/wasm/Symbols.h lld/wasm/SyntheticSections.cpp lld/wasm/Writer.cpp llvm/include/llvm/BinaryFormat/Wasm.h llvm/include/llvm/BinaryFormat/WasmTraits.h llvm/include/llvm/MC/MCSymbolWasm.h llvm/include/llvm/ObjectYAML/WasmYAML.h llvm/lib/MC/WasmObjectWriter.cpp llvm/lib/Object/WasmObjectFile.cpp llvm/lib/ObjectYAML/WasmYAML.cpp llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp llvm/lib/Target/WebAssembly/WebAssemblyUtilities.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index 3a4ff0cac7..49cfd7b421 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -1002,9 +1002,10 @@ static void createOptionalSymbols() {
     WasmSym::definedTableBase = symtab->addOptionalDataSymbol("__table_base");
   }
 
-  WasmSym::firstPageEnd = symtab->addOptionalDataSymbol("__wasm_first_page_end");
+  WasmSym::firstPageEnd =
+      symtab->addOptionalDataSymbol("__wasm_first_page_end");
   if (WasmSym::firstPageEnd) {
-      WasmSym::firstPageEnd->setVA(ctx.arg.pageSize);
+    WasmSym::firstPageEnd->setVA(ctx.arg.pageSize);
   }
 
   // For non-shared memory programs we still need to define __tls_base since we
diff --git a/lld/wasm/SyntheticSections.cpp b/lld/wasm/SyntheticSections.cpp
index 8a27502e9b..9e6cd149aa 100644
--- a/lld/wasm/SyntheticSections.cpp
+++ b/lld/wasm/SyntheticSections.cpp
@@ -361,7 +361,7 @@ void MemorySection::writeBody() {
   if (ctx.arg.is64.value_or(false))
     flags |= WASM_LIMITS_FLAG_IS_64;
   if (ctx.arg.pageSize != WasmDefaultPageSize)
-      flags |= WASM_LIMITS_FLAG_HAS_PAGE_SIZE;
+    flags |= WASM_LIMITS_FLAG_HAS_PAGE_SIZE;
   writeUleb128(os, flags, "memory limits flags");
   writeUleb128(os, numMemoryPages, "initial pages");
   if (hasMax)
diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index 2b871e548e..b23768a753 100644
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -446,7 +446,8 @@ void Writer::layoutMemory() {
 
   if (ctx.arg.initialHeap != 0) {
     if (ctx.arg.initialHeap != alignTo(ctx.arg.initialHeap, ctx.arg.pageSize))
-      error("initial heap must be aligned to the page size (" + Twine(ctx.arg.pageSize) + " bytes)");
+      error("initial heap must be aligned to the page size (" +
+            Twine(ctx.arg.pageSize) + " bytes)");
     uint64_t maxInitialHeap = maxMemorySetting - memoryPtr;
     if (ctx.arg.initialHeap > maxInitialHeap)
       error("initial heap too large, cannot be greater than " +
@@ -455,8 +456,10 @@ void Writer::layoutMemory() {
   }
 
   if (ctx.arg.initialMemory != 0) {
-    if (ctx.arg.initialMemory != alignTo(ctx.arg.initialMemory, ctx.arg.pageSize))
-      error("initial memory must be aligned to the page size (" + Twine(ctx.arg.pageSize) + " bytes)");
+    if (ctx.arg.initialMemory !=
+        alignTo(ctx.arg.initialMemory, ctx.arg.pageSize))
+      error("initial memory must be aligned to the page size (" +
+            Twine(ctx.arg.pageSize) + " bytes)");
     if (memoryPtr > ctx.arg.initialMemory)
       error("initial memory too small, " + Twine(memoryPtr) + " bytes needed");
     if (ctx.arg.initialMemory > maxMemorySetting)
@@ -481,7 +484,8 @@ void Writer::layoutMemory() {
   uint64_t maxMemory = 0;
   if (ctx.arg.maxMemory != 0) {
     if (ctx.arg.maxMemory != alignTo(ctx.arg.maxMemory, ctx.arg.pageSize))
-      error("maximum memory must be aligned to page size (" + Twine(ctx.arg.pageSize) + " bytes)");
+      error("maximum memory must be aligned to page size (" +
+            Twine(ctx.arg.pageSize) + " bytes)");
     if (memoryPtr > ctx.arg.maxMemory)
       error("maximum memory too small, " + Twine(memoryPtr) + " bytes needed");
     if (ctx.arg.maxMemory > maxMemorySetting)
diff --git a/llvm/include/llvm/BinaryFormat/Wasm.h b/llvm/include/llvm/BinaryFormat/Wasm.h
index ed2e5b2ccc..fc033d5821 100644
--- a/llvm/include/llvm/BinaryFormat/Wasm.h
+++ b/llvm/include/llvm/BinaryFormat/Wasm.h
@@ -28,7 +28,8 @@ const char WasmMagic[] = {'\0', 'a', 's', 'm'};
 const uint32_t WasmVersion = 0x1;
 // Wasm linking metadata version
 const uint32_t WasmMetadataVersion = 0x2;
-// Wasm uses a 64k page size by default (but the custom-page-sizes proposal allows changing it)
+// Wasm uses a 64k page size by default (but the custom-page-sizes proposal
+// allows changing it)
 const uint32_t WasmDefaultPageSize = 65536;
 
 enum : unsigned {
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp
index ffee1ed8e5..5412fb9b7a 100644
--- a/llvm/lib/MC/WasmObjectWriter.cpp
+++ b/llvm/lib/MC/WasmObjectWriter.cpp
@@ -845,7 +845,8 @@ void WasmObjectWriter::writeImportSection(ArrayRef<wasm::WasmImport> Imports,
   if (Imports.empty())
     return;
 
-  uint64_t NumPages = (DataSize + wasm::WasmDefaultPageSize - 1) / wasm::WasmDefaultPageSize;
+  uint64_t NumPages =
+      (DataSize + wasm::WasmDefaultPageSize - 1) / wasm::WasmDefaultPageSize;
 
   SectionBookkeeping Section;
   startSection(Section, wasm::WASM_SEC_IMPORT);
diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
index 2e8fe18502..7f35121330 100644
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
@@ -204,7 +204,7 @@ struct WebAssemblyOperand : public MCParsedAsmOperand {
 
 // Perhaps this should go somewhere common.
 static wasm::WasmLimits defaultLimits() {
-    return {wasm::WASM_LIMITS_FLAG_NONE, 0, 0, 0};
+  return {wasm::WASM_LIMITS_FLAG_NONE, 0, 0, 0};
 }
 
 static MCSymbolWasm *getOrCreateFunctionTableSymbol(MCContext &Ctx,

``````````

</details>


https://github.com/llvm/llvm-project/pull/128942