diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-09-25 23:12:48 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-09-25 23:12:48 +0000 |
| commit | 9d1221a281d2deba82446823e67b27f71798feed (patch) | |
| tree | d3784a8911b0c706498094e001221acf1d0ef954 /clang/lib | |
| parent | 15a4bea41ede51750a2a0d79036242181b6e362d (diff) | |
| download | bcm5719-llvm-9d1221a281d2deba82446823e67b27f71798feed.tar.gz bcm5719-llvm-9d1221a281d2deba82446823e67b27f71798feed.zip | |
[Options] Store the option ID in OptTable::Info.
llvm-svn: 164644
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/CC1AsOptions.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/DriverOptions.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/OptTable.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Option.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Driver/CC1AsOptions.cpp b/clang/lib/Driver/CC1AsOptions.cpp index ea80f5a20ea..cc7c7a4fef1 100644 --- a/clang/lib/Driver/CC1AsOptions.cpp +++ b/clang/lib/Driver/CC1AsOptions.cpp @@ -18,7 +18,7 @@ using namespace clang::driver::cc1asoptions; static const OptTable::Info CC1AsInfoTable[] = { #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ + { NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, FLAGS, \ OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/CC1AsOptions.inc" }; diff --git a/clang/lib/Driver/DriverOptions.cpp b/clang/lib/Driver/DriverOptions.cpp index 715819d04b2..f9d36cfb5e6 100644 --- a/clang/lib/Driver/DriverOptions.cpp +++ b/clang/lib/Driver/DriverOptions.cpp @@ -17,7 +17,7 @@ using namespace clang::driver::options; static const OptTable::Info InfoTable[] = { #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ + { NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, FLAGS, \ OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/Options.inc" }; diff --git a/clang/lib/Driver/OptTable.cpp b/clang/lib/Driver/OptTable.cpp index 3ebc6d87258..a6d3cb31499 100644 --- a/clang/lib/Driver/OptTable.cpp +++ b/clang/lib/Driver/OptTable.cpp @@ -138,7 +138,7 @@ Option *OptTable::CreateOption(unsigned id) const { const Option *Group = getOption(info.GroupID); const Option *Alias = getOption(info.AliasID); - Option *Opt = new Option(&info, id, Group, Alias); + Option *Opt = new Option(&info, Group, Alias); return Opt; } diff --git a/clang/lib/Driver/Option.cpp b/clang/lib/Driver/Option.cpp index 57eaee22136..3be141e61da 100644 --- a/clang/lib/Driver/Option.cpp +++ b/clang/lib/Driver/Option.cpp @@ -17,9 +17,9 @@ #include <algorithm> using namespace clang::driver; -Option::Option(const OptTable::Info *info, OptSpecifier _ID, +Option::Option(const OptTable::Info *info, const Option *_Group, const Option *_Alias) - : Info(info), ID(_ID.getID()), Group(_Group), Alias(_Alias) { + : Info(info), Group(_Group), Alias(_Alias) { // Multi-level aliases are not supported, and alias options cannot // have groups. This just simplifies option tracking, it is not an @@ -72,7 +72,7 @@ bool Option::matches(OptSpecifier Opt) const { return Alias->matches(Opt); // Check exact match. - if (ID == Opt) + if (getID() == Opt.getID()) return true; if (Group) |
