Get non debug metadata ids.

[hiraditya]

Ping

[danielcdh]

My understanding is that all API changes should come with its uses to prevent redundant functions in the final binary. Why not combine this patch with the change that uses these new APIs?

P.S. I'm not an LLVM expert, and my understanding was based on my limited experience.

[hiraditya]

Merged the changes with D22630

llvm/include/llvm/IR/Instruction.h

public:
   /// This does the same thing as getAllMetadata, except that it filters out the
   /// debug location.
   void getAllMetadataOtherThanDebugLoc(
       SmallVectorImpl<std::pair<unsigned, MDNode *>> &MDs) const {
     if (hasMetadataOtherThanDebugLoc())
       getAllMetadataOtherThanDebugLocImpl(MDs);
   }
 
+  /// Get all the metadata IDs attached to this Instruction except the ones
+  /// associated with debug location. The Vector \p MDIDs is not cleared.
+  void getAllNonDebugMetadataIDs(SmallVectorImpl<unsigned> &MDIDs) const;
+
   /// Fills the AAMDNodes structure with AA metadata from this instruction.
   /// When Merge is true, the existing AA metadata is merged with that from this
   /// instruction providing the most-general result.
   void getAAMetadata(AAMDNodes &N, bool Merge = false) const;
 
   /// Set the metadata of the specified kind to the specified node. This updates
   /// or replaces metadata if already present, or removes it if Node is null.
   void setMetadata(unsigned KindID, MDNode *Node);

llvm/lib/IR/LLVMContextImpl.h

public:
   /// Remove the attachment at \c ID, if any.
   void erase(unsigned ID);
 
   /// \brief Copy out all the attachments.
   ///
   /// Copies all the current attachments into \c Result, sorting by attachment
   /// ID.  This function does \em not clear \c Result.
   void getAll(SmallVectorImpl<std::pair<unsigned, MDNode *>> &Result) const;
+  void getAllIDs(SmallVectorImpl<unsigned> &Result) const;
 
   /// \brief Erase matching attachments.
   ///
   /// Erases all attachments matching the \c shouldRemove predicate.
   template <class PredTy> void remove_if(PredTy shouldRemove) {
     Attachments.erase(llvm::remove_if(Attachments, shouldRemove),
                       Attachments.end());
   }

llvm/lib/IR/Metadata.cpp

void MDAttachmentMap::getAll(
     SmallVectorImpl<std::pair<unsigned, MDNode *>> &Result) const {
   Result.append(Attachments.begin(), Attachments.end());
 
   // Sort the resulting array so it is stable.
   if (Result.size() > 1)
     array_pod_sort(Result.begin(), Result.end());
 }
 
+void MDAttachmentMap::getAllIDs(SmallVectorImpl<unsigned> &Result) const {
+  for (auto &A : Attachments)
+    Result.push_back(A.first);
+}
+
 void MDGlobalAttachmentMap::insert(unsigned ID, MDNode &MD) {
   Attachments.push_back({ID, TrackingMDNodeRef(&MD)});
 }
 
 void MDGlobalAttachmentMap::get(unsigned ID,
                                 SmallVectorImpl<MDNode *> &Result) {
   for (auto A : Attachments)
     if (A.MDKind == ID)
void Instruction::getAllMetadataOtherThanDebugLocImpl(
   assert(hasMetadataHashEntry() &&
          getContext().pImpl->InstructionMetadata.count(this) &&
          "Shouldn't have called this");
   const auto &Info = getContext().pImpl->InstructionMetadata.find(this)->second;
   assert(!Info.empty() && "Shouldn't have called this");
   Info.getAll(Result);
 }
 
+void
+Instruction::getAllNonDebugMetadataIDs(SmallVectorImpl<unsigned> &MDIDs) const {
+  if (!hasMetadataOtherThanDebugLoc())
+    return;
+  const auto &Info = getContext().pImpl->InstructionMetadata.find(this)->second;
+  assert(!Info.empty() && "Shouldn't have called this");
+  Info.getAllIDs(MDIDs);
+}
+
 bool Instruction::extractProfMetadata(uint64_t &TrueVal,
                                       uint64_t &FalseVal) const {
   assert(
       (getOpcode() == Instruction::Br || getOpcode() == Instruction::Select) &&
       "Looking for branch weights on something besides branch or select");
 
   auto *ProfileData = getMetadata(LLVMContext::MD_prof);
   if (!ProfileData || ProfileData->getNumOperands() != 3)