[llvm] 5b2549b - Revert "[AArch64] Unconditionally use DW_EH_PE_indirect|DW_EH_PE_pcrel personality/lsda/ttype encodings"

[NAKAMURA Takumi via llvm-commits]

Author: NAKAMURA Takumi
Date: 2023-02-04T20:49:39+09:00
New Revision: 5b2549b0d2834a653be60b52885bdc9f21abc2ee

URL: https://github.com/llvm/llvm-project/commit/5b2549b0d2834a653be60b52885bdc9f21abc2ee
DIFF: https://github.com/llvm/llvm-project/commit/5b2549b0d2834a653be60b52885bdc9f21abc2ee.diff

LOG: Revert "[AArch64] Unconditionally use DW_EH_PE_indirect|DW_EH_PE_pcrel personality/lsda/ttype encodings"

It causes failurs in clang-interpreter.

This reverts commit 565a1fb1334b8cf510af1338cae3f50815a99f90, aka llvmorg-17-init-1048-g565a1fb1334b

Added: 
    

Modified: 
    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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index bdb328fcfdc2..39f7ee73ec20 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -182,14 +182,26 @@ void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,
     // 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.
-    //
-    // 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;
+    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;
+    }
     break;
   case Triple::lanai:
     LSDAEncoding = dwarf::DW_EH_PE_absptr;

diff  --git a/llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll b/llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
index 6c54cec24ac5..c6f955f05837 100644
--- a/llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
+++ b/llvm/test/CodeGen/AArch64/arm64-big-endian-eh.ll
@@ -71,6 +71,5 @@ declare void @_ZSt9terminatev()
 ; CHECK-LABEL: Contents of section .eh_frame:
 ; CHECK-NEXT: {{^ 0000}}
 ; CHECK-NEXT: {{^ 0010}}
-; CHECK-NEXT: 0020 0000000c 00440e10 9e040000 0000001c .....D..........
-; CHECK-NEXT: 0030 00000000 017a504c 5200017c 1e0b9c00 .....zPLR..|....
+; CHECK-NEXT: 0000 0000001c
 

diff  --git a/llvm/test/CodeGen/AArch64/pic-eh-stubs.ll b/llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
index bdb557e5cfe5..3d072bc892e9 100644
--- a/llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
+++ b/llvm/test/CodeGen/AArch64/pic-eh-stubs.ll
@@ -1,4 +1,3 @@
-; 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
 

diff  --git a/llvm/test/DebugInfo/AArch64/eh_frame_personality.ll b/llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
index 2ee65a845081..912ebf176e3c 100644
--- a/llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
+++ b/llvm/test/DebugInfo/AArch64/eh_frame_personality.ll
@@ -17,7 +17,7 @@ clean:
 
 ; CHECK: Contents of section .eh_frame:
 ; CHECK: 0000 1c000000 00000000 017a504c 5200017c  .........zPLR..|
-; CHECK: 0010 1e0b9c00 00000000 0000001c 1b0c1f00 ................
+; CHECK: 0010 1e0b0000 00000000 00000000 1b0c1f00  ................
 
 ; Don't really care about the rest:
 

diff  --git a/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll b/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
index 301bf66b7ccd..9d8ef90680d6 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
@@ -138,8 +138,8 @@ define void @test4(i32 %n) uwtable personality ptr @__FrameHandler {
 ; CHECK-LABEL: test4:
 ; CHECK:       .Lfunc_begin0:
 ; CHECK-NEXT:    .cfi_startproc
-; CHECK-NEXT:    .cfi_personality 156, DW.ref.__FrameHandler
-; CHECK-NEXT:    .cfi_lsda 28, .Lexception0
+; CHECK-NEXT:    .cfi_personality 0, __FrameHandler
+; CHECK-NEXT:    .cfi_lsda 0, .Lexception0
 ; CHECK-NEXT:  // %bb.0: // %entry
 ; CHECK-NEXT:    stp x30, x21, [sp, #-32]! // 16-byte Folded Spill
 ; CHECK-NEXT:    .cfi_def_cfa_offset 32