[𝘀𝗽𝗿] changes introduced through rebase

Created using spr 1.3.6-beta.1

[skip ci]

Author: Prabhuk

llvm/lib/IR/Metadata.cpp

@@ -1306,15 +1306,13 @@ MDNode *MDNode::getMergedCalleeTypeMetadata(LLVMContext &Ctx, MDNode *A,
                                             MDNode *B) {
   SmallVector<Metadata *, 8> AB;
   SmallSet<Metadata *, 8> MergedCallees;
-  auto AddUniqueCallees = [&](llvm::MDNode *N) {
+  auto AddUniqueCallees = [&AB, &MergedCallees](llvm::MDNode *N) {
     if (!N)
       return;
     for (const MDOperand &Op : N->operands()) {
       Metadata *MD = Op.get();
-      if (!MergedCallees.contains(MD)) {
-        MergedCallees.insert(MD);
+      if (MergedCallees.insert(MD).second)
         AB.push_back(MD);
-      }
     }
   };
   AddUniqueCallees(A);

llvm/lib/IR/Verifier.cpp

@@ -5100,11 +5100,7 @@ void Verifier::visitCallsiteMetadata(Instruction &I, MDNode *MD) {
 void Verifier::visitCalleeTypeMetadata(Instruction &I, MDNode *MD) {
   Check(isa<CallBase>(I), "!callee_type metadata should only exist on calls",
         &I);
-  CallBase *CB = cast<CallBase>(&I);
-  Check(CB->isIndirectCall(),
-        "!callee_type metadata should only exist on indirect function calls",
-        &I);
-  for (const auto &Op : MD->operands()) {
+  for (const MDOperand &Op : MD->operands()) {
     Check(isa<MDNode>(Op.get()),
           "The callee_type metadata must be a list of type metadata nodes");
     auto *TypeMD = cast<MDNode>(Op.get());

llvm/test/Transforms/Inline/drop-callee-type-metadata.ll

@@ -1,7 +1,7 @@
 ;; Test if the callee_type metadata is dropped when it is
 ;; is mapped to a direct function call from an indirect call during inlining.
 
-; RUN: opt < %s -passes="inline" -disable-verify -S | FileCheck %s
+; RUN: opt -passes="inline" -S < %s | FileCheck %s
 
 define i32 @_Z13call_indirectPFicEc(ptr %func, i8 %x) local_unnamed_addr !type !0 {
 entry:

llvm/test/Transforms/InstCombine/drop-callee-type-metadata.ll

@@ -1,7 +1,7 @@
 ;; Test if the callee_type metadata is dropped when it is attached
 ;; to a direct function call during instcombine.
 
-; RUN: opt < %s -passes="instcombine" -disable-verify -S | FileCheck %s
+; RUN: opt -passes="instcombine" -S < %s | FileCheck %s
 
 define i32 @_Z3barv() local_unnamed_addr !type !3 {
 entry:

llvm/test/Verifier/callee-type-metadata.ll

@@ -14,15 +14,9 @@ entry:
   ;; callee_type metdata is a type metadata instead of a list of type metadata nodes.
   ; CHECK: The callee_type metadata must be a list of type metadata nodes
   %call2 = call i32 %fptr(i8 signext %x_val), !callee_type !0
-  ;; callee_type metdata is a list of non "gneralized" type metadata.  
+  ;; callee_type metdata must be a list of "generalized" type metadata.
   ; CHECK: Only generalized type metadata can be part of the callee_type metadata list
   %call3 = call i32 %fptr(i8 signext %x_val), !callee_type !4
-  ;; callee_type metadata should not be part of a direct call.
-  ; CHECK: !callee_type metadata should only exist on indirect function calls
-  %call_direct = call i32 @_Z3barc(i8 signext %x_val), !callee_type !1
-  ;; callee_type metadata should not be part of a direct call.
-  ; CHECK: !callee_type metadata should only exist on indirect function calls
-  %call_direct_wrong_signature = call i32 @_Z3barc(i8 signext %x_val), !callee_type !4
   ret i32 %call
 }