[PATCH] D156236: [RISCV] Make mapping symbols SF_FormatSpecific

[Job Noorman via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG76f023bddfc2: [RISCV] Make mapping symbols SF_FormatSpecific (authored by jobnoorman).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D156236/new/

https://reviews.llvm.org/D156236

Files:
  llvm/include/llvm/Object/ELFObjectFile.h
  llvm/test/DebugInfo/Symbolize/ELF/riscv-mapping-symbol.s


Index: llvm/test/DebugInfo/Symbolize/ELF/riscv-mapping-symbol.s
===================================================================
--- /dev/null
+++ llvm/test/DebugInfo/Symbolize/ELF/riscv-mapping-symbol.s
@@ -0,0 +1,21 @@
+# REQUIRES: riscv-registered-target
+## Ignore RISC-V mapping symbols (with a prefix of $d or $x).
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t
+# RUN: llvm-symbolizer --obj=%t 0 4 0xc | FileCheck %s
+
+# CHECK:      foo
+# CHECK-NEXT: ??:0:0
+# CHECK-EMPTY:
+# CHECK:      foo
+# CHECK-NEXT: ??:0:0
+# CHECK-EMPTY:
+# CHECK:      foo
+# CHECK-NEXT: ??:0:0
+
+    .global foo
+foo:
+    .word 32
+    nop
+    nop
+    .word 42
Index: llvm/include/llvm/Object/ELFObjectFile.h
===================================================================
--- llvm/include/llvm/Object/ELFObjectFile.h
+++ llvm/include/llvm/Object/ELFObjectFile.h
@@ -772,8 +772,10 @@
     }
   } else if (EF.getHeader().e_machine == ELF::EM_RISCV) {
     if (Expected<StringRef> NameOrErr = getSymbolName(Sym)) {
-      // Mark empty name symbols used for label differences.
-      if (NameOrErr->empty())
+      StringRef Name = *NameOrErr;
+      // Mark empty name symbols (used for label differences) and mapping
+      // symbols.
+      if (Name.empty() || Name.startswith("$d") || Name.startswith("$x"))
         Result |= SymbolRef::SF_FormatSpecific;
     } else {
       // TODO: Actually report errors helpfully.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D156236.545052.patch
Type: text/x-patch
Size: 1432 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230728/7790c738/attachment.bin>