From b515d75856f58a8b3b71d782eb00916d686329ad Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 23 Aug 2009 07:49:08 +0000 Subject: [PATCH] eliminate the std::ostream forms of the bitcode writing APIs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79840 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/BrainF/BrainFDriver.cpp | 39 +++++++++--------- examples/ModuleMaker/ModuleMaker.cpp | 4 +- include/llvm/Bitcode/ReaderWriter.h | 9 ----- lib/Bitcode/Reader/Deserialize.cpp | 14 +++---- lib/Bitcode/Writer/BitWriter.cpp | 28 ++++--------- lib/Bitcode/Writer/BitcodeWriter.cpp | 11 ------ lib/Bitcode/Writer/BitcodeWriterPass.cpp | 21 ++-------- tools/bugpoint/OptimizerDriver.cpp | 32 ++++++++------- tools/lto/LTOCodeGenerator.cpp | 50 ++++++++++++------------ 9 files changed, 80 insertions(+), 128 deletions(-) diff --git a/examples/BrainF/BrainFDriver.cpp b/examples/BrainF/BrainFDriver.cpp index f4f1e79b822..ad8a922b50c 100644 --- a/examples/BrainF/BrainFDriver.cpp +++ b/examples/BrainF/BrainFDriver.cpp @@ -32,11 +32,12 @@ #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/ExecutionEngine/JIT.h" +#include "llvm/Target/TargetSelect.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ManagedStatic.h" -#include "llvm/Target/TargetSelect.h" -#include +#include "llvm/Support/raw_ostream.h" #include +#include using namespace llvm; //Command line options @@ -91,50 +92,49 @@ int main(int argc, char **argv) { LLVMContext &Context = getGlobalContext(); if (InputFilename == "") { - std::cerr<<"Error: You must specify the filename of the program to " + errs() << "Error: You must specify the filename of the program to " "be compiled. Use --help to see the options.\n"; abort(); } //Get the output stream - std::ostream *out = &std::cout; + raw_ostream *out = &outs(); if (!JIT) { if (OutputFilename == "") { std::string base = InputFilename; - if (InputFilename == "-") {base = "a";} + if (InputFilename == "-") { base = "a"; } - //Use default filename - const char *suffix = ".bc"; - OutputFilename = base+suffix; + // Use default filename. + OutputFilename = base+".bc"; } if (OutputFilename != "-") { - out = new std:: - ofstream(OutputFilename.c_str(), - std::ios::out | std::ios::trunc | std::ios::binary); + std::string ErrInfo; + out = new raw_fd_ostream(OutputFilename.c_str(), ErrInfo, + raw_fd_ostream::F_Force| + raw_fd_ostream::F_Binary); } } //Get the input stream std::istream *in = &std::cin; - if (InputFilename != "-") { + if (InputFilename != "-") in = new std::ifstream(InputFilename.c_str()); - } //Gather the compile flags BrainF::CompileFlags cf = BrainF::flag_off; - if (ArrayBoundsChecking) { + if (ArrayBoundsChecking) cf = BrainF::CompileFlags(cf | BrainF::flag_arraybounds); - } //Read the BrainF program BrainF bf; Module *mod = bf.parse(in, 65536, cf, Context); //64 KiB - if (in != &std::cin) {delete in;} + if (in != &std::cin) + delete in; addMainFunction(mod); //Verify generated code if (verifyModule(*mod)) { - std::cerr<<"Error: module failed verification. This shouldn't happen.\n"; + errs() << "Error: module failed verification. This shouldn't happen.\n"; abort(); } @@ -142,7 +142,7 @@ int main(int argc, char **argv) { if (JIT) { InitializeNativeTarget(); - std::cout << "------- Running JIT -------\n"; + outs() << "------- Running JIT -------\n"; ExecutionEngine *ee = EngineBuilder(mod).create(); std::vector args; Function *brainf_func = mod->getFunction("brainf"); @@ -152,7 +152,8 @@ int main(int argc, char **argv) { } //Clean up - if (out != &std::cout) {delete out;} + if (out != &outs()) + delete out; delete mod; llvm_shutdown(); diff --git a/examples/ModuleMaker/ModuleMaker.cpp b/examples/ModuleMaker/ModuleMaker.cpp index ded78c7b17a..6bc52c12a03 100644 --- a/examples/ModuleMaker/ModuleMaker.cpp +++ b/examples/ModuleMaker/ModuleMaker.cpp @@ -19,7 +19,7 @@ #include "llvm/Constants.h" #include "llvm/Instructions.h" #include "llvm/Bitcode/ReaderWriter.h" -#include +#include "llvm/Support/raw_ostream.h" using namespace llvm; int main() { @@ -56,7 +56,7 @@ int main() { BB->getInstList().push_back(ReturnInst::Create(Context, Add)); // Output the bitcode file to stdout - WriteBitcodeToFile(M, std::cout); + WriteBitcodeToFile(M, outs()); // Delete the module and all of its contents. delete M; diff --git a/include/llvm/Bitcode/ReaderWriter.h b/include/llvm/Bitcode/ReaderWriter.h index 3d33d75a06a..ef32239ee7e 100644 --- a/include/llvm/Bitcode/ReaderWriter.h +++ b/include/llvm/Bitcode/ReaderWriter.h @@ -14,7 +14,6 @@ #ifndef LLVM_BITCODE_H #define LLVM_BITCODE_H -#include #include namespace llvm { @@ -41,10 +40,6 @@ namespace llvm { Module *ParseBitcodeFile(MemoryBuffer *Buffer, LLVMContext& Context, std::string *ErrMsg = 0); - /// WriteBitcodeToFile - Write the specified module to the specified output - /// stream. - void WriteBitcodeToFile(const Module *M, std::ostream &Out); - /// WriteBitcodeToFile - Write the specified module to the specified /// raw output stream. void WriteBitcodeToFile(const Module *M, raw_ostream &Out); @@ -53,10 +48,6 @@ namespace llvm { /// raw output stream. void WriteBitcodeToStream(const Module *M, BitstreamWriter &Stream); - /// CreateBitcodeWriterPass - Create and return a pass that writes the module - /// to the specified ostream. - ModulePass *CreateBitcodeWriterPass(std::ostream &Str); - /// createBitcodeWriterPass - Create and return a pass that writes the module /// to the specified ostream. ModulePass *createBitcodeWriterPass(raw_ostream &Str); diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp index 06da6ce7272..67607efae08 100644 --- a/lib/Bitcode/Reader/Deserialize.cpp +++ b/lib/Bitcode/Reader/Deserialize.cpp @@ -12,11 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Bitcode/Deserialize.h" - -#ifdef DEBUG_BACKPATCH -#include "llvm/Support/Streams.h" -#endif - +#include "llvm/Support/raw_ostream.h" using namespace llvm; Deserializer::Deserializer(BitstreamReader& stream) @@ -357,7 +353,7 @@ void Deserializer::RegisterPtr(const SerializedPtrID& PtrId, assert (!HasFinalPtr(E) && "Pointer already registered."); #ifdef DEBUG_BACKPATCH - llvm::cerr << "RegisterPtr: " << PtrId << " => " << Ptr << "\n"; + errs() << "RegisterPtr: " << PtrId << " => " << Ptr << "\n"; #endif SetPtr(E,Ptr); @@ -377,8 +373,8 @@ void Deserializer::ReadUIntPtr(uintptr_t& PtrRef, PtrRef = GetFinalPtr(E); #ifdef DEBUG_BACKPATCH - llvm::cerr << "ReadUintPtr: " << PtrId - << " <-- " << (void*) GetFinalPtr(E) << '\n'; + errs() << "ReadUintPtr: " << PtrId + << " <-- " << (void*) GetFinalPtr(E) << '\n'; #endif } else { @@ -386,7 +382,7 @@ void Deserializer::ReadUIntPtr(uintptr_t& PtrRef, "Client forbids backpatching for this pointer."); #ifdef DEBUG_BACKPATCH - llvm::cerr << "ReadUintPtr: " << PtrId << " (NO PTR YET)\n"; + errs() << "ReadUintPtr: " << PtrId << " (NO PTR YET)\n"; #endif // Register backpatch. Check the freelist for a BPNode. diff --git a/lib/Bitcode/Writer/BitWriter.cpp b/lib/Bitcode/Writer/BitWriter.cpp index 8834964b040..32a740569f7 100644 --- a/lib/Bitcode/Writer/BitWriter.cpp +++ b/lib/Bitcode/Writer/BitWriter.cpp @@ -9,43 +9,31 @@ #include "llvm-c/BitWriter.h" #include "llvm/Bitcode/ReaderWriter.h" -#include - +#include "llvm/Support/raw_ostream.h" using namespace llvm; /*===-- Operations on modules ---------------------------------------------===*/ int LLVMWriteBitcodeToFile(LLVMModuleRef M, const char *Path) { - std::ofstream OS(Path, std::ios_base::out|std::ios::trunc|std::ios::binary); - - if (!OS.fail()) - WriteBitcodeToFile(unwrap(M), OS); + std::string ErrorInfo; + raw_fd_ostream OS(Path, ErrorInfo, + raw_fd_ostream::F_Force|raw_fd_ostream::F_Binary); - if (OS.fail()) + if (!ErrorInfo.empty()) return -1; + WriteBitcodeToFile(unwrap(M), OS); return 0; } #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR >= 4) #include -// FIXME: Control this with configure? Provide some portable abstraction in -// libSystem? As is, the user will just get a linker error if they use this on -// non-GCC. Some C++ stdlibs even have ofstream::ofstream(int fd). int LLVMWriteBitcodeToFileHandle(LLVMModuleRef M, int FileHandle) { - __gnu_cxx::stdio_filebuf Buffer(FileHandle, std::ios_base::out | - std::ios::trunc | - std::ios::binary); - std::ostream OS(&Buffer); - - if (!OS.fail()) - WriteBitcodeToFile(unwrap(M), OS); - - if (OS.fail()) - return -1; + raw_fd_ostream OS(FileHandle, false); + WriteBitcodeToFile(unwrap(M), OS); return 0; } diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 6a14cb3bbd1..9cb57585762 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -26,7 +26,6 @@ #include "llvm/ValueSymbolTable.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" -#include "llvm/Support/Streams.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Program.h" using namespace llvm; @@ -1466,16 +1465,6 @@ static void EmitDarwinBCTrailer(BitstreamWriter &Stream, unsigned BufferSize) { } -/// WriteBitcodeToFile - Write the specified module to the specified output -/// stream. -void llvm::WriteBitcodeToFile(const Module *M, std::ostream &Out) { - raw_os_ostream RawOut(Out); - // If writing to stdout, set binary mode. - if (llvm::cout == Out) - sys::Program::ChangeStdoutToBinary(); - WriteBitcodeToFile(M, RawOut); -} - /// WriteBitcodeToFile - Write the specified module to the specified output /// stream. void llvm::WriteBitcodeToFile(const Module *M, raw_ostream &Out) { diff --git a/lib/Bitcode/Writer/BitcodeWriterPass.cpp b/lib/Bitcode/Writer/BitcodeWriterPass.cpp index 209cf0980d2..3a0d3ce0be9 100644 --- a/lib/Bitcode/Writer/BitcodeWriterPass.cpp +++ b/lib/Bitcode/Writer/BitcodeWriterPass.cpp @@ -17,24 +17,16 @@ using namespace llvm; namespace { class WriteBitcodePass : public ModulePass { - // FIXME: Kill off std::ostream - std::ostream *Out; - raw_ostream *RawOut; // raw_ostream to print on + raw_ostream &OS; // raw_ostream to print on public: static char ID; // Pass identification, replacement for typeid - explicit WriteBitcodePass(std::ostream &o) - : ModulePass(&ID), Out(&o), RawOut(0) {} explicit WriteBitcodePass(raw_ostream &o) - : ModulePass(&ID), Out(0), RawOut(&o) {} + : ModulePass(&ID), OS(o) {} const char *getPassName() const { return "Bitcode Writer"; } bool runOnModule(Module &M) { - if (Out) { - WriteBitcodeToFile(&M, *Out); - } else { - WriteBitcodeToFile(&M, *RawOut); - } + WriteBitcodeToFile(&M, OS); return false; } }; @@ -42,13 +34,6 @@ namespace { char WriteBitcodePass::ID = 0; -/// CreateBitcodeWriterPass - Create and return a pass that writes the module -/// to the specified ostream. -ModulePass *llvm::CreateBitcodeWriterPass(std::ostream &Str) { - return new WriteBitcodePass(Str); -} - - /// createBitcodeWriterPass - Create and return a pass that writes the module /// to the specified ostream. ModulePass *llvm::createBitcodeWriterPass(raw_ostream &Str) { diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index 257647f08f9..ef41c43b5f1 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -51,10 +51,10 @@ namespace { /// bool BugDriver::writeProgramToFile(const std::string &Filename, Module *M) const { - std::ios::openmode io_mode = std::ios::out | std::ios::trunc | - std::ios::binary; - std::ofstream Out(Filename.c_str(), io_mode); - if (!Out.good()) return true; + std::string ErrInfo; + raw_fd_ostream Out(Filename.c_str(), ErrInfo, + raw_fd_ostream::F_Force|raw_fd_ostream::F_Binary); + if (!ErrInfo.empty()) return true; WriteBitcodeToFile(M ? M : Program, Out); return false; @@ -83,11 +83,10 @@ void BugDriver::EmitProgressBitcode(const std::string &ID, bool NoFlyer) { } int BugDriver::runPassesAsChild(const std::vector &Passes) { - - std::ios::openmode io_mode = std::ios::out | std::ios::trunc | - std::ios::binary; - std::ofstream OutFile(ChildOutput.c_str(), io_mode); - if (!OutFile.good()) { + std::string ErrInfo; + raw_fd_ostream OutFile(ChildOutput.c_str(), ErrInfo, + raw_fd_ostream::F_Force|raw_fd_ostream::F_Binary); + if (!ErrInfo.empty()) { errs() << "Error opening bitcode file: " << ChildOutput << "\n"; return 1; } @@ -106,7 +105,7 @@ int BugDriver::runPassesAsChild(const std::vector &Passes) { PM.add(createVerifierPass()); // Write bitcode out to disk as the last step... - PM.add(CreateBitcodeWriterPass(OutFile)); + PM.add(createBitcodeWriterPass(OutFile)); // Run all queued passes. PM.run(*Program); @@ -146,12 +145,15 @@ bool BugDriver::runPasses(const std::vector &Passes, << ErrMsg << "\n"; return(1); } - std::ios::openmode io_mode = std::ios::out | std::ios::trunc | - std::ios::binary; - std::ofstream InFile(inputFilename.c_str(), io_mode); - if (!InFile.good()) { + + std::string ErrInfo; + raw_fd_ostream InFile(inputFilename.c_str(), ErrInfo, + raw_fd_ostream::F_Force|raw_fd_ostream::F_Binary); + + + if (!ErrInfo.empty()) { errs() << "Error opening bitcode file: " << inputFilename << "\n"; - return(1); + return 1; } WriteBitcodeToFile(Program, InFile); InFile.close(); diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index 36be5231815..f47eb49c398 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -47,10 +47,7 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Config/config.h" - - #include -#include #include #include @@ -139,31 +136,34 @@ void LTOCodeGenerator::addMustPreserveSymbol(const char* sym) } -bool LTOCodeGenerator::writeMergedModules(const char* path, std::string& errMsg) -{ - if ( this->determineTarget(errMsg) ) - return true; +bool LTOCodeGenerator::writeMergedModules(const char *path, + std::string &errMsg) { + if (determineTarget(errMsg)) + return true; - // mark which symbols can not be internalized - this->applyScopeRestrictions(); + // mark which symbols can not be internalized + applyScopeRestrictions(); - // create output file - std::ofstream out(path, std::ios_base::out|std::ios::trunc|std::ios::binary); - if ( out.fail() ) { - errMsg = "could not open bitcode file for writing: "; - errMsg += path; - return true; - } - - // write bitcode to it - WriteBitcodeToFile(_linker.getModule(), out); - if ( out.fail() ) { - errMsg = "could not write bitcode file: "; - errMsg += path; - return true; - } + // create output file + std::string ErrInfo; + raw_fd_ostream Out(path, ErrInfo, + raw_fd_ostream::F_Force|raw_fd_ostream::F_Binary); + if (!ErrInfo.empty()) { + errMsg = "could not open bitcode file for writing: "; + errMsg += path; + return true; + } - return false; + // write bitcode to it + WriteBitcodeToFile(_linker.getModule(), Out); + + if (Out.has_error()) { + errMsg = "could not write bitcode file: "; + errMsg += path; + return true; + } + + return false; } -- 2.34.1