hintonda updated this revision to Diff 195217.
hintonda added a comment.
- Original patch, r358337, that was reverted.
- Make sure to clear DefaultOptions on reset.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59746/new/
https://reviews.llvm.org/D59746
Files:
clang/lib/Tooling/CommonOptionsParser.cpp
llvm/docs/CommandLine.rst
llvm/include/llvm/Support/CommandLine.h
llvm/lib/Support/CommandLine.cpp
llvm/tools/llvm-opt-report/OptReport.cpp
llvm/unittests/Support/CommandLineTest.cpp
Index: llvm/unittests/Support/CommandLineTest.cpp
===================================================================
--- llvm/unittests/Support/CommandLineTest.cpp
+++ llvm/unittests/Support/CommandLineTest.cpp
@@ -620,6 +620,68 @@
}
}
+TEST(CommandLineTest, DefaultOptions) {
+ cl::ResetCommandLineParser();
+
+ StackOption<std::string> Bar("bar", cl::sub(*cl::AllSubCommands),
+ cl::DefaultOption);
+ StackOption<std::string, cl::alias> Bar_Alias(
+ "b", cl::desc("Alias for -bar"), cl::aliasopt(Bar), cl::DefaultOption);
+
+ StackOption<bool> Foo("foo", cl::init(false), cl::sub(*cl::AllSubCommands),
+ cl::DefaultOption);
+ StackOption<bool, cl::alias> Foo_Alias("f", cl::desc("Alias for -foo"),
+ cl::aliasopt(Foo), cl::DefaultOption);
+
+ StackSubCommand SC1("sc1", "First Subcommand");
+ // Override "-b" and change type in sc1 SubCommand.
+ StackOption<bool> SC1_B("b", cl::sub(SC1), cl::init(false));
+ StackSubCommand SC2("sc2", "Second subcommand");
+ // Override "-foo" and change type in sc2 SubCommand. Note that this does not
+ // affect "-f" alias, which continues to work correctly.
+ StackOption<std::string> SC2_Foo("foo", cl::sub(SC2));
+
+ const char *args0[] = {"prog", "-b", "args0 bar string", "-f"};
+ EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args0) / sizeof(char *), args0,
+ StringRef(), &llvm::nulls()));
+ EXPECT_TRUE(Bar == "args0 bar string");
+ EXPECT_TRUE(Foo);
+ EXPECT_FALSE(SC1_B);
+ EXPECT_TRUE(SC2_Foo.empty());
+
+ cl::ResetAllOptionOccurrences();
+
+ const char *args1[] = {"prog", "sc1", "-b", "-bar", "args1 bar string", "-f"};
+ EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args1) / sizeof(char *), args1,
+ StringRef(), &llvm::nulls()));
+ EXPECT_TRUE(Bar == "args1 bar string");
+ EXPECT_TRUE(Foo);
+ EXPECT_TRUE(SC1_B);
+ EXPECT_TRUE(SC2_Foo.empty());
+ for (auto *S : cl::getRegisteredSubcommands()) {
+ if (*S) {
+ EXPECT_EQ("sc1", S->getName());
+ }
+ }
+
+ cl::ResetAllOptionOccurrences();
+
+ const char *args2[] = {"prog", "sc2", "-b", "args2 bar string",
+ "-f", "-foo", "foo string"};
+ EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args2) / sizeof(char *), args2,
+ StringRef(), &llvm::nulls()));
+ EXPECT_TRUE(Bar == "args2 bar string");
+ EXPECT_TRUE(Foo);
+ EXPECT_FALSE(SC1_B);
+ EXPECT_TRUE(SC2_Foo == "foo string");
+ for (auto *S : cl::getRegisteredSubcommands()) {
+ if (*S) {
+ EXPECT_EQ("sc2", S->getName());
+ }
+ }
+ cl::ResetCommandLineParser();
+}
+
TEST(CommandLineTest, ArgumentLimit) {
std::string args(32 * 4096, 'a');
EXPECT_FALSE(llvm::sys::commandLineFitsWithinSystemLimits("cl", args.data()));
Index: llvm/tools/llvm-opt-report/OptReport.cpp
===================================================================
--- llvm/tools/llvm-opt-report/OptReport.cpp
+++ llvm/tools/llvm-opt-report/OptReport.cpp
@@ -36,8 +36,6 @@
using namespace llvm;
using namespace llvm::yaml;
-static cl::opt<bool> Help("h", cl::desc("Alias for -help"), cl::Hidden);
-
// Mark all our options with this category, everything else (except for -version
// and -help) will be hidden.
static cl::OptionCategory
@@ -440,11 +438,6 @@
"A tool to generate an optimization report from YAML optimization"
" record files.\n");
- if (Help) {
- cl::PrintHelpMessage();
- return 0;
- }
-
LocationInfoTy LocationInfo;
if (!readLocationInfo(LocationInfo))
return 1;
Index: llvm/lib/Support/CommandLine.cpp
===================================================================
--- llvm/lib/Support/CommandLine.cpp
+++ llvm/lib/Support/CommandLine.cpp
@@ -98,6 +98,11 @@
// This collects additional help to be printed.
std::vector<StringRef> MoreHelp;
+ // This collects Options added with the cl::DefaultOption flag. Since they can
+ // be overridden, they are not added to the appropriate SubCommands until
+ // ParseCommandLineOptions actually runs.
+ SmallVector<Option*, 4> DefaultOptions;
+
// This collects the different option categories that have been registered.
SmallPtrSet<OptionCategory *, 16> RegisteredOptionCategories;
@@ -146,6 +151,11 @@
void addOption(Option *O, SubCommand *SC) {
bool HadErrors = false;
if (O->hasArgStr()) {
+ // If it's a DefaultOption, check to make sure it isn't already there.
+ if (O->isDefaultOption() &&
+ SC->OptionsMap.find(O->ArgStr) != SC->OptionsMap.end())
+ return;
+
// Add argument to the argument map!
if (!SC->OptionsMap.insert(std::make_pair(O->ArgStr, O)).second) {
errs() << ProgramName << ": CommandLine Error: Option '" << O->ArgStr
@@ -185,7 +195,12 @@
}
}
- void addOption(Option *O) {
+ void addOption(Option *O, bool ProcessDefaultOption = false) {
+ if (!ProcessDefaultOption && O->isDefaultOption()) {
+ DefaultOptions.push_back(O);
+ return;
+ }
+
if (O->Subs.empty()) {
addOption(O, &*TopLevelSubCommand);
} else {
@@ -201,8 +216,12 @@
OptionNames.push_back(O->ArgStr);
SubCommand &Sub = *SC;
- for (auto Name : OptionNames)
- Sub.OptionsMap.erase(Name);
+ auto End = Sub.OptionsMap.end();
+ for (auto Name : OptionNames) {
+ auto I = Sub.OptionsMap.find(Name);
+ if (I != End && I->getValue() == O)
+ Sub.OptionsMap.erase(I);
+ }
if (O->getFormattingFlag() == cl::Positional)
for (auto Opt = Sub.PositionalOpts.begin();
@@ -266,8 +285,13 @@
if (O->Subs.empty())
updateArgStr(O, NewName, &*TopLevelSubCommand);
else {
- for (auto SC : O->Subs)
- updateArgStr(O, NewName, SC);
+ if (O->isInAllSubCommands()) {
+ for (auto SC : RegisteredSubCommands)
+ updateArgStr(O, NewName, SC);
+ } else {
+ for (auto SC : O->Subs)
+ updateArgStr(O, NewName, SC);
+ }
}
}
@@ -331,6 +355,8 @@
AllSubCommands->reset();
registerSubCommand(&*TopLevelSubCommand);
registerSubCommand(&*AllSubCommands);
+
+ DefaultOptions.clear();
}
private:
@@ -366,6 +392,13 @@
ArgStr = S;
}
+void Option::reset() {
+ NumOccurrences = 0;
+ setDefault();
+ if (isDefaultOption())
+ removeArgument();
+}
+
// Initialise the general option category.
OptionCategory llvm::cl::GeneralCategory("General options");
@@ -1167,6 +1200,10 @@
auto &SinkOpts = ChosenSubCommand->SinkOpts;
auto &OptionsMap = ChosenSubCommand->OptionsMap;
+ for (auto O: DefaultOptions) {
+ addOption(O, true);
+ }
+
if (ConsumeAfterOpt) {
assert(PositionalOpts.size() > 0 &&
"Cannot specify cl::ConsumeAfter without a positional argument!");
@@ -2146,6 +2183,9 @@
cl::location(WrappedNormalPrinter), cl::ValueDisallowed,
cl::cat(GenericCategory), cl::sub(*AllSubCommands));
+static cl::alias HOpA("h", cl::desc("Alias for -help"), cl::aliasopt(HOp),
+ cl::DefaultOption);
+
static cl::opt<HelpPrinterWrapper, true, parser<bool>>
HHOp("help-hidden", cl::desc("Display all available options"),
cl::location(WrappedHiddenPrinter), cl::Hidden, cl::ValueDisallowed,
Index: llvm/include/llvm/Support/CommandLine.h
===================================================================
--- llvm/include/llvm/Support/CommandLine.h
+++ llvm/include/llvm/Support/CommandLine.h
@@ -175,7 +175,10 @@
// If this is enabled, multiple letter options are allowed to bunch together
// with only a single hyphen for the whole group. This allows emulation
// of the behavior that ls uses for example: ls -la === ls -l -a
- Grouping = 0x08
+ Grouping = 0x08,
+
+ // Default option
+ DefaultOption = 0x10
};
//===----------------------------------------------------------------------===//
@@ -270,7 +273,7 @@
unsigned Value : 2;
unsigned HiddenFlag : 2; // enum OptionHidden
unsigned Formatting : 2; // enum FormattingFlags
- unsigned Misc : 4;
+ unsigned Misc : 5;
unsigned Position = 0; // Position of last occurrence of the option
unsigned AdditionalVals = 0; // Greater than 0 for multi-valued option.
@@ -306,6 +309,7 @@
bool hasArgStr() const { return !ArgStr.empty(); }
bool isPositional() const { return getFormattingFlag() == cl::Positional; }
bool isSink() const { return getMiscFlags() & cl::Sink; }
+ bool isDefaultOption() const { return getMiscFlags() & cl::DefaultOption; }
bool isConsumeAfter() const {
return getNumOccurrencesFlag() == cl::ConsumeAfter;
@@ -382,7 +386,7 @@
}
inline int getNumOccurrences() const { return NumOccurrences; }
- inline void reset() { NumOccurrences = 0; }
+ void reset();
};
//===----------------------------------------------------------------------===//
@@ -1732,7 +1736,10 @@
error("cl::alias must have argument name specified!");
if (!AliasFor)
error("cl::alias must have an cl::aliasopt(option) specified!");
+ if (!Subs.empty())
+ error("cl::alias must not have cl::sub(), aliased option's cl::sub() will be used!");
Subs = AliasFor->Subs;
+ Category = AliasFor->Category;
addArgument();
}
Index: llvm/docs/CommandLine.rst
===================================================================
--- llvm/docs/CommandLine.rst
+++ llvm/docs/CommandLine.rst
@@ -128,6 +128,7 @@
USAGE: compiler [options]
OPTIONS:
+ -h - Alias for -help
-help - display available options (-help-hidden for more)
-o <filename> - Specify output filename
@@ -194,6 +195,7 @@
USAGE: compiler [options] <input file>
OPTIONS:
+ -h - Alias for -help
-help - display available options (-help-hidden for more)
-o <filename> - Specify output filename
@@ -1251,6 +1253,14 @@
with ``cl::CommaSeparated``, this modifier only makes sense with a `cl::list`_
option.
+.. _cl::DefaultOption:
+
+* The **cl::DefaultOption** modifier is used to specify that the option is a
+ default that can be overridden by application specific parsers. For example,
+ the ``-help`` alias, ``-h``, is registered this way, so it can be overridden
+ by applications that need to use the ``-h`` option for another purpose,
+ either as a regular option or an alias for another option.
+
.. _response files:
Response files
Index: clang/lib/Tooling/CommonOptionsParser.cpp
===================================================================
--- clang/lib/Tooling/CommonOptionsParser.cpp
+++ clang/lib/Tooling/CommonOptionsParser.cpp
@@ -83,8 +83,6 @@
llvm::Error CommonOptionsParser::init(
int &argc, const char **argv, cl::OptionCategory &Category,
llvm::cl::NumOccurrencesFlag OccurrencesFlag, const char *Overview) {
- static cl::opt<bool> Help("h", cl::desc("Alias for -help"), cl::Hidden,
- cl::sub(*cl::AllSubCommands));
static cl::opt<std::string> BuildPath("p", cl::desc("Build path"),
cl::Optional, cl::cat(Category),
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
