diff --git a/lib/CodeGen/ModuleBuilder.cpp b/lib/CodeGen/ModuleBuilder.cpp
index 7937e92..3faedc1 100644
--- a/lib/CodeGen/ModuleBuilder.cpp
+++ b/lib/CodeGen/ModuleBuilder.cpp
@@ -38,7 +38,7 @@
     llvm::OwningPtr<CodeGen::CodeGenModule> Builder;
   public:
     CodeGeneratorImpl(Diagnostic &diags, const std::string& ModuleName,
-                      const CompileOptions &CO, llvm::LLVMContext* C)
+                      const CompileOptions &CO, const llvm::LLVMContext& C)
       : Diags(diags), CompileOpts(CO), M(new llvm::Module(ModuleName, C)) {}
     
     virtual ~CodeGeneratorImpl() {}
@@ -97,6 +97,6 @@
 CodeGenerator *clang::CreateLLVMCodeGen(Diagnostic &Diags, 
                                         const std::string& ModuleName,
                                         const CompileOptions &CO,
-                                        llvm::LLVMContext* C) {
+                                        const llvm::LLVMContext& C) {
   return new CodeGeneratorImpl(Diags, ModuleName, CO, C);
 }
diff --git a/lib/Frontend/Backend.cpp b/lib/Frontend/Backend.cpp
index dc84cd8..6b7f9ae 100644
--- a/lib/Frontend/Backend.cpp
+++ b/lib/Frontend/Backend.cpp
@@ -76,7 +76,7 @@
     BackendConsumer(BackendAction action, Diagnostic &Diags, 
                     const LangOptions &langopts, const CompileOptions &compopts,
                     const std::string &infile, llvm::raw_ostream* OS,
-                    LLVMContext* C) :
+                    const LLVMContext& C) :
       Action(action), 
       CompileOpts(compopts),
       AsmOutStream(OS), 
@@ -361,7 +361,7 @@
                                           const CompileOptions &CompileOpts,
                                           const std::string& InFile,
                                           llvm::raw_ostream* OS,
-                                          LLVMContext* C) {
+                                          const LLVMContext& C) {
   return new BackendConsumer(Action, Diags, LangOpts, CompileOpts,
                              InFile, OS, C);
 }