Use Err(ctx) instead of fatal and use getLocation in error message

Author: kovdan01

lld/ELF/Relocations.cpp

@@ -1331,10 +1331,11 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
     return 1;
   }
 
-  auto fatalBothAuthAndNonAuth = [&sym]() {
-    fatal("both AUTH and non-AUTH TLSDESC entries for '" + sym.getName() +
-          "' requested, but only one type of TLSDESC entry per symbol is "
-          "supported");
+  auto errBothAuthAndNonAuth = [this, &sym, offset]() {
+    Err(ctx) << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
+             << "' requested, but only one type of TLSDESC entry per symbol is "
+                "supported"
+             << getLocation(ctx, *sec, sym, offset);
   };
 
   // Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
@@ -1343,10 +1344,12 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
   if (oneof<R_AARCH64_AUTH_TLSDESC_PAGE, RelExpr::R_AARCH64_AUTH_TLSDESC>(
           expr)) {
     assert(ctx.arg.emachine == EM_AARCH64);
-    if (!sym.hasFlag(NEEDS_TLSDESC))
+    if (!sym.hasFlag(NEEDS_TLSDESC)) {
       sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
-    else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH))
-      fatalBothAuthAndNonAuth();
+    } else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
+      errBothAuthAndNonAuth();
+      return 1;
+    }
     sec->addReloc({expr, type, offset, addend, &sym});
     return 1;
   }
@@ -1357,7 +1360,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
     // with signed TLSDESC enabled since it does not give any value, but leave a
     // check against that just in case someone uses it.
     if (expr != R_TLSDESC_CALL)
-      fatalBothAuthAndNonAuth();
+      errBothAuthAndNonAuth();
     return 1;
   }
 

lld/test/ELF/aarch64-tlsdesc-pauth.s

@@ -101,7 +101,9 @@ local2:
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err1.s -o err1.o
 // RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck --check-prefix=ERR1 %s
-// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
+// ERR1:      error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
+// ERR1-NEXT: >>> defined in err1.o
+// ERR1-NEXT: >>> referenced by err1.o:(.text+0x10)
         .text
         adrp    x0, :tlsdesc_auth:a
         ldr     x16, [x0, :tlsdesc_auth_lo12:a]
@@ -119,7 +121,9 @@ local2:
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err2.s -o err2.o
 // RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck --check-prefix=ERR2 %s
-// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
+// ERR2:      error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
+// ERR2-NEXT: >>> defined in err2.o
+// ERR2-NEXT: >>> referenced by err2.o:(.text+0x10)
         .text
         adrp    x0, :tlsdesc:a
         ldr     x1, [x0, :tlsdesc_lo12:a]