commit 20126046221404b81cdd8de192bd72fdc7b0a670
author Chris Lattner <sabre@nondot.org> Mon Mar 09 22:00:34 2009 +0000
committer Chris Lattner <sabre@nondot.org> Mon Mar 09 22:00:34 2009 +0000
tree 4f9d238a25fe399d9f1ad6d8b3bcf0880f08691d
parent 2a83a8ce486e6d6bd543d42d2b67606181f44472

move debug info generation flag into CompileOptions.


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

Driver/ASTConsumers.h

diff --git a/Driver/ASTConsumers.h b/Driver/ASTConsumers.h
index 670f8dc..fd8416d 100644
--- a/Driver/ASTConsumers.h
+++ b/Driver/ASTConsumers.h
@@ -56,8 +56,7 @@
                                    const LangOptions &Features,
                                    const CompileOptions &CompileOpts,
                                    const std::string& InFile,
-                                   const std::string& OutFile,
-                                   bool GenerateDebugInfo);
+                                   const std::string& OutFile);
 
 ASTConsumer* CreateHTMLPrinter(const std::string &OutFile, Diagnostic &D,
                                Preprocessor *PP, PreprocessorFactory* PPF);

Driver/Backend.cpp

diff --git a/Driver/Backend.cpp b/Driver/Backend.cpp
index 4c5b741..459bd69 100644
--- a/Driver/Backend.cpp
+++ b/Driver/Backend.cpp
@@ -44,7 +44,6 @@
     CompileOptions CompileOpts;
     const std::string &InputFile;
     std::string OutputFile;
-    bool GenerateDebugInfo;
     ASTContext *Context;
 
     Timer LLVMIRGeneration;
@@ -79,16 +78,14 @@
   public:  
     BackendConsumer(BackendAction action, Diagnostic &Diags, 
                     const LangOptions &langopts, const CompileOptions &compopts,
-                    const std::string &infile, const std::string &outfile,
-                    bool debug) :
+                    const std::string &infile, const std::string &outfile) :
       Action(action), 
       CompileOpts(compopts),
       InputFile(infile), 
       OutputFile(outfile), 
-      GenerateDebugInfo(debug),
       LLVMIRGeneration("LLVM IR Generation Time"),
       CodeGenerationTime("Code Generation Time"),
-      Gen(CreateLLVMCodeGen(Diags, langopts, InputFile, GenerateDebugInfo)),
+      Gen(CreateLLVMCodeGen(Diags, langopts, InputFile, compopts.DebugInfo)),
       TheModule(0), TheTargetData(0), AsmOutStream(0), ModuleProvider(0),
       CodeGenPasses(0), PerModulePasses(0), PerFunctionPasses(0) {
       
@@ -427,14 +424,13 @@
                                           const LangOptions &LangOpts,
                                           const CompileOptions &CompileOpts,
                                           const std::string& InFile,
-                                          const std::string& OutFile,
-                                          bool GenerateDebugInfo) {
+                                          const std::string& OutFile) {
   // FIXME: If optimizing, disable all debug info generation.  The LLVM
   // optimizer and backend is not ready to handle it when optimizations
   // are enabled.
   if (CompileOpts.OptimizationLevel > 0)
-    GenerateDebugInfo = false;
+    const_cast<CompileOptions&>(CompileOpts).DebugInfo = false;
     
   return new BackendConsumer(Action, Diags, LangOpts, CompileOpts,
-                             InFile, OutFile, GenerateDebugInfo);  
+                             InFile, OutFile);  
 }

Driver/clang.cpp

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index adfc860..7db892f 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -1167,6 +1167,7 @@
 
 static void InitializeCompileOptions(CompileOptions &Opts) {
   Opts.OptimizeSize = OptSize;
+  Opts.DebugInfo = GenerateDebugInfo;
   if (OptSize) {
     // -Os implies -O2
     // FIXME: Diagnose conflicting options.
@@ -1246,7 +1247,7 @@
     CompileOptions Opts;
     InitializeCompileOptions(Opts);
     return CreateBackendConsumer(Act, Diag, LangOpts, Opts, 
-                                 InFile, OutputFile, GenerateDebugInfo);
+                                 InFile, OutputFile);
   }
 
   case SerializeAST: