[PATCH] D158799: [llvm-nm][WebAssembly] Report the size of data symbols

[Sam Clegg via Phabricator via llvm-commits]

sbc100 created this revision.
Herald added subscribers: pmatos, asb, wingo, sunfish, hiraditya, jgravelle-google, dschuff.
Herald added a reviewer: jhenderson.
Herald added a project: All.
sbc100 requested review of this revision.
Herald added subscribers: llvm-commits, MaskRay, aheejin.
Herald added a project: LLVM.

Fixes: https://github.com/llvm/llvm-project/issues/58839


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D158799

Files:
  llvm/lib/Object/WasmObjectFile.cpp
  llvm/test/tools/llvm-nm/wasm/print-size.test
  llvm/tools/llvm-nm/llvm-nm.cpp


Index: llvm/tools/llvm-nm/llvm-nm.cpp
===================================================================
--- llvm/tools/llvm-nm/llvm-nm.cpp
+++ llvm/tools/llvm-nm/llvm-nm.cpp
@@ -1818,6 +1818,12 @@
               dyn_cast<const XCOFFObjectFile>(&Obj))
         S.Size = XCOFFObj->getSymbolSize(Sym.getRawDataRefImpl());
 
+      if (const WasmObjectFile *WasmObj = dyn_cast<WasmObjectFile>(&Obj)) {
+        const WasmSymbol& WasmSym = WasmObj->getWasmSymbol(Sym);
+        if (WasmSym.isTypeData())
+          S.Size = WasmSym.Info.DataRef.Size;
+      }
+
       if (PrintAddress && isa<ObjectFile>(Obj)) {
         SymbolRef SymRef(Sym);
         Expected<uint64_t> AddressOrErr = SymRef.getAddress();
Index: llvm/test/tools/llvm-nm/wasm/print-size.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-nm/wasm/print-size.test
@@ -0,0 +1,28 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: llvm-nm --print-size %t.o | FileCheck %s --strict-whitespace
+# RUN: llvm-nm -S %t.o | FileCheck %s --strict-whitespace
+
+--- !WASM
+FileHeader:
+  Version:         0x1
+Sections:
+  - Type:            DATA
+    Segments:
+      - SectionOffset:   6
+        InitFlags:       0
+        Offset:
+          Opcode:          I32_CONST
+          Value:           0
+        Content:         '00000000'
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+    SymbolTable:
+      - Index:           0
+        Kind:            DATA
+        Name:            a_symbol
+        Flags:           [  ]
+        Segment:         0
+        Size:            32
+
+# CHECK: 00000000 00000020 D a_symbol
Index: llvm/lib/Object/WasmObjectFile.cpp
===================================================================
--- llvm/lib/Object/WasmObjectFile.cpp
+++ llvm/lib/Object/WasmObjectFile.cpp
@@ -724,7 +724,7 @@
       if (IsDefined) {
         auto Index = readVaruint32(Ctx);
         if (Index >= DataSegments.size())
-          return make_error<GenericBinaryError>("invalid data symbol index",
+          return make_error<GenericBinaryError>("invalid data segment index",
                                                 object_error::parse_failed);
         auto Offset = readVaruint64(Ctx);
         auto Size = readVaruint64(Ctx);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D158799.553308.patch
Type: text/x-patch
Size: 2303 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230825/8542e1e2/attachment.bin>