Revert 125820 and 125819 to fix PR9266.

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

1 files changed, 7 insertions, 16 deletions

diff --git a/include/clang/CodeGen/CodeGenAction.h b/include/clang/CodeGen/CodeGenAction.h
index 052c6603f5..b55effc6be 100644
--- a/include/clang/CodeGen/CodeGenAction.h
+++ b/include/clang/CodeGen/CodeGenAction.h
@@ -14,7 +14,6 @@
 #include "llvm/ADT/OwningPtr.h"
 
 namespace llvm {
-  class LLVMContext;
   class Module;
 }
 
@@ -25,14 +24,9 @@ class CodeGenAction : public ASTFrontendAction {
 private:
   unsigned Act;
   llvm::OwningPtr<llvm::Module> TheModule;
-  llvm::LLVMContext *VMContext;
-  bool OwnsVMContext;
 
 protected:
-  /// Create a new code generation action.  If the optional \arg _VMContext
-  /// parameter is supplied, the action uses it without taking ownership,
-  /// otherwise it creates a fresh LLVM context and takes ownership.
-  CodeGenAction(unsigned _Act, llvm::LLVMContext *_VMContext = 0);
+  CodeGenAction(unsigned _Act);
 
   virtual bool hasIRSupport() const;
 
@@ -50,40 +44,37 @@ public:
   /// been run. The result may be null on failure.
   llvm::Module *takeModule();
 
-  /// Take the LLVM context used by this action.
-  llvm::LLVMContext *takeLLVMContext();
-
   BackendConsumer *BEConsumer;
 };
 
 class EmitAssemblyAction : public CodeGenAction {
 public:
-  EmitAssemblyAction(llvm::LLVMContext *_VMContext = 0);
+  EmitAssemblyAction();
 };
 
 class EmitBCAction : public CodeGenAction {
 public:
-  EmitBCAction(llvm::LLVMContext *_VMContext = 0);
+  EmitBCAction();
 };
 
 class EmitLLVMAction : public CodeGenAction {
 public:
-  EmitLLVMAction(llvm::LLVMContext *_VMContext = 0);
+  EmitLLVMAction();
 };
 
 class EmitLLVMOnlyAction : public CodeGenAction {
 public:
-  EmitLLVMOnlyAction(llvm::LLVMContext *_VMContext = 0);
+  EmitLLVMOnlyAction();
 };
 
 class EmitCodeGenOnlyAction : public CodeGenAction {
 public:
-  EmitCodeGenOnlyAction(llvm::LLVMContext *_VMContext = 0);
+  EmitCodeGenOnlyAction();
 };
 
 class EmitObjAction : public CodeGenAction {
 public:
-  EmitObjAction(llvm::LLVMContext *_VMContext = 0);
+  EmitObjAction();
 };
 
 }