Skip to content
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

Jump to bottom

[nfc][llvm-profdata] Use cl::Subcommand to organize subcommand and options in llvm-profdata #71328

Merged
merged 8 commits into from
Nov 14, 2023
Merged

[nfc][llvm-profdata] Use cl::Subcommand to organize subcommand and options in llvm-profdata #71328

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e9b590a
[nfc][llvm-profdata] Move show options to its namespace
minglotus-6 Nov 7, 2023
02a0de6
Add show_options namespace and move show_options from function scope to
minglotus-6 Nov 8, 2023
c9bdcf9
resolve feedback
minglotus-6 Nov 8, 2023
770e167
Refactor llvm-profdata to use cl::subcommand
minglotus-6 Nov 10, 2023
6fc1bfa
undo one-line added during debugging
minglotus-6 Nov 11, 2023
d71edf1
Merge branch 'main' into llvm-profdata
minglotus-6 Nov 13, 2023
0f3951d
resolve feedback
minglotus-6 Nov 13, 2023
5b9e7dc
move enum definition before option definition
minglotus-6 Nov 14, 2023
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
2 changes: 1 addition & 1 deletion llvm/include/llvm/Support/CommandLine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ struct sub {

sub(SubCommand &S) : Sub(S) {}

template <class Opt> void apply(Opt &O) const { O.addSubCommand(Sub); }
void apply(Option &O) const { O.addSubCommand(Sub); }
};

// Specify a callback function to be called when an option is seen.
Expand Down
7 changes: 7 additions & 0 deletions llvm/lib/Support/CommandLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,6 +1667,13 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
Handler = LookupLongOption(*ChosenSubCommand, ArgName, Value,
LongOptionsUseDoubleDash, HaveDoubleDash);

// If Handler is not found in a specialized subcommand, look up handler
// in the top-level subcommand.
// cl::opt without cl::sub belongs to top-level subcommand.
if (!Handler && ChosenSubCommand != &SubCommand::getTopLevel())
snehasish marked this conversation as resolved.
Show resolved Hide resolved
Handler = LookupLongOption(SubCommand::getTopLevel(), ArgName, Value,
LongOptionsUseDoubleDash, HaveDoubleDash);

// Check to see if this "option" is really a prefixed or grouped argument.
if (!Handler && !(LongOptionsUseDoubleDash && HaveDoubleDash))
Handler = HandlePrefixedOrGroupedOption(ArgName, Value, ErrorParsing,
Expand Down
Loading