[CHERI] Ensure we always emit the $local symbol for exception handling

Without it, we would crash if GV.canBenefitFromLocalAlias() returns false (e.g. when the function is not dso_local).
veselypeta · Sep 17, 2024 · 6951ec7 · 6951ec7
1 parent 6205600
commit 6951ec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -655,10 +655,13 @@ MCSymbol *AsmPrinter::getSymbolPreferLocal(const GlobalValue &GV,
   // assembler would otherwise be conservative and assume a global default
   // visibility symbol can be interposable, even if the code generator already
   // assumed it.
-  if (TM.getTargetTriple().isOSBinFormatELF() && GV.canBenefitFromLocalAlias()) {
+  if (Force)
+    return getSymbolWithGlobalValueBase(&GV, "$local");
+  if (TM.getTargetTriple().isOSBinFormatELF() &&
+      GV.canBenefitFromLocalAlias()) {
     const Module &M = *GV.getParent();
-    if (Force || (TM.getRelocationModel() != Reloc::Static &&
-                  M.getPIELevel() == PIELevel::Default && GV.isDSOLocal()))
+    if (TM.getRelocationModel() != Reloc::Static &&
+        M.getPIELevel() == PIELevel::Default && GV.isDSOLocal())
       return getSymbolWithGlobalValueBase(&GV, "$local");
   }
   return TM.getSymbol(&GV);

diff --git a/llvm/test/CodeGen/RISCV/cheri/function-start-directives.ll b/llvm/test/CodeGen/RISCV/cheri/function-start-directives.ll
@@ -4,7 +4,7 @@
 
 target triple = "riscv64-unknown-freebsd13"
 
-define dso_local noundef signext i32 @_Z4testv() local_unnamed_addr addrspace(200) uwtable personality ptr addrspace(200) @__gxx_personality_v0 {
+define noundef signext i32 @_Z4testv() local_unnamed_addr addrspace(200) uwtable personality ptr addrspace(200) @__gxx_personality_v0 {
 entry:
   %call = invoke noundef signext i32 @_Z3foov(ptr addrspace(200) @_Z4testv)
           to label %return unwind label %lpad