From: Owen Anderson Date: Wed, 1 Jul 2009 23:14:14 +0000 (+0000) Subject: Update for changes in LLVM. Hopefully this is the last one for a while. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f1ca78009ca1bdb66903c51b9bbaa81f58ea72a;p=clang Update for changes in LLVM. Hopefully this is the last one for a while. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74657 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/CodeGen/ModuleBuilder.h b/include/clang/CodeGen/ModuleBuilder.h index cf83aaf129..12b74d5147 100644 --- a/include/clang/CodeGen/ModuleBuilder.h +++ b/include/clang/CodeGen/ModuleBuilder.h @@ -36,7 +36,7 @@ namespace clang { CodeGenerator *CreateLLVMCodeGen(Diagnostic &Diags, const std::string &ModuleName, const CompileOptions &CO, - const llvm::LLVMContext& C); + llvm::LLVMContext& C); } #endif diff --git a/include/clang/Frontend/ASTConsumers.h b/include/clang/Frontend/ASTConsumers.h index 35b00f1441..be45202625 100644 --- a/include/clang/Frontend/ASTConsumers.h +++ b/include/clang/Frontend/ASTConsumers.h @@ -81,7 +81,7 @@ ASTConsumer *CreateBackendConsumer(BackendAction Action, const CompileOptions &CompileOpts, const std::string &ModuleID, llvm::raw_ostream *OS, - const llvm::LLVMContext& C); + llvm::LLVMContext& C); // HTML printer: uses the rewriter to convert source code to HTML with // syntax highlighting suitable for viewing in a web-browser. diff --git a/lib/CodeGen/ModuleBuilder.cpp b/lib/CodeGen/ModuleBuilder.cpp index 3faedc12bc..4835454b47 100644 --- a/lib/CodeGen/ModuleBuilder.cpp +++ b/lib/CodeGen/ModuleBuilder.cpp @@ -38,7 +38,7 @@ namespace { llvm::OwningPtr Builder; public: CodeGeneratorImpl(Diagnostic &diags, const std::string& ModuleName, - const CompileOptions &CO, const llvm::LLVMContext& C) + const CompileOptions &CO, llvm::LLVMContext& C) : Diags(diags), CompileOpts(CO), M(new llvm::Module(ModuleName, C)) {} virtual ~CodeGeneratorImpl() {} @@ -97,6 +97,6 @@ namespace { CodeGenerator *clang::CreateLLVMCodeGen(Diagnostic &Diags, const std::string& ModuleName, const CompileOptions &CO, - const llvm::LLVMContext& C) { + llvm::LLVMContext& C) { return new CodeGeneratorImpl(Diags, ModuleName, CO, C); } diff --git a/lib/Frontend/Backend.cpp b/lib/Frontend/Backend.cpp index 6b7f9ae940..1c536b07ce 100644 --- a/lib/Frontend/Backend.cpp +++ b/lib/Frontend/Backend.cpp @@ -76,7 +76,7 @@ namespace { BackendConsumer(BackendAction action, Diagnostic &Diags, const LangOptions &langopts, const CompileOptions &compopts, const std::string &infile, llvm::raw_ostream* OS, - const LLVMContext& C) : + LLVMContext& C) : Action(action), CompileOpts(compopts), AsmOutStream(OS), @@ -361,7 +361,7 @@ ASTConsumer *clang::CreateBackendConsumer(BackendAction Action, const CompileOptions &CompileOpts, const std::string& InFile, llvm::raw_ostream* OS, - const LLVMContext& C) { + LLVMContext& C) { return new BackendConsumer(Action, Diags, LangOpts, CompileOpts, InFile, OS, C); } diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp index 341c10b9ad..9433c1752e 100644 --- a/tools/clang-cc/clang-cc.cpp +++ b/tools/clang-cc/clang-cc.cpp @@ -1748,7 +1748,7 @@ static llvm::raw_ostream* ComputeOutFile(const std::string& InFile, static void ProcessInputFile(Preprocessor &PP, PreprocessorFactory &PPF, const std::string &InFile, ProgActions PA, const llvm::StringMap &Features, - const llvm::LLVMContext& Context) { + llvm::LLVMContext& Context) { llvm::OwningPtr OS; llvm::OwningPtr Consumer; bool ClearSourceMgr = false;