Skip to content

[CommandLine][NFCI] Do not add 'All' to 'RegisteredSubCommands' #77041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2024
Merged

[CommandLine][NFCI] Do not add 'All' to 'RegisteredSubCommands' #77041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58114f6
[CommandLine][NFCI] Do not add 'All' to 'RegisteredSubCommands'
igorkudrin Dec 15, 2023
a20bb15
fixup! [CommandLine][NFCI] Do not add 'All' to 'RegisteredSubCommands'
igorkudrin Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions llvm/lib/Support/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,7 @@ class CommandLineParser {
// This collects the different subcommands that have been registered.
SmallPtrSet<SubCommand *, 4> RegisteredSubCommands;

CommandLineParser() {
registerSubCommand(&SubCommand::getTopLevel());
registerSubCommand(&SubCommand::getAll());
}
CommandLineParser() { registerSubCommand(&SubCommand::getTopLevel()); }

void ResetAllOptionOccurrences();

Expand Down Expand Up @@ -348,15 +345,15 @@ class CommandLineParser {

// For all options that have been registered for all subcommands, add the
// option to this subcommand now.
if (sub != &SubCommand::getAll()) {
for (auto &E : SubCommand::getAll().OptionsMap) {
Option *O = E.second;
if ((O->isPositional() || O->isSink() || O->isConsumeAfter()) ||
O->hasArgStr())
addOption(O, sub);
else
addLiteralOption(*O, sub, E.first());
}
assert(sub != &SubCommand::getAll() &&
"SubCommand::getAll() should not be registered");
for (auto &E : SubCommand::getAll().OptionsMap) {
Option *O = E.second;
if ((O->isPositional() || O->isSink() || O->isConsumeAfter()) ||
O->hasArgStr())
addOption(O, sub);
else
addLiteralOption(*O, sub, E.first());
}
}

Expand Down Expand Up @@ -384,7 +381,6 @@ class CommandLineParser {
SubCommand::getTopLevel().reset();
SubCommand::getAll().reset();
registerSubCommand(&SubCommand::getTopLevel());
registerSubCommand(&SubCommand::getAll());

DefaultOptions.clear();
}
Expand Down Expand Up @@ -532,8 +528,8 @@ SubCommand *CommandLineParser::LookupSubCommand(StringRef Name,
// Find a subcommand with the edit distance == 1.
SubCommand *NearestMatch = nullptr;
for (auto *S : RegisteredSubCommands) {
if (S == &SubCommand::getAll())
continue;
assert(S != &SubCommand::getAll() &&
"SubCommand::getAll() is not expected in RegisteredSubCommands");
if (S->getName().empty())
continue;

Expand Down