!fixup move to Metadata::PoisonGeneratingIDs.

Author: fhahn

llvm/include/llvm/IR/Instruction.h

@@ -503,10 +503,6 @@ class Instruction : public User,
   /// Determine whether the the nneg flag is set.
   bool hasNonNeg() const LLVM_READONLY;
 
-  /// Metadata IDs that may generate poison.
-  constexpr static const unsigned PoisonGeneratingMetadataIDs[] = {
-      LLVMContext::MD_range, LLVMContext::MD_nonnull, LLVMContext::MD_align};
-
   /// Return true if this operator has flags which may cause this instruction
   /// to evaluate to poison despite having non-poison inputs.
   bool hasPoisonGeneratingFlags() const LLVM_READONLY;

llvm/include/llvm/IR/Metadata.h

@@ -138,6 +138,10 @@ class Metadata {
   void printAsOperand(raw_ostream &OS, ModuleSlotTracker &MST,
                       const Module *M = nullptr) const;
   /// @}
+
+  /// Metadata IDs that may generate poison.
+  constexpr static const unsigned PoisonGeneratingIDs[] = {
+      LLVMContext::MD_range, LLVMContext::MD_nonnull, LLVMContext::MD_align};
 };
 
 // Create wrappers for C Binding types (see CBindingWrapping.h).

llvm/lib/IR/Instruction.cpp

@@ -458,7 +458,7 @@ void Instruction::dropPoisonGeneratingFlags() {
 }
 
 bool Instruction::hasPoisonGeneratingMetadata() const {
-  return any_of(PoisonGeneratingMetadataIDs,
+  return any_of(Metadata::PoisonGeneratingIDs,
                 [this](unsigned ID) { return hasMetadata(ID); });
 }
 
@@ -486,7 +486,7 @@ bool Instruction::hasNonDebugLocLoopMetadata() const {
 }
 
 void Instruction::dropPoisonGeneratingMetadata() {
-  for (unsigned ID : PoisonGeneratingMetadataIDs)
+  for (unsigned ID : Metadata::PoisonGeneratingIDs)
     eraseMetadata(ID);
 }