Provide a hook to set the code generation debug options to investigate lto failures.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53119 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm-c/lto.h b/include/llvm-c/lto.h
index 508e871ec4cbfc3376a1f38bb73a270121d1e136..c57dfe7306de9849d9f381971901a81ed170c33a 100644 (file)
--- a/include/llvm-c/lto.h
+++ b/include/llvm-c/lto.h
@@ -227,6 +227,11 @@ extern const void*
 lto_codegen_compile(lto_code_gen_t cg, size_t* length);
 
 
+/**
+ * Sets options to help debug codegen bugs.
+ */
+extern void
+lto_codegen_debug_options(lto_code_gen_t cg, const char *);
 #ifdef __cplusplus
 }
 #endif

diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index d82279d494fc56a380911ccf0eb3910fa417beb0..a07247e28e2eb0dc90dfb74492250591fa5b0c5c 100644 (file)
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -40,6 +40,7 @@
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/Config/config.h"
 
 
@@ -116,7 +117,6 @@ bool LTOCodeGenerator::setCodePICModel(lto_codegen_model model,
     return true;
 }
 
-
 void LTOCodeGenerator::addMustPreserveSymbol(const char* sym)
 {
     _mustPreserveSymbols[sym] = 1;
@@ -334,6 +334,18 @@ bool LTOCodeGenerator::generateAssemblyCode(std::ostream& out, std::string& errM
             break;
     }
 
+    for (unsigned opt_index = 0, opt_size = _codegenOptions.size();
+         opt_index < opt_size; ++opt_index) {
+      std::vector<const char *> cgOpts;
+      std::string &optString = _codegenOptions[opt_index];
+      for (std::string Opt = getToken(optString);
+           !Opt.empty(); Opt = getToken(optString))
+        cgOpts.push_back(Opt.c_str());
+     
+      int pseudo_argc = cgOpts.size()-1;
+      cl::ParseCommandLineOptions(pseudo_argc, (char**)&cgOpts[0]);
+     }
+
     // Instantiate the pass manager to organize the passes.
     PassManager passes;
 

diff --git a/tools/lto/LTOCodeGenerator.h b/tools/lto/LTOCodeGenerator.h
index eab076ebc88015dd3294161a9608872165e33cec..24a2ba316e7f89d3ab81650a006ef033b8f502d1 100644 (file)
--- a/tools/lto/LTOCodeGenerator.h
+++ b/tools/lto/LTOCodeGenerator.h
@@ -17,6 +17,7 @@
 
 #include "llvm/Linker.h"
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/SmallVector.h"
 
 #include <string>
 
@@ -38,7 +39,9 @@ public:
     bool                writeMergedModules(const char* path, 
                                                            std::string& errMsg);
     const void*         compile(size_t* length, std::string& errMsg);
-    
+    void                setCodeGenDebugOptions(const char *opts) {
+                          _codegenOptions.push_back(std::string(opts)); 
+                        }
 private:
     bool                generateAssemblyCode(std::ostream& out, 
                                                         std::string& errMsg);
@@ -56,6 +59,7 @@ private:
     lto_codegen_model           _codeModel;
     StringSet                   _mustPreserveSymbols;
     llvm::MemoryBuffer*         _nativeObjectFile;
+    llvm::SmallVector<std::string, 4> _codegenOptions;
 };
 
 #endif // LTO_CODE_GENERATOR_H

diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index f60f7b5ac0943e84fea03743a9f0db736ce5d62b..b674f3171ef86c346284e0dc47d0c2d6ad87dfe9 100644 (file)
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -237,5 +237,11 @@ lto_codegen_compile(lto_code_gen_t cg, size_t* length)
     return cg->compile(length, sLastErrorString);
 }
 
+extern void
+lto_codegen_debug_options(lto_code_gen_t cg, const char * opt)
+{
+  cg->setCodeGenDebugOptions(opt);
+}
+