Do not emit .tlsdesccall for AUTH TLSDESC

Author: kovdan01

llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp

@@ -2758,17 +2758,7 @@ void AArch64AsmPrinter::emitInstruction(const MachineInstr *MI) {
     Add.addOperand(MCOperand::createImm(AArch64_AM::getShiftValue(0)));
     EmitToStreamer(*OutStreamer, Add);
 
-    // Emit a relocation-annotation. This expands to no code, but requests
-    // the following instruction gets an R_AARCH64_TLSDESC_CALL.
-    // TODO: we probably don't need that for AUTH TLSDESC. Emit as for now for
-    // consistency with non-AUTH case.
-    MCInst TLSDescCall;
-    TLSDescCall.setOpcode(AArch64::TLSDESCCALL);
-    TLSDescCall.addOperand(Sym);
-    EmitToStreamer(*OutStreamer, TLSDescCall);
-#ifndef NDEBUG
-    --InstsEmitted; // no code emitted
-#endif
+    // Do not emit .tlsdesccall for AUTH TLSDESC.
 
     MCInst Blraa;
     Blraa.setOpcode(AArch64::BLRAA);

llvm/test/CodeGen/AArch64/ptrauth-arm64-tls-dynamics.ll

@@ -16,13 +16,12 @@ define i32 @test_generaldynamic() {
 ; CHECK: adrp x[[TLSDESC_HI:[0-9]+]], :tlsdesc_auth:general_dynamic_var
 ; CHECK-NEXT: ldr x16, [x[[TLSDESC_HI]], :tlsdesc_auth_lo12:general_dynamic_var]
 ; CHECK-NEXT: add x0, x[[TLSDESC_HI]], :tlsdesc_auth_lo12:general_dynamic_var
-; CHECK-NEXT: .tlsdesccall general_dynamic_var
 ; CHECK-NEXT: blraa x16, x0
 
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADR_PAGE21
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_LD64_LO12
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADD_LO12
-; CHECK-OBJ: R_AARCH64_TLSDESC_CALL
+; CHECK-OBJ-NOT: R_AARCH64_TLSDESC_CALL
 
 ; CHECK-ERR: LLVM ERROR: cannot select: %1:gpr64sp(p0) = G_GLOBAL_VALUE @general_dynamic_var (in function: test_generaldynamic)
 }
@@ -35,7 +34,7 @@ define ptr @test_generaldynamic_addr() {
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADR_PAGE21
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_LD64_LO12
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADD_LO12
-; CHECK-OBJ: R_AARCH64_TLSDESC_CALL
+; CHECK-OBJ-NOT: R_AARCH64_TLSDESC_CALL
 }
 
 @local_dynamic_var = external thread_local(localdynamic) global i32
@@ -49,15 +48,14 @@ define i32 @test_localdynamic() {
 ; CHECK: adrp x[[TLSDESC_HI:[0-9]+]], :tlsdesc_auth:local_dynamic_var
 ; CHECK-NEXT: ldr x16, [x[[TLSDESC_HI]], :tlsdesc_auth_lo12:local_dynamic_var]
 ; CHECK-NEXT: add x0, x[[TLSDESC_HI]], :tlsdesc_auth_lo12:local_dynamic_var
-; CHECK-NEXT: .tlsdesccall local_dynamic_var
 ; CHECK-NEXT: blraa x16, x0
 ; CHECK: mrs x[[TPIDR:[0-9]+]], TPIDR_EL0
 ; CHECK: ldr w0, [x[[TPIDR]], x0]
 
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADR_PAGE21
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_LD64_LO12
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADD_LO12
-; CHECK-OBJ: R_AARCH64_TLSDESC_CALL
+; CHECK-OBJ-NOT: R_AARCH64_TLSDESC_CALL
 }
 
 define ptr @test_localdynamic_addr() {
@@ -68,15 +66,14 @@ define ptr @test_localdynamic_addr() {
 ; CHECK: adrp x[[TLSDESC_HI:[0-9]+]], :tlsdesc_auth:local_dynamic_var
 ; CHECK-NEXT: ldr x16, [x[[TLSDESC_HI]], :tlsdesc_auth_lo12:local_dynamic_var]
 ; CHECK-NEXT: add x0, x[[TLSDESC_HI]], :tlsdesc_auth_lo12:local_dynamic_var
-; CHECK-NEXT: .tlsdesccall local_dynamic_var
 ; CHECK-NEXT: blraa x16, x0
 ; CHECK: mrs x[[TPIDR:[0-9]+]], TPIDR_EL0
 ; CHECK: add x0, x[[TPIDR]], x0
 
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADR_PAGE21
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_LD64_LO12
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADD_LO12
-; CHECK-OBJ: R_AARCH64_TLSDESC_CALL
+; CHECK-OBJ-NOT: R_AARCH64_TLSDESC_CALL
 }
 
 @extern_weak_var = extern_weak thread_local global i32
@@ -90,13 +87,12 @@ define i32 @test_extern_weak() {
 ; CHECK: adrp x[[TLSDESC_HI:[0-9]+]], :tlsdesc_auth:extern_weak_var
 ; CHECK-NEXT: ldr x16, [x[[TLSDESC_HI]], :tlsdesc_auth_lo12:extern_weak_var]
 ; CHECK-NEXT: add x0, x[[TLSDESC_HI]], :tlsdesc_auth_lo12:extern_weak_var
-; CHECK-NEXT: .tlsdesccall extern_weak_var
 ; CHECK-NEXT: blraa x16, x0
 
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADR_PAGE21
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_LD64_LO12
 ; CHECK-OBJ: R_AARCH64_AUTH_TLSDESC_ADD_LO12
-; CHECK-OBJ: R_AARCH64_TLSDESC_CALL
+; CHECK-OBJ-NOT: R_AARCH64_TLSDESC_CALL
 ; CHECK-OBJ: 0000000000000000     0 TLS     WEAK   DEFAULT   UND extern_weak_var
 }