Rebase on parent.

Created using spr 1.3.6-beta.1

Author: necipfazil

llvm/include/llvm/IR/Metadata.h

@@ -1474,8 +1474,8 @@ class MDNode : public Metadata {
                                                 const Instruction *BInstr);
   LLVM_ABI static MDNode *getMergedMemProfMetadata(MDNode *A, MDNode *B);
   LLVM_ABI static MDNode *getMergedCallsiteMetadata(MDNode *A, MDNode *B);
-  LLVM_ABI static MDNode *getMergedCalleeTypeMetadata(LLVMContext &Ctx,
-                                                      MDNode *A, MDNode *B);
+  LLVM_ABI static MDNode *getMergedCalleeTypeMetadata(const MDNode *A,
+                                                      const MDNode *B);
 };
 
 /// Tuple of metadata.

llvm/lib/IR/Metadata.cpp

@@ -1303,23 +1303,22 @@ static void addRange(SmallVectorImpl<ConstantInt *> &EndPoints,
   EndPoints.push_back(High);
 }
 
-MDNode *MDNode::getMergedCalleeTypeMetadata(LLVMContext &Ctx, MDNode *A,
-                                            MDNode *B) {
+MDNode *MDNode::getMergedCalleeTypeMetadata(const MDNode *A, const MDNode *B) {
   // Drop the callee_type metadata if either of the call instructions do not
   // have it.
   if (!A || !B)
     return nullptr;
   SmallVector<Metadata *, 8> AB;
   SmallPtrSet<Metadata *, 8> MergedCallees;
-  auto AddUniqueCallees = [&AB, &MergedCallees](MDNode *N) {
+  auto AddUniqueCallees = [&AB, &MergedCallees](const MDNode *N) {
     for (Metadata *MD : N->operands()) {
       if (MergedCallees.insert(MD).second)
         AB.push_back(MD);
     }
   };
   AddUniqueCallees(A);
   AddUniqueCallees(B);
-  return MDNode::get(Ctx, AB);
+  return MDNode::get(A->getContext(), AB);
 }
 
 MDNode *MDNode::getMostGenericRange(MDNode *A, MDNode *B) {

llvm/lib/Transforms/Utils/Local.cpp

@@ -3083,9 +3083,8 @@ static void combineMetadata(Instruction *K, const Instruction *J,
         break;
       case LLVMContext::MD_callee_type:
         if (!AAOnly) {
-          K->setMetadata(
-              LLVMContext::MD_callee_type,
-              MDNode::getMergedCalleeTypeMetadata(K->getContext(), KMD, JMD));
+          K->setMetadata(LLVMContext::MD_callee_type,
+                         MDNode::getMergedCalleeTypeMetadata(KMD, JMD));
         }
         break;
       case LLVMContext::MD_align: