Rename Diagnostic to DiagnosticsEngine as per issue 5397
llvm-svn: 140478
This commit is contained in:
@@ -872,7 +872,7 @@ using namespace clang::driver::cc1options;
|
||||
//
|
||||
|
||||
static unsigned getOptimizationLevel(ArgList &Args, InputKind IK,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
unsigned DefaultOpt = 0;
|
||||
if (IK == IK_OpenCL && !Args.hasArg(OPT_cl_opt_disable))
|
||||
DefaultOpt = 2;
|
||||
@@ -882,7 +882,7 @@ static unsigned getOptimizationLevel(ArgList &Args, InputKind IK,
|
||||
}
|
||||
|
||||
static void ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
using namespace cc1options;
|
||||
|
||||
if (Arg *A = Args.getLastArg(OPT_analyzer_store)) {
|
||||
@@ -967,7 +967,7 @@ static void ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
|
||||
}
|
||||
|
||||
static void ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
using namespace cc1options;
|
||||
|
||||
Opts.OptimizationLevel = getOptimizationLevel(Args, IK, Diags);
|
||||
@@ -1069,7 +1069,7 @@ static void ParseDependencyOutputArgs(DependencyOutputOptions &Opts,
|
||||
}
|
||||
|
||||
static void ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
using namespace cc1options;
|
||||
Opts.DiagnosticLogFile = Args.getLastArgValue(OPT_diagnostic_log_file);
|
||||
Opts.IgnoreWarnings = Args.hasArg(OPT_w);
|
||||
@@ -1096,9 +1096,9 @@ static void ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
|
||||
StringRef ShowOverloads =
|
||||
Args.getLastArgValue(OPT_fshow_overloads_EQ, "all");
|
||||
if (ShowOverloads == "best")
|
||||
Opts.ShowOverloads = Diagnostic::Ovl_Best;
|
||||
Opts.ShowOverloads = DiagnosticsEngine::Ovl_Best;
|
||||
else if (ShowOverloads == "all")
|
||||
Opts.ShowOverloads = Diagnostic::Ovl_All;
|
||||
Opts.ShowOverloads = DiagnosticsEngine::Ovl_All;
|
||||
else
|
||||
Diags.Report(diag::err_drv_invalid_value)
|
||||
<< Args.getLastArg(OPT_fshow_overloads_EQ)->getAsString(Args)
|
||||
@@ -1158,7 +1158,7 @@ static void ParseFileSystemArgs(FileSystemOptions &Opts, ArgList &Args) {
|
||||
}
|
||||
|
||||
static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
using namespace cc1options;
|
||||
Opts.ProgramAction = frontend::ParseSyntaxOnly;
|
||||
if (const Arg *A = Args.getLastArg(OPT_Action_Group)) {
|
||||
@@ -1518,7 +1518,7 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
|
||||
}
|
||||
|
||||
static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
// FIXME: Cleanup per-file based stuff.
|
||||
LangStandard::Kind LangStd = LangStandard::lang_unspecified;
|
||||
if (const Arg *A = Args.getLastArg(OPT_std_EQ)) {
|
||||
@@ -1748,7 +1748,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
|
||||
|
||||
static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
|
||||
FileManager &FileMgr,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
using namespace cc1options;
|
||||
Opts.ImplicitPCHInclude = Args.getLastArgValue(OPT_include_pch);
|
||||
Opts.ImplicitPTHInclude = Args.getLastArgValue(OPT_include_pth);
|
||||
@@ -1879,7 +1879,7 @@ static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args) {
|
||||
void CompilerInvocation::CreateFromArgs(CompilerInvocation &Res,
|
||||
const char *const *ArgBegin,
|
||||
const char *const *ArgEnd,
|
||||
Diagnostic &Diags) {
|
||||
DiagnosticsEngine &Diags) {
|
||||
// Parse the arguments.
|
||||
llvm::OwningPtr<OptTable> Opts(createCC1OptTable());
|
||||
unsigned MissingArgIndex, MissingArgCount;
|
||||
|
||||
Reference in New Issue
Block a user