Rebase on top of parent change.

Created using spr 1.3.6-beta.1

Author: necipfazil

llvm/lib/Transforms/Utils/Local.cpp

@@ -3158,14 +3158,17 @@ static void combineMetadata(Instruction *K, const Instruction *J,
   }
 
   // Merge callee_type metadata.
-  // Given the called operands are identical, presence of at least one
-  // callee_type metadata guarantees the intended callee.
-  auto *JCalleeType = J->getMetadata(LLVMContext::MD_callee_type);
-  auto *KCalleeType = K->getMetadata(LLVMContext::MD_callee_type);
-  if (!AAOnly && (JCalleeType || KCalleeType)) {
-    K->setMetadata(LLVMContext::MD_callee_type,
-                   MDNode::getMergedCalleeTypeMetadata(
-                       K->getContext(), KCalleeType, JCalleeType));
+  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.

llvm/test/Transforms/SimplifyCFG/merge-callee-type-metadata.ll

@@ -61,15 +61,15 @@ if.end:                                           ; preds = %if.else, %if.then
   ret ptr %x.0
 }
 
-;; Test if the callee_type metadata is merged correctly when
+;; Test if the callee_type metadata is dropped correctly when
 ;; only the left instruction has callee_type metadata.
 define ptr @_Z10test_leftb(i1 zeroext %b) {
 ; CHECK-LABEL: define ptr @_Z10test_leftb(
 ; CHECK-SAME: i1 zeroext [[B:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[FN:%.*]] = alloca ptr, align 8
 ; CHECK-NEXT:    store ptr @_Znwm, ptr [[FN]], align 8
-; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4), !callee_type [[META4:![0-9]+]]
+; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4)
 ; CHECK-NEXT:    ret ptr [[CALL]]
 ;
 entry:
@@ -90,15 +90,15 @@ if.end:                                           ; preds = %if.else, %if.then
   ret ptr %x.0
 }
 
-;; Test if the callee_type metadata is merged correctly when
+;; Test if the callee_type metadata is dropped correctly when
 ;; only the right instruction has callee_type metadata.
 define ptr @_Z10test_rightb(i1 zeroext %b) {
 ; CHECK-LABEL: define ptr @_Z10test_rightb(
 ; CHECK-SAME: i1 zeroext [[B:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[FN:%.*]] = alloca ptr, align 8
 ; CHECK-NEXT:    store ptr @_Znwm, ptr [[FN]], align 8
-; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4), !callee_type [[META3]]
+; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4)
 ; CHECK-NEXT:    ret ptr [[CALL]]
 ;
 entry:
@@ -127,7 +127,7 @@ define ptr @_Z10test_listb(i1 zeroext %b) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[FN:%.*]] = alloca ptr, align 8
 ; CHECK-NEXT:    store ptr @_Znwm, ptr [[FN]], align 8
-; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4), !callee_type [[META5:![0-9]+]]
+; CHECK-NEXT:    [[CALL:%.*]] = call ptr [[FN]](i64 4), !callee_type [[META4:![0-9]+]]
 ; CHECK-NEXT:    ret ptr [[CALL]]
 ;
 entry:
@@ -162,7 +162,6 @@ declare ptr @_Znwm(i64)
 ; CHECK: [[META1]] = !{i64 0, !"callee_type2.generalized"}
 ; CHECK: [[META2]] = !{i64 0, !"callee_type0.generalized"}
 ; CHECK: [[META3]] = !{[[META2]]}
-; CHECK: [[META4]] = !{[[META1]]}
-; CHECK: [[META5]] = !{[[META2]], [[META1]], [[META6:![0-9]+]]}
-; CHECK: [[META6]] = !{i64 0, !"callee_type1.generalized"}
+; CHECK: [[META4]] = !{[[META2]], [[META1]], [[META5:![0-9]+]]}
+; CHECK: [[META5]] = !{i64 0, !"callee_type1.generalized"}
 ;.