[lld] ac3096e - Revert "[lld-macho] Emit map file entry for compact unwind info"
Muhammad Omair Javaid via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 17 00:13:42 PST 2022
Author: Muhammad Omair Javaid
Date: 2022-11-17T12:13:13+04:00
New Revision: ac3096e1dd77a2687797d38976d5f8c93f7353e5
URL: https://github.com/llvm/llvm-project/commit/ac3096e1dd77a2687797d38976d5f8c93f7353e5
DIFF: https://github.com/llvm/llvm-project/commit/ac3096e1dd77a2687797d38976d5f8c93f7353e5.diff
LOG: Revert "[lld-macho] Emit map file entry for compact unwind info"
This reverts commit 7f0779967f0690482c2cef70fc49e1381d32af1e.
This patch series breaks lld:map-file.s on arm v7 linux buildbots.
e.g https://lab.llvm.org/buildbot/#/builders/178/builds/3190
Added:
Modified:
lld/MachO/MapFile.cpp
lld/test/MachO/map-file.s
Removed:
################################################################################
diff --git a/lld/MachO/MapFile.cpp b/lld/MachO/MapFile.cpp
index 8f195586ff1c..5d6c87baba9f 100644
--- a/lld/MachO/MapFile.cpp
+++ b/lld/MachO/MapFile.cpp
@@ -182,9 +182,6 @@ void macho::writeMapFile() {
info.fileIndex);
os.write_escaped(info.str) << "\n";
}
- } else if (osec == (void *)in.unwindInfo) {
- os << format("0x%08llX\t0x%08llX\t[ 0] compact unwind info\n",
- osec->addr, osec->getSize());
}
// TODO print other synthetic sections
}
diff --git a/lld/test/MachO/map-file.s b/lld/test/MachO/map-file.s
index 008bad23fd33..fe1ef88604e1 100644
--- a/lld/test/MachO/map-file.s
+++ b/lld/test/MachO/map-file.s
@@ -15,9 +15,7 @@
# CHECK-NEXT: Idx Name Size VMA Type
# CHECK-NEXT: 0 __text {{[0-9a-f]+}} [[#%x,TEXT:]] TEXT
# CHECK-NEXT: 1 __cstring {{[0-9a-f]+}} [[#%x,CSTR:]] DATA
-# CHECK-NEXT: 2 __unwind_info {{[0-9a-f]+}} [[#%x,UNWIND:]] DATA
-# CHECK-NEXT: 3 __eh_frame {{[0-9a-f]+}} [[#%x,EH_FRAME:]] DATA
-# CHECK-NEXT: 4 __common {{[0-9a-f]+}} [[#%x,BSS:]] BSS
+# CHECK-NEXT: 2 __common {{[0-9a-f]+}} [[#%x,BSS:]] BSS
# CHECK: SYMBOL TABLE:
# CHECK-DAG: [[#%x,MAIN:]] g F __TEXT,__text _main
@@ -36,12 +34,10 @@
# CHECK-NEXT: [ 3] {{.*}}{{/|\\}}map-file.s.tmp/c-string-literal.o
# CHECK-NEXT: # Sections:
-# CHECK-NEXT: # Address Size Segment Section
-# CHECK-NEXT: 0x[[#%X,TEXT]] 0x{{[0-9A-F]+}} __TEXT __text
-# CHECK-NEXT: 0x[[#%X,CSTR]] 0x{{[0-9A-F]+}} __TEXT __cstring
-# CHECK-NEXT: 0x[[#%X,UNWIND]] 0x{{[0-9A-F]+}} __TEXT __unwind_info
-# CHECK-NEXT: 0x[[#%X,EH_FRAME]] 0x{{[0-9A-F]+}} __TEXT __eh_frame
-# CHECK-NEXT: 0x[[#%X,BSS]] 0x{{[0-9A-F]+}} __DATA __common
+# CHECK-NEXT: # Address Size Segment Section
+# CHECK-NEXT: 0x[[#%X,TEXT]] 0x{{[0-9A-F]+}} __TEXT __text
+# CHECK-NEXT: 0x[[#%X,CSTR]] 0x{{[0-9A-F]+}} __TEXT __cstring
+# CHECK-NEXT: 0x[[#%X,BSS]] 0x{{[0-9A-F]+}} __DATA __common
# CHECK-NEXT: # Symbols:
# CHECK-NEXT: # Address Size File Name
@@ -52,7 +48,6 @@
# CHECK-DAG: 0x[[#%X,HIITSME]] 0x0000000F [ 3] literal string: Hello, it's me
# CHECK-DAG: 0x[[#%X,HIITSME + 0xf]] 0x0000000E [ 3] literal string: Hello world!\n
# CHECK-DAG: 0x[[#%X,NUMBER]] 0x00000001 [ 1] _number
-# CHECK-DAG: 0x[[#%X,UNWIND]] 0x0000103C [ 0] compact unwind info
# MAPFILE: "name":"Total Write map file"
@@ -94,10 +89,7 @@ __ZTIN3foo3bar4MethE:
.globl _main, _bar
_main:
-.cfi_startproc
-.cfi_def_cfa_offset 16
ret
-.cfi_endproc
_bar:
nop
More information about the llvm-commits
mailing list