From: Alp Toker Date: Fri, 27 Jun 2014 09:19:14 +0000 (+0000) Subject: IRReader: don't mark MemoryBuffers const X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9b0be7b61a2c636b7915bf30ad11b1e00a7cc0fe;p=oota-llvm.git IRReader: don't mark MemoryBuffers const git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211883 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Bitcode/ReaderWriter.h b/include/llvm/Bitcode/ReaderWriter.h index c44b084c34f..4c194a638d4 100644 --- a/include/llvm/Bitcode/ReaderWriter.h +++ b/include/llvm/Bitcode/ReaderWriter.h @@ -52,7 +52,7 @@ namespace llvm { /// Read the specified bitcode file, returning the module. /// This method *never* takes ownership of Buffer. - ErrorOr parseBitcodeFile(const MemoryBuffer *Buffer, + ErrorOr parseBitcodeFile(MemoryBuffer *Buffer, LLVMContext &Context); /// WriteBitcodeToFile - Write the specified module to the specified diff --git a/include/llvm/IRReader/IRReader.h b/include/llvm/IRReader/IRReader.h index 20022cf8d81..82c37528824 100644 --- a/include/llvm/IRReader/IRReader.h +++ b/include/llvm/IRReader/IRReader.h @@ -41,8 +41,7 @@ Module *getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err, /// If the given MemoryBuffer holds a bitcode image, return a Module /// for it. Otherwise, attempt to parse it as LLVM Assembly and return /// a Module for it. This function *never* takes ownership of Buffer. -Module *ParseIR(const MemoryBuffer *Buffer, SMDiagnostic &Err, - LLVMContext &Context); +Module *ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, LLVMContext &Context); /// If the given file holds a bitcode image, return a Module for it. /// Otherwise, attempt to parse it as LLVM Assembly and return a Module diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index d763397e557..4bbecfdb177 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -3406,10 +3406,9 @@ Module *llvm::getStreamedBitcodeModule(const std::string &name, return M; } -ErrorOr llvm::parseBitcodeFile(const MemoryBuffer *Buffer, +ErrorOr llvm::parseBitcodeFile(MemoryBuffer *Buffer, LLVMContext &Context) { - ErrorOr ModuleOrErr = - getLazyBitcodeModule(const_cast(Buffer), Context); + ErrorOr ModuleOrErr = getLazyBitcodeModule(Buffer, Context); if (!ModuleOrErr) return ModuleOrErr; Module *M = ModuleOrErr.get(); diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index 9d90324adf9..719319d96b1 100644 --- a/lib/IRReader/IRReader.cpp +++ b/lib/IRReader/IRReader.cpp @@ -62,7 +62,7 @@ Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err return getLazyIRModule(File.release(), Err, Context); } -Module *llvm::ParseIR(const MemoryBuffer *Buffer, SMDiagnostic &Err, +Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, LLVMContext &Context) { NamedRegionTimer T(TimeIRParsingName, TimeIRParsingGroupName, TimePassesIsEnabled);