diff options
| -rw-r--r-- | llvm/include/llvm/LTO/LTOCodeGenerator.h | 15 | ||||
| -rw-r--r-- | llvm/lib/LTO/LTOCodeGenerator.cpp | 7 | 
2 files changed, 9 insertions, 13 deletions
diff --git a/llvm/include/llvm/LTO/LTOCodeGenerator.h b/llvm/include/llvm/LTO/LTOCodeGenerator.h index a9f9d972a4f..04d18fd157c 100644 --- a/llvm/include/llvm/LTO/LTOCodeGenerator.h +++ b/llvm/include/llvm/LTO/LTOCodeGenerator.h @@ -9,7 +9,7 @@  //  // This file declares the LTOCodeGenerator class.  // -//   LTO compilation consists of three phases: Pre-IPO, IPO and Post-IPO.  +//   LTO compilation consists of three phases: Pre-IPO, IPO and Post-IPO.  //  //   The Pre-IPO phase compiles source code into bitcode file. The resulting  // bitcode files, along with object files and libraries, will be fed to the @@ -21,12 +21,12 @@  //   The IPO phase perform inter-procedural analyses and optimizations, and  // the Post-IPO consists two sub-phases: intra-procedural scalar optimizations  // (SOPT), and intra-procedural target-dependent code generator (CG). -//  +//  //   As of this writing, we don't separate IPO and the Post-IPO SOPT. They  // are intermingled together, and are driven by a single pass manager (see  // PassManagerBuilder::populateLTOPassManager()). -//  -//   The "LTOCodeGenerator" is the driver for the IPO and Post-IPO stages.  +// +//   The "LTOCodeGenerator" is the driver for the IPO and Post-IPO stages.  // The "CodeGenerator" here is bit confusing. Don't confuse the "CodeGenerator"  // with the machine specific code generator.  // @@ -79,9 +79,8 @@ struct LTOCodeGenerator {    // not necessarily for debugging purpose (The function name is misleading).    // This function should be called before LTOCodeGenerator::compilexxx(),    // and LTOCodeGenerator::writeMergedModules(). -  //    void setCodeGenDebugOptions(const char *opts); -   +    // Parse the options set in setCodeGenDebugOptions. Like    // setCodeGenDebugOptions, this must be called before    // LTOCodeGenerator::compilexxx() and LTOCodeGenerator::writeMergedModules() @@ -98,7 +97,6 @@ struct LTOCodeGenerator {    // NOTE that it is up to the linker to remove the intermediate object file.    //  Do not try to remove the object file in LTOCodeGenerator's destructor    //  as we don't who (LTOCodeGenerator or the obj file) will last longer. -  //     bool compile_to_file(const char **name,                         bool disableOpt,                         bool disableInline, @@ -109,8 +107,7 @@ struct LTOCodeGenerator {    // single object file. Instead of returning the object-file-path to the caller    // (linker), it brings the object to a buffer, and return the buffer to the    // caller. This function should delete intermediate object file once its content -  // is brought to memory. Return NULL if the compilation was not successful.  -  // +  // is brought to memory. Return NULL if the compilation was not successful.    const void *compile(size_t *length,                        bool disableOpt,                        bool disableInline, diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp index 0a375c89caa..17a62906376 100644 --- a/llvm/lib/LTO/LTOCodeGenerator.cpp +++ b/llvm/lib/LTO/LTOCodeGenerator.cpp @@ -82,8 +82,7 @@ LTOCodeGenerator::~LTOCodeGenerator() {  // Initialize LTO passes. Please keep this funciton in sync with  // PassManagerBuilder::populateLTOPassManager(), and make sure all LTO -// passes are initialized.  -// +// passes are initialized.  void LTOCodeGenerator::initializeLTOPasses() {    PassRegistry &R = *PassRegistry::getPassRegistry(); @@ -197,7 +196,7 @@ bool LTOCodeGenerator::writeMergedModules(const char *path,    return true;  } -bool LTOCodeGenerator::compile_to_file(const char** name,  +bool LTOCodeGenerator::compile_to_file(const char** name,                                         bool disableOpt,                                         bool disableInline,                                         bool disableGVNLoadPRE, @@ -461,7 +460,7 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out,    // Add an appropriate DataLayout instance for this module...    passes.add(new DataLayout(*TargetMach->getDataLayout())); -  // Add appropriate TargetLibraryInfo for this module.  +  // Add appropriate TargetLibraryInfo for this module.    passes.add(new TargetLibraryInfo(Triple(TargetMach->getTargetTriple())));    TargetMach->addAnalysisPasses(passes);  | 

