[CHERI] Reuse the $local function symbol for landing pads

There is no need to define our own non-preemptible local symbol since
upstream now has the $local non-preemptible symbol. Since the latest
merge it also includes my upstreamed fixes to always have the right type
and size attributes, so it is safe to use here.

Author: arichardson

lld/test/ELF/cheri/exception-table.cpp

@@ -4,20 +4,20 @@
 // RUN: llvm-readobj -r %t-riscv64.o | FileCheck %s --check-prefix=RV64-OBJ-RELOCS
 /// Should have two relocations against a local alias for _Z4testll
 // MIPS-OBJ-RELOCS:      Section ({{.+}}) .rela.gcc_except_table {
-// MIPS-OBJ-RELOCS-NEXT:   R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE .L_Z4testll$eh_alias
-// MIPS-OBJ-RELOCS-NEXT:   R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE .L_Z4testll$eh_alias
+// MIPS-OBJ-RELOCS-NEXT:   R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE .L_Z4testll$local
+// MIPS-OBJ-RELOCS-NEXT:   R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE .L_Z4testll$local
 // MIPS-OBJ-RELOCS-NEXT: }
 // RV64-OBJ-RELOCS:      Section ({{.+}}) .rela.gcc_except_table {
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
-// RV64-OBJ-RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY .L_Z4testll$eh_alias
+// RV64-OBJ-RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY .L_Z4testll$local
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
-// RV64-OBJ-RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY .L_Z4testll$eh_alias
+// RV64-OBJ-RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY .L_Z4testll$local
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 // RV64-OBJ-RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
@@ -73,16 +73,16 @@
 
 /// Local relocations for exception handling:
 // MIPS-RELOCS-NEXT: CHERI __cap_relocs [
-// MIPS-RELOCS-NEXT:   0x02{{.+}} Base: 0x1{{.+}} (.L_Z4testll$eh_alias+132) Length: 164 Perms: Function
-// MIPS-RELOCS-NEXT:   0x02{{.+}} Base: 0x1{{.+}} (.L_Z4testll$eh_alias+100) Length: 164 Perms: Function
+// MIPS-RELOCS-NEXT:   0x02{{.+}} Base: 0x1{{.+}} (.L_Z4testll$local+132) Length: 164 Perms: Function
+// MIPS-RELOCS-NEXT:   0x02{{.+}} Base: 0x1{{.+}} (.L_Z4testll$local+100) Length: 164 Perms: Function
 // MIPS-RELOCS-NEXT: ]
 
 /// Should also emit __cap_relocs for RISC-V:
 // RUN: ld.lld -shared %t-riscv64.o -o %t.so
 // RUN: llvm-readelf -r --cap-relocs %t.so | FileCheck %s --check-prefixes=RV64-RELOCS
 // RV64-RELOCS: CHERI __cap_relocs [
-// RV64-RELOCS-NEXT:   0x002{{.+}} Base: 0x1{{.+}} (.L_Z4testll$eh_alias+96) Length: 120 Perms: Function
-// RV64-RELOCS-NEXT:   0x002{{.+}} Base: 0x1{{.+}} (.L_Z4testll$eh_alias+72) Length: 120 Perms: Function
+// RV64-RELOCS-NEXT:   0x002{{.+}} Base: 0x1{{.+}} (.L_Z4testll$local+96) Length: 120 Perms: Function
+// RV64-RELOCS-NEXT:   0x002{{.+}} Base: 0x1{{.+}} (.L_Z4testll$local+72) Length: 120 Perms: Function
 // RV64-RELOCS-NEXT: ]
 
 long external_fn(long arg);

llvm/include/llvm/CodeGen/AsmPrinter.h

@@ -199,11 +199,8 @@ class AsmPrinter : public MachineFunctionPass {
 protected:
   MCSymbol *CurrentFnBegin = nullptr;
 
-  /// The symbol used to represent the start of the current function for the
-  /// purpose of exception handling for pure-capability CHERI targets.
-  MCSymbol *CurrentFnBeginForEH = nullptr;
-  
   /// For dso_local functions, the current $local alias for the function.
+  /// Also used for exception handling for pure-capability CHERI targets.
   MCSymbol *CurrentFnBeginLocal = nullptr;
 
   /// A vector of all debug/EH info emitters we should use. This vector
@@ -329,7 +326,10 @@ class AsmPrinter : public MachineFunctionPass {
   /// Similar to getSymbol() but preferred for references. On ELF, this uses a
   /// local symbol if a reference to GV is guaranteed to be resolved to the
   /// definition in the same module.
-  MCSymbol *getSymbolPreferLocal(const GlobalValue &GV) const;
+  /// If \p Force is set to true, return a local alias if possible even if the
+  /// normal heuristics say it is not beneficial.
+  MCSymbol *getSymbolPreferLocal(const GlobalValue &GV,
+                                 bool Force = false) const;
 
   bool doesDwarfUseRelocationsAcrossSections() const {
     return DwarfUsesRelocationsAcrossSections;

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -646,7 +646,8 @@ MCSymbol *AsmPrinter::getSymbol(const GlobalValue *GV) const {
   return TM.getSymbol(GV);
 }
 
-MCSymbol *AsmPrinter::getSymbolPreferLocal(const GlobalValue &GV) const {
+MCSymbol *AsmPrinter::getSymbolPreferLocal(const GlobalValue &GV,
+                                           bool Force) const {
   // On ELF, use .Lfoo$local if GV is a non-interposable GlobalObject with an
   // exact definion (intersection of GlobalValue::hasExactDefinition() and
   // !isInterposable()). These linkages include: external, appending, internal,
@@ -656,8 +657,8 @@ MCSymbol *AsmPrinter::getSymbolPreferLocal(const GlobalValue &GV) const {
   // assumed it.
   if (TM.getTargetTriple().isOSBinFormatELF() && GV.canBenefitFromLocalAlias()) {
     const Module &M = *GV.getParent();
-    if (TM.getRelocationModel() != Reloc::Static &&
-        M.getPIELevel() == PIELevel::Default && GV.isDSOLocal())
+    if (Force || (TM.getRelocationModel() != Reloc::Static &&
+                  M.getPIELevel() == PIELevel::Default && GV.isDSOLocal()))
       return getSymbolWithGlobalValueBase(&GV, "$local");
   }
   return TM.getSymbol(&GV);
@@ -1008,22 +1009,9 @@ void AsmPrinter::emitFunctionHeader() {
     if (MAI->useAssignmentForEHBegin()) {
       MCSymbol *CurPos = OutContext.createTempSymbol();
       OutStreamer->emitLabel(CurPos);
-      if (CurrentFnBeginForEH) {
-        OutStreamer->emitAssignment(
-            CurrentFnBeginForEH, MCSymbolRefExpr::create(CurPos, OutContext));
-        if (MAI->hasDotTypeDotSizeDirective())
-          OutStreamer->emitSymbolAttribute(CurrentFnBeginForEH,
-                                           MCSA_ELF_TypeFunction);
-      }
       OutStreamer->emitAssignment(CurrentFnBegin,
                                  MCSymbolRefExpr::create(CurPos, OutContext));
     } else {
-      if (CurrentFnBeginForEH) {
-        OutStreamer->emitLabel(CurrentFnBeginForEH);
-        if (MAI->hasDotTypeDotSizeDirective())
-          OutStreamer->emitSymbolAttribute(CurrentFnBeginForEH,
-                                           MCSA_ELF_TypeFunction);
-      }
       OutStreamer->emitLabel(CurrentFnBegin);
     }
   }
@@ -1063,6 +1051,8 @@ void AsmPrinter::emitFunctionHeader() {
   }
 }
 
+static bool needFuncLabelsForEH(const MachineFunction &MF);
+
 /// EmitFunctionEntryLabel - Emit the label that is the entrypoint for the
 /// function.  This can be overridden by targets as required to do custom stuff.
 void AsmPrinter::emitFunctionEntryLabel() {
@@ -1077,7 +1067,10 @@ void AsmPrinter::emitFunctionEntryLabel() {
   OutStreamer->emitLabel(CurrentFnSym);
 
   if (TM.getTargetTriple().isOSBinFormatELF()) {
-    MCSymbol *Sym = getSymbolPreferLocal(MF->getFunction());
+    // For CHERI purecap exception handling, we always have to use a local
+    // alias even if the function is not dso_local.
+    bool ForceLocal = MAI->isCheriPurecapABI() && needFuncLabelsForEH(*MF);
+    MCSymbol *Sym = getSymbolPreferLocal(MF->getFunction(), ForceLocal);
     if (Sym != CurrentFnSym) {
       cast<MCSymbolELF>(Sym)->setType(ELF::STT_FUNC);
       CurrentFnBeginLocal = Sym;
@@ -1850,8 +1843,6 @@ void AsmPrinter::emitFunctionBody() {
         MCSymbolRefExpr::create(CurrentFnEnd, OutContext),
         MCSymbolRefExpr::create(CurrentFnSymForSize, OutContext), OutContext);
     OutStreamer->emitELFSize(CurrentFnSym, SizeExp);
-    if (CurrentFnBeginForEH)
-      OutStreamer->emitELFSize(CurrentFnBeginForEH, SizeExp);
     if (CurrentFnBeginLocal)
       OutStreamer->emitELFSize(CurrentFnBeginLocal, SizeExp);
   }
@@ -2430,7 +2421,6 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
 
   CurrentFnSymForSize = CurrentFnSym;
   CurrentFnBegin = nullptr;
-  CurrentFnBeginForEH = nullptr;
   CurrentFnBeginLocal = nullptr;
   CurrentSectionBeginSym = nullptr;
   MBBSectionRanges.clear();
@@ -2444,14 +2434,6 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
     CurrentFnBegin = createTempSymbol("func_begin");
     if (NeedsLocalForSize)
       CurrentFnSymForSize = CurrentFnBegin;
-    // In the pure-capability ABI we have to create dynamic relocations for the
-    // landing pads. To avoid creating an (unnecessary and incorrect) dynamic
-    // relocation with a non-zero addend, we need to ensure that the target
-    // symbol is non-preemptible by creating a local alias for the function.
-    // See https://github.com/CTSRD-CHERI/llvm-project/issues/512.
-    // TODO: could probably omit this for !F.isInterposable()?
-    if (MAI->isCheriPurecapABI() && needFuncLabelsForEH(MF))
-      CurrentFnBeginForEH = getSymbolWithGlobalValueBase(&F, "$eh_alias");
   }
 
   ORE = &getAnalysis<MachineOptimizationRemarkEmitterPass>().getORE();

llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp

@@ -236,8 +236,8 @@ void AsmPrinter::emitCallSiteCheriCapability(const MCSymbol *Hi,
   // this would result in EmitCheriCapability() creating a relocation against
   // section plus offset rather than function + offset. We need the right
   // bounds and permissions info and need to use a non-preemptible alias.
-  assert(CurrentFnBeginForEH && "Missing local function entry alias for EH!");
-  OutStreamer->EmitCheriCapability(CurrentFnBeginForEH, DiffToStart,
+  assert(CurrentFnBeginLocal && "Missing local function entry alias for EH!");
+  OutStreamer->EmitCheriCapability(CurrentFnBeginLocal, DiffToStart,
                                    TLOF.getCheriCapabilitySize(TM));
 }
 

llvm/lib/Target/Mips/MipsAsmPrinter.cpp

@@ -428,7 +428,7 @@ void MipsAsmPrinter::emitFunctionEntryLabel() {
     TS.emitDirectiveSetNoMips16();
 
   TS.emitDirectiveEnt(*CurrentFnSym);
-  OutStreamer->emitLabel(CurrentFnSym);
+  AsmPrinter::emitFunctionEntryLabel();
 }
 
 /// EmitFunctionBodyStart - Targets can override this to emit stuff before

llvm/test/CodeGen/CHERI-Generic/Inputs/landingpad-non-preemptible.ll

@@ -1,5 +1,5 @@
-; RUN: llc @PURECAP_HARDFLOAT_ARGS@ < %s -o - | FileCheck %s
-; RUN: llc @PURECAP_HARDFLOAT_ARGS@ < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
+; RUN: llc @PURECAP_HARDFLOAT_ARGS@ --relocation-model=pic < %s -o - | FileCheck %s
+; RUN: llc @PURECAP_HARDFLOAT_ARGS@ --relocation-model=pic < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
 ; Capabilities for exception landing pads were using preemptible relocations such as
 ; .chericap foo + .Ltmp - .Lfunc_begin instead of using a local alias.
 ; https://github.com/CTSRD-CHERI/llvm-project/issues/512
@@ -58,7 +58,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; UTC_ARGS: --disable
 ; CHECK: .Lfunc_end0:
 ; CHECK-NEXT: .size _Z8do_catchv, .Lfunc_end0-_Z8do_catchv
-; CHECK-NEXT: .size .L_Z8do_catchv$eh_alias, .Lfunc_end0-_Z8do_catchv
+; CHECK-NEXT: .size .L_Z8do_catchv$local, .Lfunc_end0-_Z8do_catchv
 
 ; CHECK:      GCC_except_table0:
 ; CHECK-NEXT: .Lexception0:
@@ -76,7 +76,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; Note: RISC-V uses DW_EH_PE_udata4, so the 0xc marker uses 4 bytes instead of 1
 ; CHECK-NEXT:  [[SMALL_CS_DIRECTIVE:(\.byte)|(\.word)]] 12     # (landing pad is a capability)
 ; Note: the following line should not be using _Z8do_catchv, but a local alias
-; CHECK-NEXT:  .chericap  .L_Z8do_catchv$eh_alias + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
+; CHECK-NEXT:  .chericap  .L_Z8do_catchv$local + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
 ; CHECK-NEXT:  .byte 3                               #   On action: 2
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Ltmp1-.Lfunc_begin0           # >> Call Site 2 <<
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Lfunc_end0-.Ltmp1             #   Call between .Ltmp1 and .Lfunc_end0
@@ -103,13 +103,13 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 
 ; RELOCS-LABEL: Relocations [
 ; RELOCS-LABEL:  Section ({{.+}}) .rela.gcc_except_table {
-@IF-MIPS@; RELOCS-NEXT:    R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE  .L_Z8do_catchv$eh_alias 0x4C
+@IF-MIPS@; RELOCS-NEXT:    R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE  .L_Z8do_catchv$local 0x4C
 @IF-MIPS@; RELOCS-NEXT:    R_MIPS_PC32/R_MIPS_NONE/R_MIPS_NONE .L_ZTIi.DW.stub 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
-@IF-RISCV@; RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY  .L_Z8do_catchv$eh_alias 0x34
+@IF-RISCV@; RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY  .L_Z8do_catchv$local 0x34
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 @IF-RISCV@; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
@@ -119,7 +119,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 
 ; The local alias should have the same type and non-zero size as the real function:
 ; RELOCS:       Symbol {
-; RELOCS-LABEL:   Name:  .L_Z8do_catchv$eh_alias (
+; RELOCS-LABEL:   Name:  .L_Z8do_catchv$local (
 ; RELOCS-NEXT:    Value: 0x0
 ; RELOCS-NEXT:    Size: [[FN_SIZE:[1-9][0-9]*]]
 ; RELOCS-NEXT:    Binding: Local (0x0)

llvm/test/CodeGen/CHERI-Generic/MIPS/landingpad-non-preemptible.ll

@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
 ; DO NOT EDIT -- This file was generated from test/CodeGen/CHERI-Generic/Inputs/landingpad-non-preemptible.ll
-; RUN: llc -mtriple=mips64 -mcpu=cheri128 -mattr=+cheri128 --relocation-model=pic -target-abi purecap < %s -o - | FileCheck %s
-; RUN: llc -mtriple=mips64 -mcpu=cheri128 -mattr=+cheri128 --relocation-model=pic -target-abi purecap < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
+; RUN: llc -mtriple=mips64 -mcpu=cheri128 -mattr=+cheri128 --relocation-model=pic -target-abi purecap --relocation-model=pic < %s -o - | FileCheck %s
+; RUN: llc -mtriple=mips64 -mcpu=cheri128 -mattr=+cheri128 --relocation-model=pic -target-abi purecap --relocation-model=pic < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
 ; Capabilities for exception landing pads were using preemptible relocations such as
 ; .chericap foo + .Ltmp - .Lfunc_begin instead of using a local alias.
 ; https://github.com/CTSRD-CHERI/llvm-project/issues/512
@@ -111,7 +111,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; UTC_ARGS: --disable
 ; CHECK: .Lfunc_end0:
 ; CHECK-NEXT: .size _Z8do_catchv, .Lfunc_end0-_Z8do_catchv
-; CHECK-NEXT: .size .L_Z8do_catchv$eh_alias, .Lfunc_end0-_Z8do_catchv
+; CHECK-NEXT: .size .L_Z8do_catchv$local, .Lfunc_end0-_Z8do_catchv
 
 ; CHECK:      GCC_except_table0:
 ; CHECK-NEXT: .Lexception0:
@@ -128,7 +128,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; Note: RISC-V uses DW_EH_PE_udata4, so the 0xc marker uses 4 bytes instead of 1
 ; CHECK-NEXT:  [[SMALL_CS_DIRECTIVE:(\.byte)|(\.word)]] 12     # (landing pad is a capability)
 ; Note: the following line should not be using _Z8do_catchv, but a local alias
-; CHECK-NEXT:  .chericap  .L_Z8do_catchv$eh_alias + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
+; CHECK-NEXT:  .chericap  .L_Z8do_catchv$local + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
 ; CHECK-NEXT:  .byte 3                               #   On action: 2
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Ltmp1-.Lfunc_begin0           # >> Call Site 2 <<
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Lfunc_end0-.Ltmp1             #   Call between .Ltmp1 and .Lfunc_end0
@@ -155,13 +155,13 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 
 ; RELOCS-LABEL: Relocations [
 ; RELOCS-LABEL:  Section ({{.+}}) .rela.gcc_except_table {
-; RELOCS-NEXT:    R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE  .L_Z8do_catchv$eh_alias 0x4C
+; RELOCS-NEXT:    R_MIPS_CHERI_CAPABILITY/R_MIPS_NONE/R_MIPS_NONE  .L_Z8do_catchv$local 0x4C
 ; RELOCS-NEXT:    R_MIPS_PC32/R_MIPS_NONE/R_MIPS_NONE .L_ZTIi.DW.stub 0x0
 ; RELOCS-NEXT:  }
 
 ; The local alias should have the same type and non-zero size as the real function:
 ; RELOCS:       Symbol {
-; RELOCS-LABEL:   Name:  .L_Z8do_catchv$eh_alias (
+; RELOCS-LABEL:   Name:  .L_Z8do_catchv$local (
 ; RELOCS-NEXT:    Value: 0x0
 ; RELOCS-NEXT:    Size: [[FN_SIZE:[1-9][0-9]*]]
 ; RELOCS-NEXT:    Binding: Local (0x0)

llvm/test/CodeGen/CHERI-Generic/RISCV32/landingpad-non-preemptible.ll

@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
 ; DO NOT EDIT -- This file was generated from test/CodeGen/CHERI-Generic/Inputs/landingpad-non-preemptible.ll
-; RUN: llc -mtriple=riscv32 --relocation-model=pic -target-abi il32pc64f -mattr=+xcheri,+cap-mode,+f < %s -o - | FileCheck %s
-; RUN: llc -mtriple=riscv32 --relocation-model=pic -target-abi il32pc64f -mattr=+xcheri,+cap-mode,+f < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
+; RUN: llc -mtriple=riscv32 --relocation-model=pic -target-abi il32pc64f -mattr=+xcheri,+cap-mode,+f --relocation-model=pic < %s -o - | FileCheck %s
+; RUN: llc -mtriple=riscv32 --relocation-model=pic -target-abi il32pc64f -mattr=+xcheri,+cap-mode,+f --relocation-model=pic < %s -o - -filetype=obj | llvm-readobj --relocs --symbols - | FileCheck %s --check-prefix=RELOCS
 ; Capabilities for exception landing pads were using preemptible relocations such as
 ; .chericap foo + .Ltmp - .Lfunc_begin instead of using a local alias.
 ; https://github.com/CTSRD-CHERI/llvm-project/issues/512
@@ -95,7 +95,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; UTC_ARGS: --disable
 ; CHECK: .Lfunc_end0:
 ; CHECK-NEXT: .size _Z8do_catchv, .Lfunc_end0-_Z8do_catchv
-; CHECK-NEXT: .size .L_Z8do_catchv$eh_alias, .Lfunc_end0-_Z8do_catchv
+; CHECK-NEXT: .size .L_Z8do_catchv$local, .Lfunc_end0-_Z8do_catchv
 
 ; CHECK:      GCC_except_table0:
 ; CHECK-NEXT: .Lexception0:
@@ -112,7 +112,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; Note: RISC-V uses DW_EH_PE_udata4, so the 0xc marker uses 4 bytes instead of 1
 ; CHECK-NEXT:  [[SMALL_CS_DIRECTIVE:(\.byte)|(\.word)]] 12     # (landing pad is a capability)
 ; Note: the following line should not be using _Z8do_catchv, but a local alias
-; CHECK-NEXT:  .chericap  .L_Z8do_catchv$eh_alias + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
+; CHECK-NEXT:  .chericap  .L_Z8do_catchv$local + .Ltmp2-.Lfunc_begin0   #     jumps to .Ltmp2
 ; CHECK-NEXT:  .byte 3                               #   On action: 2
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Ltmp1-.Lfunc_begin0           # >> Call Site 2 <<
 ; CHECK-NEXT:  [[CS_DIRECTIVE]] .Lfunc_end0-.Ltmp1             #   Call between .Ltmp1 and .Lfunc_end0
@@ -143,7 +143,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 ; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 ; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 ; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
-; RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY  .L_Z8do_catchv$eh_alias 0x34
+; RELOCS-NEXT:   R_RISCV_CHERI_CAPABILITY  .L_Z8do_catchv$local 0x34
 ; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
 ; RELOCS-NEXT:   R_RISCV_SUB32 - 0x0
 ; RELOCS-NEXT:   R_RISCV_ADD32 - 0x0
@@ -153,7 +153,7 @@ declare dso_local void @__cxa_end_catch() local_unnamed_addr addrspace(200)
 
 ; The local alias should have the same type and non-zero size as the real function:
 ; RELOCS:       Symbol {
-; RELOCS-LABEL:   Name:  .L_Z8do_catchv$eh_alias (
+; RELOCS-LABEL:   Name:  .L_Z8do_catchv$local (
 ; RELOCS-NEXT:    Value: 0x0
 ; RELOCS-NEXT:    Size: [[FN_SIZE:[1-9][0-9]*]]
 ; RELOCS-NEXT:    Binding: Local (0x0)