[PATCH] D143039: [AArch64] Unconditionally use DW_EH_PE_indirect|DW_EH_PE_pcrel personality/lsda/ttype encodings

[Fangrui Song via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGca65969c3ea0: [AArch64] Unconditionally use DW_EH_PE_indirect|DW_EH_PE_pcrel… (authored by MaskRay).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D143039

Files:
  llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
  llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
  llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
  llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll


Index: llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
===================================================================
--- llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
+++ llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
@@ -138,8 +138,8 @@
 ; CHECK-LABEL: test4:
 ; CHECK:       .Lfunc_begin0:
 ; CHECK-NEXT:    .cfi_startproc
-; CHECK-NEXT:    .cfi_personality 0, __FrameHandler
-; CHECK-NEXT:    .cfi_lsda 0, .Lexception0
+; CHECK-NEXT:    .cfi_personality 156, DW.ref.__FrameHandler
+; CHECK-NEXT:    .cfi_lsda 28, .Lexception0
 ; CHECK-NEXT:  // %bb.0: // %entry
 ; CHECK-NEXT:    stp x30, x21, [sp, #-32]! // 16-byte Folded Spill
 ; CHECK-NEXT:    .cfi_def_cfa_offset 32
Index: llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
===================================================================
--- llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
+++ llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
@@ -17,7 +17,7 @@
 
 ; CHECK: Contents of section .eh_frame:
 ; CHECK: 0000 1c000000 00000000 017a504c 5200017c  .........zPLR..|
-; CHECK: 0010 1e0b0000 00000000 00000000 1b0c1f00  ................
+; CHECK: 0010 1e0b9c00 00000000 0000001c 1b0c1f00 ................
 
 ; Don't really care about the rest:
 
Index: llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
===================================================================
--- llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
+++ llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
@@ -1,3 +1,4 @@
+; RUN: llc -mtriple=aarch64-none-linux-gnu -relocation-model=static -simplifycfg-require-and-preserve-domtree=1 -o - %s | FileCheck %s
 ; RUN: llc -mtriple=aarch64-none-linux-gnu -relocation-model=pic -simplifycfg-require-and-preserve-domtree=1 -o - %s | FileCheck %s
 ; RUN: llc -mtriple=aarch64_be-none-linux-gnu -relocation-model=pic -simplifycfg-require-and-preserve-domtree=1 -o - %s | FileCheck %s
 
Index: llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
===================================================================
--- llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
+++ llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
@@ -71,5 +71,6 @@
 ; CHECK-LABEL: Contents of section .eh_frame:
 ; CHECK-NEXT: {{^ 0000}}
 ; CHECK-NEXT: {{^ 0010}}
-; CHECK-NEXT: 0000 0000001c
+; CHECK-NEXT: 0020 0000000c 00440e10 9e040000 0000001c .....D..........
+; CHECK-NEXT: 0030 00000000 017a504c 5200017c 1e0b9c00 .....zPLR..|....
 
Index: llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
===================================================================
--- llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -182,26 +182,14 @@
     // The small model guarantees static code/data size < 4GB, but not where it
     // will be in memory. Most of these could end up >2GB away so even a signed
     // pc-relative 32-bit address is insufficient, theoretically.
-    if (isPositionIndependent()) {
-      // ILP32 uses sdata4 instead of sdata8
-      if (TgtM.getTargetTriple().getEnvironment() == Triple::GNUILP32) {
-        PersonalityEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
-                              dwarf::DW_EH_PE_sdata4;
-        LSDAEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
-        TTypeEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
-                        dwarf::DW_EH_PE_sdata4;
-      } else {
-        PersonalityEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
-                              dwarf::DW_EH_PE_sdata8;
-        LSDAEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata8;
-        TTypeEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel |
-                        dwarf::DW_EH_PE_sdata8;
-      }
-    } else {
-      PersonalityEncoding = dwarf::DW_EH_PE_absptr;
-      LSDAEncoding = dwarf::DW_EH_PE_absptr;
-      TTypeEncoding = dwarf::DW_EH_PE_absptr;
-    }
+    //
+    // Use DW_EH_PE_indirect even for -fno-pic to avoid copy relocations.
+    LSDAEncoding = dwarf::DW_EH_PE_pcrel |
+                   (TgtM.getTargetTriple().getEnvironment() == Triple::GNUILP32
+                        ? dwarf::DW_EH_PE_sdata4
+                        : dwarf::DW_EH_PE_sdata8);
+    PersonalityEncoding = LSDAEncoding | dwarf::DW_EH_PE_indirect;
+    TTypeEncoding = LSDAEncoding | dwarf::DW_EH_PE_indirect;
     break;
   case Triple::lanai:
     LSDAEncoding = dwarf::DW_EH_PE_absptr;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D143039.494932.patch
Type: text/x-patch
Size: 4453 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230205/d60468a9/attachment.bin>