[clang][DebugInfo] Add virtual call-site target information in DWARF.

As the extra call site information is available by default, update
other targets that support call site debug information.

Move the 'CallSiteInfo' set to the block introduced by:
  llvm#166202

Author: CarlosAlbertoEnciso

clang/lib/CodeGen/CGCall.cpp

@@ -5958,9 +5958,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     }
   }
 
-  if (CGDebugInfo *DI = CGM.getModuleDebugInfo())
-    DI->addCallTarget(CI->getCalledFunction(), CalleeDecl, CI);
-
   // If this is within a function that has the guard(nocf) attribute and is an
   // indirect call, add the "guard_nocf" attribute to this call to indicate that
   // Control Flow Guard checks should not be added, even if the call is inlined.
@@ -6298,6 +6295,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
       DI->EmitFuncDeclForCallSite(
           CI, DI->getFunctionType(CalleeDecl, ResTy, Args), CalleeGlobalDecl);
     }
+    // Collect call site target information.
+    DI->addCallTarget(CI->getCalledFunction(), CalleeDecl, CI);
   }
 
   return Ret;

clang/lib/CodeGen/CGDebugInfo.h

@@ -914,7 +914,7 @@ class CGDebugInfo {
   llvm::StringRef GetMethodLinkageName(const CXXMethodDecl *Method) const;
 
   /// For each 'DISuprogram' we store a list of call instructions 'CallBase'
-  /// that indirectly call  such 'DISuprogram'. We use its linkage name to
+  /// that indirectly call such 'DISuprogram'. We use its linkage name to
   /// update such list.
   /// The 'CallTargetCache' is updated in the following scenarios:
   /// - Both 'CallBase' and 'MDNode' are ready available.

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -9418,8 +9418,14 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
                     *DAG.getContext());
   RetCCInfo.AnalyzeCallResult(Ins, RetCC);
 
-  // Set type id for call site info.
-  if (MF.getTarget().Options.EmitCallGraphSection && CB && CB->isIndirectCall())
+  // Set type id for call site info and metadata 'call_target'.
+  // We are filtering for:
+  // a) The call-graph-section use case that wants to know about indirect
+  //    calls, or
+  // b) We want to annotate indirect calls.
+  if (CB && CB->isIndirectCall() &&
+      (MF.getTarget().Options.EmitCallGraphSection ||
+       MF.getTarget().Options.EmitCallSiteInfo))
     CSInfo = MachineFunction::CallSiteInfo(*CB);
 
   // Check callee args/returns for SVE registers and set calling convention

llvm/lib/Target/ARM/ARMISelLowering.cpp

@@ -2316,8 +2316,14 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       !Subtarget->noBTIAtReturnTwice())
     GuardWithBTI = AFI->branchTargetEnforcement();
 
-  // Set type id for call site info.
-  if (MF.getTarget().Options.EmitCallGraphSection && CB && CB->isIndirectCall())
+  // Set type id for call site info and metadata 'call_target'.
+  // We are filtering for:
+  // a) The call-graph-section use case that wants to know about indirect
+  //    calls, or
+  // b) We want to annotate indirect calls.
+  if (CB && CB->isIndirectCall() &&
+      (MF.getTarget().Options.EmitCallGraphSection ||
+       MF.getTarget().Options.EmitCallSiteInfo))
     CSInfo = MachineFunction::CallSiteInfo(*CB);
 
   // Determine whether this is a non-secure function call.

llvm/lib/Target/Mips/MipsISelLowering.cpp

@@ -3400,8 +3400,15 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
 
   // Call site info for function parameters tracking and call base type info.
   MachineFunction::CallSiteInfo CSInfo;
-  // Set type id for call site info.
-  if (MF.getTarget().Options.EmitCallGraphSection && CB && CB->isIndirectCall())
+
+  // Set type id for call site info and metadata 'call_target'.
+  // We are filtering for:
+  // a) The call-graph-section use case that wants to know about indirect
+  //    calls, or
+  // b) We want to annotate indirect calls.
+  if (CB && CB->isIndirectCall() &&
+      (MF.getTarget().Options.EmitCallGraphSection ||
+       MF.getTarget().Options.EmitCallSiteInfo))
     CSInfo = MachineFunction::CallSiteInfo(*CB);
 
   // Check if it's really possible to do a tail call. Restrict it to functions

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -23601,8 +23601,14 @@ SDValue RISCVTargetLowering::LowerCall(CallLoweringInfo &CLI,
   MachineFunction &MF = DAG.getMachineFunction();
   MachineFunction::CallSiteInfo CSInfo;
 
-  // Set type id for call site info.
-  if (MF.getTarget().Options.EmitCallGraphSection && CB && CB->isIndirectCall())
+  // Set type id for call site info and metadata 'call_target'.
+  // We are filtering for:
+  // a) The call-graph-section use case that wants to know about indirect
+  //    calls, or
+  // b) We want to annotate indirect calls.
+  if (CB && CB->isIndirectCall() &&
+      (MF.getTarget().Options.EmitCallGraphSection ||
+       MF.getTarget().Options.EmitCallSiteInfo))
     CSInfo = MachineFunction::CallSiteInfo(*CB);
 
   // Analyze the operands of the call, assigning locations to each operand.