Move dump-build-information option into DiagnosticOptions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86966 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/clang-cc/Options.cpp b/tools/clang-cc/Options.cpp
index e2b4931..7c71640 100644
--- a/tools/clang-cc/Options.cpp
+++ b/tools/clang-cc/Options.cpp
@@ -221,6 +221,11 @@
namespace diagnosticoptions {
+static llvm::cl::opt<std::string>
+DumpBuildInformation("dump-build-information",
+ llvm::cl::value_desc("filename"),
+ llvm::cl::desc("output a dump of some build information to a file"));
+
static llvm::cl::opt<bool>
NoShowColumn("fno-show-column",
llvm::cl::desc("Do not include column number on diagnostics"));
@@ -659,14 +664,15 @@
void clang::InitializeDiagnosticOptions(DiagnosticOptions &Opts) {
using namespace diagnosticoptions;
- Opts.ShowColumn = !NoShowColumn;
- Opts.ShowLocation = !NoShowLocation;
- Opts.ShowCarets = !NoCaretDiagnostics;
- Opts.ShowFixits = !NoDiagnosticsFixIt;
- Opts.ShowSourceRanges = PrintSourceRangeInfo;
- Opts.ShowOptionNames = PrintDiagnosticOption;
- Opts.ShowColors = PrintColorDiagnostic;
+ Opts.DumpBuildInformation = DumpBuildInformation;
Opts.MessageLength = MessageLength;
+ Opts.ShowCarets = !NoCaretDiagnostics;
+ Opts.ShowColors = PrintColorDiagnostic;
+ Opts.ShowColumn = !NoShowColumn;
+ Opts.ShowFixits = !NoDiagnosticsFixIt;
+ Opts.ShowLocation = !NoShowLocation;
+ Opts.ShowOptionNames = PrintDiagnosticOption;
+ Opts.ShowSourceRanges = PrintSourceRangeInfo;
}
void clang::InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index cb00ae3..f2b3840 100644
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -341,9 +341,10 @@
llvm::cl::desc("Whether to build a relocatable precompiled "
"header"));
-// Finally, implement the code that groks the options above.
+//===----------------------------------------------------------------------===//
+// Preprocessor construction
+//===----------------------------------------------------------------------===//
-// Add the clang headers, which are relative to the clang binary.
std::string GetBuiltinIncludePath(const char *Argv0) {
llvm::sys::Path P =
llvm::sys::Path::GetMainExecutable(Argv0,
@@ -363,10 +364,6 @@
return P.str();
}
-//===----------------------------------------------------------------------===//
-// Preprocessor construction
-//===----------------------------------------------------------------------===//
-
static Preprocessor *
CreatePreprocessor(Diagnostic &Diags, const LangOptions &LangInfo,
const PreprocessorOptions &PPOpts,
@@ -433,6 +430,7 @@
//===----------------------------------------------------------------------===//
// ObjC Rewriter Options
//===----------------------------------------------------------------------===//
+
static llvm::cl::opt<bool>
SilenceRewriteMacroWarning("Wno-rewrite-macros", llvm::cl::init(false),
llvm::cl::desc("Silence ObjC rewriting warnings"));
@@ -452,23 +450,18 @@
static llvm::cl::opt<bool> OptNoWarnings("w");
//===----------------------------------------------------------------------===//
-// -dump-build-information Stuff
+// Dump Build Information
//===----------------------------------------------------------------------===//
-static llvm::cl::opt<std::string>
-DumpBuildInformation("dump-build-information",
- llvm::cl::value_desc("filename"),
- llvm::cl::desc("output a dump of some build information to a file"));
-
static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts,
unsigned argc, char **argv,
llvm::OwningPtr<DiagnosticClient> &DiagClient) {
std::string ErrorInfo;
- llvm::raw_ostream *OS = new llvm::raw_fd_ostream(DumpBuildInformation.c_str(),
- ErrorInfo);
+ llvm::raw_ostream *OS =
+ new llvm::raw_fd_ostream(DiagOpts.DumpBuildInformation.c_str(), ErrorInfo);
if (!ErrorInfo.empty()) {
llvm::errs() << "error opening -dump-build-information file '"
- << DumpBuildInformation << "', option ignored!\n";
+ << DiagOpts.DumpBuildInformation << "', option ignored!\n";
delete OS;
return;
}
@@ -1081,7 +1074,7 @@
DiagClient.reset(new TextDiagnosticPrinter(llvm::errs(), Opts));
}
- if (!DumpBuildInformation.empty())
+ if (!Opts.DumpBuildInformation.empty())
SetUpBuildDumpLog(Opts, argc, argv, DiagClient);
// Configure our handling of diagnostics.