[𝘀𝗽𝗿] changes introduced through rebase

Created using spr 1.3.6-beta.1

[skip ci]

Author: Prabhuk

llvm/lib/IR/Metadata.cpp

@@ -1305,11 +1305,13 @@ static void addRange(SmallVectorImpl<ConstantInt *> &EndPoints,
 
 MDNode *MDNode::getMergedCalleeTypeMetadata(LLVMContext &Ctx, MDNode *A,
                                             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) {
-    if (!N)
-      return;
     for (Metadata *MD : N->operands()) {
       if (MergedCallees.insert(MD).second)
         AB.push_back(MD);

llvm/lib/Transforms/Utils/Local.cpp

@@ -3080,7 +3080,13 @@ static void combineMetadata(Instruction *K, const Instruction *J,
       case LLVMContext::MD_mmra:
       case LLVMContext::MD_memprof:
       case LLVMContext::MD_callsite:
+        break;
       case LLVMContext::MD_callee_type:
+        if (!AAOnly) {
+          K->setMetadata(
+              LLVMContext::MD_callee_type,
+              MDNode::getMergedCalleeTypeMetadata(K->getContext(), KMD, JMD));
+        }
         break;
       case LLVMContext::MD_align:
         if (!AAOnly && (DoesKMove || !K->hasMetadata(LLVMContext::MD_noundef)))
@@ -3157,20 +3163,6 @@ static void combineMetadata(Instruction *K, const Instruction *J,
                    MDNode::getMergedCallsiteMetadata(KCallSite, JCallSite));
   }
 
-  // Merge callee_type metadata.
-  if (!AAOnly) {
-    auto *JCalleeType = J->getMetadata(LLVMContext::MD_callee_type);
-    auto *KCalleeType = K->getMetadata(LLVMContext::MD_callee_type);
-    // Drop the callee_type metadata if either of the call instructions do not
-    // have it.
-    if (JCalleeType && KCalleeType) {
-      K->setMetadata(LLVMContext::MD_callee_type,
-                     MDNode::getMergedCalleeTypeMetadata(
-                         K->getContext(), KCalleeType, JCalleeType));
-    } else
-      K->setMetadata(LLVMContext::MD_callee_type, nullptr);
-  }
-
   // Merge prof metadata.
   // Handle separately to support cases where only one instruction has the
   // metadata.