[lld] 27ef749 - [ELF][test] Refactor some .eh_frame tests
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 28 15:55:51 PDT 2022
Author: Fangrui Song
Date: 2022-03-28T15:55:46-07:00
New Revision: 27ef7494b10c47977e35578254ba999c76e4dee9
URL: https://github.com/llvm/llvm-project/commit/27ef7494b10c47977e35578254ba999c76e4dee9
DIFF: https://github.com/llvm/llvm-project/commit/27ef7494b10c47977e35578254ba999c76e4dee9.diff
LOG: [ELF][test] Refactor some .eh_frame tests
* Improve eh-frame-merge.s
* Delete invalid .eh_frame+5 test in ehframe-relocation.s
Added:
Modified:
lld/test/ELF/eh-frame-begin-end.s
lld/test/ELF/eh-frame-merge.s
lld/test/ELF/ehframe-relocation.s
Removed:
################################################################################
diff --git a/lld/test/ELF/eh-frame-begin-end.s b/lld/test/ELF/eh-frame-begin-end.s
index 46816054f2dc8..41df111c3b074 100644
--- a/lld/test/ELF/eh-frame-begin-end.s
+++ b/lld/test/ELF/eh-frame-begin-end.s
@@ -10,7 +10,7 @@
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x200120
+// CHECK-NEXT: Address:
// CHECK-NEXT: Offset: 0x120
// CHECK-NEXT: Size: 4
diff --git a/lld/test/ELF/eh-frame-merge.s b/lld/test/ELF/eh-frame-merge.s
index b60a5816f20ce..44aedb7c0204e 100644
--- a/lld/test/ELF/eh-frame-merge.s
+++ b/lld/test/ELF/eh-frame-merge.s
@@ -1,12 +1,39 @@
-// REQUIRES: x86
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld --hash-style=sysv %t.o %t.o -o %t -shared
-// RUN: llvm-readobj -S --section-data %t | FileCheck %s
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld %t.o %t.o -shared --emit-relocs -o %t.so
+# RUN: llvm-readelf -S -r %t.so | FileCheck %s --check-prefixes=CHECK,RELOC
+# RUN: llvm-dwarfdump --eh-frame %t.so | FileCheck %s --check-prefix=EH
-/// Also show that the merging happens when going via a -r link.
-// RUN: ld.lld -r %t.o %t.o -o %t.r.o
-// RUN: ld.lld --hash-style=sysv %t.r.o -o %t2 -shared
-// RUN: llvm-readobj -S --section-data %t2 | FileCheck %s
+## Also show that the merging happens when going via a -r link.
+# RUN: ld.lld -r %t.o %t.o -o %t.ro
+# RUN: ld.lld %t.ro -o %t2.so -shared
+# RUN: llvm-readelf -S -r %t2.so | FileCheck %s
+
+# CHECK: Name Type Address Off Size ES Flg Lk Inf Al
+# CHECK: .eh_frame PROGBITS [[#%x,]] [[#%x,]] 000064 00 A 0 0 8
+# CHECK: foo PROGBITS {{0*}}[[#%x,FOO:]] [[#%x,]] 000002 00 AX 0 0 1
+# CHECK-NEXT: bar PROGBITS {{0*}}[[#%x,FOO+2]] [[#%x,]] 000002 00 AX 0 0 1
+
+# RELOC: Offset Info Type Symbol's Value Symbol's Name + Addend
+# RELOC-NEXT: {{0*}}[[#%x,OFF:]] [[#%x,]] R_X86_64_PC32 [[#%x,]] foo + 0
+# RELOC-NEXT: {{0*}}[[#%x,OFF+20]] [[#%x,]] R_X86_64_PC32 [[#%x,]] bar + 0
+# RELOC-NEXT: {{0*}}[[#OFF]] [[#%x,]] R_X86_64_PC32 [[#%x,]] foo + 1
+# RELOC-NEXT: {{0*}}[[#OFF+20]] [[#%x,]] R_X86_64_NONE 0{{$}}
+
+# EH: Format: DWARF32
+# EH: 00000018 00000014 0000001c FDE cie=00000000 pc={{0*}}[[#%x,FOO:]]...
+# EH-SAME: {{0*}}[[#%x,FOO+1]]
+# EH-COUNT-7: DW_CFA_nop:
+# EH-EMPTY:
+# EH: 00000030 00000014 00000034 FDE cie=00000000 pc={{0*}}[[#%x,FOO+2]]...{{0*}}[[#%x,FOO+4]]
+# EH-COUNT-7: DW_CFA_nop:
+# EH-EMPTY:
+# EH: 00000048 00000014 0000004c FDE cie=00000000 pc={{0*}}[[#%x,FOO+1]]...{{0*}}[[#%x,FOO+2]]
+# EH-COUNT-7: DW_CFA_nop:
+# EH-EMPTY:
+# EH-NEXT: 0x[[#%x,]]: CFA=RSP+8: RIP=[CFA-8]
+# EH-EMPTY:
+# EH-NEXT: 00000060 ZERO terminator
.section foo,"ax", at progbits
.cfi_startproc
@@ -18,47 +45,3 @@
nop
nop
.cfi_endproc
-
-// FIXME: We could really use a .eh_frame parser.
-// The intention is to show that:
-// * There is only one copy of the CIE
-// * There are two copies of the first FDE
-// * There is only one copy of the second FDE
-
-// CHECK: Name: .eh_frame
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT: SHF_ALLOC
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address:
-// CHECK-NEXT: Offset:
-// CHECK-NEXT: Size: 100
-// CHECK-NEXT: Link: 0
-// CHECK-NEXT: Info: 0
-// CHECK-NEXT: AddressAlignment: 8
-// CHECK-NEXT: EntrySize: 0
-// CHECK-NEXT: SectionData (
-// CHECK-NEXT: 0000: 14000000 00000000 017A5200 01781001 |
-// CHECK-NEXT: 0010: 1B0C0708 90010000 14000000 1C000000 |
-// CHECK-NEXT: 0020: 44100000 01000000 00000000 00000000 |
-// CHECK-NEXT: 0030: 14000000 34000000 2E100000 02000000 |
-// CHECK-NEXT: 0040: 00000000 00000000 14000000 4C000000 |
-// CHECK-NEXT: 0050: 15100000 01000000 00000000 00000000 |
-// CHECK-NEXT: 0060: 00000000
-// CHECK-NEXT: )
-
-// CHECK: Name: foo
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT: SHF_ALLOC
-// CHECK-NEXT: SHF_EXECINSTR
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x125C
-
-// CHECK: Name: bar
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT: SHF_ALLOC
-// CHECK-NEXT: SHF_EXECINSTR
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x125E
diff --git a/lld/test/ELF/ehframe-relocation.s b/lld/test/ELF/ehframe-relocation.s
index 32353c563356c..040fbbb8de0c3 100644
--- a/lld/test/ELF/ehframe-relocation.s
+++ b/lld/test/ELF/ehframe-relocation.s
@@ -16,12 +16,10 @@
// CHECK-NOT: .eh_frame
// 0x200120 = 2097440
-// 0x200120 + 5 = 2097445
// DISASM: Disassembly of section .text:
// DISASM-EMPTY:
// DISASM-NEXT: <_start>:
// DISASM-NEXT: 201154: {{.*}} movq 2097440, %rax
-// DISASM-NEXT: 20115c: {{.*}} movq 2097445, %rax
.section .eh_frame,"a", at unwind
@@ -29,4 +27,3 @@
.globl _start
_start:
movq .eh_frame, %rax
- movq .eh_frame + 5, %rax
More information about the llvm-commits
mailing list