Final step in the metadata API restructuring: move the

getMDKindID/getMDKindNames methods to LLVMContext (and add
convenience methods to Module), eliminating MetadataContext.
Move the state that it maintains out to LLVMContext.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92259 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Bitcode/Reader/BitcodeReader.cpp

@@ -17,7 +17,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/InlineAsm.h"
 #include "llvm/IntrinsicInst.h"
-#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/Operator.h"
 #include "llvm/AutoUpgrade.h"
@@ -840,7 +839,7 @@ bool BitcodeReader::ParseMetadata() {
       for (unsigned i = 1; i != RecordLength; ++i)
         Name[i-1] = Record[i];
       
-      unsigned NewKind = Context.getMetadata().getMDKindID(Name.str());
+      unsigned NewKind = TheModule->getMDKindID(Name.str());
       assert(Kind == NewKind &&
              "FIXME: Unable to handle custom metadata mismatch!");(void)NewKind;
       break;

lib/Bitcode/Reader/BitcodeReader.h

@@ -170,7 +170,7 @@ class BitcodeReader : public ModuleProvider {
   DenseMap<Function*, std::vector<BlockAddrRefTy> > BlockAddrFwdRefs;
   
 public:
-  explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext& C)
+  explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext &C)
     : Context(C), Buffer(buffer), ErrorString(0), ValueList(C), MDValueList(C) {
     HasReversedFunctionsWithBodies = false;
   }

lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -19,8 +19,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/InlineAsm.h"
 #include "llvm/Instructions.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Metadata.h"
 #include "llvm/Module.h"
 #include "llvm/Operator.h"
 #include "llvm/TypeSymbolTable.h"
@@ -595,9 +593,8 @@ static void WriteModuleMetadataStore(const Module *M, BitstreamWriter &Stream) {
 
   // Write metadata kinds
   // METADATA_KIND - [n x [id, name]]
-  MetadataContext &TheMetadata = M->getContext().getMetadata();
   SmallVector<StringRef, 4> Names;
-  TheMetadata.getMDKindNames(Names);
+  M->getMDKindNames(Names);
   
   assert(Names[0] == "" && "MDKind #0 is invalid");
   if (Names.size() == 1) return;