From d2deb91b02ae1d810719e4a5a63dc404f362575a Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 18 Oct 2012 21:36:01 +0000 Subject: [PATCH] [Options] Make Option non clang specific. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166230 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/Option.h | 50 ++++++++++++----------------- lib/Driver/Driver.cpp | 6 ++-- lib/Driver/ToolChains.cpp | 4 +-- lib/Driver/Tools.cpp | 10 ++++-- lib/Frontend/CompilerInvocation.cpp | 2 +- 5 files changed, 35 insertions(+), 37 deletions(-) diff --git a/include/clang/Driver/Option.h b/include/clang/Driver/Option.h index 9cda2801d4..6c0f20ea5d 100644 --- a/include/clang/Driver/Option.h +++ b/include/clang/Driver/Option.h @@ -21,15 +21,20 @@ namespace driver { class ArgList; namespace options { + /// Base flags for all options. Custom flags may be added after. enum DriverFlag { - DriverOption = (1 << 0), - HelpHidden = (1 << 1), - LinkerInput = (1 << 2), - NoArgumentUnused = (1 << 3), - NoForward = (1 << 4), - RenderAsInput = (1 << 5), - RenderJoined = (1 << 6), - RenderSeparate = (1 << 7), + HelpHidden = (1 << 0), + RenderAsInput = (1 << 1), + RenderJoined = (1 << 2), + RenderSeparate = (1 << 3), + }; + + /// Flags specifically for clang options. + enum ClangFlags { + DriverOption = (1 << 4), + LinkerInput = (1 << 5), + NoArgumentUnused = (1 << 6), + NoForward = (1 << 7), Unsupported = (1 << 8), CC1Option = (1 << 9) }; @@ -68,7 +73,7 @@ namespace options { RenderValuesStyle }; - private: + protected: const OptTable::Info *Info; const OptTable *Owner; @@ -84,23 +89,23 @@ namespace options { assert(Info && "Must have a valid info!"); return Info->ID; } - + OptionClass getKind() const { assert(Info && "Must have a valid info!"); return OptionClass(Info->Kind); } - + StringRef getName() const { assert(Info && "Must have a valid info!"); return Info->Name; } - + const Option getGroup() const { assert(Info && "Must have a valid info!"); assert(Owner && "Must have a valid owner!"); return Owner->getOption(Info->GroupID); } - + const Option getAlias() const { assert(Info && "Must have a valid info!"); assert(Owner && "Must have a valid owner!"); @@ -109,10 +114,6 @@ namespace options { unsigned getNumArgs() const { return Info->Param; } - bool isUnsupported() const { return Info->Flags & options::Unsupported; } - - bool isLinkerInput() const { return Info->Flags & options::LinkerInput; } - bool hasNoOptAsInput() const { return Info->Flags & options::RenderAsInput;} RenderStyleKind getRenderStyle() const { @@ -139,18 +140,9 @@ namespace options { llvm_unreachable("Unexpected kind!"); } - bool isDriverOption() const { return Info->Flags & options::DriverOption; } - - bool hasNoArgumentUnused() const { - return Info->Flags & options::NoArgumentUnused; - } - - bool hasNoForward() const { return Info->Flags & options::NoForward; } - - bool isCC1Option() const { return Info->Flags & options::CC1Option; } - - bool hasForwardToGCC() const { - return !hasNoForward() && !isDriverOption() && !isLinkerInput(); + /// Test if this option has the flag \a Val. + bool hasFlag(unsigned Val) const { + return Info->Flags & Val; } /// getUnaliasedOption - Return the final option this option diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index f747621b8c..59cebf58c1 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -98,7 +98,7 @@ InputArgList *Driver::ParseArgStrings(ArrayRef ArgList) { for (ArgList::const_iterator it = Args->begin(), ie = Args->end(); it != ie; ++it) { Arg *A = *it; - if (A->getOption().isUnsupported()) { + if (A->getOption().hasFlag(options::Unsupported)) { Diag(clang::diag::err_drv_unsupported_opt) << A->getAsString(*Args); continue; } @@ -1033,7 +1033,7 @@ void Driver::BuildInputs(const ToolChain &TC, const DerivedArgList &Args, } else Inputs.push_back(std::make_pair(Ty, A)); - } else if (A->getOption().isLinkerInput()) { + } else if (A->getOption().hasFlag(options::LinkerInput)) { // Just treat as object type, we could make a special type for this if // necessary. Inputs.push_back(std::make_pair(types::TY_Object, A)); @@ -1300,7 +1300,7 @@ void Driver::BuildJobs(Compilation &C) const { // DiagnosticsEngine, so that extra values, position, and so on could be // printed. if (!A->isClaimed()) { - if (A->getOption().hasNoArgumentUnused()) + if (A->getOption().hasFlag(options::NoArgumentUnused)) continue; // Suppress the warning automatically if this is just a flag, and it is an diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index de18f53fbe..e5773fbe4a 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -737,7 +737,7 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, getDriver().Diag(diag::err_drv_invalid_Xarch_argument_with_args) << A->getAsString(Args); continue; - } else if (XarchArg->getOption().isDriverOption()) { + } else if (XarchArg->getOption().hasFlag(options::DriverOption)) { getDriver().Diag(diag::err_drv_invalid_Xarch_argument_isdriver) << A->getAsString(Args); continue; @@ -751,7 +751,7 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, // Linker input arguments require custom handling. The problem is that we // have already constructed the phase actions, so we can not treat them as // "input arguments". - if (A->getOption().isLinkerInput()) { + if (A->getOption().hasFlag(options::LinkerInput)) { // Convert the argument into individual Zlinker_input_args. for (unsigned i = 0, e = A->getNumValues(); i != e; ++i) { DAL->AddSeparateArg(OriginalArg, diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 760fc8bd9e..dd2d80c9d6 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -200,6 +200,12 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, CmdArgs.push_back(Args.MakeArgString(ProfileRT)); } +static bool forwardToGCC(const Option &O) { + return !O.hasFlag(options::NoForward) && + !O.hasFlag(options::DriverOption) && + !O.hasFlag(options::LinkerInput); +} + void Clang::AddPreprocessingOptions(Compilation &C, const Driver &D, const ArgList &Args, @@ -3193,7 +3199,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA, for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; - if (A->getOption().hasForwardToGCC()) { + if (forwardToGCC(A->getOption())) { // Don't forward any -g arguments to assembly steps. if (isa(JA) && A->getOption().matches(options::OPT_g_Group)) @@ -3418,7 +3424,7 @@ void hexagon::Link::ConstructJob(Compilation &C, const JobAction &JA, for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; - if (A->getOption().hasForwardToGCC()) { + if (forwardToGCC(A->getOption())) { // Don't forward any -g arguments to assembly steps. if (isa(JA) && A->getOption().matches(options::OPT_g_Group)) diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 20fd07819e..09c48ccfdb 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -2327,7 +2327,7 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, // Issue errors on arguments that are not valid for CC1. for (ArgList::iterator I = Args->begin(), E = Args->end(); I != E; ++I) { - if (!(*I)->getOption().isCC1Option()) { + if (!(*I)->getOption().hasFlag(options::CC1Option)) { Diags.Report(diag::err_drv_unknown_argument) << (*I)->getAsString(*Args); Success = false; } -- 2.40.0