Rebase on parent llvm change.

Created using spr 1.3.6-beta.1

Author: Prabhuk

llvm/include/llvm/IR/Metadata.h

@@ -1259,6 +1259,12 @@ class MDNode : public Metadata {
   bool isReplaceable() const { return isTemporary() || isAlwaysReplaceable(); }
   bool isAlwaysReplaceable() const { return getMetadataID() == DIAssignIDKind; }
 
+  bool hasGeneralizedMDString() const {
+    if (getNumOperands() < 2 || !isa<MDString>(getOperand(1)))
+      return false;
+    return cast<MDString>(getOperand(1))->getString().ends_with(".generalized");
+  }
+
   unsigned getNumTemporaryUses() const {
     assert(isTemporary() && "Only for temporaries");
     return Context.getReplaceableUses()->getNumUses();

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -1647,23 +1647,16 @@ void AsmPrinter::emitStackUsage(const MachineFunction &MF) {
 static ConstantInt *extractNumericCGTypeId(const Function &F) {
   SmallVector<MDNode *, 2> Types;
   F.getMetadata(LLVMContext::MD_type, Types);
-  MDString *MDGeneralizedTypeId = nullptr;
   for (const auto &Type : Types) {
-    if (Type->getNumOperands() == 2 && isa<MDString>(Type->getOperand(1))) {
-      auto *TMDS = cast<MDString>(Type->getOperand(1));
-      if (TMDS->getString().ends_with(".generalized")) {
-        MDGeneralizedTypeId = TMDS;
-        break;
-      }
+    if (Type->hasGeneralizedMDString()) {
+      MDString *MDGeneralizedTypeId = cast<MDString>(Type->getOperand(1));
+      uint64_t TypeIdVal = llvm::MD5Hash(MDGeneralizedTypeId->getString());
+      IntegerType *Int64Ty = Type::getInt64Ty(F.getContext());
+      return ConstantInt::get(Int64Ty, TypeIdVal);
     }
   }
 
-  if (!MDGeneralizedTypeId)
-    return nullptr;
-
-  uint64_t TypeIdVal = llvm::MD5Hash(MDGeneralizedTypeId->getString());
-  IntegerType *Int64Ty = Type::getInt64Ty(F.getContext());
-  return ConstantInt::get(Int64Ty, TypeIdVal);
+  return nullptr;
 }
 
 /// Emits .callgraph section.

llvm/lib/IR/Verifier.cpp

@@ -5060,8 +5060,7 @@ void Verifier::visitCalleeTypeMetadata(Instruction &I, MDNode *MD) {
         &I);
   for (const auto &Op : MD->operands()) {
     auto *TypeMD = cast<MDNode>(Op.get());
-    MDString *TypeIdStr = cast<MDString>(TypeMD->getOperand(1));
-    Check(TypeIdStr->getString().ends_with(".generalized"),
+    Check(TypeMD->hasGeneralizedMDString(),
           "Invalid \"callee_type\" type identifier", &I);
   }
 }

llvm/test/CodeGen/X86/call-graph-section-tailcall.ll

@@ -0,0 +1,34 @@
+;; Tests that we store the type identifiers in .callgraph section of the object file for tailcalls.
+
+; RUN: llc --call-graph-section -filetype=obj -o - < %s | \
+; RUN: llvm-readelf -x .callgraph - | FileCheck %s
+
+define dso_local noundef i32 @_Z13call_indirectPFicEc(ptr noundef readonly captures(none) %func, i8 noundef signext %x) local_unnamed_addr !type !0 {
+entry:
+  %call = tail call noundef i32 %func(i8 noundef signext %x), !callee_type !1
+  ret i32 %call
+}
+
+define dso_local noundef i32 @main(i32 noundef %argc) local_unnamed_addr !type !3 {
+entry:
+  %0 = and i32 %argc, 1
+  %cmp = icmp eq i32 %0, 0
+  %_Z3fooc._Z3barc = select i1 %cmp, ptr @_Z3fooc, ptr @_Z3barc
+  %call.i = tail call noundef i32 %_Z3fooc._Z3barc(i8 noundef signext 97), !callee_type !1
+  ret i32 %call.i
+}
+
+declare !type !2 noundef i32 @_Z3fooc(i8 noundef signext) local_unnamed_addr
+
+declare !type !2 noundef i32 @_Z3barc(i8 noundef signext) local_unnamed_addr
+
+;; Check that the numeric type id (md5 hash) for the below type ids are emitted
+;; to the callgraph section.
+
+; CHECK: Hex dump of section '.callgraph':
+
+!0 = !{i64 0, !"_ZTSFiPvcE.generalized"}
+!1 = !{!2}
+; CHECK-DAG: 5486bc59 814b8e30
+!2 = !{i64 0, !"_ZTSFicE.generalized"}
+!3 = !{i64 0, !"_ZTSFiiE.generalized"}

llvm/test/CodeGen/X86/call-graph-section.ll

@@ -1,4 +1,4 @@
-;; Tests that we store the type identifiers in .callgraph section of the binary.
+;; Tests that we store the type identifiers in .callgraph section of the object file.
 
 ; RUN: llc --call-graph-section -filetype=obj -o - < %s | \
 ; RUN: llvm-readelf -x .callgraph - | FileCheck %s