2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 568968d927..7dffafa831 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/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;
diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h
index 7b3a1ae893..bb3961a086 100644
--- a/lib/Bitcode/Reader/BitcodeReader.h
+++ b/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;
   }