--- Reverse-merging (from foreign repository) r74648 into '.':

U    include/llvm/LLVMContext.h
U    lib/VMCore/LLVMContext.cpp
U    lib/AsmParser/LLParser.cpp
U    lib/AsmParser/LLParser.h

Temporarily reverting r74648. It was causing massive failures in release mode.

llvm-svn: 74653

1 files changed, 2 insertions, 5 deletions

diff --git a/llvm/lib/AsmParser/LLParser.h b/llvm/lib/AsmParser/LLParser.h
index 924c9293cb1..41c2ee75c60 100644
--- a/llvm/lib/AsmParser/LLParser.h
+++ b/llvm/lib/AsmParser/LLParser.h
@@ -15,7 +15,6 @@
 #define LLVM_ASMPARSER_LLPARSER_H
 
 #include "LLLexer.h"
-#include "llvm/Module.h"
 #include "llvm/Type.h"
 #include <map>
 
@@ -30,14 +29,13 @@ namespace llvm {
   class GlobalValue;
   class MDString;
   class MDNode;
-  class LLVMContext;
   struct ValID;
 
   class LLParser {
   public:
     typedef LLLexer::LocTy LocTy;
   private:
-    const LLVMContext& Context;
+
     LLLexer Lex;
     Module *M;
 
@@ -74,8 +72,7 @@ namespace llvm {
     std::map<unsigned, std::pair<GlobalValue*, LocTy> > ForwardRefValIDs;
     std::vector<GlobalValue*> NumberedVals;
   public:
-    LLParser(MemoryBuffer *F, ParseError &Err, Module *m) : 
-      Context(M->getContext()), Lex(F, Err), M(m) {}
+    LLParser(MemoryBuffer *F, ParseError &Err, Module *m) : Lex(F, Err), M(m) {}
     bool Run();
 
   private: